1
0
mirror of synced 2026-04-13 20:48:55 +08:00

修复 Redis 命令被中断时的 accessToken 异常问题

Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-17 02:40:34 +00:00
parent 0e9df9c0da
commit e50d1c2782
4 changed files with 258 additions and 7 deletions

View File

@@ -1,6 +1,7 @@
package me.chanjar.weixin.cp.config.impl;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.bean.WxAccessToken;
import me.chanjar.weixin.common.redis.WxRedisOps;
import org.apache.commons.lang3.StringUtils;
@@ -12,6 +13,7 @@ import java.util.concurrent.locks.Lock;
* @author yl
* created on 2023/04/23
*/
@Slf4j
public abstract class AbstractWxCpInRedisConfigImpl extends WxCpDefaultConfigImpl {
private static final long serialVersionUID = 7157341535439380615L;
/**
@@ -120,8 +122,15 @@ public abstract class AbstractWxCpInRedisConfigImpl extends WxCpDefaultConfigImp
@Override
public boolean isAccessTokenExpired() {
Long expire = redisOps.getExpire(this.accessTokenKey);
return expire == null || expire < 2;
try {
Long expire = redisOps.getExpire(this.accessTokenKey);
return expire == null || expire < 2;
} catch (Exception e) {
log.warn("获取access_token过期时间时发生异常将视为已过期以触发刷新异常信息: {}", e.getMessage());
// 清除中断标志确保后续的锁获取和token刷新操作能够正常执行
Thread.interrupted();
return true;
}
}
@Override
@@ -146,8 +155,14 @@ public abstract class AbstractWxCpInRedisConfigImpl extends WxCpDefaultConfigImp
@Override
public boolean isJsapiTicketExpired() {
Long expire = redisOps.getExpire(this.jsapiTicketKey);
return expire == null || expire < 2;
try {
Long expire = redisOps.getExpire(this.jsapiTicketKey);
return expire == null || expire < 2;
} catch (Exception e) {
log.warn("获取jsapi_ticket过期时间时发生异常将视为已过期异常信息: {}", e.getMessage());
Thread.interrupted();
return true;
}
}
@Override
@@ -177,8 +192,14 @@ public abstract class AbstractWxCpInRedisConfigImpl extends WxCpDefaultConfigImp
@Override
public boolean isAgentJsapiTicketExpired() {
Long expire = redisOps.getExpire(this.agentJsapiTicketKey);
return expire == null || expire < 2;
try {
Long expire = redisOps.getExpire(this.agentJsapiTicketKey);
return expire == null || expire < 2;
} catch (Exception e) {
log.warn("获取agent_jsapi_ticket过期时间时发生异常将视为已过期异常信息: {}", e.getMessage());
Thread.interrupted();
return true;
}
}
@Override

View File

@@ -0,0 +1,132 @@
package me.chanjar.weixin.cp.config.impl;
import me.chanjar.weixin.common.redis.WxRedisOps;
import org.mockito.Mockito;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
/**
* 测试 AbstractWxCpInRedisConfigImpl 对 Redis 异常的容错处理
*
* @author GitHub Copilot
*/
public class AbstractWxCpInRedisConfigImplTest {
private WxRedisOps mockRedisOps;
private AbstractWxCpInRedisConfigImpl config;
@BeforeMethod
public void setUp() {
mockRedisOps = Mockito.mock(WxRedisOps.class);
Mockito.when(mockRedisOps.getLock(Mockito.anyString()))
.thenReturn(new ReentrantLock());
config = new AbstractWxCpInRedisConfigImpl(mockRedisOps, "test") {
// 使用匿名类提供具体实现用于测试
};
config.setCorpId("testCorpId");
config.setAgentId(1);
}
/**
* 测试当 Redis getExpire 抛出异常时isAccessTokenExpired() 应返回 true视为已过期
*/
@Test
public void testIsAccessTokenExpiredWhenRedisThrowsException() {
Mockito.when(mockRedisOps.getExpire(Mockito.anyString()))
.thenThrow(new RuntimeException("Redis command interrupted"));
boolean expired = config.isAccessTokenExpired();
Assert.assertTrue(expired, "Redis异常时应将token视为已过期");
Assert.assertFalse(Thread.currentThread().isInterrupted(), "处理异常后线程中断标志应被清除");
}
/**
* 测试当线程中断状态已设置时Redis 调用抛出异常isAccessTokenExpired() 应处理并清除中断标志
*/
@Test
public void testIsAccessTokenExpiredClearsInterruptedFlag() {
Mockito.when(mockRedisOps.getExpire(Mockito.anyString()))
.thenThrow(new RuntimeException("Redis command interrupted"));
// 设置线程中断标志
Thread.currentThread().interrupt();
boolean expired = config.isAccessTokenExpired();
Assert.assertTrue(expired, "Redis异常时应将token视为已过期");
// 中断标志应该被清除,允许后续操作正常进行
Assert.assertFalse(Thread.currentThread().isInterrupted(), "处理异常后线程中断标志应被清除");
}
/**
* 测试正常情况下 isAccessTokenExpired() 的行为
*/
@Test
public void testIsAccessTokenExpiredWhenTokenValid() {
// 返回60秒后过期未过期
Mockito.when(mockRedisOps.getExpire(Mockito.anyString())).thenReturn(60L);
boolean expired = config.isAccessTokenExpired();
Assert.assertFalse(expired, "token未过期时应返回false");
}
/**
* 测试 isAccessTokenExpired() 当 expire 为 null 时视为已过期
*/
@Test
public void testIsAccessTokenExpiredWhenExpireIsNull() {
Mockito.when(mockRedisOps.getExpire(Mockito.anyString())).thenReturn(null);
boolean expired = config.isAccessTokenExpired();
Assert.assertTrue(expired, "expire为null时应视为已过期");
}
/**
* 测试当 Redis getExpire 抛出异常时isJsapiTicketExpired() 应返回 true视为已过期
*/
@Test
public void testIsJsapiTicketExpiredWhenRedisThrowsException() {
Mockito.when(mockRedisOps.getExpire(Mockito.anyString()))
.thenThrow(new RuntimeException("Redis command interrupted"));
boolean expired = config.isJsapiTicketExpired();
Assert.assertTrue(expired, "Redis异常时应将jsapi_ticket视为已过期");
Assert.assertFalse(Thread.currentThread().isInterrupted(), "处理异常后线程中断标志应被清除");
}
/**
* 测试当 Redis getExpire 抛出异常时isAgentJsapiTicketExpired() 应返回 true视为已过期
*/
@Test
public void testIsAgentJsapiTicketExpiredWhenRedisThrowsException() {
Mockito.when(mockRedisOps.getExpire(Mockito.anyString()))
.thenThrow(new RuntimeException("Redis command interrupted"));
boolean expired = config.isAgentJsapiTicketExpired();
Assert.assertTrue(expired, "Redis异常时应将agent_jsapi_ticket视为已过期");
Assert.assertFalse(Thread.currentThread().isInterrupted(), "处理异常后线程中断标志应被清除");
}
/**
* 测试提供自定义 Lock 实现时 getAccessTokenLock() 返回正确的锁
*/
@Test
public void testGetAccessTokenLockReturnsMockedLock() {
Lock mockLock = Mockito.mock(Lock.class);
Mockito.when(mockRedisOps.getLock(Mockito.anyString())).thenReturn(mockLock);
Lock lock = config.getAccessTokenLock();
Assert.assertNotNull(lock, "获取到的锁不应为null");
}
}