From 0919205931449b380fc5312963e5f5fa05ca2c08 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 7 Mar 2022 09:25:15 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E6=94=B9XML=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E7=B1=BB=E9=87=8C=E7=9A=84agentId=E4=B8=BA?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8B=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E4=B8=BA=E7=A9=BA=E5=80=BC=E6=97=B6=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java
index 4408d3cb9..40d72c3a5 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java
@@ -16,6 +16,7 @@ import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 import me.chanjar.weixin.cp.util.xml.XStreamTransformer;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -51,7 +52,7 @@ public class WxCpXmlMessage implements Serializable {
   ///////////////////////
 
   @XStreamAlias("AgentID")
-  private Integer agentId;
+  private String agentId;
 
   @XStreamAlias("ToUserName")
   @XStreamConverter(value = XStreamCDataConverter.class)
@@ -476,7 +477,7 @@ public class WxCpXmlMessage implements Serializable {
     return xmlMessage;
   }
 
-  public static WxCpXmlMessage fromXml(String xml, Integer agentId) {
+  public static WxCpXmlMessage fromXml(String xml, String agentId) {
     //修改微信变态的消息内容格式，方便解析
     xml = xml.replace("</PicList><PicList>", "");
     final WxCpXmlMessage xmlMessage = fromXml(xml);
@@ -497,7 +498,7 @@ public class WxCpXmlMessage implements Serializable {
     WxCpXmlMessage wxCpXmlMessage = fromXml(encryptedXml);
     String plainText = cryptUtil.decrypt(msgSignature, timestamp, nonce, encryptedXml);
     log.debug("解密后的原始xml消息内容：{}", plainText);
-    if (null != wxCpXmlMessage.getAgentId()) {
+    if (StringUtils.isNotEmpty(wxCpXmlMessage.getAgentId())) {
       return fromXml(plainText, wxCpXmlMessage.getAgentId());
     } else {
       return fromXml(plainText);