🐛 #2314 【企业微信】修复多个不同通知消息被误判为同一消息的问题

Author: Zerision

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/message/WxCpMessageRouter.java

@@ -209,16 +209,20 @@ private boolean isMsgDuplicated(WxCpXmlMessage wxMessage) {
         .append("-").append(wxMessage.getCreateTime())
         .append("-").append(wxMessage.getFromUserName());
     }
+    append(messageId, wxMessage.getUserId());
+    append(messageId, wxMessage.getChangeType());
+    append(messageId, wxMessage.getTagId());
+    append(messageId, wxMessage.getId());
+    append(messageId, wxMessage.getChatId());
+    append(messageId, wxMessage.getExternalUserId());
 
-    if (StringUtils.isNotEmpty(wxMessage.getUserId())) {
-      messageId.append("-").append(wxMessage.getUserId());
-    }
+    return this.messageDuplicateChecker.isDuplicate(messageId.toString());
+  }
 
-    if (StringUtils.isNotEmpty(wxMessage.getChangeType())) {
-      messageId.append("-").append(wxMessage.getChangeType());
+  private void append(StringBuilder sb, String value){
+    if(StringUtils.isNotEmpty(value)){
+      sb.append("-").append(value);
     }
-
-    return this.messageDuplicateChecker.isDuplicate(messageId.toString());
   }
 
   /**