From bd782503eaad5779219f41089f22f53aee9a8f8f Mon Sep 17 00:00:00 2001 From: xiafang Date: Thu, 9 Feb 2023 09:35:06 +0800 Subject: [PATCH] =?UTF-8?q?factor:=E7=A7=9F=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/wechat/InMemoryWechatTenantService.java | 4 +++- .../cn/felord/payment/wechat/WechatPayConfiguration.java | 2 +- .../cn/felord/payment/wechat/WechatTenantService.java | 9 ++++++--- .../payment/wechat/WechatTenantServiceConfiguration.java | 4 ++-- 4 files changed, 12 insertions(+), 7 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 aa2af98..78bc9fd 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 @@ -29,6 +29,8 @@ import java.util.Set; import java.util.stream.Collectors; /** + * 从配置文件中加载租户信息,默认实现,可被覆盖 + * * @author xiafang * @since 2023/2/3 11:40 */ @@ -37,7 +39,7 @@ public class InMemoryWechatTenantService implements WechatTenantService { private final WechatPayProperties wechatPayProperties; @Override - public Set getAllTenants() { + public Set loadTenants() { Map v3Map = wechatPayProperties.getV3(); KeyPairFactory keyPairFactory = new KeyPairFactory(); return v3Map.entrySet() 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 73d19d6..f2c77c5 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 @@ -44,7 +44,7 @@ public class WechatPayConfiguration { @ConditionalOnMissingBean WechatMetaContainer wechatMetaContainer(WechatTenantService wechatTenantService) { WechatMetaContainer container = new WechatMetaContainer(); - container.addWechatMetas(wechatTenantService.getAllTenants()); + container.addWechatMetas(wechatTenantService.loadTenants()); return container; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantService.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantService.java index 8269096..7b682a6 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantService.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantService.java @@ -22,9 +22,12 @@ import cn.felord.payment.wechat.v3.WechatMetaBean; import java.util.Set; /** - * @author xiafang - * @since 2023/2/3 11:37 + * 加载租户信息服务 + * + * @author felord.cn + * @since 1.0.16.RELEASE */ +@FunctionalInterface public interface WechatTenantService { - Set getAllTenants(); + Set loadTenants(); } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantServiceConfiguration.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantServiceConfiguration.java index f3bf990..a34e312 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantServiceConfiguration.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/WechatTenantServiceConfiguration.java @@ -26,8 +26,8 @@ import org.springframework.context.annotation.Configuration; /** * The type Wechat tenant service configuration. * - * @author xiafang - * @since 2023 /2/3 12:32 + * @author felord.cn + * @since 1.0.16.RELEASE */ @Configuration(proxyBeanMethods = false) @Conditional(WechatPayConfiguredCondition.class)