🐛 【企业微信】修复重复消息误判的问题

Author: AaronChen2012

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouter.java

@@ -187,15 +187,17 @@ public WxCpTpMessageRouterRule rule() {
     return new WxCpTpMessageRouterRule(this);
   }
 
+
   /**
    * 处理微信消息.
    *
+   * @param suiteId   the suiteId
    * @param wxMessage the wx message
    * @param context   the context
    * @return the wx cp xml out message
    */
-  public WxCpXmlOutMessage route(final WxCpTpXmlMessage wxMessage, final Map<String, Object> context) {
-    if (isMsgDuplicated(wxMessage)) {
+  public WxCpXmlOutMessage route(final String suiteId, final WxCpTpXmlMessage wxMessage, final Map<String, Object> context) {
+    if (isMsgDuplicated(suiteId, wxMessage)) {
       // 如果是重复消息，那么就不做处理
       return null;
     }
@@ -254,6 +256,18 @@ public WxCpXmlOutMessage route(final WxCpTpXmlMessage wxMessage, final Map<Strin
     return res;
   }
 
+
+  /**
+   * 处理微信消息.
+   *
+   * @param wxMessage the wx message
+   * @param context   the context
+   * @return the wx cp xml out message
+   */
+  public WxCpXmlOutMessage route(final WxCpTpXmlMessage wxMessage, final Map<String, Object> context) {
+    return this.route(null, wxMessage, new HashMap<>(2));
+  }
+
   /**
    * 处理微信消息.
    *
@@ -264,8 +278,9 @@ public WxCpXmlOutMessage route(final WxCpTpXmlMessage wxMessage) {
     return this.route(wxMessage, new HashMap<>(2));
   }
 
-  private boolean isMsgDuplicated(WxCpTpXmlMessage wxMessage) {
+  private boolean isMsgDuplicated(final String suiteId, WxCpTpXmlMessage wxMessage) {
     StringBuilder messageId = new StringBuilder();
+    messageId.append(wxMessage.getToUserName());
     if (wxMessage.getInfoType() != null) {
       messageId.append(wxMessage.getInfoType())
         .append("-").append(StringUtils.trimToEmpty(wxMessage.getSuiteId()))
@@ -275,6 +290,10 @@ private boolean isMsgDuplicated(WxCpTpXmlMessage wxMessage) {
         .append("-").append(StringUtils.trimToEmpty(wxMessage.getChangeType()))
         .append("-").append(StringUtils.trimToEmpty(wxMessage.getServiceCorpId()))
         .append("-").append(StringUtils.trimToEmpty(wxMessage.getExternalUserID()));
+    } else {
+      if (StringUtils.isNotBlank(suiteId)) {
+        messageId.append(suiteId);
+      }
     }
 
     if (wxMessage.getMsgType() != null) {