Skip to content

Commit 5345a6d

Browse files
binarywangbinarywang
committed
重构WxMpXmlMessage，修改fromUserName为fromUser，toUserName为toUser，避免不必要的歧义
1 parent 87ab934 commit 5345a6d

File tree

10 files changed

+40
-55
lines changed

10 files changed

+40
-55
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public void run() {
171171
} else {
172172
res = rule.service(wxMessage, this.wxMpService, this.sessionManager, this.exceptionHandler);
173173
// 在同步操作结束，session访问结束
174-
this.log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName());
174+
this.log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUser());
175175
sessionEndAccess(wxMessage);
176176
}
177177
}
@@ -183,7 +183,7 @@ public void run() {
183183
for (Future<?> future : futures) {
184184
try {
185185
future.get();
186-
WxMpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName());
186+
WxMpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUser());
187187
// 异步操作结束，session访问结束
188188
sessionEndAccess(wxMessage);
189189
} catch (InterruptedException e) {
@@ -203,7 +203,7 @@ protected boolean isDuplicateMessage(WxMpXmlMessage wxMessage) {
203203
StringBuffer messageId = new StringBuffer();
204204
if (wxMessage.getMsgId() == null) {
205205
messageId.append(wxMessage.getCreateTime())
206-
.append("-").append(wxMessage.getFromUserName())
206+
.append("-").append(wxMessage.getFromUser())
207207
.append("-").append(wxMessage.getEventKey() == null ? "" : wxMessage.getEventKey())
208208
.append("-").append(wxMessage.getEvent() == null ? "" : wxMessage.getEvent())
209209
;
@@ -221,7 +221,7 @@ protected boolean isDuplicateMessage(WxMpXmlMessage wxMessage) {
221221
*/
222222
protected void sessionEndAccess(WxMpXmlMessage wxMessage) {
223223

224-
InternalSession session = ((InternalSessionManager)this.sessionManager).findSession(wxMessage.getFromUserName());
224+
InternalSession session = ((InternalSessionManager)this.sessionManager).findSession(wxMessage.getFromUser());
225225
if (session != null) {
226226
session.endAccess();
227227
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public WxMpMessageRouter next() {
168168
*/
169169
protected boolean test(WxMpXmlMessage wxMessage) {
170170
return
171-
(this.fromUser == null || this.fromUser.equals(wxMessage.getFromUserName()))
171+
(this.fromUser == null || this.fromUser.equals(wxMessage.getFromUser()))
172172
&&
173173
(this.msgType == null || this.msgType.toLowerCase().equals((wxMessage.getMsgType()==null?null:wxMessage.getMsgType().toLowerCase())))
174174
&&

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ public class WxMpXmlMessage implements Serializable {
4040

4141
@XStreamAlias("ToUserName")
4242
@XStreamConverter(value = XStreamCDataConverter.class)
43-
private String toUserName;
43+
private String toUser;
4444

4545
@XStreamAlias("FromUserName")
4646
@XStreamConverter(value = XStreamCDataConverter.class)
47-
private String fromUserName;
47+
private String fromUser;
4848

4949
@XStreamAlias("CreateTime")
5050
private Long createTime;
@@ -272,12 +272,12 @@ public void setMsg(String msg) {
272272
this.msg = msg;
273273
}
274274

275-
public String getToUserName() {
276-
return this.toUserName;
275+
public String getToUser() {
276+
return this.toUser;
277277
}
278278

279-
public void setToUserName(String toUserName) {
280-
this.toUserName = toUserName;
279+
public void setToUser(String toUser) {
280+
this.toUser = toUser;
281281
}
282282

283283
public Long getCreateTime() {
@@ -482,12 +482,12 @@ public void setRecognition(String recognition) {
482482
this.recognition = recognition;
483483
}
484484

485-
public String getFromUserName() {
486-
return this.fromUserName;
485+
public String getFromUser() {
486+
return this.fromUser;
487487
}
488488

489-
public void setFromUserName(String fromUserName) {
490-
this.fromUserName = fromUserName;
489+
public void setFromUser(String fromUser) {
490+
this.fromUser = fromUser;
491491
}
492492

493493
public static WxMpXmlMessage fromXml(String xml) {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public void testSessionClean1(StandardSessionManager ism) throws InterruptedExce
195195
.rule().async(false).handler(new WxSessionMessageHandler()).end();
196196

197197
WxMpXmlMessage msg = new WxMpXmlMessage();
198-
msg.setFromUserName("abc");
198+
msg.setFromUser("abc");
199199
router.route(msg);
200200

201201
Thread.sleep(2000l);
@@ -215,7 +215,7 @@ public void testSessionClean2(StandardSessionManager ism) throws InterruptedExce
215215
.rule().async(true).handler(new WxSessionMessageHandler()).end();
216216

217217
WxMpXmlMessage msg = new WxMpXmlMessage();
218-
msg.setFromUserName("abc");
218+
msg.setFromUser("abc");
219219
router.route(msg);
220220

221221
Thread.sleep(2000l);
@@ -229,7 +229,7 @@ public void testSessionClean2(StandardSessionManager ism) throws InterruptedExce
229229
.rule().async(false).handler(new WxSessionMessageHandler()).end();
230230

231231
WxMpXmlMessage msg = new WxMpXmlMessage();
232-
msg.setFromUserName("abc");
232+
msg.setFromUser("abc");
233233
router.route(msg);
234234

235235
Thread.sleep(2000l);
@@ -249,7 +249,7 @@ public void testSessionClean3(StandardSessionManager ism) throws InterruptedExce
249249
.rule().async(true).handler(new WxSessionMessageHandler()).end();
250250

251251
WxMpXmlMessage msg = new WxMpXmlMessage();
252-
msg.setFromUserName("abc");
252+
msg.setFromUser("abc");
253253
router.route(msg);
254254

255255
Thread.sleep(2000l);
@@ -268,7 +268,7 @@ public void testSessionClean4(StandardSessionManager ism) throws InterruptedExce
268268
.rule().async(false).handler(new WxSessionMessageHandler()).end();
269269

270270
WxMpXmlMessage msg = new WxMpXmlMessage();
271-
msg.setFromUserName("abc");
271+
msg.setFromUser("abc");
272272
router.route(msg);
273273

274274
Thread.sleep(2000l);
@@ -282,7 +282,7 @@ public void testSessionClean4(StandardSessionManager ism) throws InterruptedExce
282282
.rule().async(true).handler(new WxSessionMessageHandler()).end();
283283

284284
WxMpXmlMessage msg = new WxMpXmlMessage();
285-
msg.setFromUserName("abc");
285+
msg.setFromUser("abc");
286286
router.route(msg);
287287

288288
Thread.sleep(2000l);
@@ -295,7 +295,7 @@ public static class WxSessionMessageHandler implements WxMpMessageHandler {
295295
@Override
296296
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
297297
WxSessionManager sessionManager) {
298-
sessionManager.getSession(wxMessage.getFromUserName());
298+
sessionManager.getSession(wxMessage.getFromUser());
299299
return null;
300300
}
301301

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

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@ public class WxMpPayServiceImplTest {
2525
@Inject
2626
protected WxMpServiceImpl wxService;
2727

28-
@Test
29-
public void testGetPrepayId() throws Exception {
30-
31-
}
32-
33-
@Test
34-
public void testGetJsapiPayInfo() throws Exception {
35-
36-
}
37-
38-
@Test
39-
public void testGetNativePayInfo() throws Exception {
40-
41-
}
42-
4328
@Test
4429
public void testGetPayInfo() throws Exception {
4530

@@ -79,7 +64,7 @@ public void testSendRedpack() throws Exception {
7964

8065
/**
8166
* Test method for {@link me.chanjar.weixin.mp.api.impl.WxMpPayServiceImpl#unifiedOrder(me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest)}.
82-
* @throws WxErrorException
67+
* @throws WxErrorException
8368
*/
8469
@Test
8570
public void testUnifiedOrder() throws WxErrorException {
@@ -89,4 +74,4 @@ public void testUnifiedOrder() throws WxErrorException {
8974
.tradeType("JSAPI").openid("122").outTradeNo("111111").build());
9075
System.err.println(result);
9176
}
92-
}
77+
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public void testFromXml() {
5454
+ "</SendLocationInfo>"
5555
+ "</xml>";
5656
WxMpXmlMessage wxMessage = WxMpXmlMessage.fromXml(xml);
57-
Assert.assertEquals(wxMessage.getToUserName(), "toUser");
58-
Assert.assertEquals(wxMessage.getFromUserName(), "fromUser");
57+
Assert.assertEquals(wxMessage.getToUser(), "toUser");
58+
Assert.assertEquals(wxMessage.getFromUser(), "fromUser");
5959
Assert.assertEquals(wxMessage.getCreateTime(), new Long(1348831860l));
6060
Assert.assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
6161
Assert.assertEquals(wxMessage.getContent(), "this is a test");
@@ -135,8 +135,8 @@ public void testFromXml2() {
135135
+ "</SendLocationInfo>"
136136
+ "</xml>";
137137
WxMpXmlMessage wxMessage = WxMpXmlMessage.fromXml(xml);
138-
Assert.assertEquals(wxMessage.getToUserName(), "toUser");
139-
Assert.assertEquals(wxMessage.getFromUserName(), "fromUser");
138+
Assert.assertEquals(wxMessage.getToUser(), "toUser");
139+
Assert.assertEquals(wxMessage.getFromUser(), "fromUser");
140140
Assert.assertEquals(wxMessage.getCreateTime(), new Long(1348831860l));
141141
Assert.assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
142142
Assert.assertEquals(wxMessage.getContent(), "this is a test");

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> co
5050
}
5151

5252
protected void letsGo(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException {
53-
WxSession session = sessionManager.getSession(wxMessage.getFromUserName());
53+
WxSession session = sessionManager.getSession(wxMessage.getFromUser());
5454
if (session.getAttribute("guessing") == null) {
5555
WxMpCustomMessage m = WxMpCustomMessage
5656
.TEXT()
57-
.toUser(wxMessage.getFromUserName())
57+
.toUser(wxMessage.getFromUser())
5858
.content("请猜一个100以内的数字")
5959
.build();
6060
wxMpService.getKefuService().customMessageSend(m);
6161
} else {
6262
WxMpCustomMessage m = WxMpCustomMessage
6363
.TEXT()
64-
.toUser(wxMessage.getFromUserName())
64+
.toUser(wxMessage.getFromUser())
6565
.content("放弃了吗？那请重新猜一个100以内的数字")
6666
.build();
6767
wxMpService.getKefuService().customMessageSend(m);
@@ -74,7 +74,7 @@ protected void letsGo(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessi
7474

7575
protected void giveHint(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException {
7676

77-
WxSession session = sessionManager.getSession(wxMessage.getFromUserName());
77+
WxSession session = sessionManager.getSession(wxMessage.getFromUser());
7878

7979
if (session.getAttribute("guessing") == null) {
8080
return;
@@ -89,22 +89,22 @@ protected void giveHint(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSes
8989
if (guessNumber < answer) {
9090
WxMpCustomMessage m = WxMpCustomMessage
9191
.TEXT()
92-
.toUser(wxMessage.getFromUserName())
92+
.toUser(wxMessage.getFromUser())
9393
.content("小了")
9494
.build();
9595
wxMpService.getKefuService().customMessageSend(m);
9696

9797
} else if (guessNumber > answer) {
9898
WxMpCustomMessage m = WxMpCustomMessage
9999
.TEXT()
100-
.toUser(wxMessage.getFromUserName())
100+
.toUser(wxMessage.getFromUser())
101101
.content("大了")
102102
.build();
103103
wxMpService.getKefuService().customMessageSend(m);
104104
} else {
105105
WxMpCustomMessage m = WxMpCustomMessage
106106
.TEXT()
107-
.toUser(wxMessage.getFromUserName())
107+
.toUser(wxMessage.getFromUser())
108108
.content("Bingo!")
109109
.build();
110110
session.removeAttribute("guessing");

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoImageHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> co
2424
= WxMpXmlOutMessage
2525
.IMAGE()
2626
.mediaId(wxMediaUploadResult.getMediaId())
27-
.fromUser(wxMessage.getToUserName())
28-
.toUser(wxMessage.getFromUserName())
27+
.fromUser(wxMessage.getToUser())
28+
.toUser(wxMessage.getFromUser())
2929
.build();
3030
return m;
3131
} catch (WxErrorException e) {

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoOAuth2Handler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
2121
wxMpService.getWxMpConfigStorage().getOauth2redirectUri(),
2222
WxConsts.OAUTH2_SCOPE_USER_INFO, null) + "\">测试oauth2</a>";
2323
return WxMpXmlOutMessage.TEXT().content(href)
24-
.fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName())
24+
.fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
2525
.build();
2626
}
2727
}

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoTextHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public class DemoTextHandler implements WxMpMessageHandler {
1717
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context,
1818
WxMpService wxMpService, WxSessionManager sessionManager) {
1919
WxMpXmlOutTextMessage m
20-
= WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUserName())
21-
.toUser(wxMessage.getFromUserName()).build();
20+
= WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUser())
21+
.toUser(wxMessage.getFromUser()).build();
2222
return m;
2323
}
2424

0 commit comments

Comments
 (0)