diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
index 8816b34d..adef735d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -370,5 +370,5 @@ public interface WxMpService {
*
* @return WxMpUserBlackListService
*/
- WxMpUserBlackListService getBlackListService();
+ WxMpUserBlacklistService getBlackListService();
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserBlackListService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserBlacklistService.java
similarity index 68%
rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserBlackListService.java
rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserBlacklistService.java
index 17dd5821..d93384f0 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserBlackListService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserBlacklistService.java
@@ -1,21 +1,21 @@
package me.chanjar.weixin.mp.api;
import me.chanjar.weixin.common.exception.WxErrorException;
-import me.chanjar.weixin.mp.bean.result.WxMpUserBlackListGetResult;
+import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
import java.util.List;
/**
* @author miller
*/
-public interface WxMpUserBlackListService {
+public interface WxMpUserBlacklistService {
/**
*
* 获取公众号的黑名单列表
* 详情请见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1471422259_pJMWA&token=&lang=zh_CN
*
*/
- WxMpUserBlackListGetResult blackList(String nextOpenid) throws WxErrorException;
+ WxMpUserBlacklistGetResult getBlacklist(String nextOpenid) throws WxErrorException;
/**
*
@@ -23,7 +23,7 @@ public interface WxMpUserBlackListService {
* 详情请见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1471422259_pJMWA&token=&lang=zh_CN
*
*/
- void pushToBlackList(List openIdList) throws WxErrorException;
+ void pushToBlacklist(List openidList) throws WxErrorException;
/**
*
@@ -31,5 +31,5 @@ public interface WxMpUserBlackListService {
* 详情请见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1471422259_pJMWA&token=&lang=zh_CN
*
*/
- void pullFromBlackList(List openIdList) throws WxErrorException;
+ void pullFromBlacklist(List openidList) throws WxErrorException;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
index 96031b6c..f1c8388e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
@@ -28,7 +28,7 @@ import me.chanjar.weixin.mp.api.WxMpMenuService;
import me.chanjar.weixin.mp.api.WxMpPayService;
import me.chanjar.weixin.mp.api.WxMpQrcodeService;
import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.WxMpUserBlackListService;
+import me.chanjar.weixin.mp.api.WxMpUserBlacklistService;
import me.chanjar.weixin.mp.api.WxMpUserService;
import me.chanjar.weixin.mp.api.WxMpUserTagService;
import me.chanjar.weixin.mp.bean.WxMpIndustry;
@@ -95,7 +95,7 @@ public class WxMpServiceImpl implements WxMpService {
private WxMpDataCubeService dataCubeService = new WxMpDataCubeServiceImpl(this);
- private WxMpUserBlackListService blackListService = new WxMpUserBlackListServiceImpl(this);
+ private WxMpUserBlacklistService blackListService = new WxMpUserBlacklistServiceImpl(this);
private CloseableHttpClient httpClient;
@@ -582,7 +582,7 @@ public class WxMpServiceImpl implements WxMpService {
}
@Override
- public WxMpUserBlackListService getBlackListService() {
+ public WxMpUserBlacklistService getBlackListService() {
return this.blackListService;
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlackListServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImpl.java
similarity index 53%
rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlackListServiceImpl.java
rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImpl.java
index d749ed8c..b0b35343 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlackListServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImpl.java
@@ -5,8 +5,8 @@ import com.google.gson.JsonObject;
import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.WxMpUserBlackListService;
-import me.chanjar.weixin.mp.bean.result.WxMpUserBlackListGetResult;
+import me.chanjar.weixin.mp.api.WxMpUserBlacklistService;
+import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
import java.util.HashMap;
import java.util.List;
@@ -15,36 +15,36 @@ import java.util.Map;
/**
* @author miller
*/
-public class WxMpUserBlackListServiceImpl implements WxMpUserBlackListService {
- private static final String API_BLACK_LIST_PREFIX = "https://api.weixin.qq.com/cgi-bin/tags/members";
+public class WxMpUserBlacklistServiceImpl implements WxMpUserBlacklistService {
+ private static final String API_BLACKLIST_PREFIX = "https://api.weixin.qq.com/cgi-bin/tags/members";
private WxMpService wxMpService;
- public WxMpUserBlackListServiceImpl(WxMpService wxMpService) {
+ public WxMpUserBlacklistServiceImpl(WxMpService wxMpService) {
this.wxMpService = wxMpService;
}
@Override
- public WxMpUserBlackListGetResult blackList(String nextOpenid) throws WxErrorException {
+ public WxMpUserBlacklistGetResult getBlacklist(String nextOpenid) throws WxErrorException {
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("begin_openid", nextOpenid);
- String url = API_BLACK_LIST_PREFIX + "/getblacklist";
+ String url = API_BLACKLIST_PREFIX + "/getblacklist";
String responseContent = this.wxMpService.execute(new SimplePostRequestExecutor(), url, jsonObject.toString());
- return WxMpUserBlackListGetResult.fromJson(responseContent);
+ return WxMpUserBlacklistGetResult.fromJson(responseContent);
}
@Override
- public void pushToBlackList(List openIdList) throws WxErrorException {
+ public void pushToBlacklist(List openidList) throws WxErrorException {
Map map = new HashMap<>();
- map.put("openid_list", openIdList);
- String url = API_BLACK_LIST_PREFIX + "/batchblacklist";
+ map.put("openid_list", openidList);
+ String url = API_BLACKLIST_PREFIX + "/batchblacklist";
this.wxMpService.execute(new SimplePostRequestExecutor(), url, new Gson().toJson(map));
}
@Override
- public void pullFromBlackList(List openIdList) throws WxErrorException {
+ public void pullFromBlacklist(List openidList) throws WxErrorException {
Map map = new HashMap<>();
- map.put("openid_list", openIdList);
- String url = API_BLACK_LIST_PREFIX + "/batchunblacklist";
+ map.put("openid_list", openidList);
+ String url = API_BLACKLIST_PREFIX + "/batchunblacklist";
this.wxMpService.execute(new SimplePostRequestExecutor(), url, new Gson().toJson(map));
}
}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlackListGetResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java
similarity index 55%
rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlackListGetResult.java
rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java
index 12a48e3d..3cfbc009 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlackListGetResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java
@@ -8,14 +8,14 @@ import java.util.List;
/**
* @author miller
*/
-public class WxMpUserBlackListGetResult {
+public class WxMpUserBlacklistGetResult {
protected int total = -1;
protected int count = -1;
- protected List openIds = new ArrayList<>();
- protected String nextOpenId;
+ protected List openidList = new ArrayList<>();
+ protected String nextOpenid;
- public static WxMpUserBlackListGetResult fromJson(String json) {
- return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUserBlackListGetResult.class);
+ public static WxMpUserBlacklistGetResult fromJson(String json) {
+ return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUserBlacklistGetResult.class);
}
public int getTotal() {
@@ -34,20 +34,20 @@ public class WxMpUserBlackListGetResult {
this.count = count;
}
- public List getOpenIds() {
- return this.openIds;
+ public List getOpenidList() {
+ return this.openidList;
}
- public void setOpenIds(List openIds) {
- this.openIds = openIds;
+ public void setOpenidList(List openidList) {
+ this.openidList = openidList;
}
- public String getNextOpenId() {
- return this.nextOpenId;
+ public String getNextOpenid() {
+ return this.nextOpenid;
}
- public void setNextOpenId(String nextOpenId) {
- this.nextOpenId = nextOpenId;
+ public void setNextOpenid(String nextOpenid) {
+ this.nextOpenid = nextOpenid;
}
@Override
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
index 4152a8da..ab3d5769 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
@@ -45,7 +45,7 @@ public class WxMpGsonBuilder {
INSTANCE.registerTypeAdapter(WxMpMassPreviewMessage.class, new WxMpMassPreviewMessageGsonAdapter());
INSTANCE.registerTypeAdapter(WxMediaImgUploadResult.class, new WxMediaImgUploadResultGsonAdapter());
INSTANCE.registerTypeAdapter(WxMpIndustry.class, new WxMpIndustryGsonAdapter());
- INSTANCE.registerTypeAdapter(WxMpUserBlackListGetResult.class, new WxUserBlackListGetResultGsonAdapter());
+ INSTANCE.registerTypeAdapter(WxMpUserBlacklistGetResult.class, new WxUserBlacklistGetResultGsonAdapter());
}
public static Gson create() {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserBlackListGetResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserBlackListGetResultGsonAdapter.java
deleted file mode 100644
index 5f68f12a..00000000
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserBlackListGetResultGsonAdapter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package me.chanjar.weixin.mp.util.json;
-
-import com.google.gson.*;
-import me.chanjar.weixin.common.util.json.GsonHelper;
-import me.chanjar.weixin.mp.bean.result.WxMpUserBlackListGetResult;
-
-import java.lang.reflect.Type;
-
-/**
- * @author miller
- */
-public class WxUserBlackListGetResultGsonAdapter implements JsonDeserializer {
- @Override
- public WxMpUserBlackListGetResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
- JsonObject o = json.getAsJsonObject();
- WxMpUserBlackListGetResult wxMpUserBlackListGetResult = new WxMpUserBlackListGetResult();
- wxMpUserBlackListGetResult.setTotal(GsonHelper.getInteger(o, "total"));
- wxMpUserBlackListGetResult.setCount(GsonHelper.getInteger(o, "count"));
- wxMpUserBlackListGetResult.setNextOpenId(GsonHelper.getString(o, "next_openid"));
- if (o.get("data") != null && !o.get("data").isJsonNull() && !o.get("data").getAsJsonObject().get("openid").isJsonNull()) {
- JsonArray data = o.get("data").getAsJsonObject().get("openid").getAsJsonArray();
- for (int i = 0; i < data.size(); i++) {
- wxMpUserBlackListGetResult.getOpenIds().add(GsonHelper.getAsString(data.get(i)));
- }
- }
- return wxMpUserBlackListGetResult;
- }
-}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserBlacklistGetResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserBlacklistGetResultGsonAdapter.java
new file mode 100644
index 00000000..64582f64
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserBlacklistGetResultGsonAdapter.java
@@ -0,0 +1,28 @@
+package me.chanjar.weixin.mp.util.json;
+
+import com.google.gson.*;
+import me.chanjar.weixin.common.util.json.GsonHelper;
+import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
+
+import java.lang.reflect.Type;
+
+/**
+ * @author miller
+ */
+public class WxUserBlacklistGetResultGsonAdapter implements JsonDeserializer {
+ @Override
+ public WxMpUserBlacklistGetResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+ JsonObject o = json.getAsJsonObject();
+ WxMpUserBlacklistGetResult wxMpUserBlacklistGetResult = new WxMpUserBlacklistGetResult();
+ wxMpUserBlacklistGetResult.setTotal(GsonHelper.getInteger(o, "total"));
+ wxMpUserBlacklistGetResult.setCount(GsonHelper.getInteger(o, "count"));
+ wxMpUserBlacklistGetResult.setNextOpenid(GsonHelper.getString(o, "next_openid"));
+ if (o.get("data") != null && !o.get("data").isJsonNull() && !o.get("data").getAsJsonObject().get("openid").isJsonNull()) {
+ JsonArray data = o.get("data").getAsJsonObject().get("openid").getAsJsonArray();
+ for (int i = 0; i < data.size(); i++) {
+ wxMpUserBlacklistGetResult.getOpenidList().add(GsonHelper.getAsString(data.get(i)));
+ }
+ }
+ return wxMpUserBlacklistGetResult;
+ }
+}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
index 3955f87d..f4b79ae2 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
@@ -43,16 +43,16 @@ public class ApiTestModule implements Module {
public static class WxXmlMpInMemoryConfigStorage
extends WxMpInMemoryConfigStorage {
- private String openId;
+ private String openid;
private String kfAccount;
private String qrconnectRedirectUrl;
- public String getOpenId() {
- return this.openId;
+ public String getOpenid() {
+ return this.openid;
}
- public void setOpenId(String openId) {
- this.openId = openId;
+ public void setOpenid(String openid) {
+ this.openid = openid;
}
@Override
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
index 168f96cf..ee99b6e1 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
@@ -41,7 +41,7 @@ public class WxMpMassMessageAPITest {
WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
massMessage.setMsgType(WxConsts.MASS_MSG_TEXT);
massMessage.setContent("测试群发消息\n欢迎欢迎,热烈欢迎\n换行测试\n超链接:Hello World");
- massMessage.getToUsers().add(configProvider.getOpenId());
+ massMessage.getToUsers().add(configProvider.getOpenid());
WxMpMassSendResult massResult = this.wxService
.massOpenIdsMessageSend(massMessage);
@@ -58,7 +58,7 @@ public class WxMpMassMessageAPITest {
WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
massMessage.setMsgType(massMsgType);
massMessage.setMediaId(mediaId);
- massMessage.getToUsers().add(configProvider.getOpenId());
+ massMessage.getToUsers().add(configProvider.getOpenid());
WxMpMassSendResult massResult = this.wxService
.massOpenIdsMessageSend(massMessage);
@@ -73,13 +73,13 @@ public class WxMpMassMessageAPITest {
massMessage.setContent("测试群发消息\n欢迎欢迎,热烈欢迎\n换行测试\n超链接:Hello World");
massMessage
.setGroupId(this.wxService.getGroupService().groupGet().get(0).getId());
-
+
WxMpMassSendResult massResult = this.wxService
.massGroupMessageSend(massMessage);
Assert.assertNotNull(massResult);
Assert.assertNotNull(massResult.getMsgId());
}
-
+
@Test(dataProvider="massMessages")
public void testMediaMassGroupMessageSend(String massMsgType, String mediaId)
throws WxErrorException {
@@ -94,7 +94,7 @@ public class WxMpMassMessageAPITest {
Assert.assertNotNull(massResult);
Assert.assertNotNull(massResult.getMsgId());
}
-
+
@DataProvider
public Object[][] massMessages() throws WxErrorException, IOException {
Object[][] messages = new Object[4][];
@@ -109,7 +109,7 @@ public class WxMpMassMessageAPITest {
.mediaUpload(WxConsts.MEDIA_VIDEO, WxConsts.FILE_MP4, inputStream);
Assert.assertNotNull(uploadMediaRes);
Assert.assertNotNull(uploadMediaRes.getMediaId());
-
+
// 把视频变成可被群发的媒体
WxMpMassVideo video = new WxMpMassVideo();
video.setTitle("测试标题");
@@ -155,7 +155,7 @@ public class WxMpMassMessageAPITest {
.mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
Assert.assertNotNull(uploadMediaRes);
Assert.assertNotNull(uploadMediaRes.getMediaId());
-
+
// 上传图文消息
WxMpMassNews news = new WxMpMassNews();
WxMpMassNews.WxMpMassNewsArticle article1 = new WxMpMassNews.WxMpMassNewsArticle();
@@ -163,7 +163,7 @@ public class WxMpMassMessageAPITest {
article1.setContent("内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1");
article1.setThumbMediaId(uploadMediaRes.getMediaId());
news.addArticle(article1);
-
+
WxMpMassNews.WxMpMassNewsArticle article2 = new WxMpMassNews.WxMpMassNewsArticle();
article2.setTitle("标题2");
article2.setContent("内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2");
@@ -173,7 +173,7 @@ public class WxMpMassMessageAPITest {
article2.setContentSourceUrl("www.baidu.com");
article2.setDigest("摘要2");
news.addArticle(article2);
-
+
WxMpMassUploadResult massUploadResult = this.wxService
.massNewsUpload(news);
Assert.assertNotNull(massUploadResult);
@@ -183,5 +183,5 @@ public class WxMpMassMessageAPITest {
return messages;
}
-
+
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
index d0ba6029..5d114cc4 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
@@ -12,7 +12,7 @@ import java.util.List;
/**
* 测试分组接口
- *
+ *
* @author chanjarster
*/
@Deprecated
@@ -24,7 +24,7 @@ public class WxMpGroupServiceImplTest {
protected WxMpServiceImpl wxService;
protected WxMpGroup group;
-
+
public void testGroupCreate() throws WxErrorException {
WxMpGroup res = this.wxService.getGroupService().groupCreate("测试分组1");
Assert.assertEquals(res.getName(), "测试分组1");
@@ -40,7 +40,7 @@ public class WxMpGroupServiceImplTest {
Assert.assertNotNull(g.getName());
}
}
-
+
@Test(dependsOnMethods={"testGroupGet", "testGroupCreate"})
public void getGroupUpdate() throws WxErrorException {
this.group.setName("分组改名");
@@ -49,13 +49,13 @@ public class WxMpGroupServiceImplTest {
public void testGroupQueryUserGroup() throws WxErrorException {
ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
- long groupid = this.wxService.getGroupService().userGetGroup(configStorage.getOpenId());
+ long groupid = this.wxService.getGroupService().userGetGroup(configStorage.getOpenid());
Assert.assertTrue(groupid != -1l);
}
public void testGroupMoveUser() throws WxErrorException {
ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
- this.wxService.getGroupService().userUpdateGroup(configStorage.getOpenId(), this.wxService.getGroupService().groupGet().get(3).getId());
+ this.wxService.getGroupService().userUpdateGroup(configStorage.getOpenid(), this.wxService.getGroupService().groupGet().get(3).getId());
}
}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java
index 21096f61..66ff3c30 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java
@@ -42,7 +42,7 @@ public class WxMpKefuServiceImplTest {
.getWxMpConfigStorage();
WxMpCustomMessage message = new WxMpCustomMessage();
message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
- message.setToUser(configStorage.getOpenId());
+ message.setToUser(configStorage.getOpenid());
message.setContent(
"欢迎欢迎,热烈欢迎\n换行测试\n超链接:Hello World");
@@ -54,7 +54,7 @@ public class WxMpKefuServiceImplTest {
.getWxMpConfigStorage();
WxMpCustomMessage message = new WxMpCustomMessage();
message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
- message.setToUser(configStorage.getOpenId());
+ message.setToUser(configStorage.getOpenid());
message.setKfAccount(configStorage.getKfAccount());
message.setContent(
"欢迎欢迎,热烈欢迎\n换行测试\n超链接:Hello World");
@@ -130,7 +130,7 @@ public class WxMpKefuServiceImplTest {
WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
.getWxMpConfigStorage();
return new Object[][] {
- { configStorage.getKfAccount(), configStorage.getOpenId() } };
+ { configStorage.getKfAccount(), configStorage.getOpenid() } };
}
@Test(dataProvider = "getKfAccountAndOpenid")
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlackListServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlackListServiceImplTest.java
deleted file mode 100644
index b511f5e7..00000000
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlackListServiceImplTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package me.chanjar.weixin.mp.api.impl;
-
-import me.chanjar.weixin.mp.api.ApiTestModule;
-import me.chanjar.weixin.mp.bean.result.WxMpUserBlackListGetResult;
-import org.testng.Assert;
-import org.testng.annotations.Guice;
-import org.testng.annotations.Test;
-
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author miller
- */
-@Test(groups = "userAPI")
-@Guice(modules = ApiTestModule.class)
-public class WxMpUserBlackListServiceImplTest {
- //此处openid只是开发的时候测试用 使用者测试的时候请替换自己公众号的openid
- private final String TEST_OPENID = "o9VAswOI0KSXFUtFHgk9Kb9Rtkys";
- @Inject
- protected WxMpServiceImpl wxService;
-
- @Test
- public void testBlackList() throws Exception {
- WxMpUserBlackListGetResult wxMpUserBlackListGetResult = this.wxService.getBlackListService().blackList(TEST_OPENID);
- Assert.assertNotNull(wxMpUserBlackListGetResult);
- Assert.assertFalse(wxMpUserBlackListGetResult.getCount() == -1);
- Assert.assertFalse(wxMpUserBlackListGetResult.getTotal() == -1);
- Assert.assertFalse(wxMpUserBlackListGetResult.getOpenIds().size() == -1);
- System.out.println(wxMpUserBlackListGetResult);
- }
-
- @Test
- public void testPushToBlackList() throws Exception {
- List openIdList = new ArrayList<>();
- openIdList.add(TEST_OPENID);
- this.wxService.getBlackListService().pushToBlackList(openIdList);
- }
-
- @Test
- public void testPullFromBlackList() throws Exception {
- List openIdList = new ArrayList<>();
- openIdList.add(TEST_OPENID);
- this.wxService.getBlackListService().pullFromBlackList(openIdList);
- }
-
-}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImplTest.java
new file mode 100644
index 00000000..6d31ea97
--- /dev/null
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImplTest.java
@@ -0,0 +1,52 @@
+package me.chanjar.weixin.mp.api.impl;
+
+import me.chanjar.weixin.mp.api.ApiTestModule;
+import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
+import org.testng.Assert;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author miller
+ */
+@Test(groups = "userAPI")
+@Guice(modules = ApiTestModule.class)
+public class WxMpUserBlacklistServiceImplTest {
+ @Inject
+ protected WxMpServiceImpl wxService;
+
+ @Test
+ public void testGetBlacklist() throws Exception {
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+ .getWxMpConfigStorage();
+ WxMpUserBlacklistGetResult wxMpUserBlacklistGetResult = this.wxService.getBlackListService().getBlacklist(configStorage.getOpenid());
+ Assert.assertNotNull(wxMpUserBlacklistGetResult);
+ Assert.assertFalse(wxMpUserBlacklistGetResult.getCount() == -1);
+ Assert.assertFalse(wxMpUserBlacklistGetResult.getTotal() == -1);
+ Assert.assertFalse(wxMpUserBlacklistGetResult.getOpenidList().size() == -1);
+ System.out.println(wxMpUserBlacklistGetResult);
+ }
+
+ @Test
+ public void testPushToBlacklist() throws Exception {
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+ .getWxMpConfigStorage();
+ List openidList = new ArrayList<>();
+ openidList.add(configStorage.getOpenid());
+ this.wxService.getBlackListService().pushToBlacklist(openidList);
+ }
+
+ @Test
+ public void testPullFromBlacklist() throws Exception {
+ ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
+ .getWxMpConfigStorage();
+ List openidList = new ArrayList<>();
+ openidList.add(configStorage.getOpenid());
+ this.wxService.getBlackListService().pullFromBlacklist(openidList);
+ }
+
+}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
index bc598285..95671b40 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
@@ -26,12 +26,12 @@ public class WxMpUserServiceImplTest {
public void testUserUpdateRemark() throws WxErrorException {
ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
- this.wxService.getUserService().userUpdateRemark(configProvider.getOpenId(), "测试备注名");
+ this.wxService.getUserService().userUpdateRemark(configProvider.getOpenid(), "测试备注名");
}
public void testUserInfo() throws WxErrorException {
ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
- WxMpUser user = this.wxService.getUserService().userInfo(configProvider.getOpenId(), null);
+ WxMpUser user = this.wxService.getUserService().userInfo(configProvider.getOpenid(), null);
Assert.assertNotNull(user);
System.out.println(user);
}
diff --git a/weixin-java-mp/src/test/resources/test-config.sample.xml b/weixin-java-mp/src/test/resources/test-config.sample.xml
index 836b26c4..0df87b09 100644
--- a/weixin-java-mp/src/test/resources/test-config.sample.xml
+++ b/weixin-java-mp/src/test/resources/test-config.sample.xml
@@ -5,7 +5,7 @@
公众号EncodingAESKey
可以不填写
可以不填写
- 某个加你公众号的用户的openId
+ 某个加你公众号的用户的openId
网页授权获取用户信息回调地址
网页应用授权登陆回调地址
完整客服账号,格式为:账号前缀@公众号微信号