🎨 binarywang#3445 【企业微信】第三方应用开发消息处理判断重复的方法进行优化

lixize · binarywang · commit 75aa3fce9a59 · 2025-01-02T10:15:45.000+08:00
diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/message/WxChannelMessageRouter.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/message/WxChannelMessageRouter.java
@@ -178,7 +178,7 @@ public Object route(final WxChannelMessage message, final String content, final
    * @param wxMessage 消息
    * @return 是否重复
    */
-  private boolean isMsgDuplicated(WxChannelMessage wxMessage) {
+  protected boolean isMsgDuplicated(WxChannelMessage wxMessage) {
     String messageId = this.generateMessageId(wxMessage);
     return this.messageDuplicateChecker.isDuplicate(messageId);
   }
@@ -188,7 +188,7 @@ private boolean isMsgDuplicated(WxChannelMessage wxMessage) {
    *
    * @return 消息id
    */
-  private String generateMessageId(WxChannelMessage wxMessage) {
+  protected String generateMessageId(WxChannelMessage wxMessage) {
     StringBuilder sb = new StringBuilder();
     if (wxMessage.getMsgId() == null) {
       sb.append(wxMessage.getCreateTime())
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/message/WxCpMessageRouter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/message/WxCpMessageRouter.java
@@ -258,7 +258,7 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {
     return this.route(wxMessage, new HashMap<>(2));
   }
 
-  private boolean isMsgDuplicated(WxCpXmlMessage wxMessage) {
+  protected boolean isMsgDuplicated(WxCpXmlMessage wxMessage) {
     StringBuilder messageId = new StringBuilder();
     if (wxMessage.getMsgId() == null) {
       messageId.append(wxMessage.getCreateTime())
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouter.java
@@ -278,7 +278,7 @@ public WxCpXmlOutMessage route(final WxCpTpXmlMessage wxMessage) {
     return this.route(wxMessage, new HashMap<>(2));
   }
 
-  private boolean isMsgDuplicated(final String suiteId, WxCpTpXmlMessage wxMessage) {
+  protected boolean isMsgDuplicated(final String suiteId, WxCpTpXmlMessage wxMessage) {
     StringBuilder messageId = new StringBuilder();
     messageId.append(wxMessage.getToUserName());
     if (wxMessage.getInfoType() != null) {
@@ -306,7 +306,8 @@ private boolean isMsgDuplicated(final String suiteId, WxCpTpXmlMessage wxMessage
           .append("-").append(wxMessage.getCreateTime())
           .append("-").append(wxMessage.getFromUserName())
           .append("-").append(StringUtils.trimToEmpty(wxMessage.getEvent()))
-          .append("-").append(StringUtils.trimToEmpty(wxMessage.getEventKey()));
+          .append("-").append(StringUtils.trimToEmpty(wxMessage.getEventKey()))
+          .append("-").append(StringUtils.trimToEmpty(wxMessage.getExternalUserID()));
       }
     }
 
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java
@@ -173,7 +173,7 @@ public WxMaXmlOutMessage route(final WxMaMessage wxMessage) {
     return this.route(wxMessage, new HashMap<>(2));
   }
 
-  private boolean isMsgDuplicated(WxMaMessage wxMessage) {
+  protected boolean isMsgDuplicated(WxMaMessage wxMessage) {
     StringBuilder messageId = new StringBuilder();
     if (wxMessage.getMsgId() == null) {
       messageId.append(wxMessage.getCreateTime())
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
@@ -315,7 +315,7 @@ public WxMpXmlOutMessage route(String appid, final WxMpXmlMessage wxMessage) {
     return this.route(appid, wxMessage, new HashMap<>(2));
   }
 
-  private boolean isMsgDuplicated(WxMpXmlMessage wxMessage) {
+  protected boolean isMsgDuplicated(WxMpXmlMessage wxMessage) {
     StringBuilder messageId = new StringBuilder();
     if (wxMessage.getMsgId() == null) {
       messageId.append(wxMessage.getCreateTime())

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {`
`258`	`258`	`return this.route(wxMessage, new HashMap<>(2));`
`259`	`259`	`}`
`260`	`260`
`261`		`- private boolean isMsgDuplicated(WxCpXmlMessage wxMessage) {`
	`261`	`+ protected boolean isMsgDuplicated(WxCpXmlMessage wxMessage) {`
`262`	`262`	`StringBuilder messageId = new StringBuilder();`
`263`	`263`	`if (wxMessage.getMsgId() == null) {`
`264`	`264`	`messageId.append(wxMessage.getCreateTime())`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ public WxCpXmlOutMessage route(final WxCpTpXmlMessage wxMessage) {`
`278`	`278`	`return this.route(wxMessage, new HashMap<>(2));`
`279`	`279`	`}`
`280`	`280`
`281`		`- private boolean isMsgDuplicated(final String suiteId, WxCpTpXmlMessage wxMessage) {`
	`281`	`+ protected boolean isMsgDuplicated(final String suiteId, WxCpTpXmlMessage wxMessage) {`
`282`	`282`	`StringBuilder messageId = new StringBuilder();`
`283`	`283`	`messageId.append(wxMessage.getToUserName());`
`284`	`284`	`if (wxMessage.getInfoType() != null) {`
`@@ -306,7 +306,8 @@ private boolean isMsgDuplicated(final String suiteId, WxCpTpXmlMessage wxMessage`
`306`	`306`	`.append("-").append(wxMessage.getCreateTime())`
`307`	`307`	`.append("-").append(wxMessage.getFromUserName())`
`308`	`308`	`.append("-").append(StringUtils.trimToEmpty(wxMessage.getEvent()))`
`309`		`- .append("-").append(StringUtils.trimToEmpty(wxMessage.getEventKey()));`
	`309`	`+ .append("-").append(StringUtils.trimToEmpty(wxMessage.getEventKey()))`
	`310`	`+ .append("-").append(StringUtils.trimToEmpty(wxMessage.getExternalUserID()));`
`310`	`311`	`}`
`311`	`312`	`}`
`312`	`313`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public WxMaXmlOutMessage route(final WxMaMessage wxMessage) {`
`173`	`173`	`return this.route(wxMessage, new HashMap<>(2));`
`174`	`174`	`}`
`175`	`175`
`176`		`- private boolean isMsgDuplicated(WxMaMessage wxMessage) {`
	`176`	`+ protected boolean isMsgDuplicated(WxMaMessage wxMessage) {`
`177`	`177`	`StringBuilder messageId = new StringBuilder();`
`178`	`178`	`if (wxMessage.getMsgId() == null) {`
`179`	`179`	`messageId.append(wxMessage.getCreateTime())`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ public WxMpXmlOutMessage route(String appid, final WxMpXmlMessage wxMessage) {`
`315`	`315`	`return this.route(appid, wxMessage, new HashMap<>(2));`
`316`	`316`	`}`
`317`	`317`
`318`		`- private boolean isMsgDuplicated(WxMpXmlMessage wxMessage) {`
	`318`	`+ protected boolean isMsgDuplicated(WxMpXmlMessage wxMessage) {`
`319`	`319`	`StringBuilder messageId = new StringBuilder();`
`320`	`320`	`if (wxMessage.getMsgId() == null) {`
`321`	`321`	`messageId.append(wxMessage.getCreateTime())`