From 30613a2fdd4e4e01924167368f9e5e846bbb41d0 Mon Sep 17 00:00:00 2001 From: xiafang Date: Wed, 1 Mar 2023 09:24:51 +0800 Subject: [PATCH] =?UTF-8?q?enhance:=20=E4=BC=98=E5=8C=96=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=96=B9=E5=BC=8F=E4=BB=A5=E6=94=AF=E6=8C=81?= =?UTF-8?q?Docker=E5=86=85=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #94 --- .../felord/payment/wechat/InMemoryWechatTenantService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java index 78bc9fd..e4ba13e 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/InMemoryWechatTenantService.java @@ -20,9 +20,9 @@ package cn.felord.payment.wechat; import cn.felord.payment.wechat.v3.KeyPairFactory; import cn.felord.payment.wechat.v3.WechatMetaBean; import lombok.AllArgsConstructor; -import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; import java.util.Map; import java.util.Set; @@ -37,7 +37,7 @@ import java.util.stream.Collectors; @AllArgsConstructor public class InMemoryWechatTenantService implements WechatTenantService { private final WechatPayProperties wechatPayProperties; - + private final ResourceLoader resourceLoader; @Override public Set loadTenants() { Map v3Map = wechatPayProperties.getV3(); @@ -51,7 +51,7 @@ public class InMemoryWechatTenantService implements WechatTenantService { String certAbsolutePath = v3.getCertAbsolutePath(); String mchId = v3.getMchId(); Resource resource = certAbsolutePath != null ? new FileSystemResource(certAbsolutePath) : - new ClassPathResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath); + resourceLoader.getResource(certPath == null ? "wechat/apiclient_cert.p12" : certPath); WechatMetaBean wechatMetaBean = keyPairFactory.initWechatMetaBean(resource, mchId); wechatMetaBean.setV3(v3); wechatMetaBean.setTenantId(tenantId);