@@ -171,7 +171,7 @@ public class WxMpMessageRouter { | |||
} else { | |||
res = rule.service(wxMessage, this.wxMpService, this.sessionManager, this.exceptionHandler); | |||
// 在同步操作结束,session访问结束 | |||
this.log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName()); | |||
this.log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUser()); | |||
sessionEndAccess(wxMessage); | |||
} | |||
} | |||
@@ -183,7 +183,7 @@ public class WxMpMessageRouter { | |||
for (Future<?> future : futures) { | |||
try { | |||
future.get(); | |||
WxMpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUserName()); | |||
WxMpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUser()); | |||
// 异步操作结束,session访问结束 | |||
sessionEndAccess(wxMessage); | |||
} catch (InterruptedException e) { | |||
@@ -203,7 +203,7 @@ public class WxMpMessageRouter { | |||
StringBuffer messageId = new StringBuffer(); | |||
if (wxMessage.getMsgId() == null) { | |||
messageId.append(wxMessage.getCreateTime()) | |||
.append("-").append(wxMessage.getFromUserName()) | |||
.append("-").append(wxMessage.getFromUser()) | |||
.append("-").append(wxMessage.getEventKey() == null ? "" : wxMessage.getEventKey()) | |||
.append("-").append(wxMessage.getEvent() == null ? "" : wxMessage.getEvent()) | |||
; | |||
@@ -221,7 +221,7 @@ public class WxMpMessageRouter { | |||
*/ | |||
protected void sessionEndAccess(WxMpXmlMessage wxMessage) { | |||
InternalSession session = ((InternalSessionManager)this.sessionManager).findSession(wxMessage.getFromUserName()); | |||
InternalSession session = ((InternalSessionManager)this.sessionManager).findSession(wxMessage.getFromUser()); | |||
if (session != null) { | |||
session.endAccess(); | |||
} | |||
@@ -168,7 +168,7 @@ public class WxMpMessageRouterRule { | |||
*/ | |||
protected boolean test(WxMpXmlMessage wxMessage) { | |||
return | |||
(this.fromUser == null || this.fromUser.equals(wxMessage.getFromUserName())) | |||
(this.fromUser == null || this.fromUser.equals(wxMessage.getFromUser())) | |||
&& | |||
(this.msgType == null || this.msgType.toLowerCase().equals((wxMessage.getMsgType()==null?null:wxMessage.getMsgType().toLowerCase()))) | |||
&& | |||
@@ -40,11 +40,11 @@ public class WxMpXmlMessage implements Serializable { | |||
@XStreamAlias("ToUserName") | |||
@XStreamConverter(value = XStreamCDataConverter.class) | |||
private String toUserName; | |||
private String toUser; | |||
@XStreamAlias("FromUserName") | |||
@XStreamConverter(value = XStreamCDataConverter.class) | |||
private String fromUserName; | |||
private String fromUser; | |||
@XStreamAlias("CreateTime") | |||
private Long createTime; | |||
@@ -272,12 +272,12 @@ public class WxMpXmlMessage implements Serializable { | |||
this.msg = msg; | |||
} | |||
public String getToUserName() { | |||
return this.toUserName; | |||
public String getToUser() { | |||
return this.toUser; | |||
} | |||
public void setToUserName(String toUserName) { | |||
this.toUserName = toUserName; | |||
public void setToUser(String toUser) { | |||
this.toUser = toUser; | |||
} | |||
public Long getCreateTime() { | |||
@@ -482,12 +482,12 @@ public class WxMpXmlMessage implements Serializable { | |||
this.recognition = recognition; | |||
} | |||
public String getFromUserName() { | |||
return this.fromUserName; | |||
public String getFromUser() { | |||
return this.fromUser; | |||
} | |||
public void setFromUserName(String fromUserName) { | |||
this.fromUserName = fromUserName; | |||
public void setFromUser(String fromUser) { | |||
this.fromUser = fromUser; | |||
} | |||
public static WxMpXmlMessage fromXml(String xml) { | |||
@@ -195,7 +195,7 @@ public class WxMpMessageRouterTest { | |||
.rule().async(false).handler(new WxSessionMessageHandler()).end(); | |||
WxMpXmlMessage msg = new WxMpXmlMessage(); | |||
msg.setFromUserName("abc"); | |||
msg.setFromUser("abc"); | |||
router.route(msg); | |||
Thread.sleep(2000l); | |||
@@ -215,7 +215,7 @@ public class WxMpMessageRouterTest { | |||
.rule().async(true).handler(new WxSessionMessageHandler()).end(); | |||
WxMpXmlMessage msg = new WxMpXmlMessage(); | |||
msg.setFromUserName("abc"); | |||
msg.setFromUser("abc"); | |||
router.route(msg); | |||
Thread.sleep(2000l); | |||
@@ -229,7 +229,7 @@ public class WxMpMessageRouterTest { | |||
.rule().async(false).handler(new WxSessionMessageHandler()).end(); | |||
WxMpXmlMessage msg = new WxMpXmlMessage(); | |||
msg.setFromUserName("abc"); | |||
msg.setFromUser("abc"); | |||
router.route(msg); | |||
Thread.sleep(2000l); | |||
@@ -249,7 +249,7 @@ public class WxMpMessageRouterTest { | |||
.rule().async(true).handler(new WxSessionMessageHandler()).end(); | |||
WxMpXmlMessage msg = new WxMpXmlMessage(); | |||
msg.setFromUserName("abc"); | |||
msg.setFromUser("abc"); | |||
router.route(msg); | |||
Thread.sleep(2000l); | |||
@@ -268,7 +268,7 @@ public class WxMpMessageRouterTest { | |||
.rule().async(false).handler(new WxSessionMessageHandler()).end(); | |||
WxMpXmlMessage msg = new WxMpXmlMessage(); | |||
msg.setFromUserName("abc"); | |||
msg.setFromUser("abc"); | |||
router.route(msg); | |||
Thread.sleep(2000l); | |||
@@ -282,7 +282,7 @@ public class WxMpMessageRouterTest { | |||
.rule().async(true).handler(new WxSessionMessageHandler()).end(); | |||
WxMpXmlMessage msg = new WxMpXmlMessage(); | |||
msg.setFromUserName("abc"); | |||
msg.setFromUser("abc"); | |||
router.route(msg); | |||
Thread.sleep(2000l); | |||
@@ -295,7 +295,7 @@ public class WxMpMessageRouterTest { | |||
@Override | |||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, | |||
WxSessionManager sessionManager) { | |||
sessionManager.getSession(wxMessage.getFromUserName()); | |||
sessionManager.getSession(wxMessage.getFromUser()); | |||
return null; | |||
} | |||
@@ -25,21 +25,6 @@ public class WxMpPayServiceImplTest { | |||
@Inject | |||
protected WxMpServiceImpl wxService; | |||
@Test | |||
public void testGetPrepayId() throws Exception { | |||
} | |||
@Test | |||
public void testGetJsapiPayInfo() throws Exception { | |||
} | |||
@Test | |||
public void testGetNativePayInfo() throws Exception { | |||
} | |||
@Test | |||
public void testGetPayInfo() throws Exception { | |||
@@ -79,7 +64,7 @@ public class WxMpPayServiceImplTest { | |||
/** | |||
* Test method for {@link me.chanjar.weixin.mp.api.impl.WxMpPayServiceImpl#unifiedOrder(me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest)}. | |||
* @throws WxErrorException | |||
* @throws WxErrorException | |||
*/ | |||
@Test | |||
public void testUnifiedOrder() throws WxErrorException { | |||
@@ -89,4 +74,4 @@ public class WxMpPayServiceImplTest { | |||
.tradeType("JSAPI").openid("122").outTradeNo("111111").build()); | |||
System.err.println(result); | |||
} | |||
} | |||
} |
@@ -54,8 +54,8 @@ public class WxMpXmlMessageTest { | |||
+ "</SendLocationInfo>" | |||
+ "</xml>"; | |||
WxMpXmlMessage wxMessage = WxMpXmlMessage.fromXml(xml); | |||
Assert.assertEquals(wxMessage.getToUserName(), "toUser"); | |||
Assert.assertEquals(wxMessage.getFromUserName(), "fromUser"); | |||
Assert.assertEquals(wxMessage.getToUser(), "toUser"); | |||
Assert.assertEquals(wxMessage.getFromUser(), "fromUser"); | |||
Assert.assertEquals(wxMessage.getCreateTime(), new Long(1348831860l)); | |||
Assert.assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT); | |||
Assert.assertEquals(wxMessage.getContent(), "this is a test"); | |||
@@ -135,8 +135,8 @@ public class WxMpXmlMessageTest { | |||
+ "</SendLocationInfo>" | |||
+ "</xml>"; | |||
WxMpXmlMessage wxMessage = WxMpXmlMessage.fromXml(xml); | |||
Assert.assertEquals(wxMessage.getToUserName(), "toUser"); | |||
Assert.assertEquals(wxMessage.getFromUserName(), "fromUser"); | |||
Assert.assertEquals(wxMessage.getToUser(), "toUser"); | |||
Assert.assertEquals(wxMessage.getFromUser(), "fromUser"); | |||
Assert.assertEquals(wxMessage.getCreateTime(), new Long(1348831860l)); | |||
Assert.assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT); | |||
Assert.assertEquals(wxMessage.getContent(), "this is a test"); | |||
@@ -50,18 +50,18 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa | |||
} | |||
protected void letsGo(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException { | |||
WxSession session = sessionManager.getSession(wxMessage.getFromUserName()); | |||
WxSession session = sessionManager.getSession(wxMessage.getFromUser()); | |||
if (session.getAttribute("guessing") == null) { | |||
WxMpCustomMessage m = WxMpCustomMessage | |||
.TEXT() | |||
.toUser(wxMessage.getFromUserName()) | |||
.toUser(wxMessage.getFromUser()) | |||
.content("请猜一个100以内的数字") | |||
.build(); | |||
wxMpService.getKefuService().customMessageSend(m); | |||
} else { | |||
WxMpCustomMessage m = WxMpCustomMessage | |||
.TEXT() | |||
.toUser(wxMessage.getFromUserName()) | |||
.toUser(wxMessage.getFromUser()) | |||
.content("放弃了吗?那请重新猜一个100以内的数字") | |||
.build(); | |||
wxMpService.getKefuService().customMessageSend(m); | |||
@@ -74,7 +74,7 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa | |||
protected void giveHint(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException { | |||
WxSession session = sessionManager.getSession(wxMessage.getFromUserName()); | |||
WxSession session = sessionManager.getSession(wxMessage.getFromUser()); | |||
if (session.getAttribute("guessing") == null) { | |||
return; | |||
@@ -89,7 +89,7 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa | |||
if (guessNumber < answer) { | |||
WxMpCustomMessage m = WxMpCustomMessage | |||
.TEXT() | |||
.toUser(wxMessage.getFromUserName()) | |||
.toUser(wxMessage.getFromUser()) | |||
.content("小了") | |||
.build(); | |||
wxMpService.getKefuService().customMessageSend(m); | |||
@@ -97,14 +97,14 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa | |||
} else if (guessNumber > answer) { | |||
WxMpCustomMessage m = WxMpCustomMessage | |||
.TEXT() | |||
.toUser(wxMessage.getFromUserName()) | |||
.toUser(wxMessage.getFromUser()) | |||
.content("大了") | |||
.build(); | |||
wxMpService.getKefuService().customMessageSend(m); | |||
} else { | |||
WxMpCustomMessage m = WxMpCustomMessage | |||
.TEXT() | |||
.toUser(wxMessage.getFromUserName()) | |||
.toUser(wxMessage.getFromUser()) | |||
.content("Bingo!") | |||
.build(); | |||
session.removeAttribute("guessing"); | |||
@@ -24,8 +24,8 @@ public class DemoImageHandler implements WxMpMessageHandler { | |||
= WxMpXmlOutMessage | |||
.IMAGE() | |||
.mediaId(wxMediaUploadResult.getMediaId()) | |||
.fromUser(wxMessage.getToUserName()) | |||
.toUser(wxMessage.getFromUserName()) | |||
.fromUser(wxMessage.getToUser()) | |||
.toUser(wxMessage.getFromUser()) | |||
.build(); | |||
return m; | |||
} catch (WxErrorException e) { | |||
@@ -21,7 +21,7 @@ public class DemoOAuth2Handler implements WxMpMessageHandler { | |||
wxMpService.getWxMpConfigStorage().getOauth2redirectUri(), | |||
WxConsts.OAUTH2_SCOPE_USER_INFO, null) + "\">测试oauth2</a>"; | |||
return WxMpXmlOutMessage.TEXT().content(href) | |||
.fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName()) | |||
.fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()) | |||
.build(); | |||
} | |||
} |
@@ -17,8 +17,8 @@ public class DemoTextHandler implements WxMpMessageHandler { | |||
public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, | |||
WxMpService wxMpService, WxSessionManager sessionManager) { | |||
WxMpXmlOutTextMessage m | |||
= WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUserName()) | |||
.toUser(wxMessage.getFromUserName()).build(); | |||
= WxMpXmlOutMessage.TEXT().content("测试加密消息").fromUser(wxMessage.getToUser()) | |||
.toUser(wxMessage.getFromUser()).build(); | |||
return m; | |||
} | |||