From db68c22ca15d463130b3c085572befe6cc88ed88 Mon Sep 17 00:00:00 2001 From: yunchao Date: Fri, 16 May 2025 12:46:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E8=AE=BE=E7=BD=AEprivateKeyString=E6=88=96=E8=80=85privateKeyC?= =?UTF-8?q?ontent=EF=BC=8C=E7=A7=81=E9=92=A5=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=A4=B1=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 c4fecfd123..0a804f2694 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 CloseableHttpClient initApiV3HttpClient() throws WxPayException { } // 加载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); From 546a7e0b78adcfd2bd553907ec7eb09542e65946 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Fri, 16 May 2025 20:11:00 +0800 Subject: [PATCH 2/2] Update WxPayConfig.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../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 0a804f2694..c6235a58d7 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 CloseableHttpClient initApiV3HttpClient() throws WxPayException { } // 加载api私钥 - if (merchantPrivateKey == null && (StringUtils.isNotBlank(this.getPrivateKeyPath()) || StringUtils.isNotBlank(this.getPrivateKeyString()) || null != this.privateKeyContent)) { + if (merchantPrivateKey == null && (StringUtils.isNotBlank(this.getPrivateKeyPath()) || StringUtils.isNotBlank(this.getPrivateKeyString()) || StringUtils.isNotBlank(this.privateKeyContent))) { try (InputStream keyInputStream = this.loadConfigInputStream(this.getPrivateKeyString(), this.getPrivateKeyPath(), this.privateKeyContent, "privateKeyPath")) { merchantPrivateKey = PemUtils.loadPrivateKey(keyInputStream);