From 7d637399dfa6ea8333c2830cfdbecc9f48520680 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 14 Jan 2026 04:03:29 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E5=AE=A1?=
 =?UTF-8?q?=E6=9F=A5=E5=8F=8D=E9=A6=88=EF=BC=9A=E5=AE=8C=E5=96=84SDK?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=94=80=E6=AF=81=E9=80=BB=E8=BE=91=E5=92=8C?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com>
---
 .../me/chanjar/weixin/cp/config/WxCpConfigStorage.java |  2 +-
 .../weixin/cp/config/impl/WxCpDefaultConfigImpl.java   | 10 +++++++++-
 .../weixin/cp/config/impl/WxCpRedisConfigImpl.java     | 10 +++++++++-
 .../me/chanjar/weixin/cp/api/WxCpMsgAuditTest.java     | 10 +++++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java
index f9c0e5d94..f7729f4a3 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java
@@ -304,7 +304,7 @@ public interface WxCpConfigStorage {
 
   /**
    * 减少会话存档SDK的引用计数
-   * 当引用计数降为0时，自动销毁SDK
+   * 当引用计数降为0时，自动销毁SDK以释放资源
    *
    * @param sdk sdk id
    * @return 减少后的引用计数，如果返回0表示SDK已被销毁
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java
index cd2bdb45d..a3f94be59 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.cp.config.impl;
 
+import com.tencent.wework.Finance;
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.cp.config.WxCpConfigStorage;
@@ -497,7 +498,14 @@ public class WxCpDefaultConfigImpl implements WxCpConfigStorage, Serializable {
   @Override
   public synchronized int decrementMsgAuditSdkRefCount(long sdk) {
     if (this.msgAuditSdk == sdk && this.msgAuditSdkRefCount > 0) {
-      return --this.msgAuditSdkRefCount;
+      int newCount = --this.msgAuditSdkRefCount;
+      // 当引用计数降为0时，自动销毁SDK以释放资源
+      if (newCount == 0) {
+        Finance.DestroySdk(sdk);
+        this.msgAuditSdk = 0;
+        this.msgAuditSdkExpiresTime = 0;
+      }
+      return newCount;
     }
     return 0;
   }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java
index 93ec3d567..64c74e265 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.cp.config.impl;
 
+import com.tencent.wework.Finance;
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.cp.config.WxCpConfigStorage;
@@ -515,7 +516,14 @@ public class WxCpRedisConfigImpl implements WxCpConfigStorage {
   @Override
   public synchronized int decrementMsgAuditSdkRefCount(long sdk) {
     if (this.msgAuditSdk == sdk && this.msgAuditSdkRefCount > 0) {
-      return --this.msgAuditSdkRefCount;
+      int newCount = --this.msgAuditSdkRefCount;
+      // 当引用计数降为0时，自动销毁SDK以释放资源
+      if (newCount == 0) {
+        Finance.DestroySdk(sdk);
+        this.msgAuditSdk = 0;
+        this.msgAuditSdkExpiresTime = 0;
+      }
+      return newCount;
     }
     return 0;
   }
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMsgAuditTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMsgAuditTest.java
index 1d63216ca..a1ea40f3f 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMsgAuditTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMsgAuditTest.java
@@ -803,15 +803,23 @@ public class WxCpMsgAuditTest {
             suffix = "." + decryptData.getFile().getFileExt();
             sdkFileId = decryptData.getFile().getSdkFileId();
             break;
+          default:
+            // 未知消息类型，跳过处理
+            continue;
         }
         
         // 测试新的downloadMediaFile方法 - 不需要传入SDK
         String path = Thread.currentThread().getContextClassLoader().getResource("").getPath();
         String targetPath = path + "testfile-new/" + md5Sum + suffix;
         File file = new File(targetPath);
+        
+        // 确保父目录存在
         if (!file.getParentFile().exists()) {
           file.getParentFile().mkdirs();
-        } else {
+        }
+        
+        // 删除已存在的文件
+        if (file.exists()) {
           file.delete();
         }