dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-08-29 09:04:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 微信支付配置加载空指针判断

Browse Source
This commit is contained in:
DaxPay
2025-02-10 16:22:14 +08:00
parent e753d0c448
commit c4996443b2
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/config/WechatPayConfigService.java
View File

@@ -152,12 +152,20 @@ public class WechatPayConfigService {
payConfig.setMchKey(wechatPayConfig.getApiKeyV2());
payConfig.setApiV3Key(wechatPayConfig.getApiKeyV3());
// 注意不要使用base64的方式进行配置, 因为wxjava 是直接读取文本并不会进行解码, 会导致证书异常
payConfig.setPublicKeyContent(Base64.decode(wechatPayConfig.getPublicKey()));
if (StrUtil.isNotBlank(wechatPayConfig.getPublicKey())){
payConfig.setPublicKeyContent(Base64.decode(wechatPayConfig.getPublicKey()));
}
payConfig.setPublicKeyId(wechatPayConfig.getPublicKeyId());
payConfig.setPrivateCertContent(Base64.decode(wechatPayConfig.getPrivateCert()));
payConfig.setPrivateKeyContent(Base64.decode(wechatPayConfig.getPrivateKey()));
if (StrUtil.isNotBlank(wechatPayConfig.getPrivateCert())){
payConfig.setPrivateCertContent(Base64.decode(wechatPayConfig.getPrivateCert()));
}
if (StrUtil.isNotBlank(wechatPayConfig.getPrivateKey())){
payConfig.setPrivateKeyContent(Base64.decode(wechatPayConfig.getPrivateKey()));
}
payConfig.setCertSerialNo(wechatPayConfig.getCertSerialNo());
payConfig.setKeyContent(Base64.decode(wechatPayConfig.getP12()));
if (StrUtil.isNotBlank(wechatPayConfig.getP12())){
payConfig.setKeyContent(Base64.decode(wechatPayConfig.getP12()));
}
WxPayService wxPayService = new WxPayServiceImpl();
wxPayService.setConfig(payConfig);
return wxPayService;