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

2.数据源配置优化 删除多余配置 优化配置流程
3.优化江津采集日志相关代码
4.自来水和江津采集增加重试机制
5.数据源配置再优化, 将orcle数据源连接配置优化到主数据源代码中

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

@@ -14,6 +14,7 @@ import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
 import javax.annotation.PostConstruct;
@@ -435,6 +436,46 @@ public class MainSourceConfiguration {
         return new DataSourceTransactionManager(dataSource);
     }
 
+    //TODO orcale 相关
+    @Bean(name = "primaryDataSource")
+    public DataSource primaryDataSource(@Value("${spring.datasource.primary.url}") String url,
+                                        @Value("${spring.datasource.primary.username}") String username,
+                                        @Value("${spring.datasource.primary.password}") String password,
+                                        @Value("${spring.datasource.primary.driver-class-name}") String driverClassName) {
+//        HikariConfig config = new HikariConfig();
+//        config.setJdbcUrl(url);
+//        config.setUsername(username);
+//        config.setPassword(password);
+//        config.setDriverClassName(driverClassName);
+//        config.setInitializationFailTimeout(-1);
+//        return new HikariDataSource(config);
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "zilaishuiDataSource")
+    public DataSource secondaryDataSource(@Value("${spring.datasource.zilaishui.url}") String url,
+                                          @Value("${spring.datasource.zilaishui.username}") String username,
+                                          @Value("${spring.datasource.zilaishui.password}") String password,
+                                          @Value("${spring.datasource.zilaishui.driver-class-name}") String driverClassName) {
+        HikariConfig config = new HikariConfig();
+        config.setJdbcUrl(url);
+        config.setUsername(username);
+        config.setPassword(password);
+        config.setDriverClassName(driverClassName);
+        return new HikariDataSource(config);
+        //        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "oneTemplate")
+    public JdbcTemplate primaryJdbcTemplate(@Qualifier("primaryDataSource") DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
+    @Bean(name = "twoTemplate")
+    public JdbcTemplate zilaishuiJdbcTemplate(@Qualifier("zilaishuiDataSource") DataSource dataSource) {
+        return new JdbcTemplate(dataSource);
+    }
+
     @Bean
     public DBMgrProxy startDBMgrProxy(){
         DBMgrProxy.getInstance().init();

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

@@ -1,65 +0,0 @@
-package io.github.pnoker.gateway.config;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import io.github.pnoker.gateway.dbdao.DBMgrProxy;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import javax.sql.DataSource;
-
-/**
- * @ClassName OrcaleDataSourceConfig
- * @Description: TODO
- * @Author LX
- * @Date 2024/5/21
- * @Version V1.0
- **/
-@Configuration
-public class OrcaleDataSourceConfig {
-    @Bean(name = "primaryDataSource")
-    public DataSource primaryDataSource(@Value("${spring.datasource.primary.url}") String url,
-                                        @Value("${spring.datasource.primary.username}") String username,
-                                        @Value("${spring.datasource.primary.password}") String password,
-                                        @Value("${spring.datasource.primary.driver-class-name}") String driverClassName) {
-        HikariConfig config = new HikariConfig();
-        config.setJdbcUrl(url);
-        config.setUsername(username);
-        config.setPassword(password);
-        config.setDriverClassName(driverClassName);
-        config.setInitializationFailTimeout(-1);
-        return new HikariDataSource(config);
-    }
-
-    @Bean(name = "zilaishuiDataSource")
-    public DataSource secondaryDataSource(@Value("${spring.datasource.zilaishui.url}") String url,
-                                          @Value("${spring.datasource.zilaishui.username}") String username,
-                                          @Value("${spring.datasource.zilaishui.password}") String password,
-                                          @Value("${spring.datasource.zilaishui.driver-class-name}") String driverClassName) {
-        HikariConfig config = new HikariConfig();
-        config.setJdbcUrl(url);
-        config.setUsername(username);
-        config.setPassword(password);
-        config.setDriverClassName(driverClassName);
-        return new HikariDataSource(config);
-    }
-
-    @Bean(name = "oneTemplate")
-    public JdbcTemplate primaryJdbcTemplate(@Qualifier("primaryDataSource") DataSource dataSource) {
-        return new JdbcTemplate(dataSource);
-    }
-
-    @Bean(name = "twoTemplate")
-    public JdbcTemplate zilaishuiJdbcTemplate(@Qualifier("zilaishuiDataSource") DataSource dataSource) {
-        return new JdbcTemplate(dataSource);
-    }
-//    @Bean
-//    public DBMgrProxy startDBMgrProxy(){
-//        DBMgrProxy.getInstance().init();
-//        return DBMgrProxy.getInstance();
-//    }
-}