lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-06-28 13:16:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎨 修改XML消息解析类里的agentId为字符串类型，避免为空值时导致的异常

Browse Source
This commit is contained in:
Binary Wang 2022-03-07 09:25:15 +08:00
parent bbb5269bc2
commit 0919205931
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java
View File

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