Merge remote-tracking branch 'origin/dev' into dev

build.gradle

@@ -120,7 +120,6 @@ dependencies {
     compile("org.samba.jcifs:jcifs:1.2.9")
     compile("com.google.zxing:javase:3.3.3")
     compile ("org.rxtx:rxtx:2.1.7")
-    compile("com.baomidou:dynamic-datasource-spring-boot-starter:2.5.7")
     compile("com.qcloud:cos_api:5.2.4") {
         exclude module: 'slf4j-log4j12'
     }

src/main/java/com/patzn/cloud/service/lims/config/MybatisPlusConfig.java

 package com.patzn.cloud.service.lims.config;
 
-import com.baomidou.dynamic.datasource.plugin.MasterSlaveAutoRoutingPlugin;
 import com.baomidou.mybatisplus.mapper.MetaObjectHandler;
 import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.plugins.PerformanceInterceptor;
@@ -124,7 +123,6 @@ public class MybatisPlusConfig {
         return paginationInterceptor;
     }
 
-
     /**
      * mybatis-plus SQL执行效率插件
      */
@@ -134,7 +132,6 @@ public class MybatisPlusConfig {
         return new PerformanceInterceptor();
     }
 
-
     /**
      * 注入自动填充器
      */
@@ -142,13 +139,4 @@ public class MybatisPlusConfig {
     public MetaObjectHandler metaObjectHandler() {
         return new PatznMetaObjectHandler();
     }
-
-    /**
-     * 读写分离配置
-     */
-    @Bean
-    @Profile({"test"})
-    public MasterSlaveAutoRoutingPlugin masterSlaveAutoRoutingPlugin(){
-        return new MasterSlaveAutoRoutingPlugin();
-    }
 }
\ No newline at end of file

src/main/java/com/patzn/cloud/service/lims/config/RabbitMQConfig.java

 package com.patzn.cloud.service.lims.config;
 
+import com.patzn.cloud.mq.MqAutoConfiguration;
 import org.springframework.amqp.core.Queue;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.patzn.cloud.mq.MqAutoConfiguration;
-import com.patzn.cloud.mq.log.LogDisruptor;
-
 /**
  * <p>
  * RabbitMQ 消息推送服务配置
@@ -27,16 +25,6 @@ public class RabbitMQConfig extends MqAutoConfiguration {
     }
 
     /**
-     * 初始化跟踪日志队列
-     */
-    @Bean
-    public Queue syslog() {
-        // 启动 lmax Disruptor
-        LogDisruptor.INSTANCE.start();
-        return new Queue(mqProperties.getTopic().getSyslog());
-    }
-
-    /**
      * 初始化推送消息队列
      */
     @Bean

src/main/java/com/patzn/cloud/service/lims/config/WebConfig.java

@@ -31,8 +31,6 @@ public class WebConfig extends WebServiceConfigurer {
         registry.addInterceptor(ssoInterceptor).addPathPatterns("/**");
         // 表单重复提交拦截器
         // registry.addInterceptor(new RepeatFormInterceptor()).excludePathPatterns("/list");
-        // 注入跟踪访问日志
-        registry.addInterceptor(new LogInterceptor().setService("lims"));
     }
 
     @Override