Skip to content

Commit 3e1a38a

Browse files
mengyou658binarywang
authored andcommitted
🎨 #3591【微信支付】修复只设置privateKeyString或者privateKeyContent时私钥初始化失败的问题
1 parent fefe737 commit 3e1a38a

File tree

1 file changed

+1
-1
lines changed
  • weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config

1 file changed

+1
-1
lines changed

weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public CloseableHttpClient initApiV3HttpClient() throws WxPayException {
345345
}
346346

347347
// 加载api私钥
348-
if (merchantPrivateKey == null && StringUtils.isNotBlank(this.getPrivateKeyPath())) {
348+
if (merchantPrivateKey == null && (StringUtils.isNotBlank(this.getPrivateKeyPath()) || StringUtils.isNotBlank(this.getPrivateKeyString()) || null != this.privateKeyContent)) {
349349
try (InputStream keyInputStream = this.loadConfigInputStream(this.getPrivateKeyString(), this.getPrivateKeyPath(),
350350
this.privateKeyContent, "privateKeyPath")) {
351351
merchantPrivateKey = PemUtils.loadPrivateKey(keyInputStream);

0 commit comments

Comments
 (0)