Skip to content

Commit 3eabfed

Browse files
foreveryang321foreveryang321
authored
🎨 wx-java-open-spring-boot-starter 增加重试次数配置
1 parent 0a75b0e commit 3eabfed

File tree

15 files changed

+201
-59
lines changed

15 files changed

+201
-59
lines changed

‎spring-boot-starters/wx-java-open-spring-boot-starter/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
wx.open.config-storage.http-proxy-port=
2828
wx.open.config-storage.http-proxy-username=
2929
wx.open.config-storage.http-proxy-password=
30+
# 最大重试次数，默认：5 次，如果小于 0，则为 0
31+
wx.open.config-storage.max-retry-times=5
32+
# 重试时间间隔步进，默认：1000 毫秒，如果小于 0，则为 1000
33+
wx.open.config-storage.retry-sleep-millis=1000
3034
```
3135
3. 支持自动注入的类型: `WxOpenService, WxOpenMessageRouter, WxOpenComponentService`
3236

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

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

3+
import com.binarywang.spring.starter.wxjava.open.config.storage.WxOpenInJedisConfigStorageConfiguration;
34
import com.binarywang.spring.starter.wxjava.open.config.storage.WxOpenInMemoryConfigStorageConfiguration;
4-
import com.binarywang.spring.starter.wxjava.open.config.storage.WxOpenInRedisConfigStorageConfiguration;
55
import com.binarywang.spring.starter.wxjava.open.config.storage.WxOpenInRedisTemplateConfigStorageConfiguration;
66
import com.binarywang.spring.starter.wxjava.open.config.storage.WxOpenInRedissonConfigStorageConfiguration;
77
import org.springframework.context.annotation.Configuration;
@@ -16,7 +16,7 @@
1616
@Import({
1717
WxOpenInMemoryConfigStorageConfiguration.class,
1818
WxOpenInRedisTemplateConfigStorageConfiguration.class,
19-
WxOpenInRedisConfigStorageConfiguration.class,
19+
WxOpenInJedisConfigStorageConfiguration.class,
2020
WxOpenInRedissonConfigStorageConfiguration.class
2121
})
2222
public class WxOpenStorageAutoConfiguration {

‎spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/storage/AbstractWxOpenConfigStorageConfiguration.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.binarywang.spring.starter.wxjava.open.config.storage;
2+
3+
import com.binarywang.spring.starter.wxjava.open.properties.WxOpenProperties;
4+
import me.chanjar.weixin.open.api.impl.WxOpenInMemoryConfigStorage;
5+
6+
/**
7+
* @author yl
8+
*/
9+
public abstract class AbstractWxOpenConfigStorageConfiguration {
10+
11+
protected WxOpenInMemoryConfigStorage config(WxOpenInMemoryConfigStorage config, WxOpenProperties properties) {
12+
WxOpenProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
13+
config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
14+
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
15+
config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
16+
config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
17+
if (configStorageProperties.getHttpProxyPort() != null) {
18+
config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
19+
}
20+
int maxRetryTimes = configStorageProperties.getMaxRetryTimes();
21+
if (configStorageProperties.getMaxRetryTimes() < 0) {
22+
maxRetryTimes = 0;
23+
}
24+
int retrySleepMillis = configStorageProperties.getRetrySleepMillis();
25+
if (retrySleepMillis < 0) {
26+
retrySleepMillis = 1000;
27+
}
28+
config.setRetrySleepMillis(retrySleepMillis);
29+
config.setMaxRetryTimes(maxRetryTimes);
30+
return config;
31+
}
32+
}

spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/storage/WxOpenInRedisConfigStorageConfiguration.java renamed to spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/storage/WxOpenInJedisConfigStorageConfiguration.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,15 @@
2727
)
2828
@ConditionalOnClass({JedisPool.class, JedisPoolConfig.class})
2929
@RequiredArgsConstructor
30-
public class WxOpenInRedisConfigStorageConfiguration {
30+
public class WxOpenInJedisConfigStorageConfiguration extends AbstractWxOpenConfigStorageConfiguration {
3131
private final WxOpenProperties properties;
3232
private final ApplicationContext applicationContext;
3333

3434
@Bean
3535
@ConditionalOnMissingBean(WxOpenConfigStorage.class)
3636
public WxOpenConfigStorage wxOpenConfigStorage() {
3737
WxOpenInMemoryConfigStorage config = getWxOpenInRedisConfigStorage();
38-
39-
WxOpenProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
40-
config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
41-
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
42-
config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
43-
config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
44-
if (configStorageProperties.getHttpProxyPort() != null) {
45-
config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
46-
}
47-
return config;
38+
return this.config(config, properties);
4839
}
4940

5041
private WxOpenInRedisConfigStorage getWxOpenInRedisConfigStorage() {

‎spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/storage/WxOpenInMemoryConfigStorageConfiguration.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,13 @@
1818
matchIfMissing = true, havingValue = "memory"
1919
)
2020
@RequiredArgsConstructor
21-
public class WxOpenInMemoryConfigStorageConfiguration {
21+
public class WxOpenInMemoryConfigStorageConfiguration extends AbstractWxOpenConfigStorageConfiguration {
2222
private final WxOpenProperties properties;
2323

2424
@Bean
2525
@ConditionalOnMissingBean(WxOpenConfigStorage.class)
2626
public WxOpenConfigStorage wxOpenConfigStorage() {
2727
WxOpenInMemoryConfigStorage config = new WxOpenInMemoryConfigStorage();
28-
29-
WxOpenProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
30-
config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
31-
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
32-
config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
33-
config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
34-
if (configStorageProperties.getHttpProxyPort() != null) {
35-
config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
36-
}
37-
return config;
28+
return this.config(config, properties);
3829
}
3930
}

‎spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/storage/WxOpenInRedisTemplateConfigStorageConfiguration.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,15 @@
2424
)
2525
@ConditionalOnClass(StringRedisTemplate.class)
2626
@RequiredArgsConstructor
27-
public class WxOpenInRedisTemplateConfigStorageConfiguration {
27+
public class WxOpenInRedisTemplateConfigStorageConfiguration extends AbstractWxOpenConfigStorageConfiguration {
2828
private final WxOpenProperties properties;
2929
private final ApplicationContext applicationContext;
3030

3131
@Bean
3232
@ConditionalOnMissingBean(WxOpenConfigStorage.class)
3333
public WxOpenConfigStorage wxOpenConfigStorage() {
3434
WxOpenInMemoryConfigStorage config = getWxOpenInRedisTemplateConfigStorage();
35-
36-
WxOpenProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
37-
config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
38-
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
39-
config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
40-
config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
41-
if (configStorageProperties.getHttpProxyPort() != null) {
42-
config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
43-
}
44-
return config;
35+
return this.config(config, properties);
4536
}
4637

4738
private WxOpenInRedisConfigStorage getWxOpenInRedisTemplateConfigStorage() {

‎spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/storage/WxOpenInRedissonConfigStorageConfiguration.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,15 @@
2929
)
3030
@ConditionalOnClass({Redisson.class, RedissonClient.class})
3131
@RequiredArgsConstructor
32-
public class WxOpenInRedissonConfigStorageConfiguration {
32+
public class WxOpenInRedissonConfigStorageConfiguration extends AbstractWxOpenConfigStorageConfiguration {
3333
private final WxOpenProperties properties;
3434
private final ApplicationContext applicationContext;
3535

3636
@Bean
3737
@ConditionalOnMissingBean(WxOpenConfigStorage.class)
3838
public WxOpenConfigStorage wxOpenConfigStorage() {
3939
WxOpenInMemoryConfigStorage config = getWxOpenInRedissonConfigStorage();
40-
41-
WxOpenProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
42-
config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
43-
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
44-
config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
45-
config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
46-
if (configStorageProperties.getHttpProxyPort() != null) {
47-
config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
48-
}
49-
return config;
40+
return this.config(config, properties);
5041
}
5142

5243
private WxOpenInRedisConfigStorage getWxOpenInRedissonConfigStorage() {

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,23 @@ public static class ConfigStorage implements Serializable {
9191
*/
9292
private String httpProxyPassword;
9393

94+
/**
95+
* http 请求重试间隔
96+
* <pre>
97+
* {@link me.chanjar.weixin.mp.api.impl.BaseWxMpServiceImpl#setRetrySleepMillis(int)}
98+
* {@link cn.binarywang.wx.miniapp.api.impl.BaseWxMaServiceImpl#setRetrySleepMillis(int)}
99+
* </pre>
100+
*/
101+
private int retrySleepMillis = 1000;
102+
/**
103+
* http 请求最大重试次数
104+
* <pre>
105+
* {@link me.chanjar.weixin.mp.api.impl.BaseWxMpServiceImpl#setMaxRetryTimes(int)}
106+
* {@link cn.binarywang.wx.miniapp.api.impl.BaseWxMaServiceImpl#setMaxRetryTimes(int)}
107+
* </pre>
108+
*/
109+
private int maxRetryTimes = 5;
110+
94111
}
95112

96113
public enum StorageType {

‎weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/WxMaConfig.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,22 @@ public interface WxMaConfig {
205205
*/
206206
String getHttpProxyPassword();
207207

208+
/**
209+
* http 请求重试间隔
210+
* <pre>
211+
* {@link cn.binarywang.wx.miniapp.api.impl.BaseWxMaServiceImpl#setRetrySleepMillis(int)}
212+
* </pre>
213+
*/
214+
int getRetrySleepMillis();
215+
216+
/**
217+
* http 请求最大重试次数
218+
* <pre>
219+
* {@link cn.binarywang.wx.miniapp.api.impl.BaseWxMaServiceImpl#setMaxRetryTimes(int)}
220+
* </pre>
221+
*/
222+
int getMaxRetryTimes();
223+
208224
/**
209225
* http client builder
210226
*
@@ -231,7 +247,7 @@ public interface WxMaConfig {
231247
* 获取自定义的apiHost地址，用于替换原请求中的https://api.weixin.qq.com
232248
* 具体取值，可以参考https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Interface_field_description.html
233249
*
234-
* @return 自定义的api域名地址
250+
* @return 自定义的api域名地址
235251
*/
236252
String getApiHostUrl();
237253
}

‎weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ public class WxMaDefaultConfigImpl implements WxMaConfig {
4141
private volatile int httpProxyPort;
4242
private volatile String httpProxyUsername;
4343
private volatile String httpProxyPassword;
44+
45+
private volatile int retrySleepMillis = 1000;
46+
private volatile int maxRetryTimes = 5;
47+
4448
private volatile String jsapiTicket;
4549
private volatile long jsapiTicketExpiresTime;
4650
/**
@@ -257,6 +261,24 @@ public void setHttpProxyPassword(String httpProxyPassword) {
257261
this.httpProxyPassword = httpProxyPassword;
258262
}
259263

264+
@Override
265+
public int getRetrySleepMillis() {
266+
return this.retrySleepMillis;
267+
}
268+
269+
public void setRetrySleepMillis(int retrySleepMillis) {
270+
this.retrySleepMillis = retrySleepMillis;
271+
}
272+
273+
@Override
274+
public int getMaxRetryTimes() {
275+
return this.maxRetryTimes;
276+
}
277+
278+
public void setMaxRetryTimes(int maxRetryTimes) {
279+
this.maxRetryTimes = maxRetryTimes;
280+
}
281+
260282
@Override
261283
public String toString() {
262284
return WxMaGsonBuilder.create().toJson(this);

0 commit comments

Comments
 (0)