lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-10-21 11:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎨 修复微信开发平台部分问题，并对企业微信新增多种 redis 存储实现支持

Browse Source
This commit is contained in:
Forever杨
2023-04-23 13:21:03 +08:00
committed by GitHub
parent e72991c0b5
commit e50457892d
19 changed files with 527 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weixin-java-cp/pom.xml
View File

@@ -43,6 +43,10 @@
<groupId>org.redisson</groupId>
<artifactId>redisson</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>

183
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/AbstractWxCpInRedisConfigImpl.java Normal file
View File

@@ -0,0 +1,183 @@
package me.chanjar.weixin.cp.config.impl;
import lombok.NonNull;
import me.chanjar.weixin.common.bean.WxAccessToken;
import me.chanjar.weixin.common.redis.WxRedisOps;
import org.apache.commons.lang3.StringUtils;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
/**
* @author yl
* created on 2023/04/23
*/
public abstract class AbstractWxCpInRedisConfigImpl extends WxCpDefaultConfigImpl {
private static final long serialVersionUID = 7157341535439380615L;
/**
* The constant LOCK_KEY.
*/
protected static final String LOCK_KEY = "wechat_cp_lock:";
/**
* The constant CP_ACCESS_TOKEN_KEY.
*/
protected static final String CP_ACCESS_TOKEN_KEY = "wechat_cp_access_token_key:";
/**
* The constant CP_JSAPI_TICKET_KEY.
*/
protected static final String CP_JSAPI_TICKET_KEY = "wechat_cp_jsapi_ticket_key:";
/**
* The constant CP_AGENT_JSAPI_TICKET_KEY.
*/
protected static final String CP_AGENT_JSAPI_TICKET_KEY = "wechat_cp_agent_jsapi_ticket_key:";
/**
* redis 存储的 key 的前缀，可为空
*/
protected String keyPrefix;
/**
* The Access token key.
*/
protected String accessTokenKey;
/**
* The Jsapi ticket key.
*/
protected String jsapiTicketKey;
/**
* The Agent jsapi ticket key.
*/
protected String agentJsapiTicketKey;
/**
* The Lock key.
*/
protected String lockKey;
private final WxRedisOps redisOps;
/**
* Instantiates a new Wx cp redis config.
*
* @param redisOps the redis ops
* @param keyPrefix the key prefix
*/
public AbstractWxCpInRedisConfigImpl(@NonNull WxRedisOps redisOps, String keyPrefix) {
this.redisOps = redisOps;
this.keyPrefix = keyPrefix;
}
/**
* 设置企业微信自研应用ID（整数）,同时初始化相关的redis key，注意要先调用setCorpId，再调用setAgentId
*
* @param agentId 应用 agentId
*/
@Override
public void setAgentId(Integer agentId) {
super.setAgentId(agentId);
String ukey;
if (agentId != null) {
ukey = getCorpId().concat(":").concat(String.valueOf(agentId));
} else {
ukey = getCorpId();
}
String prefix = StringUtils.isBlank(keyPrefix) ? "" :
(StringUtils.endsWith(keyPrefix, ":") ? keyPrefix : (keyPrefix + ":"));
lockKey = prefix + LOCK_KEY.concat(ukey);
accessTokenKey = prefix + CP_ACCESS_TOKEN_KEY.concat(ukey);
jsapiTicketKey = prefix + CP_JSAPI_TICKET_KEY.concat(ukey);
agentJsapiTicketKey = prefix + CP_AGENT_JSAPI_TICKET_KEY.concat(ukey);
}
/**
* Gets lock by key.
*
* @param key the key
* @return the lock by key
*/
protected Lock getLockByKey(String key) {
return redisOps.getLock(key);
}
@Override
public Lock getAccessTokenLock() {
return getLockByKey(this.lockKey.concat(":").concat("accessToken"));
}
@Override
public Lock getAgentJsapiTicketLock() {
return getLockByKey(this.lockKey.concat(":").concat("agentJsapiTicket"));
}
@Override
public Lock getJsapiTicketLock() {
return getLockByKey(this.lockKey.concat(":").concat("jsapiTicket"));
}
@Override
public String getAccessToken() {
return redisOps.getValue(this.accessTokenKey);
}
@Override
public boolean isAccessTokenExpired() {
Long expire = redisOps.getExpire(this.accessTokenKey);
return expire == null || expire < 2;
}
@Override
public void updateAccessToken(WxAccessToken accessToken) {
redisOps.setValue(this.accessTokenKey, accessToken.getAccessToken(), accessToken.getExpiresIn(), TimeUnit.SECONDS);
}
@Override
public void updateAccessToken(String accessToken, int expiresInSeconds) {
redisOps.setValue(this.accessTokenKey, accessToken, expiresInSeconds, TimeUnit.SECONDS);
}
@Override
public void expireAccessToken() {
redisOps.expire(this.accessTokenKey, 0, TimeUnit.SECONDS);
}
@Override
public String getJsapiTicket() {
return redisOps.getValue(this.jsapiTicketKey);
}
@Override
public boolean isJsapiTicketExpired() {
Long expire = redisOps.getExpire(this.jsapiTicketKey);
return expire == null || expire < 2;
}
@Override
public void expireJsapiTicket() {
redisOps.expire(this.jsapiTicketKey, 0, TimeUnit.SECONDS);
}
@Override
public void updateJsapiTicket(String jsapiTicket, int expiresInSeconds) {
redisOps.setValue(this.jsapiTicketKey, jsapiTicket, expiresInSeconds, TimeUnit.SECONDS);
}
@Override
public void expireAgentJsapiTicket() {
redisOps.expire(this.agentJsapiTicketKey, 0, TimeUnit.SECONDS);
}
@Override
public void updateAgentJsapiTicket(String agentJsapiTicket, int expiresInSeconds) {
redisOps.setValue(this.agentJsapiTicketKey, agentJsapiTicket, expiresInSeconds, TimeUnit.SECONDS);
}
@Override
public String getAgentJsapiTicket() {
return redisOps.getValue(this.agentJsapiTicketKey);
}
@Override
public boolean isAgentJsapiTicketExpired() {
Long expire = redisOps.getExpire(this.agentJsapiTicketKey);
return expire == null || expire < 2;
}
}

