1.江津版本切换 , 数据采集优化

2.数据源配置优化 删除多余配置 优化配置流程
3.优化江津采集日志相关代码
4.自来水采集优化

dc3-gateway/src/main/java/io/github/pnoker/gateway/comtool/ScheduleTaskMgr.java

@@ -221,7 +221,7 @@ public class ScheduleTaskMgr {
 
     //TODO 江津相关
 
-    @Resource(name = "infulxJiangjinDbUtil")
+    /*@Resource(name = "infulxJiangjinDbUtil")
     private InfulxJiangjinDbUtil infulxJiangjinDbUtil;
 
     //TODO 启动后5秒初始化所有配置参数
@@ -366,13 +366,13 @@ public class ScheduleTaskMgr {
             }
         };
         timer.schedule(timerTask1,9000);//9秒后执行一次
-    }
+    }*/
 
 
     /**
      * TODO 自来水相关
      */
-    /*@Resource(name = "infulxZilaishuiDbUtil")
+    @Resource(name = "infulxZilaishuiDbUtil")
     private InfulxZilaishuiDbUtil infulxZilaishuiDbUtil;
 
     //TODO 启动后5秒初始化所有配置参数
@@ -506,7 +506,7 @@ public class ScheduleTaskMgr {
                 KprZilaishuiPumpBizFun.initWaterPumpReacordAll(formattedDate);
             }
         },5000);
-    }*/
+    }
 
     /**
      * TODO 汤阴业务相关

dc3-gateway/src/main/java/io/github/pnoker/gateway/config/MainSourceConfiguration.java

@@ -144,8 +144,8 @@ public class MainSourceConfiguration {
     @Bean(name = "childDatasource")
     //@ConfigurationProperties(prefix = "spring.datasource.data")
     public DataSource childDatasource() {
-        return new HikariDataSource(getConfig1());
-//        return DataSourceBuilder.create().build();
+//        return new HikariDataSource(getConfig1());
+        return DataSourceBuilder.create().build();
         //Spring Boot 2.x默认使用HikariCP
     }
 
@@ -226,8 +226,8 @@ public class MainSourceConfiguration {
     @Bean(name = "child2Datasource")
     //@ConfigurationProperties(prefix = "spring.datasource.data")
     public DataSource child2Datasource() {
-//        return new HikariDataSource(getConfig2());
-        return DataSourceBuilder.create().build();
+        return new HikariDataSource(getConfig2());
+//        return DataSourceBuilder.create().build();
         //Spring Boot 2.x默认使用HikariCP
     }
 
@@ -308,8 +308,8 @@ public class MainSourceConfiguration {
     @Bean(name = "child3Datasource")
     //@ConfigurationProperties(prefix = "spring.datasource.data")
     public DataSource child3Datasource() {
-//        return new HikariDataSource(getConfig3());
-        return DataSourceBuilder.create().build();
+        return new HikariDataSource(getConfig3());
+//        return DataSourceBuilder.create().build();
         //Spring Boot 2.x默认使用HikariCP
     }