Skip to content

Commit a50eb2b

Browse files
Copilotbinarywang
andcommitted
修复企业微信会话存档SDK频繁初始化和销毁的问题
Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com>
1 parent 471ff67 commit a50eb2b

File tree

5 files changed

+222
-15
lines changed

5 files changed

+222
-15
lines changed

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,11 @@ public interface WxCpConfigStorage {
338338

339339
/**
340340
* 减少会话存档SDK的引用计数
341-
* 当引用计数降为0时,自动销毁SDK以释放资源
341+
* 当引用计数降为0且SDK已过期时,才自动销毁SDK以释放资源
342+
* 如果SDK尚未过期,保留SDK缓存以供后续调用复用
342343
*
343344
* @param sdk sdk id
344-
* @return 减少后的引用计数,如果返回0表示SDK已被销毁,如果SDK不匹配返回-1
345+
* @return 减少后的引用计数,如果SDK不匹配返回-1
345346
*/
346347
int decrementMsgAuditSdkRefCount(long sdk);
347348

@@ -364,7 +365,8 @@ public interface WxCpConfigStorage {
364365

365366
/**
366367
* 减少SDK引用计数并在必要时释放(原子操作)
367-
* 此方法确保引用计数递减和SDK检查在同一个同步块内完成
368+
* 当引用计数降为0且SDK已过期时,才销毁SDK以释放资源
369+
* 如果SDK尚未过期,保留SDK缓存以供后续调用复用,避免频繁初始化和销毁
368370
*
369371
* @param sdk sdk id
370372
*/

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,9 @@ public synchronized int incrementMsgAuditSdkRefCount(long sdk) {
541541
public synchronized int decrementMsgAuditSdkRefCount(long sdk) {
542542
if (this.msgAuditSdk == sdk && this.msgAuditSdkRefCount > 0) {
543543
int newCount = --this.msgAuditSdkRefCount;
544-
// 当引用计数降为0时,自动销毁SDK以释放资源
545-
// 再次检查SDK是否仍然是当前缓存的SDK(防止并发重新初始化)
546-
if (newCount == 0 && this.msgAuditSdk == sdk) {
544+
// 当引用计数降为0且SDK已过期时,才销毁SDK以释放资源
545+
// 如果SDK尚未过期,保留SDK缓存以供后续调用复用,避免频繁初始化和销毁
546+
if (newCount == 0 && this.msgAuditSdk == sdk && isMsgAuditSdkExpired()) {
547547
Finance.DestroySdk(sdk);
548548
this.msgAuditSdk = 0;
549549
this.msgAuditSdkExpiresTime = 0;
@@ -575,9 +575,9 @@ public synchronized long acquireMsgAuditSdk() {
575575
public synchronized void releaseMsgAuditSdk(long sdk) {
576576
if (this.msgAuditSdk == sdk && this.msgAuditSdkRefCount > 0) {
577577
int newCount = --this.msgAuditSdkRefCount;
578-
// 当引用计数降为0时,自动销毁SDK以释放资源
579-
// 再次检查SDK是否仍然是当前缓存的SDK(防止并发重新初始化)
580-
if (newCount == 0 && this.msgAuditSdk == sdk) {
578+
// 当引用计数降为0且SDK已过期时,才销毁SDK以释放资源
579+
// 如果SDK尚未过期,保留SDK缓存以供后续调用复用,避免频繁初始化和销毁
580+
if (newCount == 0 && this.msgAuditSdk == sdk && isMsgAuditSdkExpired()) {
581581
Finance.DestroySdk(sdk);
582582
this.msgAuditSdk = 0;
583583
this.msgAuditSdkExpiresTime = 0;

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,9 @@ public synchronized int incrementMsgAuditSdkRefCount(long sdk) {
559559
public synchronized int decrementMsgAuditSdkRefCount(long sdk) {
560560
if (this.msgAuditSdk == sdk && this.msgAuditSdkRefCount > 0) {
561561
int newCount = --this.msgAuditSdkRefCount;
562-
// 当引用计数降为0时,自动销毁SDK以释放资源
563-
// 再次检查SDK是否仍然是当前缓存的SDK(防止并发重新初始化)
564-
if (newCount == 0 && this.msgAuditSdk == sdk) {
562+
// 当引用计数降为0且SDK已过期时,才销毁SDK以释放资源
563+
// 如果SDK尚未过期,保留SDK缓存以供后续调用复用,避免频繁初始化和销毁
564+
if (newCount == 0 && this.msgAuditSdk == sdk && isMsgAuditSdkExpired()) {
565565
Finance.DestroySdk(sdk);
566566
this.msgAuditSdk = 0;
567567
this.msgAuditSdkExpiresTime = 0;
@@ -593,9 +593,9 @@ public synchronized long acquireMsgAuditSdk() {
593593
public synchronized void releaseMsgAuditSdk(long sdk) {
594594
if (this.msgAuditSdk == sdk && this.msgAuditSdkRefCount > 0) {
595595
int newCount = --this.msgAuditSdkRefCount;
596-
// 当引用计数降为0时,自动销毁SDK以释放资源
597-
// 再次检查SDK是否仍然是当前缓存的SDK(防止并发重新初始化)
598-
if (newCount == 0 && this.msgAuditSdk == sdk) {
596+
// 当引用计数降为0且SDK已过期时,才销毁SDK以释放资源
597+
// 如果SDK尚未过期,保留SDK缓存以供后续调用复用,避免频繁初始化和销毁
598+
if (newCount == 0 && this.msgAuditSdk == sdk && isMsgAuditSdkExpired()) {
599599
Finance.DestroySdk(sdk);
600600
this.msgAuditSdk = 0;
601601
this.msgAuditSdkExpiresTime = 0;
Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
package me.chanjar.weixin.cp.config.impl;
2+
3+
import org.testng.Assert;
4+
import org.testng.annotations.BeforeMethod;
5+
import org.testng.annotations.Test;
6+
7+
import java.lang.reflect.Field;
8+
9+
/**
10+
* 测试 WxCpDefaultConfigImpl 中会话存档 SDK 引用计数的正确性
11+
* 验证修复:SDK 在引用计数降为 0 但尚未过期时,不应被销毁
12+
*
13+
* @author GitHub Copilot
14+
*/
15+
public class WxCpDefaultConfigImplMsgAuditSdkTest {
16+
17+
/**
18+
* 用于测试的未过期时间偏移量(毫秒),模拟 SDK 有效状态
19+
*/
20+
private static final long VALID_EXPIRATION_TIME_OFFSET = 7_000_000L;
21+
22+
private WxCpDefaultConfigImpl config;
23+
24+
@BeforeMethod
25+
public void setUp() {
26+
config = new WxCpDefaultConfigImpl();
27+
}
28+
29+
/**
30+
* 通过反射设置内部字段
31+
*/
32+
private void setField(String fieldName, Object value) throws Exception {
33+
Field field = WxCpDefaultConfigImpl.class.getDeclaredField(fieldName);
34+
field.setAccessible(true);
35+
field.set(config, value);
36+
}
37+
38+
/**
39+
* 通过反射获取内部字段值
40+
*/
41+
private Object getField(String fieldName) throws Exception {
42+
Field field = WxCpDefaultConfigImpl.class.getDeclaredField(fieldName);
43+
field.setAccessible(true);
44+
return field.get(config);
45+
}
46+
47+
/**
48+
* 验证 acquireMsgAuditSdk 在 SDK 有效时能正确返回 SDK 并增加引用计数
49+
*/
50+
@Test
51+
public void testAcquireMsgAuditSdkWhenSdkValid() throws Exception {
52+
long fakeSdk = 12345L;
53+
// 设置一个有效的(未过期的)SDK
54+
setField("msgAuditSdk", fakeSdk);
55+
setField("msgAuditSdkExpiresTime", System.currentTimeMillis() + VALID_EXPIRATION_TIME_OFFSET);
56+
setField("msgAuditSdkRefCount", 0);
57+
58+
long acquired = config.acquireMsgAuditSdk();
59+
60+
Assert.assertEquals(acquired, fakeSdk, "应返回已缓存的有效 SDK");
61+
int refCount = (int) getField("msgAuditSdkRefCount");
62+
Assert.assertEquals(refCount, 1, "引用计数应增加到 1");
63+
}
64+
65+
/**
66+
* 验证 acquireMsgAuditSdk 在 SDK 已过期时返回 0
67+
*/
68+
@Test
69+
public void testAcquireMsgAuditSdkWhenSdkExpired() throws Exception {
70+
long fakeSdk = 12345L;
71+
// 设置已过期的 SDK
72+
setField("msgAuditSdk", fakeSdk);
73+
setField("msgAuditSdkExpiresTime", System.currentTimeMillis() - 1000L);
74+
setField("msgAuditSdkRefCount", 0);
75+
76+
long acquired = config.acquireMsgAuditSdk();
77+
78+
Assert.assertEquals(acquired, 0L, "SDK 已过期,应返回 0");
79+
int refCount = (int) getField("msgAuditSdkRefCount");
80+
Assert.assertEquals(refCount, 0, "引用计数不应改变");
81+
}
82+
83+
/**
84+
* 核心测试:验证当引用计数降为 0 但 SDK 尚未过期时,SDK 不会被销毁
85+
* 这是修复 issue 的关键验证:避免每次 API 调用后频繁销毁和重新初始化 SDK
86+
*/
87+
@Test
88+
public void testReleaseMsgAuditSdkShouldNotDestroyWhenNotExpired() throws Exception {
89+
long fakeSdk = 12345L;
90+
// 设置一个有效的(未过期的)SDK,引用计数为 1
91+
setField("msgAuditSdk", fakeSdk);
92+
setField("msgAuditSdkExpiresTime", System.currentTimeMillis() + VALID_EXPIRATION_TIME_OFFSET);
93+
setField("msgAuditSdkRefCount", 1);
94+
95+
// 释放引用,引用计数应降为 0,但 SDK 尚未过期,不应被销毁
96+
config.releaseMsgAuditSdk(fakeSdk);
97+
98+
long sdkAfterRelease = (long) getField("msgAuditSdk");
99+
int refCountAfterRelease = (int) getField("msgAuditSdkRefCount");
100+
101+
Assert.assertEquals(sdkAfterRelease, fakeSdk, "SDK 尚未过期,引用计数归零后不应被销毁,应继续缓存");
102+
Assert.assertEquals(refCountAfterRelease, 0, "引用计数应为 0");
103+
}
104+
105+
/**
106+
* 验证:SDK 在未过期、引用计数为 0 时,下次调用 acquireMsgAuditSdk 应直接复用,无需重新初始化
107+
* 这是修复后的核心行为:避免频繁初始化
108+
*/
109+
@Test
110+
public void testSdkReuseAfterReleaseWhenNotExpired() throws Exception {
111+
long fakeSdk = 99999L;
112+
// 模拟:SDK 有效,引用计数为 1(正在被使用)
113+
setField("msgAuditSdk", fakeSdk);
114+
setField("msgAuditSdkExpiresTime", System.currentTimeMillis() + VALID_EXPIRATION_TIME_OFFSET);
115+
setField("msgAuditSdkRefCount", 1);
116+
117+
// 模拟方法调用结束,释放引用
118+
config.releaseMsgAuditSdk(fakeSdk);
119+
120+
// 模拟下一次方法调用,应该直接复用缓存的 SDK
121+
long reacquired = config.acquireMsgAuditSdk();
122+
123+
Assert.assertEquals(reacquired, fakeSdk, "SDK 应被复用,而不是返回 0(需要重新初始化)");
124+
int refCount = (int) getField("msgAuditSdkRefCount");
125+
Assert.assertEquals(refCount, 1, "复用后引用计数应为 1");
126+
}
127+
128+
/**
129+
* 验证:多线程场景下,多个并发调用的引用计数正确性
130+
*/
131+
@Test
132+
public void testConcurrentRefCounting() throws Exception {
133+
long fakeSdk = 77777L;
134+
setField("msgAuditSdk", fakeSdk);
135+
setField("msgAuditSdkExpiresTime", System.currentTimeMillis() + VALID_EXPIRATION_TIME_OFFSET);
136+
setField("msgAuditSdkRefCount", 0);
137+
138+
// 模拟 3 个并发调用同时持有 SDK
139+
long sdk1 = config.acquireMsgAuditSdk();
140+
long sdk2 = config.acquireMsgAuditSdk();
141+
long sdk3 = config.acquireMsgAuditSdk();
142+
143+
Assert.assertEquals(sdk1, fakeSdk);
144+
Assert.assertEquals(sdk2, fakeSdk);
145+
Assert.assertEquals(sdk3, fakeSdk);
146+
Assert.assertEquals((int) getField("msgAuditSdkRefCount"), 3, "应有 3 个引用");
147+
148+
// 逐一释放
149+
config.releaseMsgAuditSdk(fakeSdk);
150+
Assert.assertEquals((int) getField("msgAuditSdkRefCount"), 2, "释放一个后应有 2 个引用");
151+
Assert.assertEquals((long) getField("msgAuditSdk"), fakeSdk, "SDK 仍有引用,不应被销毁");
152+
153+
config.releaseMsgAuditSdk(fakeSdk);
154+
Assert.assertEquals((int) getField("msgAuditSdkRefCount"), 1, "释放两个后应有 1 个引用");
155+
156+
config.releaseMsgAuditSdk(fakeSdk);
157+
Assert.assertEquals((int) getField("msgAuditSdkRefCount"), 0, "全部释放后引用计数应为 0");
158+
// SDK 未过期,不应被销毁
159+
Assert.assertEquals((long) getField("msgAuditSdk"), fakeSdk, "SDK 未过期,全部引用释放后不应被销毁");
160+
}
161+
162+
/**
163+
* 验证 incrementMsgAuditSdkRefCount 在 SDK 匹配时正确增加引用计数
164+
*/
165+
@Test
166+
public void testIncrementRefCount() throws Exception {
167+
long fakeSdk = 11111L;
168+
setField("msgAuditSdk", fakeSdk);
169+
setField("msgAuditSdkRefCount", 2);
170+
171+
int result = config.incrementMsgAuditSdkRefCount(fakeSdk);
172+
173+
Assert.assertEquals(result, 3, "引用计数应增加到 3");
174+
}
175+
176+
/**
177+
* 验证 incrementMsgAuditSdkRefCount 在 SDK 不匹配时返回 -1
178+
*/
179+
@Test
180+
public void testIncrementRefCountWithWrongSdk() throws Exception {
181+
setField("msgAuditSdk", 11111L);
182+
setField("msgAuditSdkRefCount", 2);
183+
184+
int result = config.incrementMsgAuditSdkRefCount(99999L);
185+
186+
Assert.assertEquals(result, -1, "SDK 不匹配时应返回 -1");
187+
}
188+
189+
/**
190+
* 验证 getMsgAuditSdkRefCount 的正确性
191+
*/
192+
@Test
193+
public void testGetMsgAuditSdkRefCount() throws Exception {
194+
long fakeSdk = 55555L;
195+
setField("msgAuditSdk", fakeSdk);
196+
setField("msgAuditSdkRefCount", 5);
197+
198+
int count = config.getMsgAuditSdkRefCount(fakeSdk);
199+
Assert.assertEquals(count, 5, "应返回正确的引用计数");
200+
201+
int wrongCount = config.getMsgAuditSdkRefCount(99L);
202+
Assert.assertEquals(wrongCount, -1, "SDK 不匹配时应返回 -1");
203+
}
204+
}

weixin-java-cp/src/test/resources/testng.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<class name="me.chanjar.weixin.cp.api.WxCpMessageRouterTest"/>
99
<class name="me.chanjar.weixin.cp.tp.service.impl.WxCpTpServiceApacheHttpClientImplTest"/>
1010
<class name="me.chanjar.weixin.cp.config.impl.WxCpTpDefaultConfigImplTest"/>
11+
<class name="me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImplMsgAuditSdkTest"/>
1112
<class name="me.chanjar.weixin.cp.tp.service.impl.WxCpTpTagServiceImplTest"/>
1213
</classes>
1314
</test>

0 commit comments

Comments
 (0)