24
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpJedisConfigImpl.java Normal file
View File

@@ -0,0 +1,24 @@
package me.chanjar.weixin.cp.config.impl;
import lombok.NonNull;
import me.chanjar.weixin.common.redis.JedisWxRedisOps;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.util.Pool;
/**
* 基于 jdis 的实现
*
* @author yl
* created on 2023/04/23
*/
public class WxCpJedisConfigImpl extends AbstractWxCpInRedisConfigImpl {
private static final long serialVersionUID = -1869372247414407433L;
public WxCpJedisConfigImpl(Pool<Jedis> jedisPool) {
this(jedisPool, null);
}
public WxCpJedisConfigImpl(@NonNull Pool<Jedis> jedisPool, String keyPrefix) {
super(new JedisWxRedisOps(jedisPool), keyPrefix);
}
}

23
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisTemplateConfigImpl.java Normal file
View File

@@ -0,0 +1,23 @@
package me.chanjar.weixin.cp.config.impl;
import lombok.NonNull;
import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
import org.springframework.data.redis.core.StringRedisTemplate;
/**
* 基于 RedisTemplate 的实现
*
* @author yl
* created on 2023/04/23
*/
public class WxCpRedisTemplateConfigImpl extends AbstractWxCpInRedisConfigImpl {
private static final long serialVersionUID = -1660004125413310620L;
public WxCpRedisTemplateConfigImpl(@NonNull StringRedisTemplate stringRedisTemplate) {
this(stringRedisTemplate, null);
}
public WxCpRedisTemplateConfigImpl(@NonNull StringRedisTemplate stringRedisTemplate, String keyPrefix) {
super(new RedisTemplateWxRedisOps(stringRedisTemplate), keyPrefix);
}
}

185
weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedissonConfigImpl.java
View File

