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

src/main/resources/application-dev.yml

@@ -56,11 +56,11 @@ spring:
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
+        poolPreparedStatements: false
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters.commons-log.connection-logger-name: wall,log4j
-        share-prepared-statements: true
+        share-prepared-statements: false
         filter:
           stat:
             enabled: true

src/main/resources/application-local.yml

@@ -56,11 +56,11 @@ spring:
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
+        poolPreparedStatements: false
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters.commons-log.connection-logger-name: wall,log4j
-        share-prepared-statements: true
+        share-prepared-statements: false
         filter:
           stat:
             enabled: true

src/main/resources/application-pre.yml

@@ -39,49 +39,49 @@ spring:
   datasource:
     dynamic:
       primary: med
-      # 数据库配置
-      datasource:
-        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
-          share-prepared-statements: true
-          filter:
-            stat:
-              enabled: true
-              mergeSql: true
-              log-slow-sql: true
-              slow-sql-millis: 2000
-          #监控配置
-          web-stat-filter:
+      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: false
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        share-prepared-statements: false
+        filter:
+          stat:
             enabled: true
-            url-pattern: /*
-            exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+            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
+        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库配置
+      datasource:
         cdss:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql

src/main/resources/application-pro.yml

@@ -56,11 +56,11 @@ spring:
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
+        poolPreparedStatements: false
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters.commons-log.connection-logger-name: wall,log4j
-        share-prepared-statements: true
+        share-prepared-statements: false
         filter:
           stat:
             enabled: true

src/main/resources/application-test.yml

@@ -56,11 +56,11 @@ spring:
         testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
+        poolPreparedStatements: false
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters.commons-log.connection-logger-name: wall,log4j
-        share-prepared-statements: true
+        share-prepared-statements: false
         filter:
           stat:
             enabled: true