删除冗余代码

pom.xml

@@ -13,6 +13,7 @@
     <artifactId>center-data</artifactId>
 
     <dependencies>
+
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -31,10 +32,10 @@
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
-        <!-- Sentinel Datasource Nacos -->
+        <!-- SpringBoot Actuator -->
         <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-nacos</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
         <!-- Swagger UI -->
@@ -74,22 +75,15 @@
             <artifactId>sooka-sponest-common-swagger</artifactId>
         </dependency>
 
+        <!-- RabbitMQ的Stream实现 -->
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.1.22</version>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>sooka-sponest-api-message</artifactId>
-            <version>3.4.0</version>
-        </dependency>
-
-        <!--  RabbitMQ的Stream实现  -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
         </dependency>
 
     </dependencies>

src/main/java/com/sooka/sponest/data/utils/database/DynamicDataSource.java

@@ -1,19 +0,0 @@
-package com.sooka.sponest.data.utils.database;
-
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
-
-
-public class DynamicDataSource extends AbstractRoutingDataSource {
-
-    Logger logger = LoggerFactory.getLogger(DynamicDataSource.class);
-
-    @Override
-    protected Object determineCurrentLookupKey() {
-//        String datasource = DynamicDataSourceSwitcher.getDataSource();
-        logger.info("------------------当前数据源 {}", DynamicDataSourceSwitcher.getDataSource());
-        return DynamicDataSourceSwitcher.getDataSource();
-    }
-}

src/main/java/com/sooka/sponest/data/utils/database/DynamicDataSourceAspect.java

@@ -1,38 +0,0 @@
-package com.sooka.sponest.data.utils.database;
-
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-@Aspect
-@Component
-@Order(1)
-public class DynamicDataSourceAspect {
-    private Logger logger = LoggerFactory.getLogger(DynamicDataSourceAspect.class);
-
-    /**
-     * 切入点只对@Service注解的类上的@DataSource方法生效
-     * @param myDataSource
-     */
-    @Pointcut(value="(@within(org.springframework.stereotype.Service) ||@within(org.springframework.stereotype.Repository)) && @annotation(myDataSource)" )
-    public void dynamicDataSourcePointCut(MyDataSource myDataSource){}
-
-    @Before(value = "dynamicDataSourcePointCut(myDataSource)")
-    public void switchDataSource(MyDataSource myDataSource) {
-        DynamicDataSourceSwitcher.setDataSource(myDataSource.value());
-    }
-
-    /**
-     * 切点执行完后 切换成主数据库
-     * @param myDataSource
-     */
-    @After(value="dynamicDataSourcePointCut(myDataSource)")
-    public void after(MyDataSource myDataSource){
-        DynamicDataSourceSwitcher.cleanDataSource();
-    }
-}

src/main/java/com/sooka/sponest/data/utils/database/DynamicDataSourceSwitcher.java

@@ -1,43 +0,0 @@
-package com.sooka.sponest.data.utils.database;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class DynamicDataSourceSwitcher {
-
-    static Logger logger = LoggerFactory.getLogger(DynamicDataSourceSwitcher.class);
-
-    public static final String Master = "master";
-    public static final String dbCenterTtranmanager = "db-center-tranmanager";
-    public static final String dbCenterData = "db-center-data";
-    public static final String dbCenterEvent = "db-center-event";
-    public static final String dbCenterMonitor = "db-center-monitor";
-    public static final String dbCenterTask = "db-center-task";
-    public static final String dbCenterEvaluation = "db-center-evaluation";
-    public static final String dbCenterFire = "db-center-fire";
-    public static final String dbCenterStraw = "db-center-straw";
-    public static final String dbCenterPests = "db-center-pests";
-    public static final String dbCenterComprehensive = "db-center-comprehensive";
-    public static final String dbCenterOnest = "db-center-onest";
-
-    private static final ThreadLocal<String> contextHolder = new ThreadLocal<>();
-
-    public static void setDataSource(String name){
-        logger.info("-------- 设置数据源数据源为 ：{} ", name);
-        contextHolder.set(name);
-    }
-
-    public static String getDataSource(){
-        if (StringUtils.isEmpty(contextHolder.get())) {
-            setDataSource(Master);
-        }
-        return contextHolder.get();
-    }
-
-    public static void cleanDataSource(){
-        contextHolder.remove();
-    }
-
-}

