From 18b49daf2b4f203bfc3b033ebc7410d7cd0e8523 Mon Sep 17 00:00:00 2001
From: Zerision <894477402@qq.com>
Date: Sun, 19 Sep 2021 10:30:35 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20#2314=20=E3=80=90=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E9=80=9A=E7=9F=A5=E6=B6=88=E6=81=AF=E8=A2=AB?=
 =?UTF-8?q?=E8=AF=AF=E5=88=A4=E4=B8=BA=E5=90=8C=E4=B8=80=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/message/WxCpMessageRouter.java  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

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
index 92de0c238..a0464a725 100644
--- 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
@@ -209,18 +209,22 @@ public class WxCpMessageRouter {
         .append("-").append(wxMessage.getCreateTime())
         .append("-").append(wxMessage.getFromUserName());
     }
-
-    if (StringUtils.isNotEmpty(wxMessage.getUserId())) {
-      messageId.append("-").append(wxMessage.getUserId());
-    }
-
-    if (StringUtils.isNotEmpty(wxMessage.getChangeType())) {
-      messageId.append("-").append(wxMessage.getChangeType());
-    }
+    append(messageId, wxMessage.getUserId());
+    append(messageId, wxMessage.getChangeType());
+    append(messageId, wxMessage.getTagId());
+    append(messageId, wxMessage.getId());
+    append(messageId, wxMessage.getChatId());
+    append(messageId, wxMessage.getExternalUserId());
 
     return this.messageDuplicateChecker.isDuplicate(messageId.toString());
   }
 
+  private void append(StringBuilder sb, String value){
+    if(StringUtils.isNotEmpty(value)){
+      sb.append("-").append(value);
+    }
+  }
+
   /**
    * 对session的访问结束.
    */