From aec2f3851f1f5472dc68f33b7493dcdb05a261c7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 22 Sep 2025 16:26:14 +0000
Subject: [PATCH 1/2] Initial plan
From 81291e54b1f5b995ec23e9fe1fa24f53b8d0bf0d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 22 Sep 2025 16:37:04 +0000
Subject: [PATCH 2/2] Fix NullPointerException in
WxOpenXmlMessage.fromEncryptedXml method
Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com>
---
.../weixin/open/bean/message/WxOpenXmlMessage.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
index 9185a4e030..449697c5a6 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
@@ -299,7 +299,9 @@ public static String wxMpOutXmlMessageToEncryptedXml(WxMpXmlOutMessage message,
public static WxOpenXmlMessage fromXml(String xml) {
//修改微信变态的消息内容格式，方便解析
- xml = xml.replace("", "");
+ if (xml != null) {
+ xml = xml.replace("", "");
+ }
return XStreamTransformer.fromXml(WxOpenXmlMessage.class, xml);
}
@@ -321,6 +323,11 @@ public static WxOpenXmlMessage fromEncryptedXml(String encryptedXml, WxOpenConfi
WxOpenCryptUtil cryptUtil = new WxOpenCryptUtil(wxOpenConfigStorage);
String plainText = cryptUtil.decryptXml(msgSignature, timestamp, nonce, encryptedXml);
log.debug("解密后的原始xml消息内容：{}", plainText);
+
+ if (plainText == null || plainText.trim().isEmpty()) {
+ throw new WxRuntimeException("解密后的xml消息内容为空，请检查加密参数是否正确");
+ }
+
WxOpenXmlMessage wxOpenXmlMessage = fromXml(plainText);
wxOpenXmlMessage.setContext(plainText);
return wxOpenXmlMessage;