@@ -1,198 +1,23 @@
package me.chanjar.weixin.cp.config.impl;
import lombok.NonNull;
import me.chanjar.weixin.common.bean.WxAccessToken;
import me.chanjar.weixin.common.redis.RedissonWxRedisOps;
import me.chanjar.weixin.common.redis.WxRedisOps;
import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RedissonClient;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
/**
* 基于Redisson的实现
*
* @author yuanqixun created on 2020 /5/13
* @author yl
*/
public class WxCpRedissonConfigImpl extends WxCpDefaultConfigImpl {
/**
* The constant LOCK_KEY.
*/
protected static final String LOCK_KEY = "wechat_cp_lock:";
/**
* The constant CP_ACCESS_TOKEN_KEY.
*/
protected static final String CP_ACCESS_TOKEN_KEY = "wechat_cp_access_token_key:";
/**
* The constant CP_JSAPI_TICKET_KEY.
*/
protected static final String CP_JSAPI_TICKET_KEY = "wechat_cp_jsapi_ticket_key:";
/**
* The constant CP_AGENT_JSAPI_TICKET_KEY.
*/
protected static final String CP_AGENT_JSAPI_TICKET_KEY = "wechat_cp_agent_jsapi_ticket_key:";
private final WxRedisOps redisOps;
/**
* redis 存储的 key 的前缀，可为空
*/
protected String keyPrefix;
/**
* The Access token key.
*/
protected String accessTokenKey;
/**
* The Jsapi ticket key.
*/
protected String jsapiTicketKey;
/**
* The Agent jsapi ticket key.
*/
protected String agentJsapiTicketKey;
/**
* The Lock key.
*/
protected String lockKey;
public class WxCpRedissonConfigImpl extends AbstractWxCpInRedisConfigImpl {
private static final long serialVersionUID = -5674792341070783967L;
/**
* Instantiates a new Wx cp redisson config.
*
* @param redissonClient the redisson client
* @param keyPrefix the key prefix
*/
public WxCpRedissonConfigImpl(@NonNull RedissonClient redissonClient, String keyPrefix) {
this(new RedissonWxRedisOps(redissonClient), keyPrefix);
}
/**
* Instantiates a new Wx cp redisson config.
*
* @param redissonClient the redisson client
*/
public WxCpRedissonConfigImpl(@NonNull RedissonClient redissonClient) {
this(redissonClient, null);
}
/**
* Instantiates a new Wx cp redisson config.
*
* @param redisOps the redis ops
* @param keyPrefix the key prefix
*/
public WxCpRedissonConfigImpl(@NonNull WxRedisOps redisOps, String keyPrefix) {
this.redisOps = redisOps;
this.keyPrefix = keyPrefix;
public WxCpRedissonConfigImpl(@NonNull RedissonClient redissonClient, String keyPrefix) {
super(new RedissonWxRedisOps(redissonClient), keyPrefix);
}
/**
* 设置企业微信自研应用ID（整数）,同时初始化相关的redis key，注意要先调用setCorpId，再调用setAgentId
*
* @param agentId
*/
@Override
public void setAgentId(Integer agentId) {
super.setAgentId(agentId);
String ukey = getCorpId().concat(":").concat(String.valueOf(agentId));
String prefix = StringUtils.isBlank(keyPrefix) ? "" :
(StringUtils.endsWith(keyPrefix, ":") ? keyPrefix : (keyPrefix + ":"));
lockKey = prefix + LOCK_KEY.concat(ukey);
accessTokenKey = prefix + CP_ACCESS_TOKEN_KEY.concat(ukey);
jsapiTicketKey = prefix + CP_JSAPI_TICKET_KEY.concat(ukey);
agentJsapiTicketKey = prefix + CP_AGENT_JSAPI_TICKET_KEY.concat(ukey);
}
/**
* Gets lock by key.
*
* @param key the key
* @return the lock by key
*/
protected Lock getLockByKey(String key) {
return redisOps.getLock(key);
}
@Override
public Lock getAccessTokenLock() {
return getLockByKey(this.lockKey.concat(":").concat("accessToken"));
}
@Override
public Lock getAgentJsapiTicketLock() {
return getLockByKey(this.lockKey.concat(":").concat("agentJsapiTicket"));
}
@Override
public Lock getJsapiTicketLock() {
return getLockByKey(this.lockKey.concat(":").concat("jsapiTicket"));
}
@Override
public String getAccessToken() {
return redisOps.getValue(this.accessTokenKey);
}
@Override
public boolean isAccessTokenExpired() {
Long expire = redisOps.getExpire(this.accessTokenKey);
return expire == null || expire < 2;
}
@Override
public void updateAccessToken(WxAccessToken accessToken) {
redisOps.setValue(this.accessTokenKey, accessToken.getAccessToken(), accessToken.getExpiresIn(), TimeUnit.SECONDS);
}
@Override
public void updateAccessToken(String accessToken, int expiresInSeconds) {
redisOps.setValue(this.accessTokenKey, accessToken, expiresInSeconds, TimeUnit.SECONDS);
}
@Override
public void expireAccessToken() {
redisOps.expire(this.accessTokenKey, 0, TimeUnit.SECONDS);
}
@Override
public String getJsapiTicket() {
return redisOps.getValue(this.jsapiTicketKey);
}
@Override
public boolean isJsapiTicketExpired() {
Long expire = redisOps.getExpire(this.jsapiTicketKey);
return expire == null || expire < 2;
}
@Override
public void expireJsapiTicket() {
redisOps.expire(this.jsapiTicketKey, 0, TimeUnit.SECONDS);
}
@Override
public void updateJsapiTicket(String jsapiTicket, int expiresInSeconds) {
redisOps.setValue(this.jsapiTicketKey, jsapiTicket, expiresInSeconds, TimeUnit.SECONDS);
}
@Override
public void expireAgentJsapiTicket() {
redisOps.expire(this.agentJsapiTicketKey, 0, TimeUnit.SECONDS);
}
@Override
public void updateAgentJsapiTicket(String agentJsapiTicket, int expiresInSeconds) {
redisOps.setValue(this.agentJsapiTicketKey, agentJsapiTicket, expiresInSeconds, TimeUnit.SECONDS);
}
@Override
public String getAgentJsapiTicket() {
return redisOps.getValue(this.agentJsapiTicketKey);
}
@Override
public boolean isAgentJsapiTicketExpired() {
Long expire = redisOps.getExpire(this.agentJsapiTicketKey);
return expire == null || expire < 2;
}
}