Skip to content

Commit 8447caa

Browse files
authored
🎨 #3694 统一各模块微信接口请求的基础地址字段命名为apiHostUrl,并完善Spring Boot starter配置支持
1 parent 1eefd11 commit 8447caa

File tree

20 files changed

+175
-28
lines changed

20 files changed

+175
-28
lines changed

spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/configuration/services/AbstractWxChannelConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ private void configApp(WxChannelDefaultConfigImpl config, WxChannelSinglePropert
119119
config.setAesKey(aesKey);
120120
}
121121
config.setStableAccessToken(useStableAccessToken);
122+
config.setApiHostUrl(StringUtils.trimToNull(wxChannelSingleProperties.getApiHostUrl()));
123+
config.setAccessTokenUrl(StringUtils.trimToNull(wxChannelSingleProperties.getAccessTokenUrl()));
122124
}
123125

124126
private void configHttp(WxChannelDefaultConfigImpl config, WxChannelMultiProperties.ConfigStorage storage) {

spring-boot-starters/wx-java-channel-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelSingleProperties.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,16 @@ public class WxChannelSingleProperties implements Serializable {
4040
* 是否使用稳定版 Access Token
4141
*/
4242
private boolean useStableAccessToken = false;
43+
44+
/**
45+
* 自定义API主机地址,用于替换默认的 https://api.weixin.qq.com
46+
* 例如:http://proxy.company.com:8080
47+
*/
48+
private String apiHostUrl;
49+
50+
/**
51+
* 自定义获取AccessToken地址,用于向自定义统一服务获取AccessToken
52+
* 例如:http://proxy.company.com:8080/oauth/token
53+
*/
54+
private String accessTokenUrl;
4355
}

spring-boot-starters/wx-java-channel-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/config/storage/AbstractWxChannelConfigStorageConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ protected WxChannelDefaultConfigImpl config(WxChannelDefaultConfigImpl config, W
1616
config.setAesKey(StringUtils.trimToNull(properties.getAesKey()));
1717
config.setMsgDataFormat(StringUtils.trimToNull(properties.getMsgDataFormat()));
1818
config.setStableAccessToken(properties.isUseStableAccessToken());
19+
config.setApiHostUrl(StringUtils.trimToNull(properties.getApiHostUrl()));
20+
config.setAccessTokenUrl(StringUtils.trimToNull(properties.getAccessTokenUrl()));
1921

2022
WxChannelProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
2123
config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());

spring-boot-starters/wx-java-channel-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/channel/properties/WxChannelProperties.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@ public class WxChannelProperties {
4646
*/
4747
private boolean useStableAccessToken = false;
4848

49+
/**
50+
* 自定义API主机地址,用于替换默认的 https://api.weixin.qq.com
51+
* 例如:http://proxy.company.com:8080
52+
*/
53+
private String apiHostUrl;
54+
55+
/**
56+
* 自定义获取AccessToken地址,用于向自定义统一服务获取AccessToken
57+
* 例如:http://proxy.company.com:8080/oauth/token
58+
*/
59+
private String accessTokenUrl;
60+
4961
/**
5062
* 存储策略
5163
*/

spring-boot-starters/wx-java-cp-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/cp/configuration/services/AbstractWxCpConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ private void configCorp(WxCpDefaultConfigImpl config, WxCpSingleProperties wxCpS
139139
if (StringUtils.isNotBlank(msgAuditLibPath)) {
140140
config.setMsgAuditLibPath(msgAuditLibPath);
141141
}
142+
if (StringUtils.isNotBlank(wxCpSingleProperties.getBaseApiUrl())) {
143+
config.setBaseApiUrl(wxCpSingleProperties.getBaseApiUrl());
144+
}
142145
}
143146

144147
private void configHttp(WxCpDefaultConfigImpl config, WxCpMultiProperties.ConfigStorage storage) {

spring-boot-starters/wx-java-cp-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/cp/properties/WxCpSingleProperties.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,10 @@ public class WxCpSingleProperties implements Serializable {
4343
* 微信企业号应用 会话存档类库路径
4444
*/
4545
private String msgAuditLibPath;
46+
47+
/**
48+
* 自定义企业微信服务器baseUrl,用于替换默认的 https://qyapi.weixin.qq.com
49+
* 例如:http://proxy.company.com:8080
50+
*/
51+
private String baseApiUrl;
4652
}

spring-boot-starters/wx-java-cp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/cp/properties/WxCpProperties.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ public class WxCpProperties {
4848
*/
4949
private String msgAuditLibPath;
5050

51+
/**
52+
* 自定义企业微信服务器baseUrl,用于替换默认的 https://qyapi.weixin.qq.com
53+
* 例如:http://proxy.company.com:8080
54+
*/
55+
private String baseApiUrl;
56+
5157
/**
5258
* 配置存储策略,默认内存
5359
*/

spring-boot-starters/wx-java-cp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/cp/storage/AbstractWxCpConfigStorageConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ protected WxCpDefaultConfigImpl config(WxCpDefaultConfigImpl config, WxCpPropert
3737
if (StringUtils.isNotBlank(msgAuditLibPath)) {
3838
config.setMsgAuditLibPath(msgAuditLibPath);
3939
}
40+
if (StringUtils.isNotBlank(properties.getBaseApiUrl())) {
41+
config.setBaseApiUrl(properties.getBaseApiUrl());
42+
}
4043

4144
WxCpProperties.ConfigStorage storage = properties.getConfigStorage();
4245
String httpProxyHost = storage.getHttpProxyHost();

spring-boot-starters/wx-java-miniapp-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/configuration/services/AbstractWxMaConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ private void configApp(WxMaDefaultConfigImpl config, WxMaSingleProperties proper
125125
}
126126
config.setMsgDataFormat(properties.getMsgDataFormat());
127127
config.useStableAccessToken(useStableAccessToken);
128+
config.setApiHostUrl(StringUtils.trimToNull(properties.getApiHostUrl()));
129+
config.setAccessTokenUrl(StringUtils.trimToNull(properties.getAccessTokenUrl()));
128130
}
129131

130132
private void configHttp(WxMaDefaultConfigImpl config, WxMaMultiProperties.ConfigStorage storage) {

spring-boot-starters/wx-java-miniapp-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaSingleProperties.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,16 @@ public class WxMaSingleProperties implements Serializable {
4242
* 是否使用稳定版 Access Token
4343
*/
4444
private boolean useStableAccessToken = false;
45+
46+
/**
47+
* 自定义API主机地址,用于替换默认的 https://api.weixin.qq.com
48+
* 例如:http://proxy.company.com:8080
49+
*/
50+
private String apiHostUrl;
51+
52+
/**
53+
* 自定义获取AccessToken地址,用于向自定义统一服务获取AccessToken
54+
* 例如:http://proxy.company.com:8080/oauth/token
55+
*/
56+
private String accessTokenUrl;
4557
}

0 commit comments

Comments
 (0)