Merge pull request #865 from wangqifan/bugfix/dbconfig

Bugfix/dbconfig
ctripcorp · Aug 7, 2024 · 5032c49 · 5032c49
2 parents 681f100 + afdf916
commit 5032c49
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/...nsole/src/main/java/com/ctrip/xpipe/redis/console/config/impl/DefaultConsoleDbConfig.java b/...nsole/src/main/java/com/ctrip/xpipe/redis/console/config/impl/DefaultConsoleDbConfig.java
@@ -19,15 +19,12 @@
  *         <p>
  *         Jun 15, 2017
  */
-public class DefaultConsoleDbConfig extends AbstractConfigBean implements ConsoleDbConfig, AlertDbConfig {
+public class DefaultConsoleDbConfig implements ConsoleDbConfig, AlertDbConfig {
 
     private TimeBoundCache<Set<String>> sentinelCheckWhitelistCache;
 
     private TimeBoundCache<Set<String>> clusterAlertWhitelistCache;
 
-    @Autowired
-    private DbConfig dbConfig;
-
     @Autowired
     private ConsoleConfig config;
 
@@ -36,8 +33,6 @@ public class DefaultConsoleDbConfig extends AbstractConfigBean implements Consol
 
     @PostConstruct
     public void postConstruct(){
-        setConfig(dbConfig);
-
         sentinelCheckWhitelistCache = new TimeBoundCache<>(config::getCacheRefreshInterval, this::refreshSentinelCheckWhiteList);
         clusterAlertWhitelistCache = new TimeBoundCache<>(config::getCacheRefreshInterval, this::refreshClusterAlertWhiteList);
     }

diff --git a/...ava/com/ctrip/xpipe/redis/console/healthcheck/nonredis/console/AlertSystemOffChecker.java b/...ava/com/ctrip/xpipe/redis/console/healthcheck/nonredis/console/AlertSystemOffChecker.java
@@ -1,7 +1,6 @@
 package com.ctrip.xpipe.redis.console.healthcheck.nonredis.console;
 
 import com.ctrip.xpipe.redis.checker.alert.ALERT_TYPE;
-import com.ctrip.xpipe.redis.console.config.impl.DefaultConsoleDbConfig;
 import com.ctrip.xpipe.redis.console.model.ConfigModel;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;

diff --git a/...ices/ctrip-service/src/main/java/com/ctrip/xpipe/service/datasource/DataSourceConfig.java b/...ices/ctrip-service/src/main/java/com/ctrip/xpipe/service/datasource/DataSourceConfig.java
@@ -1,7 +1,10 @@
 package com.ctrip.xpipe.service.datasource;
 
+import com.ctrip.xpipe.api.config.ConfigProvider;
 import com.ctrip.xpipe.config.AbstractConfigBean;
 
+import static com.ctrip.xpipe.api.config.ConfigProvider.COMMON_CONFIG;
+
 /**
  * @author lishanglin
  * date 2021/4/13
@@ -10,6 +13,10 @@ public class DataSourceConfig extends AbstractConfigBean {
 
     public static final String KEY_DATASOURCE_CLUSTER = "dal.datasource.cluster";
 
+    public DataSourceConfig() {
+        super(ConfigProvider.DEFAULT.getOrCreateConfig(COMMON_CONFIG));
+    }
+
     public String getClusterName() {
         return getProperty(KEY_DATASOURCE_CLUSTER, "fxxpipedb_dalcluster");
     }