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

🎨 #1384 小程序体验者接口增加错误码，同时优化WxOpenStorageAutoConfiguration，增加keyPrefix属性

Browse Source 
* ✨ 增加自助核销接口

* 🐛 修改接口路径

* ✨ 增加错误码

* ✨ 优化

* ✨ starter config增加keyPrefix

* ✨ 修改支付返回结果判断
This commit is contained in:
S
2020-01-19 11:30:35 +08:00
committed by Binary Wang
parent ac935c5c66
commit 6b3a09a925
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java
View File

@@ -49,11 +49,11 @@ public class WxOpenStorageAutoConfiguration {
return getWxOpenInRedisConfigStorage();
}
if (type == WxOpenProperties.StorageType.jedis){
if (type == WxOpenProperties.StorageType.jedis) {
return getWxOpenInRedisConfigStorage();
}
if (type == WxOpenProperties.StorageType.redisson){
if (type == WxOpenProperties.StorageType.redisson) {
return getWxOpenInRedissonConfigStorage();
}
return getWxOpenInMemoryConfigStorage();
@@ -61,7 +61,7 @@ public class WxOpenStorageAutoConfiguration {
private WxOpenInMemoryConfigStorage getWxOpenInMemoryConfigStorage() {
WxOpenInMemoryConfigStorage config = new WxOpenInMemoryConfigStorage();
config.setWxOpenInfo(properties.getAppId(),properties.getSecret(), properties.getToken(), properties.getAesKey());
config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
return config;
}
@@ -70,18 +70,18 @@ public class WxOpenStorageAutoConfiguration {
if (jedisPool == null || StringUtils.isNotEmpty(redisHost)) {
poolToUse = getJedisPool();
}
WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(poolToUse);
config.setWxOpenInfo(properties.getAppId(),properties.getSecret(), properties.getToken(), properties.getAesKey());
WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(poolToUse, properties.getConfigStorage().getKeyPrefix());
config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
return config;
}
private WxOpenInRedissonConfigStorage getWxOpenInRedissonConfigStorage(){
private WxOpenInRedissonConfigStorage getWxOpenInRedissonConfigStorage() {
RedissonClient redissonClientToUse = this.redissonClient;
if(redissonClient == null){
if (redissonClient == null) {
redissonClientToUse = getRedissonClient();
}
WxOpenInRedissonConfigStorage config = new WxOpenInRedissonConfigStorage(redissonClientToUse);
config.setWxOpenInfo(properties.getAppId(),properties.getSecret(), properties.getToken(), properties.getAesKey());
WxOpenInRedissonConfigStorage config = new WxOpenInRedissonConfigStorage(redissonClientToUse, properties.getConfigStorage().getKeyPrefix());
config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
return config;
}
@@ -111,7 +111,7 @@ public class WxOpenStorageAutoConfiguration {
return pool;
}
private RedissonClient getRedissonClient(){
private RedissonClient getRedissonClient() {
WxOpenProperties.ConfigStorage storage = properties.getConfigStorage();
RedisProperties redis = storage.getRedis();

2
spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java
View File

@@ -53,6 +53,8 @@ public class WxOpenProperties {
private RedisProperties redis = new RedisProperties();
private String keyPrefix;
}
public enum StorageType {