Skip to content

Commit d9b7217

Browse files
binarywangbinarywang
committed
规范统一config部分代码
1 parent d0d83a7 commit d9b7217

File tree

34 files changed

+277
-294
lines changed

34 files changed

+277
-294
lines changed

‎starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpServiceAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.binarywang.spring.starter.wxjava.mp;
22

3-
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
3+
import me.chanjar.weixin.mp.config.WxMpConfigStorage;
44
import me.chanjar.weixin.mp.api.WxMpService;
55
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
66
import org.springframework.beans.factory.annotation.Autowired;

‎starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpStorageAutoConfiguration.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.binarywang.spring.starter.wxjava.mp;
22

3-
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
4-
import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
5-
import me.chanjar.weixin.mp.api.WxMpInRedisConfigStorage;
3+
import me.chanjar.weixin.mp.config.WxMpConfigStorage;
4+
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
5+
import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl;
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
88
import org.springframework.context.annotation.Bean;
@@ -34,23 +34,23 @@ public WxMpConfigStorage wxMpInMemoryConfigStorage() {
3434
return getWxMpInMemoryConfigStorage();
3535
}
3636

37-
private WxMpInMemoryConfigStorage getWxMpInMemoryConfigStorage() {
38-
WxMpInMemoryConfigStorage config = new WxMpInMemoryConfigStorage();
37+
private WxMpDefaultConfigImpl getWxMpInMemoryConfigStorage() {
38+
WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl();
3939
setWxMpInfo(config);
4040
return config;
4141
}
4242

43-
private WxMpInRedisConfigStorage getWxMpInRedisConfigStorage() {
43+
private WxMpRedisConfigImpl getWxMpInRedisConfigStorage() {
4444
JedisPool poolToUse = jedisPool;
4545
if (poolToUse == null) {
4646
poolToUse = getJedisPool();
4747
}
48-
WxMpInRedisConfigStorage config = new WxMpInRedisConfigStorage(poolToUse);
48+
WxMpRedisConfigImpl config = new WxMpRedisConfigImpl(poolToUse);
4949
setWxMpInfo(config);
5050
return config;
5151
}
5252

53-
private void setWxMpInfo(WxMpInMemoryConfigStorage config) {
53+
private void setWxMpInfo(WxMpDefaultConfigImpl config) {
5454
config.setAppId(properties.getAppId());
5555
config.setSecret(properties.getSecret());
5656
config.setToken(properties.getToken());

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpTpConfigStorage.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public interface WxCpTpConfigStorage {
1414

1515
/**
1616
* 设置企业微信服务器 baseUrl.
17-
*
1817
* 默认值是 https://qyapi.weixin.qq.com , 如果使用默认值，则不需要调用 setBaseApiUrl
1918
*
2019
* @param baseUrl 企业微信服务器 Url
@@ -23,7 +22,6 @@ public interface WxCpTpConfigStorage {
2322

2423
/**
2524
* 读取企业微信 API Url.
26-
*
2725
* 支持私有化企业微信服务器.
2826
*/
2927
String getApiUrl(String path);
@@ -33,7 +31,7 @@ public interface WxCpTpConfigStorage {
3331
boolean isSuiteAccessTokenExpired();
3432

3533
/**
36-
* 强制将suite access token过期掉
34+
* 强制将suite access token过期掉.
3735
*/
3836
void expireSuiteAccessToken();
3937

@@ -46,15 +44,15 @@ public interface WxCpTpConfigStorage {
4644
boolean isSuiteTicketExpired();
4745

4846
/**
49-
* 强制将suite ticket过期掉
47+
* 强制将suite ticket过期掉.
5048
*/
5149
void expireSuiteTicket();
5250

5351
/**
54-
* 应该是线程安全的
52+
* 应该是线程安全的.
5553
*/
5654
void updateSuiteTicket(String suiteTicket, int expiresInSeconds);
57-
55+
5856
String getCorpId();
5957

6058
String getCorpSecret();
@@ -80,7 +78,7 @@ public interface WxCpTpConfigStorage {
8078
File getTmpDirFile();
8179

8280
/**
83-
* http client builder
81+
* http client builder.
8482
*
8583
* @return ApacheHttpClientBuilder
8684
*/

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpInMemoryConfigStorage.java renamed to ‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,49 @@
1-
package me.chanjar.weixin.cp.config;
1+
package me.chanjar.weixin.cp.config.impl;
22

33
import me.chanjar.weixin.common.bean.WxAccessToken;
44
import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
5+
import me.chanjar.weixin.cp.config.WxCpConfigStorage;
56
import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
67
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
78

89
import java.io.File;
10+
import java.io.Serializable;
911

1012
/**
11-
* 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化
13+
* 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化.
1214
*
1315
* @author Daniel Qian
1416
*/
15-
public class WxCpInMemoryConfigStorage implements WxCpConfigStorage {
16-
protected volatile String corpId;
17-
protected volatile String corpSecret;
17+
public class WxCpDefaultConfigImpl implements WxCpConfigStorage, Serializable {
18+
private static final long serialVersionUID = 1154541446729462780L;
1819

19-
protected volatile String token;
20+
private volatile String corpId;
21+
private volatile String corpSecret;
22+
23+
private volatile String token;
2024
protected volatile String accessToken;
21-
protected volatile String aesKey;
25+
private volatile String aesKey;
2226
protected volatile Integer agentId;
23-
protected volatile long expiresTime;
27+
private volatile long expiresTime;
2428

25-
protected volatile String oauth2redirectUri;
29+
private volatile String oauth2redirectUri;
2630

27-
protected volatile String httpProxyHost;
28-
protected volatile int httpProxyPort;
29-
protected volatile String httpProxyUsername;
30-
protected volatile String httpProxyPassword;
31+
private volatile String httpProxyHost;
32+
private volatile int httpProxyPort;
33+
private volatile String httpProxyUsername;
34+
private volatile String httpProxyPassword;
3135

32-
protected volatile String jsapiTicket;
33-
protected volatile long jsapiTicketExpiresTime;
36+
private volatile String jsapiTicket;
37+
private volatile long jsapiTicketExpiresTime;
3438

35-
protected volatile String agentJsapiTicket;
36-
protected volatile long agentJsapiTicketExpiresTime;
39+
private volatile String agentJsapiTicket;
40+
private volatile long agentJsapiTicketExpiresTime;
3741

38-
protected volatile File tmpDirFile;
42+
private volatile File tmpDirFile;
3943

4044
private volatile ApacheHttpClientBuilder apacheHttpClientBuilder;
4145

42-
protected volatile String baseApiUrl;
46+
private volatile String baseApiUrl;
4347

4448
@Override
4549
public void setBaseApiUrl(String baseUrl) {

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpJedisConfigStorage.java renamed to ‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package me.chanjar.weixin.cp.config;
1+
package me.chanjar.weixin.cp.config.impl;
22

33
import me.chanjar.weixin.common.bean.WxAccessToken;
44
import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
5+
import me.chanjar.weixin.cp.config.WxCpConfigStorage;
56
import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
67
import redis.clients.jedis.Jedis;
78
import redis.clients.jedis.JedisPool;
@@ -17,7 +18,7 @@
1718
*
1819
* @author gaigeshen
1920
*/
20-
public class WxCpJedisConfigStorage implements WxCpConfigStorage {
21+
public class WxCpRedisConfigImpl implements WxCpConfigStorage {
2122
private static final String ACCESS_TOKEN_KEY = "WX_CP_ACCESS_TOKEN";
2223
private static final String ACCESS_TOKEN_EXPIRES_TIME_KEY = "WX_CP_ACCESS_TOKEN_EXPIRES_TIME";
2324
private static final String JS_API_TICKET_KEY = "WX_CP_JS_API_TICKET";
@@ -54,23 +55,23 @@ public String getApiUrl(String path) {
5455
return baseApiUrl + path;
5556
}
5657

57-
public WxCpJedisConfigStorage(JedisPool jedisPool) {
58+
public WxCpRedisConfigImpl(JedisPool jedisPool) {
5859
this.jedisPool = jedisPool;
5960
}
6061

61-
public WxCpJedisConfigStorage(String host, int port) {
62+
public WxCpRedisConfigImpl(String host, int port) {
6263
jedisPool = new JedisPool(host, port);
6364
}
6465

65-
public WxCpJedisConfigStorage(JedisPoolConfig poolConfig, String host, int port) {
66+
public WxCpRedisConfigImpl(JedisPoolConfig poolConfig, String host, int port) {
6667
jedisPool = new JedisPool(poolConfig, host, port);
6768
}
6869

69-
public WxCpJedisConfigStorage(JedisPoolConfig poolConfig, String host, int port, int timeout, String password) {
70+
public WxCpRedisConfigImpl(JedisPoolConfig poolConfig, String host, int port, int timeout, String password) {
7071
jedisPool = new JedisPool(poolConfig, host, port, timeout, password);
7172
}
7273

73-
public WxCpJedisConfigStorage(JedisPoolConfig poolConfig, String host, int port, int timeout, String password, int database) {
74+
public WxCpRedisConfigImpl(JedisPoolConfig poolConfig, String host, int port, int timeout, String password, int database) {
7475
jedisPool = new JedisPool(poolConfig, host, port, timeout, password, database);
7576
}
7677

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpTpInMemoryConfigStorage.java renamed to ‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpTpDefaultConfigImpl.java

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,47 @@
1-
package me.chanjar.weixin.cp.config;
1+
package me.chanjar.weixin.cp.config.impl;
22

33
import me.chanjar.weixin.common.bean.WxAccessToken;
44
import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
5+
import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
56
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
67

78
import java.io.File;
9+
import java.io.Serializable;
810

911
/**
10-
* 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化
12+
* 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化.
1113
*
12-
* @author Daniel Qian
14+
* @author someone
1315
*/
14-
public class WxCpTpInMemoryConfigStorage implements WxCpTpConfigStorage {
15-
protected volatile String corpId;
16-
protected volatile String corpSecret;
17-
18-
protected volatile String suiteId;
19-
protected volatile String suiteSecret;
16+
public class WxCpTpDefaultConfigImpl implements WxCpTpConfigStorage, Serializable {
17+
private static final long serialVersionUID = 6678780920621872824L;
2018

21-
protected volatile String token;
22-
protected volatile String suiteAccessToken;
23-
protected volatile String aesKey;
24-
protected volatile long expiresTime;
19+
private volatile String corpId;
20+
private volatile String corpSecret;
2521

26-
protected volatile String oauth2redirectUri;
22+
private volatile String suiteId;
23+
private volatile String suiteSecret;
2724

28-
protected volatile String httpProxyHost;
29-
protected volatile int httpProxyPort;
30-
protected volatile String httpProxyUsername;
31-
protected volatile String httpProxyPassword;
25+
private volatile String token;
26+
private volatile String suiteAccessToken;
27+
private volatile String aesKey;
28+
private volatile long expiresTime;
3229

33-
protected volatile String suiteTicket;
34-
protected volatile long suiteTicketExpiresTime;
30+
private volatile String oauth2redirectUri;
3531

32+
private volatile String httpProxyHost;
33+
private volatile int httpProxyPort;
34+
private volatile String httpProxyUsername;
35+
private volatile String httpProxyPassword;
3636

37-
protected volatile File tmpDirFile;
37+
private volatile String suiteTicket;
38+
private volatile long suiteTicketExpiresTime;
39+
40+
private volatile File tmpDirFile;
3841

3942
private volatile ApacheHttpClientBuilder apacheHttpClientBuilder;
4043

41-
protected volatile String baseApiUrl;
44+
private volatile String baseApiUrl;
4245

4346
@Override
4447
public void setBaseApiUrl(String baseUrl) {
@@ -57,7 +60,7 @@ public String getApiUrl(String path) {
5760
public String getSuiteAccessToken() {
5861
return this.suiteAccessToken;
5962
}
60-
63+
6164
public void setSuiteAccessToken(String suiteAccessToken) {
6265
this.suiteAccessToken = suiteAccessToken;
6366
}
@@ -82,25 +85,25 @@ public synchronized void updateSuiteAccessToken(String suiteAccessToken, int exp
8285
this.suiteAccessToken = suiteAccessToken;
8386
this.expiresTime = System.currentTimeMillis() + (expiresInSeconds - 200) * 1000L;
8487
}
85-
88+
8689
@Override
8790
public String getCorpId() {
8891
return this.corpId;
8992
}
90-
93+
9194
public void setCorpId(String corpId) {
9295
this.corpId = corpId;
9396
}
94-
97+
9598
@Override
9699
public String getCorpSecret() {
97100
return this.corpSecret;
98101
}
99-
102+
100103
public void setCorpSecret(String corpSecret) {
101104
this.corpSecret = corpSecret;
102105
}
103-
106+
104107
@Override
105108
public String getSuiteTicket() {
106109
return this.suiteTicket;

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/ApiTestModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.thoughtworks.xstream.annotations.XStreamAlias;
1313
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
1414
import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
15-
import me.chanjar.weixin.cp.config.WxCpInMemoryConfigStorage;
15+
import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
1616

1717
public class ApiTestModule implements Module {
1818
private final Logger log = LoggerFactory.getLogger(this.getClass());
@@ -44,7 +44,7 @@ public void configure(Binder binder) {
4444
}
4545

4646
@XStreamAlias("xml")
47-
public static class WxXmlCpInMemoryConfigStorage extends WxCpInMemoryConfigStorage {
47+
public static class WxXmlCpInMemoryConfigStorage extends WxCpDefaultConfigImpl {
4848

4949
protected String userId;
5050

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoInMemoryConfigStorage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import com.thoughtworks.xstream.annotations.XStreamAlias;
77
import lombok.ToString;
88
import me.chanjar.weixin.common.util.xml.XStreamInitializer;
9-
import me.chanjar.weixin.cp.config.WxCpInMemoryConfigStorage;
9+
import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
1010

1111
/**
1212
* @author Daniel Qian
1313
*/
1414
@XStreamAlias("xml")
1515
@ToString
16-
public class WxCpDemoInMemoryConfigStorage extends WxCpInMemoryConfigStorage {
16+
public class WxCpDemoInMemoryConfigStorage extends WxCpDefaultConfigImpl {
1717
public static WxCpDemoInMemoryConfigStorage fromXml(InputStream is) {
1818
XStream xstream = XStreamInitializer.getInstance();
1919
xstream.processAnnotations(WxCpDemoInMemoryConfigStorage.class);

0 commit comments

Comments
 (0)