From 5ef0ff0c852836c4aebfd8552626fa5c241b632f Mon Sep 17 00:00:00 2001 From: dax Date: Thu, 21 Jul 2022 10:05:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 配置项增加`certAbsolutePath`字段用来定义证书的绝对路径，优先级高于`certPath`。当这两个路径都不配置时采用classpath路径`wechat/apiclient_cert.p12`。 Closes #73 --- .../felord/payment/wechat/WechatPayConfiguration.java | 8 +++++++- .../cn/felord/payment/wechat/WechatPayProperties.java | 4 ++++ .../cn/felord/payment/wechat/v2/WechatV2Client.java | 2 ++ .../cn/felord/payment/wechat/v2/model/BaseModel.java | 11 ++++++++++- .../cn/felord/payment/wechat/v3/KeyPairFactory.java | 10 ++++++---- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java index 81c1594..d0d97f7 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayConfiguration.java @@ -25,6 +25,9 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.io.Resource; import java.util.Map; @@ -59,8 +62,11 @@ public class WechatPayConfiguration { v3Map.keySet().forEach(tenantId -> { WechatPayProperties.V3 v3 = v3Map.get(tenantId); String certPath = v3.getCertPath(); + String certAbsolutePath = v3.getCertAbsolutePath(); String mchId = v3.getMchId(); - WechatMetaBean wechatMetaBean = keyPairFactory.initWechatMetaBean(certPath, CERT_ALIAS, mchId); + Resource resource = certAbsolutePath != null ? new FileSystemResource(certAbsolutePath) : + new ClassPathResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath); + WechatMetaBean wechatMetaBean = keyPairFactory.initWechatMetaBean(resource, CERT_ALIAS, mchId); wechatMetaBean.setV3(v3); wechatMetaBean.setTenantId(tenantId); container.addWechatMeta(tenantId, wechatMetaBean); diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java index eae797b..8c695e7 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatPayProperties.java @@ -70,6 +70,10 @@ public class WechatPayProperties { * wechat pay certificate Path */ private String certPath; + /** + * wechat pay absolute certificate Path + */ + private String certAbsolutePath; /** * your pay server domain */ diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatV2Client.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatV2Client.java index 84339c1..4731ee4 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatV2Client.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatV2Client.java @@ -42,6 +42,8 @@ public class WechatV2Client { WechatPayProperties.V3 v3 = wechatMetaBean.getV3(); return model .appSecret(v3.getAppSecret()) + .certPath(v3.getCertPath()) + .certAbsolutePath(v3.getCertAbsolutePath()) .request(v3.getMchId(), method, url); } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/BaseModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/BaseModel.java index 2d6d1e7..f5ceb41 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/BaseModel.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/BaseModel.java @@ -37,6 +37,8 @@ import org.bouncycastle.crypto.Digest; import org.bouncycastle.crypto.digests.MD5Digest; import org.bouncycastle.util.encoders.Hex; import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.io.Resource; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.RequestEntity; @@ -97,6 +99,8 @@ public abstract class BaseModel { @JsonIgnore private String certPath; @JsonIgnore + private String certAbsolutePath; + @JsonIgnore private String signType; public BaseModel appSecret(String appSecret) { @@ -109,6 +113,10 @@ public abstract class BaseModel { return this; } + public BaseModel certAbsolutePath(String certAbsolutePath) { + this.certAbsolutePath = certAbsolutePath; + return this; + } public BaseModel signType(String signType) { this.signType = signType; @@ -211,8 +219,9 @@ public abstract class BaseModel { private RestTemplate getRestTemplateClientAuthentication(String mchId) throws IOException, UnrecoverableKeyException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException { - ClassPathResource resource = new ClassPathResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath); + Resource resource = certAbsolutePath != null ? new FileSystemResource(certAbsolutePath) : + new ClassPathResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath); char[] pem = mchId.toCharArray(); KeyStore store = KeyStore.getInstance("PKCS12"); diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java index 7a9bc55..5a22744 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/KeyPairFactory.java @@ -21,6 +21,8 @@ package cn.felord.payment.wechat.v3; import cn.felord.payment.PayException; import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.io.Resource; import java.security.*; import java.security.cert.X509Certificate; @@ -30,7 +32,7 @@ import java.security.cert.X509Certificate; * * @author felord.cn * @since 1.0.0.RELEASE - **/ + */ public class KeyPairFactory { private static final KeyStore PKCS12_KEY_STORE; @@ -47,13 +49,13 @@ public class KeyPairFactory { /** * 获取公私钥. * - * @param keyPath the key path + * @param resource the resource * @param keyAlias the key alias * @param keyPass password * @return the key pair */ - public WechatMetaBean initWechatMetaBean(String keyPath, String keyAlias, String keyPass) { - ClassPathResource resource = new ClassPathResource(keyPath); + public WechatMetaBean initWechatMetaBean(Resource resource, String keyAlias, String keyPass) { + char[] pem = keyPass.toCharArray(); try { PKCS12_KEY_STORE.load(resource.getInputStream(), pem);