Skip to content

Commit 63c41d4

Browse files
kareanyikareanyi
committed
1.rename openId to openid 2.rename blackList to blacklist 3.refine blacklist test
1 parent b941a57 commit 63c41d4

16 files changed

+143
-139
lines changed

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,5 +370,5 @@ public interface WxMpService {
370370
*
371371
* @return WxMpUserBlackListService
372372
*/
373-
WxMpUserBlackListService getBlackListService();
373+
WxMpUserBlacklistService getBlackListService();
374374
}

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserBlackListService.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserBlacklistService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
package me.chanjar.weixin.mp.api;
22

33
import me.chanjar.weixin.common.exception.WxErrorException;
4-
import me.chanjar.weixin.mp.bean.result.WxMpUserBlackListGetResult;
4+
import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
55

66
import java.util.List;
77

88
/**
99
* @author miller
1010
*/
11-
public interface WxMpUserBlackListService {
11+
public interface WxMpUserBlacklistService {
1212
/**
1313
* <pre>
1414
* 获取公众号的黑名单列表
1515
* 详情请见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1471422259_pJMWA&token=&lang=zh_CN
1616
* </pre>
1717
*/
18-
WxMpUserBlackListGetResult blackList(String nextOpenid) throws WxErrorException;
18+
WxMpUserBlacklistGetResult getBlacklist(String nextOpenid) throws WxErrorException;
1919

2020
/**
2121
* <pre>
2222
* 拉黑用户
2323
* 详情请见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1471422259_pJMWA&token=&lang=zh_CN
2424
* </pre>
2525
*/
26-
void pushToBlackList(List<String> openIdList) throws WxErrorException;
26+
void pushToBlacklist(List<String> openidList) throws WxErrorException;
2727

2828
/**
2929
* <pre>
3030
* 取消拉黑用户
3131
* 详情请见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1471422259_pJMWA&token=&lang=zh_CN
3232
* </pre>
3333
*/
34-
void pullFromBlackList(List<String> openIdList) throws WxErrorException;
34+
void pullFromBlacklist(List<String> openidList) throws WxErrorException;
3535
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import me.chanjar.weixin.mp.api.WxMpPayService;
2929
import me.chanjar.weixin.mp.api.WxMpQrcodeService;
3030
import me.chanjar.weixin.mp.api.WxMpService;
31-
import me.chanjar.weixin.mp.api.WxMpUserBlackListService;
31+
import me.chanjar.weixin.mp.api.WxMpUserBlacklistService;
3232
import me.chanjar.weixin.mp.api.WxMpUserService;
3333
import me.chanjar.weixin.mp.api.WxMpUserTagService;
3434
import me.chanjar.weixin.mp.bean.WxMpIndustry;
@@ -95,7 +95,7 @@ public class WxMpServiceImpl implements WxMpService {
9595

9696
private WxMpDataCubeService dataCubeService = new WxMpDataCubeServiceImpl(this);
9797

98-
private WxMpUserBlackListService blackListService = new WxMpUserBlackListServiceImpl(this);
98+
private WxMpUserBlacklistService blackListService = new WxMpUserBlacklistServiceImpl(this);
9999

100100
private CloseableHttpClient httpClient;
101101

@@ -582,7 +582,7 @@ public WxMpDataCubeService getDataCubeService() {
582582
}
583583

584584
@Override
585-
public WxMpUserBlackListService getBlackListService() {
585+
public WxMpUserBlacklistService getBlackListService() {
586586
return this.blackListService;
587587
}
588588

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlackListServiceImpl.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImpl.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import me.chanjar.weixin.common.exception.WxErrorException;
66
import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
77
import me.chanjar.weixin.mp.api.WxMpService;
8-
import me.chanjar.weixin.mp.api.WxMpUserBlackListService;
9-
import me.chanjar.weixin.mp.bean.result.WxMpUserBlackListGetResult;
8+
import me.chanjar.weixin.mp.api.WxMpUserBlacklistService;
9+
import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
1010

1111
import java.util.HashMap;
1212
import java.util.List;
@@ -15,36 +15,36 @@
1515
/**
1616
* @author miller
1717
*/
18-
public class WxMpUserBlackListServiceImpl implements WxMpUserBlackListService {
19-
private static final String API_BLACK_LIST_PREFIX = "https://api.weixin.qq.com/cgi-bin/tags/members";
18+
public class WxMpUserBlacklistServiceImpl implements WxMpUserBlacklistService {
19+
private static final String API_BLACKLIST_PREFIX = "https://api.weixin.qq.com/cgi-bin/tags/members";
2020
private WxMpService wxMpService;
2121

22-
public WxMpUserBlackListServiceImpl(WxMpService wxMpService) {
22+
public WxMpUserBlacklistServiceImpl(WxMpService wxMpService) {
2323
this.wxMpService = wxMpService;
2424
}
2525

2626
@Override
27-
public WxMpUserBlackListGetResult blackList(String nextOpenid) throws WxErrorException {
27+
public WxMpUserBlacklistGetResult getBlacklist(String nextOpenid) throws WxErrorException {
2828
JsonObject jsonObject = new JsonObject();
2929
jsonObject.addProperty("begin_openid", nextOpenid);
30-
String url = API_BLACK_LIST_PREFIX + "/getblacklist";
30+
String url = API_BLACKLIST_PREFIX + "/getblacklist";
3131
String responseContent = this.wxMpService.execute(new SimplePostRequestExecutor(), url, jsonObject.toString());
32-
return WxMpUserBlackListGetResult.fromJson(responseContent);
32+
return WxMpUserBlacklistGetResult.fromJson(responseContent);
3333
}
3434

3535
@Override
36-
public void pushToBlackList(List<String> openIdList) throws WxErrorException {
36+
public void pushToBlacklist(List<String> openidList) throws WxErrorException {
3737
Map<String, Object> map = new HashMap<>();
38-
map.put("openid_list", openIdList);
39-
String url = API_BLACK_LIST_PREFIX + "/batchblacklist";
38+
map.put("openid_list", openidList);
39+
String url = API_BLACKLIST_PREFIX + "/batchblacklist";
4040
this.wxMpService.execute(new SimplePostRequestExecutor(), url, new Gson().toJson(map));
4141
}
4242

4343
@Override
44-
public void pullFromBlackList(List<String> openIdList) throws WxErrorException {
44+
public void pullFromBlacklist(List<String> openidList) throws WxErrorException {
4545
Map<String, Object> map = new HashMap<>();
46-
map.put("openid_list", openIdList);
47-
String url = API_BLACK_LIST_PREFIX + "/batchunblacklist";
46+
map.put("openid_list", openidList);
47+
String url = API_BLACKLIST_PREFIX + "/batchunblacklist";
4848
this.wxMpService.execute(new SimplePostRequestExecutor(), url, new Gson().toJson(map));
4949
}
5050
}

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlackListGetResult.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
/**
99
* @author miller
1010
*/
11-
public class WxMpUserBlackListGetResult {
11+
public class WxMpUserBlacklistGetResult {
1212
protected int total = -1;
1313
protected int count = -1;
14-
protected List<String> openIds = new ArrayList<>();
15-
protected String nextOpenId;
14+
protected List<String> openidList = new ArrayList<>();
15+
protected String nextOpenid;
1616

17-
public static WxMpUserBlackListGetResult fromJson(String json) {
18-
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUserBlackListGetResult.class);
17+
public static WxMpUserBlacklistGetResult fromJson(String json) {
18+
return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUserBlacklistGetResult.class);
1919
}
2020

2121
public int getTotal() {
@@ -34,20 +34,20 @@ public void setCount(int count) {
3434
this.count = count;
3535
}
3636

37-
public List<String> getOpenIds() {
38-
return this.openIds;
37+
public List<String> getOpenidList() {
38+
return this.openidList;
3939
}
4040

41-
public void setOpenIds(List<String> openIds) {
42-
this.openIds = openIds;
41+
public void setOpenidList(List<String> openidList) {
42+
this.openidList = openidList;
4343
}
4444

45-
public String getNextOpenId() {
46-
return this.nextOpenId;
45+
public String getNextOpenid() {
46+
return this.nextOpenid;
4747
}
4848

49-
public void setNextOpenId(String nextOpenId) {
50-
this.nextOpenId = nextOpenId;
49+
public void setNextOpenid(String nextOpenid) {
50+
this.nextOpenid = nextOpenid;
5151
}
5252

5353
@Override

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class WxMpGsonBuilder {
4545
INSTANCE.registerTypeAdapter(WxMpMassPreviewMessage.class, new WxMpMassPreviewMessageGsonAdapter());
4646
INSTANCE.registerTypeAdapter(WxMediaImgUploadResult.class, new WxMediaImgUploadResultGsonAdapter());
4747
INSTANCE.registerTypeAdapter(WxMpIndustry.class, new WxMpIndustryGsonAdapter());
48-
INSTANCE.registerTypeAdapter(WxMpUserBlackListGetResult.class, new WxUserBlackListGetResultGsonAdapter());
48+
INSTANCE.registerTypeAdapter(WxMpUserBlacklistGetResult.class, new WxUserBlacklistGetResultGsonAdapter());
4949
}
5050

5151
public static Gson create() {

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserBlackListGetResultGsonAdapter.java‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserBlacklistGetResultGsonAdapter.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package me.chanjar.weixin.mp.util.json;
2+
3+
import com.google.gson.*;
4+
import me.chanjar.weixin.common.util.json.GsonHelper;
5+
import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
6+
7+
import java.lang.reflect.Type;
8+
9+
/**
10+
* @author miller
11+
*/
12+
public class WxUserBlacklistGetResultGsonAdapter implements JsonDeserializer<WxMpUserBlacklistGetResult> {
13+
@Override
14+
public WxMpUserBlacklistGetResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
15+
JsonObject o = json.getAsJsonObject();
16+
WxMpUserBlacklistGetResult wxMpUserBlacklistGetResult = new WxMpUserBlacklistGetResult();
17+
wxMpUserBlacklistGetResult.setTotal(GsonHelper.getInteger(o, "total"));
18+
wxMpUserBlacklistGetResult.setCount(GsonHelper.getInteger(o, "count"));
19+
wxMpUserBlacklistGetResult.setNextOpenid(GsonHelper.getString(o, "next_openid"));
20+
if (o.get("data") != null && !o.get("data").isJsonNull() && !o.get("data").getAsJsonObject().get("openid").isJsonNull()) {
21+
JsonArray data = o.get("data").getAsJsonObject().get("openid").getAsJsonArray();
22+
for (int i = 0; i < data.size(); i++) {
23+
wxMpUserBlacklistGetResult.getOpenidList().add(GsonHelper.getAsString(data.get(i)));
24+
}
25+
}
26+
return wxMpUserBlacklistGetResult;
27+
}
28+
}

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ public static <T> T fromXml(Class<T> clazz, InputStream is) {
4343
public static class WxXmlMpInMemoryConfigStorage
4444
extends WxMpInMemoryConfigStorage {
4545

46-
private String openId;
46+
private String openid;
4747
private String kfAccount;
4848
private String qrconnectRedirectUrl;
4949

50-
public String getOpenId() {
51-
return this.openId;
50+
public String getOpenid() {
51+
return this.openid;
5252
}
5353

54-
public void setOpenId(String openId) {
55-
this.openId = openId;
54+
public void setOpenid(String openid) {
55+
this.openid = openid;
5656
}
5757

5858
@Override

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void testTextMassOpenIdsMessageSend() throws WxErrorException {
4141
WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
4242
massMessage.setMsgType(WxConsts.MASS_MSG_TEXT);
4343
massMessage.setContent("测试群发消息\n欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
44-
massMessage.getToUsers().add(configProvider.getOpenId());
44+
massMessage.getToUsers().add(configProvider.getOpenid());
4545

4646
WxMpMassSendResult massResult = this.wxService
4747
.massOpenIdsMessageSend(massMessage);
@@ -58,7 +58,7 @@ public void testMediaMassOpenIdsMessageSend(String massMsgType,
5858
WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
5959
massMessage.setMsgType(massMsgType);
6060
massMessage.setMediaId(mediaId);
61-
massMessage.getToUsers().add(configProvider.getOpenId());
61+
massMessage.getToUsers().add(configProvider.getOpenid());
6262

6363
WxMpMassSendResult massResult = this.wxService
6464
.massOpenIdsMessageSend(massMessage);
@@ -73,13 +73,13 @@ public void testTextMassGroupMessageSend() throws WxErrorException {
7373
massMessage.setContent("测试群发消息\n欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
7474
massMessage
7575
.setGroupId(this.wxService.getGroupService().groupGet().get(0).getId());
76-
76+
7777
WxMpMassSendResult massResult = this.wxService
7878
.massGroupMessageSend(massMessage);
7979
Assert.assertNotNull(massResult);
8080
Assert.assertNotNull(massResult.getMsgId());
8181
}
82-
82+
8383
@Test(dataProvider="massMessages")
8484
public void testMediaMassGroupMessageSend(String massMsgType, String mediaId)
8585
throws WxErrorException {
@@ -94,7 +94,7 @@ public void testMediaMassGroupMessageSend(String massMsgType, String mediaId)
9494
Assert.assertNotNull(massResult);
9595
Assert.assertNotNull(massResult.getMsgId());
9696
}
97-
97+
9898
@DataProvider
9999
public Object[][] massMessages() throws WxErrorException, IOException {
100100
Object[][] messages = new Object[4][];
@@ -109,7 +109,7 @@ public Object[][] massMessages() throws WxErrorException, IOException {
109109
.mediaUpload(WxConsts.MEDIA_VIDEO, WxConsts.FILE_MP4, inputStream);
110110
Assert.assertNotNull(uploadMediaRes);
111111
Assert.assertNotNull(uploadMediaRes.getMediaId());
112-
112+
113113
// 把视频变成可被群发的媒体
114114
WxMpMassVideo video = new WxMpMassVideo();
115115
video.setTitle("测试标题");
@@ -155,15 +155,15 @@ public Object[][] massMessages() throws WxErrorException, IOException {
155155
.mediaUpload(WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, inputStream);
156156
Assert.assertNotNull(uploadMediaRes);
157157
Assert.assertNotNull(uploadMediaRes.getMediaId());
158-
158+
159159
// 上传图文消息
160160
WxMpMassNews news = new WxMpMassNews();
161161
WxMpMassNews.WxMpMassNewsArticle article1 = new WxMpMassNews.WxMpMassNewsArticle();
162162
article1.setTitle("标题1");
163163
article1.setContent("内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1");
164164
article1.setThumbMediaId(uploadMediaRes.getMediaId());
165165
news.addArticle(article1);
166-
166+
167167
WxMpMassNews.WxMpMassNewsArticle article2 = new WxMpMassNews.WxMpMassNewsArticle();
168168
article2.setTitle("标题2");
169169
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 Object[][] massMessages() throws WxErrorException, IOException {
173173
article2.setContentSourceUrl("www.baidu.com");
174174
article2.setDigest("摘要2");
175175
news.addArticle(article2);
176-
176+
177177
WxMpMassUploadResult massUploadResult = this.wxService
178178
.massNewsUpload(news);
179179
Assert.assertNotNull(massUploadResult);
@@ -183,5 +183,5 @@ public Object[][] massMessages() throws WxErrorException, IOException {
183183

184184
return messages;
185185
}
186-
186+
187187
}

0 commit comments

Comments
 (0)