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(); }