From dc5e5c6c08d4f9b9a2f69fc73a4704665871cc1e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 三月 2022 14:07:46 +0800
Subject: [PATCH] add 增加 postgres sqlserver jdbc连接适配

---
 ruoyi-admin/src/main/resources/application-prod.yml |  101 +++++++++++++++-----------------------------------
 1 files changed, 31 insertions(+), 70 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index b66db3e..5139221 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -1,3 +1,10 @@
+--- # 閰嶇疆涓存椂璺緞瀛樺偍
+spring:
+  servlet:
+    multipart:
+      # 涓存椂鏂囦欢瀛樺偍浣嶇疆 閬垮厤涓存椂鏂囦欢琚郴缁熸竻鐞嗘姤閿�
+      location: /ruoyi/server/temp
+
 --- # 鐩戞帶閰嶇疆
 spring:
   boot:
@@ -9,13 +16,15 @@
         # 璁剧疆 Spring Boot Admin Server 鍦板潃
         url: http://172.30.0.90:9090/admin
         instance:
-          prefer-ip: true # 娉ㄥ唽瀹炰緥鏃讹紝浼樺厛浣跨敤 IP
+          service-host-type: IP
         username: ruoyi
         password: 123456
 
 --- # xxl-job 閰嶇疆
 xxl:
   job:
+    # 鎵ц鍣ㄥ紑鍏�
+    enabled: true
     # 璋冨害涓績鍦板潃锛氬璋冨害涓績闆嗙兢閮ㄧ讲瀛樺湪澶氫釜鍦板潃鍒欑敤閫楀彿鍒嗛殧銆�
     admin-addresses: http://172.30.0.92:9100/xxl-job-admin
     # 鎵ц鍣ㄩ�氳TOKEN锛氶潪绌烘椂鍚敤
@@ -49,7 +58,9 @@
         # 涓诲簱鏁版嵁婧�
         master:
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+          # jdbc 鎵�鏈夊弬鏁伴厤缃弬鑰� https://lionli.blog.csdn.net/article/details/122018562
+          # rewriteBatchedStatements=true 鎵瑰鐞嗕紭鍖� 澶у箙鎻愬崌鎵归噺鎻掑叆鏇存柊鍒犻櫎鎬ц兘(瀵规暟鎹簱鏈夋�ц兘鎹熻�� 浣跨敤鎵归噺鎿嶄綔搴旇�冭檻鎬ц兘闂)
+          url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
           password: root
         # 浠庡簱鏁版嵁婧�
@@ -59,6 +70,23 @@
           url:
           username:
           password:
+#        oracle:
+#          driverClassName: oracle.jdbc.OracleDriver
+#          url: jdbc:oracle:thin:@//172.30.0.36:1521/XE
+#          username: ROOT
+#          password: root
+#          druid:
+#            validationQuery: SELECT 1 FROM DUAL
+#        postgres:
+#          driverClassName: org.postgresql.Driver
+#          url: jdbc:postgresql://172.30.0.36:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+#          username: root
+#          password: root
+#        sqlserver:
+#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#          url: jdbc:sqlserver://172.30.0.36:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true
+#          username: SA
+#          password: root
       druid:
         # 鍒濆杩炴帴鏁�
         initialSize: 5
@@ -75,7 +103,7 @@
         # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
         maxEvictableIdleTimeMillis: 900000
         # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -146,72 +174,5 @@
     retryAttempts: 3
     # 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
     retryInterval: 1500
-    # 鍙戝竷鍜岃闃呰繛鎺ョ殑鏈�灏忕┖闂茶繛鎺ユ暟
-    subscriptionConnectionMinimumIdleSize: 1
     # 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
     subscriptionConnectionPoolSize: 50
-    # 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲�
-    subscriptionsPerConnection: 5
-    # DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
-    dnsMonitoringInterval: 5000
-
-#--- # redis 闆嗙兢閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀)
-#spring:
-#  redis:
-#    cluster:
-#      nodes:
-#        - 192.168.0.100:6379
-#        - 192.168.0.101:6379
-#        - 192.168.0.102:6379
-#    # 瀵嗙爜
-#    password:
-#    # 杩炴帴瓒呮椂鏃堕棿
-#    timeout: 10s
-#    # 鏄惁寮�鍚痵sl
-#    ssl: false
-#
-#redisson:
-#  # 绾跨▼姹犳暟閲�
-#  threads: 16
-#  # Netty绾跨▼姹犳暟閲�
-#  nettyThreads: 32
-#  # 浼犺緭妯″紡
-#  transportMode: "NIO"
-#  # 闆嗙兢閰嶇疆
-#  clusterServersConfig:
-#    # 瀹㈡埛绔悕绉�
-#    clientName: ${ruoyi.name}
-#    # master鏈�灏忕┖闂茶繛鎺ユ暟
-#    masterConnectionMinimumIdleSize: 32
-#    # master杩炴帴姹犲ぇ灏�
-#    masterConnectionPoolSize: 64
-#    # slave鏈�灏忕┖闂茶繛鎺ユ暟
-#    slaveConnectionMinimumIdleSize: 32
-#    # slave杩炴帴姹犲ぇ灏�
-#    slaveConnectionPoolSize: 64
-#    # 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣
-#    idleConnectionTimeout: 10000
-#    # ping杩炴帴闂撮殧
-#    pingConnectionInterval: 1000
-#    # 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
-#    timeout: 3000
-#    # 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆�
-#    retryAttempts: 3
-#    # 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
-#    retryInterval: 1500
-#    # 浠庡彲鐢ㄦ湇鍔″櫒鐨勫唴閮ㄥ垪琛ㄤ腑鎺掗櫎 Redis Slave 閲嶆柊杩炴帴灏濊瘯鐨勯棿闅斻��
-#    failedSlaveReconnectionInterval: 3000
-#    # 鍙戝竷鍜岃闃呰繛鎺ユ睜鏈�灏忕┖闂茶繛鎺ユ暟
-#    subscriptionConnectionMinimumIdleSize: 1
-#    # 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
-#    subscriptionConnectionPoolSize: 50
-#    # 鍗曚釜杩炴帴鏈�澶ц闃呮暟閲�
-#    subscriptionsPerConnection: 5
-#    # 鎵弿闂撮殧
-#    scanInterval: 1000
-#    # DNS鐩戞祴鏃堕棿闂撮殧锛屽崟浣嶏細姣
-#    dnsMonitoringInterval: 5000
-#    # 璇诲彇妯″紡
-#    readMode: "SLAVE"
-#    # 璁㈤槄妯″紡
-#    subscriptionMode: "MASTER"

--
Gitblit v1.9.3