Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

增加错误码，一些优化 #1384

Merged
merged 6 commits into from
Jan 19, 2020
Merged

增加错误码，一些优化 #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec12e35
:sparkles: 增加自助核销接口
silloy Sep 19, 2019
4276c1f
:bug: 修改接口路径
silloy Sep 19, 2019
c222155
:sparkles: 增加错误码
silloy Dec 28, 2019
aa24df4
:sparkles: 优化
silloy Jan 17, 2020
9909a61
:sparkles: starter config增加keyPrefix
silloy Jan 17, 2020
27d82c7
:sparkles: 修改支付返回结果判断
silloy Jan 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions ...java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@ public WxOpenConfigStorage wxOpenConfigStorage() {
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();
}

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

Expand All @@ -70,18 +70,18 @@ private WxOpenInRedisConfigStorage getWxOpenInRedisConfigStorage() {
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;
}

Expand Down Expand Up @@ -111,7 +111,7 @@ private JedisPool getJedisPool() {
return pool;
}

private RedissonClient getRedissonClient(){
private RedissonClient getRedissonClient() {
WxOpenProperties.ConfigStorage storage = properties.getConfigStorage();
RedisProperties redis = storage.getRedis();

Expand Down
2 changes: 2 additions & 0 deletions .../src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ public static class ConfigStorage implements Serializable {

private RedisProperties redis = new RedisProperties();

private String keyPrefix;

}

public enum StorageType {
Expand Down
11 changes: 11 additions & 0 deletions weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxMaErrorMsgEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,17 @@ public enum WxMaErrorMsgEnum {
CODE_43101(43101, "用户拒绝接受消息，如果用户之前曾经订阅过，则表示用户取消了订阅关系"),

CODE_47003(47003, "模板参数不准确，可能为空或者不满足规则，errmsg会提示具体是哪个字段出错"),

/**
* 小程序绑定体验者
*/
CODE_85001(85001, "微信号不存在或微信号设置为不可搜索"),

CODE_85002(85002, "小程序绑定的体验者数量达到上限"),

CODE_85003(85003, "微信号绑定的小程序体验者达到上限"),

CODE_85004(85004, "微信号已经绑定"),
;

private int code;
Expand Down