lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2026-02-19 06:36:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

重构WxMpXmlMessage，修改fromUserName为fromUser，toUserName为toUser，避免不必要的歧义

Browse Source
This commit is contained in:
BinaryWang
2016-09-30 16:41:50 +08:00
parent 87ab934a1c
commit 5345a6d1f1
10 changed files with 40 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
View File

@@ -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();
}

2
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouterRule.java
View File

@@ -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())))
&&

20
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpXmlMessage.java
View File

@@ -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) {