🎨 #3591【微信支付】修复只设置privateKeyString或者privateKeyContent时私钥初始化失败的问题

mengyou658 · binarywang · commit 3e1a38a69689 · 2025-05-16T20:19:19.000+08:00
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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ public CloseableHttpClient initApiV3HttpClient() throws WxPayException {`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`// 加载api私钥`
`348`		`- if (merchantPrivateKey == null && StringUtils.isNotBlank(this.getPrivateKeyPath())) {`
	`348`	`+ if (merchantPrivateKey == null && (StringUtils.isNotBlank(this.getPrivateKeyPath()) \|\| StringUtils.isNotBlank(this.getPrivateKeyString()) \|\| null != this.privateKeyContent)) {`
`349`	`349`	`try (InputStream keyInputStream = this.loadConfigInputStream(this.getPrivateKeyString(), this.getPrivateKeyPath(),`
`350`	`350`	`this.privateKeyContent, "privateKeyPath")) {`
`351`	`351`	`merchantPrivateKey = PemUtils.loadPrivateKey(keyInputStream);`