From 70c1a37bbd95bd3850d23c902fbe82aaf835adae Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 四月 2022 12:16:03 +0800
Subject: [PATCH] update 删除一些基本用不上的配置 简化折叠一些配置

---
 ruoyi-admin/src/main/resources/application-prod.yml |  123 +++++++++++++++++-----------------------
 1 files changed, 52 insertions(+), 71 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 0b9b987..6a28bcc 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -1,48 +1,37 @@
---- # 閰嶇疆涓存椂璺緞瀛樺偍
-spring:
-  servlet:
-    multipart:
-      # 涓存椂鏂囦欢瀛樺偍浣嶇疆 閬垮厤涓存椂鏂囦欢琚郴缁熸竻鐞嗘姤閿�
-      location: /ruoyi/server/temp
+--- # 涓存椂鏂囦欢瀛樺偍浣嶇疆 閬垮厤涓存椂鏂囦欢琚郴缁熸竻鐞嗘姤閿�
+spring.servlet.multipart.location: /ruoyi/server/temp
 
---- # 鐩戞帶閰嶇疆
-spring:
-  boot:
-    admin:
-      # Spring Boot Admin Client 瀹㈡埛绔殑鐩稿叧閰嶇疆
-      client:
-        # 澧炲姞瀹㈡埛绔紑鍏�
-        enabled: true
-        # 璁剧疆 Spring Boot Admin Server 鍦板潃
-        url: http://172.30.0.90:9090/admin
-        instance:
-          service-host-type: IP
-        username: ruoyi
-        password: 123456
+--- # 鐩戞帶涓績閰嶇疆
+spring.boot.admin.client:
+  # 澧炲姞瀹㈡埛绔紑鍏�
+  enabled: true
+  url: http://172.30.0.90:9090/admin
+  instance:
+    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锛氶潪绌烘椂鍚敤
-    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
+xxl.job:
+  # 鎵ц鍣ㄥ紑鍏�
+  enabled: true
+  # 璋冨害涓績鍦板潃锛氬璋冨害涓績闆嗙兢閮ㄧ讲瀛樺湪澶氫釜鍦板潃鍒欑敤閫楀彿鍒嗛殧銆�
+  admin-addresses: http://172.30.0.92: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:
@@ -113,29 +102,27 @@
         filters: stat
 
 --- # druid 閰嶇疆
-spring:
-  datasource:
-    druid:
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 璁剧疆鐧藉悕鍗曪紝涓嶅~鍒欏厑璁告墍鏈夎闂�
-        allow:
-        url-pattern: /druid/*
-        # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
-        login-username: ruoyi
-        login-password: 123456
-      filter:
-        stat:
-          enabled: true
-          # 鎱QL璁板綍
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
+spring.datasource.druid:
+  webStatFilter:
+    enabled: true
+  statViewServlet:
+    enabled: true
+    # 璁剧疆鐧藉悕鍗曪紝涓嶅~鍒欏厑璁告墍鏈夎闂�
+    allow:
+    url-pattern: /druid/*
+    # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+    login-username: ruoyi
+    login-password: 123456
+  filter:
+    stat:
+      enabled: true
+      # 鎱QL璁板綍
+      log-slow-sql: true
+      slow-sql-millis: 1000
+      merge-sql: true
+    wall:
+      config:
+        multi-statement-allow: true
 
 --- # redis 鍗曟満閰嶇疆(鍗曟満涓庨泦缇ゅ彧鑳藉紑鍚竴涓彟涓�涓渶瑕佹敞閲婃帀)
 spring:
@@ -158,8 +145,6 @@
   threads: 16
   # Netty绾跨▼姹犳暟閲�
   nettyThreads: 32
-  # 浼犺緭妯″紡
-  transportMode: "NIO"
   # 鍗曡妭鐐归厤缃�
   singleServerConfig:
     # 瀹㈡埛绔悕绉�
@@ -172,9 +157,5 @@
     idleConnectionTimeout: 10000
     # 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
     timeout: 3000
-    # 濡傛灉灏濊瘯鍦ㄦ闄愬埗涔嬪唴鍙戦�佹垚鍔燂紝鍒欏紑濮嬪惎鐢� timeout 璁℃椂銆�
-    retryAttempts: 3
-    # 鍛戒护閲嶈瘯鍙戦�佹椂闂撮棿闅旓紝鍗曚綅锛氭绉�
-    retryInterval: 1500
     # 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
     subscriptionConnectionPoolSize: 50

--
Gitblit v1.9.3