Skip to content

Commit 146ab36

Browse files
committed
issue binarywang#32 发送客服消息图文消息时,拼接对象错误
1 parent 55e9b72 commit 146ab36

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpMessageGsonAdapter.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public JsonElement serialize(WxCpMessage message, Type typeOfSrc, JsonSerializat
7575
}
7676

7777
if (WxConsts.CUSTOM_MSG_NEWS.equals(message.getMsgType())) {
78+
JsonObject newsJsonObject = new JsonObject();
7879
JsonArray articleJsonArray = new JsonArray();
7980
for (WxCpMessage.WxArticle article : message.getArticles()) {
8081
JsonObject articleJson = new JsonObject();
@@ -84,7 +85,8 @@ public JsonElement serialize(WxCpMessage message, Type typeOfSrc, JsonSerializat
8485
articleJson.addProperty("picurl", article.getPicUrl());
8586
articleJsonArray.add(articleJson);
8687
}
87-
messageJson.add("articles", articleJsonArray);
88+
newsJsonObject.add("articles", articleJsonArray);
89+
messageJson.add("news", newsJsonObject);
8890
}
8991

9092
return messageJson;

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpMessageTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public void testNewsReply() {
8383
article2.setTitle("Happy Day");
8484
reply.getArticles().add(article2);
8585

86-
87-
Assert.assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}");
86+
87+
Assert.assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"news\":{\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}}");
8888
}
8989

9090
public void testNewsBuild() {
@@ -101,8 +101,8 @@ public void testNewsBuild() {
101101
article2.setTitle("Happy Day");
102102

103103
WxCpMessage reply = WxCpMessage.NEWS().toUser("OPENID").addArticle(article1).addArticle(article2).build();
104-
105-
Assert.assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}");
104+
105+
Assert.assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"news\":{\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}}");
106106
}
107107

108108
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public JsonElement serialize(WxMpCustomMessage message, Type typeOfSrc, JsonSeri
6464
}
6565

6666
if (WxConsts.CUSTOM_MSG_NEWS.equals(message.getMsgType())) {
67+
JsonObject newsJsonObject = new JsonObject();
6768
JsonArray articleJsonArray = new JsonArray();
6869
for (WxMpCustomMessage.WxArticle article : message.getArticles()) {
6970
JsonObject articleJson = new JsonObject();
@@ -73,7 +74,8 @@ public JsonElement serialize(WxMpCustomMessage message, Type typeOfSrc, JsonSeri
7374
articleJson.addProperty("picurl", article.getPicUrl());
7475
articleJsonArray.add(articleJson);
7576
}
76-
messageJson.add("articles", articleJsonArray);
77+
newsJsonObject.add("articles", articleJsonArray);
78+
messageJson.add("news", newsJsonObject);
7779
}
7880

7981
return messageJson;

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpCustomMessageTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void testNewsReply() {
108108
reply.getArticles().add(article2);
109109

110110

111-
Assert.assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}");
111+
Assert.assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"news\":{\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}}");
112112
}
113113

114114
public void testNewsBuild() {
@@ -125,8 +125,8 @@ public void testNewsBuild() {
125125
article2.setTitle("Happy Day");
126126

127127
WxMpCustomMessage reply = WxMpCustomMessage.NEWS().toUser("OPENID").addArticle(article1).addArticle(article2).build();
128-
129-
Assert.assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}");
128+
129+
Assert.assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"news\":{\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}}");
130130
}
131131

132132
}

0 commit comments

Comments
 (0)