diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java b/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java index b7fbc7d67..c95e50910 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java @@ -1,5 +1,6 @@ package com.jsowell.adapay.config; +import com.alibaba.fastjson2.JSON; import com.huifu.adapay.Adapay; import com.huifu.adapay.model.MerConfig; import com.jsowell.adapay.factory.AdapayConfigFactory; @@ -40,13 +41,13 @@ public class InitializeAdapayConfig implements CommandLineRunner { /* 单商户 */ - singleMerchant(); + // singleMerchant(); /* 多商户 目前有jsowell和xixiao */ - // multiMerchant(); + multiMerchant(); } /** @@ -118,5 +119,6 @@ public class InitializeAdapayConfig implements CommandLineRunner { // 将商户A和B的商户配置放入本地缓存 Adapay.initWithMerConfigs(configPathMap); + logger.info("汇付多商户配置初始化成功,configPathMap:{}", JSON.toJSONString(configPathMap)); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/config/JsowellAdapayConfig.java b/jsowell-pile/src/main/java/com/jsowell/adapay/config/merchant/JsowellAdapayConfig.java similarity index 85% rename from jsowell-pile/src/main/java/com/jsowell/adapay/config/JsowellAdapayConfig.java rename to jsowell-pile/src/main/java/com/jsowell/adapay/config/merchant/JsowellAdapayConfig.java index 5ce90b348..6edd6b7f5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/config/JsowellAdapayConfig.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/config/merchant/JsowellAdapayConfig.java @@ -1,5 +1,6 @@ -package com.jsowell.adapay.config; +package com.jsowell.adapay.config.merchant; +import com.jsowell.adapay.config.AbstractAdapayConfig; import com.jsowell.adapay.factory.AdapayConfigFactory; import lombok.Getter; import lombok.Setter; @@ -12,7 +13,7 @@ import org.springframework.stereotype.Component; @Component @Getter @Setter -public class JsowellAdapayConfig extends AbstractAdapayConfig{ +public class JsowellAdapayConfig extends AbstractAdapayConfig { @Value("${adapay.debugFlag}") private boolean debugFlag; diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/config/XixiaoAdapayConfig.java b/jsowell-pile/src/main/java/com/jsowell/adapay/config/merchant/XixiaoAdapayConfig.java similarity index 85% rename from jsowell-pile/src/main/java/com/jsowell/adapay/config/XixiaoAdapayConfig.java rename to jsowell-pile/src/main/java/com/jsowell/adapay/config/merchant/XixiaoAdapayConfig.java index ee6f753d7..b86f9354b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/config/XixiaoAdapayConfig.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/config/merchant/XixiaoAdapayConfig.java @@ -1,5 +1,6 @@ -package com.jsowell.adapay.config; +package com.jsowell.adapay.config.merchant; +import com.jsowell.adapay.config.AbstractAdapayConfig; import com.jsowell.adapay.factory.AdapayConfigFactory; import lombok.Getter; import lombok.Setter; @@ -12,7 +13,7 @@ import org.springframework.stereotype.Component; @Component @Getter @Setter -public class XixiaoAdapayConfig extends AbstractAdapayConfig{ +public class XixiaoAdapayConfig extends AbstractAdapayConfig { @Value("${adapay.debugFlag}") private boolean debugFlag;