From 1a19c3b3a5e5f5d1766c08fe7d8258bb6d9a138a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 三月 2022 14:05:29 +0800
Subject: [PATCH] update 单独指定oracle心跳检查

---
 ruoyi-admin/src/main/resources/application-dev.yml |  170 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 126 insertions(+), 44 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 06456dd..8c7b490 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -1,40 +1,102 @@
-# 鏁版嵁婧愰厤缃�
+--- # 鐩戞帶閰嶇疆
+spring:
+  boot:
+    admin:
+      # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
+      client:
+        # 澧炲姞瀹㈡埛绔紑鍏�
+        enabled: true
+        # 璁剧疆 Spring Boot Admin Server 鍦板潃
+        url: http://localhost:9090/admin
+        instance:
+          service-host-type: IP
+        username: ruoyi
+        password: 123456
+
+--- # xxl-job 閰嶇疆
+xxl:
+  job:
+    # 鎵ц鍣ㄥ紑鍏�
+    enabled: true
+    # 璋冨害涓績鍦板潃锛氬璋冨害涓績闆嗙兢閮ㄧ讲瀛樺湪澶氫釜鍦板潃鍒欑敤閫楀彿鍒嗛殧銆�
+    admin-addresses: http://localhost:9100/xxl-job-admin
+    # 鎵ц鍣ㄩ�氳TOKEN锛氶潪绌烘椂鍚敤
+    access-token: xxl-job
+    # 鎵ц鍣ㄩ厤缃�
+    executor:
+      # 鎵ц鍣ˋppName锛氭墽琛屽櫒蹇冭烦娉ㄥ唽鍒嗙粍渚濇嵁锛涗负绌哄垯鍏抽棴鑷姩娉ㄥ唽
+      appname: xxl-job-executor
+      # 鎵ц鍣ㄧ鍙e彿 鎵ц鍣ㄤ粠9101寮�濮嬪線鍚庡啓
+      port: 9101
+      # 鎵ц鍣ㄦ敞鍐岋細榛樿IP:PORT
+      address:
+      # 鎵ц鍣↖P锛氶粯璁よ嚜鍔ㄨ幏鍙朓P
+      ip:
+      # 鎵ц鍣ㄨ繍琛屾棩蹇楁枃浠跺瓨鍌ㄧ鐩樿矾寰�
+      logpath: ./logs/xxl-job
+      # 鎵ц鍣ㄦ棩蹇楁枃浠朵繚瀛樺ぉ鏁帮細澶т簬3鐢熸晥
+      logretentiondays: 30
+
+--- # 鏁版嵁婧愰厤缃�
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
+    # 鍔ㄦ�佹暟鎹簮鏂囨。 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
+    dynamic:
+      # 鎬ц兘鍒嗘瀽鎻掍欢(鏈夋�ц兘鎹熻�� 涓嶅缓璁敓浜х幆澧冧娇鐢�)
+      p6spy: true
+      # 璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓� master
+      primary: master
+      datasource:
+        # 涓诲簱鏁版嵁婧�
+        master:
+          driverClassName: com.mysql.cj.jdbc.Driver
+          # jdbc 鎵�鏈夊弬鏁伴厤缃弬鑰� https://lionli.blog.csdn.net/article/details/122018562
+          # rewriteBatchedStatements=true 鎵瑰鐞嗕紭鍖� 澶у箙鎻愬崌鎵归噺鎻掑叆鏇存柊鍒犻櫎鎬ц兘(瀵规暟鎹簱鏈夋�ц兘鎹熻�� 浣跨敤鎵归噺鎿嶄綔搴旇�冭檻鎬ц兘闂)
+          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          username: root
+          password: root
+        # 浠庡簱鏁版嵁婧�
+        slave:
+          lazy: true
+          driverClassName: com.mysql.cj.jdbc.Driver
+          url:
+          username:
+          password:
+#        oracle:
+#          driverClassName: oracle.jdbc.OracleDriver
+#          url: jdbc:oracle:thin:@//localhost:1521/XE
+#          username: ROOT
+#          password: root
+#          druid:
+#            validationQuery: SELECT 1 FROM DUAL
+      druid:
+        # 鍒濆杩炴帴鏁�
+        initialSize: 5
+        # 鏈�灏忚繛鎺ユ睜鏁伴噺
+        minIdle: 10
+        # 鏈�澶ц繛鎺ユ睜鏁伴噺
+        maxActive: 20
+        # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+        maxWait: 60000
+        # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+        timeBetweenEvictionRunsMillis: 60000
+        # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+        minEvictableIdleTimeMillis: 300000
+        # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+        maxEvictableIdleTimeMillis: 900000
+        # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+        validationQuery: SELECT 1
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 娉ㄦ剰杩欎釜鍊煎拰druid鍘熺敓涓嶄竴鑷达紝榛樿鍚姩浜唖tat
+        filters: stat
+
+--- # druid 閰嶇疆
+spring:
+  datasource:
     druid:
-      # 涓诲簱鏁版嵁婧�
-      master:
-        url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-        username: root
-        password: root
-      # 浠庡簱鏁版嵁婧�
-      slave:
-        # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
-        enabled: false
-        url:
-        username:
-        password:
-      # 鍒濆杩炴帴鏁�
-      initialSize: 5
-      # 鏈�灏忚繛鎺ユ睜鏁伴噺
-      minIdle: 10
-      # 鏈�澶ц繛鎺ユ睜鏁伴噺
-      maxActive: 20
-      # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
-      maxWait: 60000
-      # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
-      timeBetweenEvictionRunsMillis: 60000
-      # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
-      minEvictableIdleTimeMillis: 300000
-      # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
-      maxEvictableIdleTimeMillis: 900000
-      # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
       webStatFilter:
         enabled: true
       statViewServlet:
@@ -55,7 +117,9 @@
         wall:
           config:
             multi-statement-allow: true
-  # redis 閰嶇疆
+
+--- # redis 鍗曟満閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀)
+spring:
   redis:
     # 鍦板潃
     host: localhost
@@ -67,13 +131,31 @@
     password:
     # 杩炴帴瓒呮椂鏃堕棿
     timeout: 10s
-    lettuce:
-      pool:
-        # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
-        min-idle: 0
-        # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
-        max-idle: 8
-        # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
-        max-active: 8
-        # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
-        max-wait: -1ms
+    # 鏄惁寮�鍚痵sl
+    ssl: false
+
+redisson:
+  # 绾跨▼姹犳暟閲�
+  threads: 4
+  # Netty绾跨▼姹犳暟閲�
+  nettyThreads: 8
+  # 浼犺緭妯″紡
+  transportMode: "NIO"
+  # 鍗曡妭鐐归厤缃�
+  singleServerConfig:
+    # 瀹㈡埛绔悕绉�
+    clientName: ${ruoyi.name}
+    # 鏈�灏忕┖闂茶繛鎺ユ暟
+    connectionMinimumIdleSize: 8
+    # 杩炴帴姹犲ぇ灏�
+    connectionPoolSize: 32
+    # 杩炴帴绌洪棽瓒呮椂锛屽崟浣嶏細姣
+    idleConnectionTimeout: 10000
+    # 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
+    timeout: 3000
+    # 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆�
+    retryAttempts: 3
+    # 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
+    retryInterval: 1500
+    # 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
+    subscriptionConnectionPoolSize: 50

--
Gitblit v1.9.3