lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-04-05 17:38:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 #3392【微信支付】修复V3客户端初始化时p12证书加载失败的问题

Browse Source
This commit is contained in:
leung 2024-10-31 15:55:00 +08:00 committed by GitHub
parent bf7356e808
commit c483d6f1ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,6 +270,7 @@ public class WxPayConfig {
if (objects != null) {
merchantPrivateKey = (PrivateKey) objects[0];
certificate = (X509Certificate) objects[1];
this.certSerialNo = certificate.getSerialNumber().toString(16).toUpperCase();
}
try {
if (merchantPrivateKey == null) {
@ -405,30 +406,12 @@ public class WxPayConfig {
}
}
/**
* 从配置路径 加载p12证书文件流
*
* @return 文件流
*/
private InputStream loadP12InputStream() {
try (InputStream inputStream = this.loadConfigInputStream(this.keyString, this.getKeyPath(),
this.keyContent, "p12证书");) {
return inputStream;
} catch (Exception e) {
return null;
}
}
/**
* 分解p12证书文件
*
* @return
*/
private Object[] p12ToPem() {
InputStream inputStream = this.loadP12InputStream();
if (inputStream == null) {
return null;
}
String key = getMchId();
if (StringUtils.isBlank(key)) {
return null;
@ -436,7 +419,11 @@ public class WxPayConfig {
// 分解p12证书文件
PrivateKey privateKey = null;
X509Certificate x509Certificate = null;
try {
try (InputStream inputStream = this.loadConfigInputStream(this.keyString, this.getKeyPath(),
this.keyContent, "p12证书");){
if (inputStream == null) {
return null;
}
KeyStore keyStore = KeyStore.getInstance("PKCS12");
keyStore.load(inputStream, key.toCharArray());
@ -446,8 +433,8 @@ public class WxPayConfig {
Certificate certificate = keyStore.getCertificate(alias);
x509Certificate = (X509Certificate) certificate;
return new Object[]{privateKey, x509Certificate};
} catch (Exception ignored) {
} catch (Exception e) {
e.printStackTrace();
}
return null;