Browse Source

去除多数据源配置

songxinlu 3 years ago
parent
commit
5ee9625669

+ 5 - 5
pom.xml

@@ -213,11 +213,11 @@
         </dependency>
 
         <!--多数据源-->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>3.3.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>-->
+<!--            <version>3.3.1</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.oracle</groupId>

+ 1 - 1
src/main/java/com/diagbot/MrqcSysApplication.java

@@ -20,7 +20,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @time: 2018/8/7 9:26
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class , DruidDataSourceAutoConfigure.class})
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
 @EnableFeignClients({ "com.diagbot.client" })
 @EnableHystrixDashboard
 @EnableHystrix

+ 2 - 2
src/main/java/com/diagbot/service/impl/his/DoctorHosServiceImpl.java

@@ -1,6 +1,6 @@
 package com.diagbot.service.impl.his;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
+//import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.his.DoctorHos;
 import com.diagbot.mapper.his.DoctorHosMapper;
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
  * @since 2022-04-20
  */
 @Service
-@DS("slave")
+//@DS("slave")
 public class DoctorHosServiceImpl extends ServiceImpl<DoctorHosMapper, DoctorHos> implements DoctorHosService {
 
 }

+ 44 - 58
src/main/resources/application-dev.yml

@@ -58,65 +58,51 @@ spring:
   application:
     name: gateway-service
   datasource:
-    dynamic:
-      primary: master
-      druid:
-        # 连接池的配置信息
-        # 初始化大小,最小,最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间,单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache,并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters.commons-log.connection-logger-name: wall,log4j
-        filter:
-          stat:
-            enabled: true
-            mergeSql: true
-            log-slow-sql: true
-            slow-sql-millis: 2000
-        #监控配置
-        web-stat-filter:
+    druid:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      platform: mysql
+      url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: lantone
+      # 连接池的配置信息
+      # 初始化大小,最小,最大
+      initialSize: 5
+      minIdle: 5
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间,单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      # 打开PSCache,并且指定每个连接上PSCache的大小
+      poolPreparedStatements: true
+      maxPoolPreparedStatementPerConnectionSize: 20
+      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
           enabled: true
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      datasource:
-        master:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: lantone
-          druid:
-            initial-size: 5
-        slave:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.126:3307/xy_st?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: Lat0ne@tesT
-          druid:
-            initial-size: 5
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
+      #监控配置
+      web-stat-filter:
+        enabled: true
+        url-pattern: /*
+        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+
+      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        reset-enable: false
+        login-username: root
+        login-password: root
 
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss