From 3e1a38a69689a747aed22eec17f12a29e241af36 Mon Sep 17 00:00:00 2001 From: mengyou Date: Fri, 16 May 2025 20:11:53 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#3591=E3=80=90=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E3=80=91=E4=BF=AE=E5=A4=8D=E5=8F=AA=E8=AE=BE?= =?UTF-8?q?=E7=BD=AEprivateKeyString=E6=88=96=E8=80=85privateKeyContent?= =?UTF-8?q?=E6=97=B6=E7=A7=81=E9=92=A5=E5=88=9D=E5=A7=8B=E5=8C=96=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/github/binarywang/wxpay/config/WxPayConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java index c4fecfd12..0a804f269 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java @@ -345,7 +345,7 @@ public class WxPayConfig { } // 加载api私钥 - if (merchantPrivateKey == null && StringUtils.isNotBlank(this.getPrivateKeyPath())) { + if (merchantPrivateKey == null && (StringUtils.isNotBlank(this.getPrivateKeyPath()) || StringUtils.isNotBlank(this.getPrivateKeyString()) || null != this.privateKeyContent)) { try (InputStream keyInputStream = this.loadConfigInputStream(this.getPrivateKeyString(), this.getPrivateKeyPath(), this.privateKeyContent, "privateKeyPath")) { merchantPrivateKey = PemUtils.loadPrivateKey(keyInputStream);