src/main/java/com/sooka/sponest/data/utils/database/MultipleDataSourceConfig.java

@@ -1,136 +0,0 @@
-package com.sooka.sponest.data.utils.database;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-import java.util.HashMap;
-import java.util.Map;
-
-@Configuration
-public class MultipleDataSourceConfig {
-
-    @Bean("master")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.master")
-    public DataSource createMasterDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbSystemData")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-system")
-    public DataSource createSystemDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterTranmanager")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-tranmanager")
-    public DataSource createTranmanagerDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterData")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-data")
-    public DataSource createDataDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterEvent")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-event")
-    public DataSource createEventDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterMonitor")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-monitor")
-    public DataSource createMonitorDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterTask")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-task")
-    public DataSource createTaskDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterEvaluation")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-evaluation")
-    public DataSource createEvaluationDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterFire")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-fire")
-    public DataSource createFireDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterStraw")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-straw")
-    public DataSource createStrawDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterPests")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-pests")
-    public DataSource createPestsDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterComprehensive")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-comprehensive")
-    public DataSource createComprehensiveDataSource() {
-        return new DruidDataSource();
-    }
-
-    @Bean("dbCenterOnest")
-    @ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.db-center-onest")
-    public DataSource createOnestDataSource() {
-        return new DruidDataSource();
-    }
-
-    /**
-     * 设置动态数据源，通过@Primary 来确定主DataSource
-     *
-     * @return
-     */
-    @Bean
-    @Primary
-    public DataSource createDynamicDataSource(@Qualifier("master") DataSource master,
-                                              @Qualifier("dbSystemData") DataSource dbSystemData,
-                                              @Qualifier("dbCenterData") DataSource dbCenterData,
-                                              @Qualifier("dbCenterEvent") DataSource dbCenterEvent,
-                                              @Qualifier("dbCenterMonitor") DataSource dbCenterMonitor,
-                                              @Qualifier("dbCenterTask") DataSource dbCenterTask,
-                                              @Qualifier("dbCenterEvaluation") DataSource dbCenterEvaluation,
-                                              @Qualifier("dbCenterFire") DataSource dbCenterFire,
-                                              @Qualifier("dbCenterStraw") DataSource dbCenterStraw,
-                                              @Qualifier("dbCenterPests") DataSource dbCenterPests,
-                                              @Qualifier("dbCenterComprehensive") DataSource dbCenterComprehensive,
-                                              @Qualifier("dbCenterOnest") DataSource dbCenterOnest,
-                                              @Qualifier("dbCenterTranmanager") DataSource dbCenterTranmanager) {
-        DynamicDataSource dynamicDataSource = new DynamicDataSource();
-        //设置默认数据源
-        dynamicDataSource.setDefaultTargetDataSource(master);
-        //配置多数据源
-        Map<Object, Object> map = new HashMap<>();
-        map.put("master", master);
-        map.put("db-system", dbSystemData);
-        map.put("db-center-tranmanager", dbCenterTranmanager);
-        map.put("db-center-data", dbCenterData);
-        map.put("db-center-event", dbCenterEvent);
-        map.put("db-center-monitor", dbCenterMonitor);
-        map.put("db-center-task", dbCenterTask);
-        map.put("db-center-evaluation", dbCenterEvaluation);
-        map.put("db-center-fire", dbCenterFire);
-        map.put("db-center-straw", dbCenterStraw);
-        map.put("db-center-pests", dbCenterPests);
-        map.put("db-center-comprehensive", dbCenterComprehensive);
-        map.put("db-center-onest", dbCenterOnest);
-        dynamicDataSource.setTargetDataSources(map);
-        return dynamicDataSource;
-    }
-}

src/main/java/com/sooka/sponest/data/utils/database/MyDataSource.java

@@ -1,14 +0,0 @@
-package com.sooka.sponest.data.utils.database;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({
-        ElementType.METHOD
-})
-public @interface MyDataSource {
-    String value() default "";
-}