From c4996443b24501c56d33ccb3b949ae7e84a307a9 Mon Sep 17 00:00:00 2001 From: DaxPay Date: Mon, 10 Feb 2025 16:22:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=A0=E8=BD=BD=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/config/WechatPayConfigService.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/config/WechatPayConfigService.java b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/config/WechatPayConfigService.java index 3244e9cb9..d978a7b78 100644 --- a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/config/WechatPayConfigService.java +++ b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/config/WechatPayConfigService.java @@ -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;