Skip to content

Commit 343ed7a

Browse files
binarywangbinarywang
committed
优化代码
1 parent 014fb28 commit 343ed7a

File tree

6 files changed

+254
-243
lines changed

6 files changed

+254
-243
lines changed

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAppChatMessage.java‎

Lines changed: 87 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
import lombok.Builder;
1010
import lombok.Data;
1111
import lombok.NoArgsConstructor;
12-
import me.chanjar.weixin.common.api.WxConsts;
13-
import me.chanjar.weixin.cp.WxCpConsts;
12+
import me.chanjar.weixin.cp.WxCpConsts.AppChatMsgType;
1413
import me.chanjar.weixin.cp.bean.article.MpnewsArticle;
1514
import me.chanjar.weixin.cp.bean.article.NewArticle;
1615

@@ -46,7 +45,7 @@ public class WxCpAppChatMessage implements Serializable {
4645
*/
4746
public static WxCpAppChatMessage buildTextMsg(String chatId, String content, boolean safe) {
4847
final WxCpAppChatMessage message = new WxCpAppChatMessage();
49-
message.setMsgType(WxCpConsts.AppChatMsgType.TEXT);
48+
message.setMsgType(AppChatMsgType.TEXT);
5049
message.setContent(content);
5150
message.setChatId(chatId);
5251
message.setSafe(safe);
@@ -61,94 +60,104 @@ public String toJson() {
6160
messageJson.addProperty("msgtype", this.getMsgType());
6261
messageJson.addProperty("chatid", this.getChatId());
6362

64-
if (WxConsts.KefuMsgType.TEXT.equals(this.getMsgType())) {
65-
JsonObject text = new JsonObject();
66-
text.addProperty("content", this.getContent());
67-
messageJson.add("text", text);
68-
}
69-
70-
if (WxConsts.KefuMsgType.MARKDOWN.equals(this.getMsgType())) {
71-
JsonObject text = new JsonObject();
72-
text.addProperty("content", this.getContent());
73-
messageJson.add("markdown", text);
74-
}
75-
76-
if (WxConsts.KefuMsgType.TEXTCARD.equals(this.getMsgType())) {
77-
JsonObject text = new JsonObject();
78-
text.addProperty("title", this.getTitle());
79-
text.addProperty("description", this.getDescription());
80-
text.addProperty("url", this.getUrl());
81-
text.addProperty("btntxt", this.getBtnTxt());
82-
messageJson.add("textcard", text);
83-
}
84-
85-
if (WxConsts.KefuMsgType.IMAGE.equals(this.getMsgType())) {
86-
JsonObject image = new JsonObject();
87-
image.addProperty("media_id", this.getMediaId());
88-
messageJson.add("image", image);
89-
}
90-
91-
if (WxConsts.KefuMsgType.FILE.equals(this.getMsgType())) {
92-
JsonObject image = new JsonObject();
93-
image.addProperty("media_id", this.getMediaId());
94-
messageJson.add("file", image);
95-
}
96-
97-
if (WxConsts.KefuMsgType.VOICE.equals(this.getMsgType())) {
98-
JsonObject voice = new JsonObject();
99-
voice.addProperty("media_id", this.getMediaId());
100-
messageJson.add("voice", voice);
101-
}
102-
10363
if (this.getSafe() != null && this.getSafe()) {
10464
messageJson.addProperty("safe", 1);
10565
}
10666

107-
if (WxConsts.KefuMsgType.VIDEO.equals(this.getMsgType())) {
108-
JsonObject video = new JsonObject();
109-
video.addProperty("media_id", this.getMediaId());
110-
video.addProperty("title", this.getTitle());
111-
video.addProperty("description", this.getDescription());
112-
messageJson.add("video", video);
113-
}
67+
this.handleMsgType(messageJson);
11468

115-
if (WxConsts.KefuMsgType.NEWS.equals(this.getMsgType())) {
116-
JsonObject newsJsonObject = new JsonObject();
117-
JsonArray articleJsonArray = new JsonArray();
118-
for (NewArticle article : this.getArticles()) {
119-
JsonObject articleJson = new JsonObject();
120-
articleJson.addProperty("title", article.getTitle());
121-
articleJson.addProperty("description", article.getDescription());
122-
articleJson.addProperty("url", article.getUrl());
123-
articleJson.addProperty("picurl", article.getPicUrl());
124-
articleJsonArray.add(articleJson);
125-
}
126-
newsJsonObject.add("articles", articleJsonArray);
127-
messageJson.add("news", newsJsonObject);
128-
}
69+
return messageJson.toString();
70+
}
12971

130-
if (WxConsts.KefuMsgType.MPNEWS.equals(this.getMsgType())) {
131-
JsonObject newsJsonObject = new JsonObject();
132-
if (this.getMediaId() != null) {
133-
newsJsonObject.addProperty("media_id", this.getMediaId());
134-
} else {
72+
private void handleMsgType(JsonObject messageJson) {
73+
switch (this.getMsgType()) {
74+
case AppChatMsgType.TEXT: {
75+
JsonObject text = new JsonObject();
76+
text.addProperty("content", this.getContent());
77+
messageJson.add("text", text);
78+
break;
79+
}
80+
case AppChatMsgType.MARKDOWN: {
81+
JsonObject text = new JsonObject();
82+
text.addProperty("content", this.getContent());
83+
messageJson.add("markdown", text);
84+
break;
85+
}
86+
case AppChatMsgType.TEXTCARD: {
87+
JsonObject text = new JsonObject();
88+
text.addProperty("title", this.getTitle());
89+
text.addProperty("description", this.getDescription());
90+
text.addProperty("url", this.getUrl());
91+
text.addProperty("btntxt", this.getBtnTxt());
92+
messageJson.add("textcard", text);
93+
break;
94+
}
95+
case AppChatMsgType.IMAGE: {
96+
JsonObject image = new JsonObject();
97+
image.addProperty("media_id", this.getMediaId());
98+
messageJson.add("image", image);
99+
break;
100+
}
101+
case AppChatMsgType.FILE: {
102+
JsonObject image = new JsonObject();
103+
image.addProperty("media_id", this.getMediaId());
104+
messageJson.add("file", image);
105+
break;
106+
}
107+
case AppChatMsgType.VOICE: {
108+
JsonObject voice = new JsonObject();
109+
voice.addProperty("media_id", this.getMediaId());
110+
messageJson.add("voice", voice);
111+
break;
112+
}
113+
case AppChatMsgType.VIDEO: {
114+
JsonObject video = new JsonObject();
115+
video.addProperty("media_id", this.getMediaId());
116+
video.addProperty("title", this.getTitle());
117+
video.addProperty("description", this.getDescription());
118+
messageJson.add("video", video);
119+
break;
120+
}
121+
case AppChatMsgType.NEWS: {
122+
JsonObject newsJsonObject = new JsonObject();
135123
JsonArray articleJsonArray = new JsonArray();
136-
for (MpnewsArticle article : this.getMpnewsArticles()) {
124+
for (NewArticle article : this.getArticles()) {
137125
JsonObject articleJson = new JsonObject();
138126
articleJson.addProperty("title", article.getTitle());
139-
articleJson.addProperty("thumb_media_id", article.getThumbMediaId());
140-
articleJson.addProperty("author", article.getAuthor());
141-
articleJson.addProperty("content_source_url", article.getContentSourceUrl());
142-
articleJson.addProperty("content", article.getContent());
143-
articleJson.addProperty("digest", article.getDigest());
127+
articleJson.addProperty("description", article.getDescription());
128+
articleJson.addProperty("url", article.getUrl());
129+
articleJson.addProperty("picurl", article.getPicUrl());
144130
articleJsonArray.add(articleJson);
145131
}
146-
147132
newsJsonObject.add("articles", articleJsonArray);
133+
messageJson.add("news", newsJsonObject);
134+
break;
135+
}
136+
case AppChatMsgType.MPNEWS: {
137+
JsonObject newsJsonObject = new JsonObject();
138+
if (this.getMediaId() != null) {
139+
newsJsonObject.addProperty("media_id", this.getMediaId());
140+
} else {
141+
JsonArray articleJsonArray = new JsonArray();
142+
for (MpnewsArticle article : this.getMpnewsArticles()) {
143+
JsonObject articleJson = new JsonObject();
144+
articleJson.addProperty("title", article.getTitle());
145+
articleJson.addProperty("thumb_media_id", article.getThumbMediaId());
146+
articleJson.addProperty("author", article.getAuthor());
147+
articleJson.addProperty("content_source_url", article.getContentSourceUrl());
148+
articleJson.addProperty("content", article.getContent());
149+
articleJson.addProperty("digest", article.getDigest());
150+
articleJsonArray.add(articleJson);
151+
}
152+
153+
newsJsonObject.add("articles", articleJsonArray);
154+
}
155+
messageJson.add("mpnews", newsJsonObject);
156+
break;
157+
}
158+
default: {
159+
//do nothing
148160
}
149-
messageJson.add("mpnews", newsJsonObject);
150161
}
151-
152-
return messageJson.toString();
153162
}
154163
}

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java‎

Lines changed: 133 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
import java.util.ArrayList;
55
import java.util.List;
66

7+
import org.apache.commons.lang3.StringUtils;
8+
9+
import com.google.gson.JsonArray;
10+
import com.google.gson.JsonObject;
711
import lombok.Data;
8-
import me.chanjar.weixin.common.api.WxConsts;
12+
import me.chanjar.weixin.common.api.WxConsts.KefuMsgType;
913
import me.chanjar.weixin.cp.bean.article.MpnewsArticle;
1014
import me.chanjar.weixin.cp.bean.article.NewArticle;
1115
import me.chanjar.weixin.cp.bean.messagebuilder.FileBuilder;
@@ -17,7 +21,6 @@
1721
import me.chanjar.weixin.cp.bean.messagebuilder.TextCardBuilder;
1822
import me.chanjar.weixin.cp.bean.messagebuilder.VideoBuilder;
1923
import me.chanjar.weixin.cp.bean.messagebuilder.VoiceBuilder;
20-
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
2124

2225
/**
2326
* 消息.
@@ -113,14 +116,14 @@ public static FileBuilder FILE() {
113116
/**
114117
* <pre>
115118
* 请使用
116-
* {@link WxConsts.KefuMsgType#TEXT}
117-
* {@link WxConsts.KefuMsgType#IMAGE}
118-
* {@link WxConsts.KefuMsgType#VOICE}
119-
* {@link WxConsts.KefuMsgType#MUSIC}
120-
* {@link WxConsts.KefuMsgType#VIDEO}
121-
* {@link WxConsts.KefuMsgType#NEWS}
122-
* {@link WxConsts.KefuMsgType#MPNEWS}
123-
* {@link WxConsts.KefuMsgType#MARKDOWN}
119+
* {@link KefuMsgType#TEXT}
120+
* {@link KefuMsgType#IMAGE}
121+
* {@link KefuMsgType#VOICE}
122+
* {@link KefuMsgType#MUSIC}
123+
* {@link KefuMsgType#VIDEO}
124+
* {@link KefuMsgType#NEWS}
125+
* {@link KefuMsgType#MPNEWS}
126+
* {@link KefuMsgType#MARKDOWN}
124127
* </pre>
125128
*
126129
* @param msgType 消息类型
@@ -130,7 +133,126 @@ public void setMsgType(String msgType) {
130133
}
131134

132135
public String toJson() {
133-
return WxCpGsonBuilder.create().toJson(this);
136+
JsonObject messageJson = new JsonObject();
137+
if (this.getAgentId() != null) {
138+
messageJson.addProperty("agentid", this.getAgentId());
139+
}
140+
141+
if (StringUtils.isNotBlank(this.getToUser())) {
142+
messageJson.addProperty("touser", this.getToUser());
143+
}
144+
145+
messageJson.addProperty("msgtype", this.getMsgType());
146+
147+
if (StringUtils.isNotBlank(this.getToParty())) {
148+
messageJson.addProperty("toparty", this.getToParty());
149+
}
150+
151+
if (StringUtils.isNotBlank(this.getToTag())) {
152+
messageJson.addProperty("totag", this.getToTag());
153+
}
154+
155+
this.handleMsgType(messageJson);
156+
157+
if (StringUtils.isNotBlank(this.getSafe())) {
158+
messageJson.addProperty("safe", this.getSafe());
159+
}
160+
161+
return messageJson.toString();
162+
}
163+
164+
private void handleMsgType(JsonObject messageJson) {
165+
switch (this.getMsgType()) {
166+
case KefuMsgType.TEXT: {
167+
JsonObject text = new JsonObject();
168+
text.addProperty("content", this.getContent());
169+
messageJson.add("text", text);
170+
break;
171+
}
172+
case KefuMsgType.MARKDOWN: {
173+
JsonObject text = new JsonObject();
174+
text.addProperty("content", this.getContent());
175+
messageJson.add("markdown", text);
176+
break;
177+
}
178+
case KefuMsgType.TEXTCARD: {
179+
JsonObject text = new JsonObject();
180+
text.addProperty("title", this.getTitle());
181+
text.addProperty("description", this.getDescription());
182+
text.addProperty("url", this.getUrl());
183+
text.addProperty("btntxt", this.getBtnTxt());
184+
messageJson.add("textcard", text);
185+
break;
186+
}
187+
case KefuMsgType.IMAGE: {
188+
JsonObject image = new JsonObject();
189+
image.addProperty("media_id", this.getMediaId());
190+
messageJson.add("image", image);
191+
break;
192+
}
193+
case KefuMsgType.FILE: {
194+
JsonObject image = new JsonObject();
195+
image.addProperty("media_id", this.getMediaId());
196+
messageJson.add("file", image);
197+
break;
198+
}
199+
case KefuMsgType.VOICE: {
200+
JsonObject voice = new JsonObject();
201+
voice.addProperty("media_id", this.getMediaId());
202+
messageJson.add("voice", voice);
203+
break;
204+
}
205+
case KefuMsgType.VIDEO: {
206+
JsonObject video = new JsonObject();
207+
video.addProperty("media_id", this.getMediaId());
208+
video.addProperty("thumb_media_id", this.getThumbMediaId());
209+
video.addProperty("title", this.getTitle());
210+
video.addProperty("description", this.getDescription());
211+
messageJson.add("video", video);
212+
break;
213+
}
214+
case KefuMsgType.NEWS: {
215+
JsonObject newsJsonObject = new JsonObject();
216+
JsonArray articleJsonArray = new JsonArray();
217+
for (NewArticle article : this.getArticles()) {
218+
JsonObject articleJson = new JsonObject();
219+
articleJson.addProperty("title", article.getTitle());
220+
articleJson.addProperty("description", article.getDescription());
221+
articleJson.addProperty("url", article.getUrl());
222+
articleJson.addProperty("picurl", article.getPicUrl());
223+
articleJsonArray.add(articleJson);
224+
}
225+
newsJsonObject.add("articles", articleJsonArray);
226+
messageJson.add("news", newsJsonObject);
227+
break;
228+
}
229+
case KefuMsgType.MPNEWS: {
230+
JsonObject newsJsonObject = new JsonObject();
231+
if (this.getMediaId() != null) {
232+
newsJsonObject.addProperty("media_id", this.getMediaId());
233+
} else {
234+
JsonArray articleJsonArray = new JsonArray();
235+
for (MpnewsArticle article : this.getMpnewsArticles()) {
236+
JsonObject articleJson = new JsonObject();
237+
articleJson.addProperty("title", article.getTitle());
238+
articleJson.addProperty("thumb_media_id", article.getThumbMediaId());
239+
articleJson.addProperty("author", article.getAuthor());
240+
articleJson.addProperty("content_source_url", article.getContentSourceUrl());
241+
articleJson.addProperty("content", article.getContent());
242+
articleJson.addProperty("digest", article.getDigest());
243+
articleJson.addProperty("show_cover_pic", article.getShowCoverPic());
244+
articleJsonArray.add(articleJson);
245+
}
246+
247+
newsJsonObject.add("articles", articleJsonArray);
248+
}
249+
messageJson.add("mpnews", newsJsonObject);
250+
break;
251+
}
252+
default: {
253+
// do nothing
254+
}
255+
}
134256
}
135257

136258
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import me.chanjar.weixin.common.util.json.WxErrorAdapter;
88
import me.chanjar.weixin.cp.bean.WxCpChat;
99
import me.chanjar.weixin.cp.bean.WxCpDepart;
10-
import me.chanjar.weixin.cp.bean.WxCpMessage;
1110
import me.chanjar.weixin.cp.bean.WxCpTag;
1211
import me.chanjar.weixin.cp.bean.WxCpUser;
1312

@@ -20,7 +19,6 @@ public class WxCpGsonBuilder {
2019

2120
static {
2221
INSTANCE.disableHtmlEscaping();
23-
INSTANCE.registerTypeAdapter(WxCpMessage.class, new WxCpMessageGsonAdapter());
2422
INSTANCE.registerTypeAdapter(WxCpChat.class, new WxCpChatGsonAdapter());
2523
INSTANCE.registerTypeAdapter(WxCpDepart.class, new WxCpDepartGsonAdapter());
2624
INSTANCE.registerTypeAdapter(WxCpUser.class, new WxCpUserGsonAdapter());

0 commit comments

Comments
 (0)