From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-admin/src/main/resources/application.yml |   75 ++++++++++++-------------------------
 1 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 5633232..dbd182f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -10,6 +10,8 @@
   demoEnabled: true
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: true
+  # 缂撳瓨鎳掑姞杞�
+  cacheLazy: true
 
 captcha:
   # 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
@@ -97,9 +99,9 @@
 sa-token:
   # token鍚嶇О (鍚屾椂涔熸槸cookie鍚嶇О)
   token-name: Authorization
-  # token鏈夋晥鏈燂紝鍗曚綅s 榛樿30澶�, -1浠ｈ〃姘镐笉杩囨湡
-  timeout: 2592000
-  # token涓存椂鏈夋晥鏈� (鎸囧畾鏃堕棿鍐呮棤鎿嶄綔灏辫涓簍oken杩囨湡) 鍗曚綅: 绉�
+  # token鏈夋晥鏈� 璁句负涓�澶� (蹇呭畾杩囨湡) 鍗曚綅: 绉�
+  timeout: 86400
+  # token涓存椂鏈夋晥鏈� (鎸囧畾鏃堕棿鏃犳搷浣滃氨杩囨湡) 鍗曚綅: 绉�
   activity-timeout: 1800
   # 鏄惁鍏佽鍚屼竴璐﹀彿骞跺彂鐧诲綍 (涓簍rue鏃跺厑璁镐竴璧风櫥褰�, 涓篺alse鏃舵柊鐧诲綍鎸ゆ帀鏃х櫥褰�)
   is-concurrent: true
@@ -114,7 +116,9 @@
   # token鍓嶇紑
   token-prefix: "Bearer"
   # token椋庢牸
-  token-style: random-128
+  token-style: uuid
+  # jwt绉橀挜
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
   # 鏄惁杈撳嚭鎿嶄綔鏃ュ織
   is-log: true
 
@@ -232,6 +236,22 @@
     - name: 3.浠ｇ爜鐢熸垚妯″潡
       basePackage: com.ruoyi.generator
 
+knife4j:
+  # 鏄惁寮�鍚疜nife4j澧炲己妯″紡
+  enable: true
+  # 鏄惁寮�鍚敓浜х幆澧冧繚鎶ょ瓥鐣�
+  production: @knife4j.production@
+  # 鍓嶇Ui鐨勪釜鎬у寲閰嶇疆灞炴��
+  setting:
+    # 榛樿璇█
+    language: zh-CN
+    # 鏄惁鏄剧ずFooter
+    enableFooter: false
+    # 鏄惁寮�鍚姩鎬佸弬鏁拌皟璇曞姛鑳�
+    enableDynamicParameter: true
+    # 鏄惁鍦ㄦ瘡涓狣ebug璋冭瘯鏍忓悗鏄剧ず鍒锋柊鍙橀噺鎸夐挳
+    enableReloadCacheParameter: true
+
 # 闃叉XSS鏀诲嚮
 xss:
   # 杩囨护寮�鍏�
@@ -259,22 +279,6 @@
   # DISCARD_POLICY 涓㈠純
   # ABORT_POLICY 涓
   rejectedExecutionHandler: CALLER_RUNS_POLICY
-
-# feign 鐩稿叧閰嶇疆
-feign:
-  # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
-  # 渚嬪 com.**.**.feign
-  package: com.ruoyi.**.feign
-  # 寮�鍚帇缂�
-  compression:
-    request:
-      enabled: true
-    response:
-      enabled: true
-  okhttp:
-    enabled: true
-  circuitbreaker:
-    enabled: true
 
 --- # redisson 缂撳瓨閰嶇疆
 redisson:
@@ -311,34 +315,3 @@
   endpoint:
     logfile:
       external-file: ./logs/sys-console.log
-
---- # 瀹氭椂浠诲姟閰嶇疆
-spring:
-  quartz:
-    scheduler-name: RuoyiScheduler
-    startup-delay: 1s
-    overwrite-existing-jobs: true
-    auto-startup: true
-    job-store-type: jdbc
-    properties:
-      org:
-        quartz:
-          # Scheduler 鐩稿叧閰嶇疆
-          scheduler:
-            instanceName: RuoyiScheduler
-            instanceId: AUTO
-          # 绾跨▼姹犵浉鍏抽厤缃�
-          threadPool:
-            class: org.quartz.simpl.SimpleThreadPool
-            threadCount: 20
-            threadPriority: 5
-          # JobStore 闆嗙兢閰嶇疆
-          jobStore:
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
-            isClustered: true
-            clusterCheckinInterval: 15000
-            txIsolationLevelSerializable: true
-            misfireThreshold: 60000
-            tablePrefix: QRTZ_
-            # sqlserver 鍚敤
-            # selectWithLockSQL: SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?

--
Gitblit v1.9.3