From 83d2ee2f3ad2e667032081c01ec235ffd994813e Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 25 Dec 2023 14:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20order=20=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/netty/server/mqtt/MqttSever.java | 2 +- .../netty/server/yunkuaichong/NettyServer.java | 2 +- .../adapay/config/InitializeAdapayConfig.java | 12 +++++------- .../com/jsowell/wxpay/config/WechatPayConfig.java | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java index 97fd0b29c..ee43bf00f 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java @@ -20,7 +20,7 @@ import java.net.InetSocketAddress; @Slf4j @Component -@Order(value = 2) +@Order(value = 5) public class MqttSever implements CommandLineRunner { @Override diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServer.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServer.java index bf01b9f9b..065a49a31 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServer.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServer.java @@ -17,7 +17,7 @@ import java.net.InetSocketAddress; @Slf4j @Component -@Order(value = 1) +@Order(value = 2) public class NettyServer implements CommandLineRunner { @Resource private NettyServerChannelInitializer nettyServerChannelInitializer; 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 f1167b8a0..d09d7601b 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 @@ -4,8 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.huifu.adapay.Adapay; import com.huifu.adapay.model.MerConfig; import com.jsowell.adapay.factory.AdapayConfigFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; @@ -15,12 +14,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -@Order(value = 3) +@Slf4j +@Order(value = 4) @Component public class InitializeAdapayConfig implements CommandLineRunner { - private Logger logger = LoggerFactory.getLogger(InitializeAdapayConfig.class); - @Value("${adapay.debugFlag}") private boolean DEBUG_FLAG; @@ -78,7 +76,7 @@ public class InitializeAdapayConfig implements CommandLineRunner { merConfig.setApiMockKey(mockApiKey); merConfig.setRSAPrivateKey(rsaPrivateKey); Adapay.initWithMerConfig(merConfig); - logger.info("汇付配置初始化成功，debug:{}, prodMode:{}, apiKey:{}, mockApiKey:{}, rsaPrivateKey:{}" + log.info("汇付配置初始化成功，debug:{}, prodMode:{}, apiKey:{}, mockApiKey:{}, rsaPrivateKey:{}" , DEBUG_FLAG, PROD_MODE, JSOWELL_API_KEY, JSOWELL_MOCK_API_KEY, JSOWELL_RSA_PRIVATE_KEY); } @@ -119,6 +117,6 @@ public class InitializeAdapayConfig implements CommandLineRunner { // 将商户A和B的商户配置放入本地缓存 Adapay.initWithMerConfigs(configPathMap); - logger.info("汇付多商户配置初始化成功，configPathMap:{}", JSON.toJSONString(configPathMap)); + log.info("汇付多商户配置初始化成功，configPathMap:{}", JSON.toJSONString(configPathMap)); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java index 511c166f2..2640c1778 100644 --- a/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java +++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java @@ -8,7 +8,7 @@ import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -@Order(value = 2) +@Order(value = 3) @Component public class WechatPayConfig implements CommandLineRunner { /**