From c9768346fc8bc1cc6326e06125deaf57ff423eaf Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 19 九月 2023 16:17:07 +0800
Subject: [PATCH] 修改三厂数字化使用原生jdbc连接

---
 src/main/resources/application-dev.yml |  114 ++++++++++++++-------------------------------------------
 1 files changed, 28 insertions(+), 86 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a77be36..ed3593e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -9,90 +9,26 @@
       max-file-size: 30MB
       max-request-size: 30MB
   datasource:
-    dynamic:
-      primary: postgres #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�
-      strict: false #涓ユ牸鍖归厤鏁版嵁婧�,榛樿false. true鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鎶涘紓甯�,false浣跨敤榛樿鏁版嵁婧�
-      druid: # 鍏ㄥ眬druid鍙傛暟锛屽崟鐙暟鎹簮閰嶇疆涓虹┖鏃跺彇鍏ㄥ眬閰嶇疆
-        # 杩炴帴姹犵殑閰嶇疆淇℃伅
-        # 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
-        initial-size: 1
-        min-idle: 2
-        maxActive: 8
-        # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
-        maxWait: 60000
-        # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
-        timeBetweenEvictionRunsMillis: 60000
-        # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 鎵撳紑PSCache锛屽苟涓旀寚瀹氭瘡涓繛鎺ヤ笂PSCache鐨勫ぇ灏�
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻锛�'wall'鐢ㄤ簬闃茬伀澧�
-        filters: stat,wall,slf4j
-        # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-      datasource:
-        master:
-          url: jdbc:postgresql://192.168.2.15:5432/ry-vue
-          username: postgres
-          password: postgres
-          driver-class-name: org.postgresql.Driver
-          druid: # 閰嶇疆multi-datasource1 鏁版嵁婧愯繛鎺ユ睜鍙傛暟
-            # 杩炴帴姹犵殑閰嶇疆淇℃伅
-            # 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
-            initial-size: 2
-            min-idle: 2
-            maxActive: 2
-            # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
-            maxWait: 600000
-            # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
-            timeBetweenEvictionRunsMillis: 60000
-            # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
-            minEvictableIdleTimeMillis: 300000
-            validationQuery: SELECT 1
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            # 鎵撳紑PSCache锛屽苟涓旀寚瀹氭瘡涓繛鎺ヤ笂PSCache鐨勫ぇ灏�
-            poolPreparedStatements: true
-            maxPoolPreparedStatementPerConnectionSize: 20
-            # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻锛�'wall'鐢ㄤ簬闃茬伀澧�
-            filters: stat,wall,slf4j
-            # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
-            connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-        oracle:
-          url: jdbc:oracle:thin:@//112.98.126.2:21521/orcl
-          username: c##ard_user
-          password: 123456
-          driver-class-name: oracle.jdbc.driver.OracleDriver
-          druid: #閰嶇疆mysql 榛樿杩炴帴姹犲弬鏁�
-            # 杩炴帴姹犵殑閰嶇疆淇℃伅
-            # 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
-            initial-size: 3
-            min-idle: 3
-            maxActive: 8
-            # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
-            maxWait: 600000
-            # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
-            timeBetweenEvictionRunsMillis: 60000
-            # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
-            minEvictableIdleTimeMillis: 300000
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            # 鎵撳紑PSCache锛屽苟涓旀寚瀹氭瘡涓繛鎺ヤ笂PSCache鐨勫ぇ灏�
-            poolPreparedStatements: true
-            maxPoolPreparedStatementPerConnectionSize: 20
-            # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻锛�'wall'鐢ㄤ簬闃茬伀澧�
-            filters: stat,wall,slf4j
-            # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
-            connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-
+    druid:
+      #寮�鍚痙ruid鐩戞帶web
+      stat-view-servlet:
+        enabled: true
+      driver-class-name: org.postgresql.Driver
+      url: jdbc:postgresql://192.168.2.15:5432/ry-vue
+      username: postgres
+      password: postgres
+      #鏈�澶ц繛鎺ユ暟
+      maxActive: 30
+      #鏈�灏忚繛鎺ユ暟
+      minIdle: 5
+      #鑾峰彇杩炴帴鐨勬渶澶х瓑寰呮椂闂�
+      maxWait: 10000
+      #瑙e喅mysql8灏忔椂鐨勯棶棰�
+      validation-query: SELECT 'X'
+      #绌洪棽杩炴帴鐨勬鏌ユ椂闂撮棿闅�
+      timeBetweenEvictionRunsMillis: 60000
+      #绌洪棽杩炴帴鏈�灏忕┖闂叉椂闂�
+      minEvictableIdleTimeMillis: 300000
   # netty閰嶇疆
   netty:
     udp:
@@ -112,7 +48,11 @@
     enabled: true
   # 鐩楃數鎺ュ彛鍦板潃
   stealelec:
+    enabled: false
     url: http://iot.zhdk.net:8090/Warning/GetWarning?userName=cy4oil
+  # 涓夊巶鏁板瓧鍖栧湴鍧�
+  digitization3:
+    enabled: true
   # minio閰嶇疆
   minio:
     endpoint: http://192.168.2.15:9001
@@ -126,8 +66,10 @@
 logging:
   level:
     hikSdk: info
-    mqtt: debug
-    netty: debug
+    mqtt: info
+    netty: info
     external: info
     camera: info
     tube: info
+    digitization3: debug
+    stealAlarm: info
\ No newline at end of file

--
Gitblit v1.9.3