Skip to content

Commit 56fd7be

Browse files
buaazylbuaazyl
authored
🎨 #3976 【微信支付】v3接口默认走公钥模式，并统一携带 Wechatpay-Serial 请求头
1 parent d27a922 commit 56fd7be

9 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎solon-plugins/wx-java-pay-solon-plugin/src/main/java/com/binarywang/solon/wxjava/pay/config/WxPayAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public WxPayService wxPayService() {
5555
payConfig.setPrivateKeyPath(StringUtils.trimToNull(this.properties.getPrivateKeyPath()));
5656
payConfig.setPrivateCertPath(StringUtils.trimToNull(this.properties.getPrivateCertPath()));
5757
payConfig.setCertSerialNo(StringUtils.trimToNull(this.properties.getCertSerialNo()));
58-
payConfig.setApiV3Key(StringUtils.trimToNull(this.properties.getApiv3Key()));
58+
payConfig.setApiV3Key(StringUtils.trimToNull(this.properties.getApiV3Key()));
5959
payConfig.setPublicKeyId(StringUtils.trimToNull(this.properties.getPublicKeyId()));
6060
payConfig.setPublicKeyPath(StringUtils.trimToNull(this.properties.getPublicKeyPath()));
6161
payConfig.setApiHostUrl(StringUtils.trimToNull(this.properties.getApiHostUrl()));

‎solon-plugins/wx-java-pay-solon-plugin/src/main/java/com/binarywang/solon/wxjava/pay/properties/WxPayProperties.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class WxPayProperties {
5959
/**
6060
* apiV3秘钥
6161
*/
62-
private String apiv3Key;
62+
private String apiV3Key;
6363

6464
/**
6565
* 微信支付分回调地址
@@ -114,13 +114,13 @@ public class WxPayProperties {
114114
private String apiHostUrl;
115115

116116
/**
117-
* 是否将全部v3接口的请求都添加Wechatpay-Serial请求头，默认不添加
117+
* 是否将全部v3接口的请求都添加Wechatpay-Serial请求头，默认添加
118118
*/
119-
private boolean strictlyNeedWechatPaySerial = false;
119+
private boolean strictlyNeedWechatPaySerial = true;
120120

121121
/**
122-
* 是否完全使用公钥模式(用以微信从平台证书到公钥的灰度切换)，默认不使用
122+
* 是否完全使用公钥模式(用以微信从平台证书到公钥的灰度切换)，默认使用
123123
*/
124-
private boolean fullPublicKeyModel = false;
124+
private boolean fullPublicKeyModel = true;
125125

126126
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ wx:
104104
# 公众号1配置
105105
wx.pay.configs.wx1234567890abcdef.app-id=wx1234567890abcdef
106106
wx.pay.configs.wx1234567890abcdef.mch-id=1234567890
107-
wx.pay.configs.wx1234567890abcdef.apiv3-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
107+
wx.pay.configs.wx1234567890abcdef.api-v3-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
108108
wx.pay.configs.wx1234567890abcdef.cert-serial-no=62C6CEAA360BCxxxxxxxxxxxxxxx
109109
wx.pay.configs.wx1234567890abcdef.private-key-path=classpath:cert/app1/apiclient_key.pem
110110
wx.pay.configs.wx1234567890abcdef.private-cert-path=classpath:cert/app1/apiclient_cert.pem
@@ -113,7 +113,7 @@ wx.pay.configs.wx1234567890abcdef.notify-url=https://example.com/pay/notify
113113
# 公众号2配置
114114
wx.pay.configs.wx9876543210fedcba.app-id=wx9876543210fedcba
115115
wx.pay.configs.wx9876543210fedcba.mch-id=9876543210
116-
wx.pay.configs.wx9876543210fedcba.apiv3-key=yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
116+
wx.pay.configs.wx9876543210fedcba.api-v3-key=yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
117117
wx.pay.configs.wx9876543210fedcba.cert-serial-no=73D7DFBB471CDxxxxxxxxxxxxxxx
118118
wx.pay.configs.wx9876543210fedcba.private-key-path=classpath:cert/app2/apiclient_key.pem
119119
wx.pay.configs.wx9876543210fedcba.private-cert-path=classpath:cert/app2/apiclient_cert.pem
@@ -255,8 +255,8 @@ public class PayService {
255255
| payScorePermissionNotifyUrl | 支付分授权回调地址 | 无 |
256256
| useSandboxEnv | 是否使用沙箱环境 | false |
257257
| apiHostUrl | 自定义API主机地址 | https://api.mch.weixin.qq.com |
258-
| strictlyNeedWechatPaySerial | 是否所有V3请求都添加序列号头 | false |
259-
| fullPublicKeyModel | 是否完全使用公钥模式 | false |
258+
| strictlyNeedWechatPaySerial | 是否所有V3请求都添加序列号头 | true |
259+
| fullPublicKeyModel | 是否完全使用公钥模式 | true |
260260
| publicKeyId | 公钥ID | 无 |
261261
| publicKeyPath | 公钥文件路径 | 无 |
262262

@@ -312,5 +312,5 @@ wx:
312312
## 更多信息
313313

314314
- [WxJava 项目首页](https://github.com/Wechat-Group/WxJava)
315-
- [微信支付官方文档](https://pay.weixin.qq.com/wiki/doc/api/)
316-
- [微信支付V3接口文档](https://pay.weixin.qq.com/wiki/doc/apiv3/index.shtml)
315+
- [微信支付V2文档](https://pay.weixin.qq.com/doc/v2)
316+
- [微信支付V3接口文档](https://pay.weixin.qq.com/doc/v3/merchant/4012062524)

‎spring-boot-starters/wx-java-pay-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/properties/WxPaySingleProperties.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class WxPaySingleProperties implements Serializable {
5858
/**
5959
* apiV3秘钥.
6060
*/
61-
private String apiv3Key;
61+
private String apiV3Key;
6262

6363
/**
6464
* 微信支付异步回调地址，通知url必须为直接可访问的url，不能携带参数.
@@ -113,12 +113,12 @@ public class WxPaySingleProperties implements Serializable {
113113
private String apiHostUrl;
114114

115115
/**
116-
* 是否将全部v3接口的请求都添加Wechatpay-Serial请求头，默认不添加.
116+
* 是否将全部v3接口的请求都添加Wechatpay-Serial请求头，默认添加.
117117
*/
118-
private boolean strictlyNeedWechatPaySerial = false;
118+
private boolean strictlyNeedWechatPaySerial = true;
119119

120120
/**
121-
* 是否完全使用公钥模式(用以微信从平台证书到公钥的灰度切换)，默认不使用.
121+
* 是否完全使用公钥模式(用以微信从平台证书到公钥的灰度切换)，默认使用.
122122
*/
123-
private boolean fullPublicKeyModel = false;
123+
private boolean fullPublicKeyModel = true;
124124
}

‎spring-boot-starters/wx-java-pay-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/service/WxPayMultiServicesImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private WxPayService buildWxPayService(WxPaySingleProperties properties) {
7979
payConfig.setPrivateKeyPath(StringUtils.trimToNull(properties.getPrivateKeyPath()));
8080
payConfig.setPrivateCertPath(StringUtils.trimToNull(properties.getPrivateCertPath()));
8181
payConfig.setCertSerialNo(StringUtils.trimToNull(properties.getCertSerialNo()));
82-
payConfig.setApiV3Key(StringUtils.trimToNull(properties.getApiv3Key()));
82+
payConfig.setApiV3Key(StringUtils.trimToNull(properties.getApiV3Key()));
8383
payConfig.setPublicKeyId(StringUtils.trimToNull(properties.getPublicKeyId()));
8484
payConfig.setPublicKeyPath(StringUtils.trimToNull(properties.getPublicKeyPath()));
8585
payConfig.setApiHostUrl(StringUtils.trimToNull(properties.getApiHostUrl()));

‎spring-boot-starters/wx-java-pay-multi-spring-boot-starter/src/test/java/com/binarywang/spring/starter/wxjava/pay/WxPayMultiServicesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void testConfiguration() {
5757
assertNotNull(app2Config, "app2 configuration should exist");
5858
assertEquals("wx2222222222222222", app2Config.getAppId());
5959
assertEquals("2222222222", app2Config.getMchId());
60-
assertEquals("22222222222222222222222222222222", app2Config.getApiv3Key());
60+
assertEquals("22222222222222222222222222222222", app2Config.getApiV3Key());
6161
}
6262

6363
@Test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public WxPayService wxPayService() {
5959
payConfig.setPrivateKeyPath(StringUtils.trimToNull(this.properties.getPrivateKeyPath()));
6060
payConfig.setPrivateCertPath(StringUtils.trimToNull(this.properties.getPrivateCertPath()));
6161
payConfig.setCertSerialNo(StringUtils.trimToNull(this.properties.getCertSerialNo()));
62-
payConfig.setApiV3Key(StringUtils.trimToNull(this.properties.getApiv3Key()));
62+
payConfig.setApiV3Key(StringUtils.trimToNull(this.properties.getApiV3Key()));
6363
payConfig.setPublicKeyId(StringUtils.trimToNull(this.properties.getPublicKeyId()));
6464
payConfig.setPublicKeyPath(StringUtils.trimToNull(this.properties.getPublicKeyPath()));
6565
payConfig.setApiHostUrl(StringUtils.trimToNull(this.properties.getApiHostUrl()));

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class WxPayProperties {
5757
/**
5858
* apiV3秘钥
5959
*/
60-
private String apiv3Key;
60+
private String apiV3Key;
6161

6262
/**
6363
* 微信支付异步回调地址，通知url必须为直接可访问的url，不能携带参数
@@ -112,13 +112,13 @@ public class WxPayProperties {
112112
private String apiHostUrl;
113113

114114
/**
115-
* 是否将全部v3接口的请求都添加Wechatpay-Serial请求头，默认不添加
115+
* 是否将全部v3接口的请求都添加Wechatpay-Serial请求头，默认添加
116116
*/
117-
private boolean strictlyNeedWechatPaySerial = false;
117+
private boolean strictlyNeedWechatPaySerial = true;
118118

119119
/**
120-
* 是否完全使用公钥模式(用以微信从平台证书到公钥的灰度切换)，默认不使用
120+
* 是否完全使用公钥模式(用以微信从平台证书到公钥的灰度切换)，默认使用
121121
*/
122-
private boolean fullPublicKeyModel = false;
122+
private boolean fullPublicKeyModel = true;
123123

124124
}

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,14 +270,14 @@ public class WxPayConfig {
270270
private Verifier verifier;
271271

272272
/**
273-
* 是否将全部v3接口的请求都添加Wechatpay-Serial请求头，默认不添加
273+
* 是否将全部v3接口的请求都添加Wechatpay-Serial请求头，默认添加
274274
*/
275-
private boolean strictlyNeedWechatPaySerial = false;
275+
private boolean strictlyNeedWechatPaySerial = true;
276276

277277
/**
278-
* 是否完全使用公钥模式(用以微信从平台证书到公钥的灰度切换)，默认不使用
278+
* 是否完全使用公钥模式(用以微信从平台证书到公钥的灰度切换)，默认使用
279279
*/
280-
private boolean fullPublicKeyModel = false;
280+
private boolean fullPublicKeyModel = true;
281281

282282
/**
283283
* 返回所设置的微信支付接口请求地址域名.

0 commit comments

Comments
 (0)