From 0d24be4c050db59c7d5a781a0da808ea0eef5c69 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 26 九月 2021 09:49:32 +0800
Subject: [PATCH] update 更新satoken配置 设置从header读取鉴权token

---
 ruoyi-admin/src/main/resources/application.yml |   79 +++++++++++++++++++++++++++------------
 1 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ad20f9a..b88f100 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -8,16 +8,15 @@
   copyrightYear: 2021
   # 瀹炰緥婕旂ず寮�鍏�
   demoEnabled: true
-  # 鏂囦欢璺緞
-  profile: ./ruoyi/uploadPath
   # 鑾峰彇ip鍦板潃寮�鍏�
   addressEnabled: true
 
 captcha:
+  # 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
-  type: math
+  type: MATH
   # line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
-  category: circle
+  category: CIRCLE
   # 鏁板瓧楠岃瘉鐮佷綅鏁�
   numberLength: 1
   # 瀛楃楠岃瘉鐮侀暱搴�
@@ -98,19 +97,35 @@
       # 鍏佽瀵硅薄蹇界暐json涓笉瀛樺湪鐨勫睘鎬�
       fail_on_unknown_properties: false
 
-# token閰嶇疆
-token:
-  # 浠ょ墝鑷畾涔夋爣璇�
-  header: Authorization
-  # 浠ょ墝瀵嗛挜
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
-  expireTime: 30
+# Sa-Token閰嶇疆
+sa-token:
+  # token鍚嶇О (鍚屾椂涔熸槸cookie鍚嶇О)
+  token-name: Authorization
+  # token鏈夋晥鏈燂紝鍗曚綅s 榛樿30澶�, -1浠ｈ〃姘镐笉杩囨湡
+  timeout: 2592000
+  # token涓存椂鏈夋晥鏈� (鎸囧畾鏃堕棿鍐呮棤鎿嶄綔灏辫涓簍oken杩囨湡) 鍗曚綅: 绉�
+  activity-timeout: 1800
+  # 鏄惁鍏佽鍚屼竴璐﹀彿骞跺彂鐧诲綍 (涓簍rue鏃跺厑璁镐竴璧风櫥褰�, 涓篺alse鏃舵柊鐧诲綍鎸ゆ帀鏃х櫥褰�)
+  is-concurrent: true
+  # 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓猼oken (涓簍rue鏃舵墍鏈夌櫥褰曞叡鐢ㄤ竴涓猼oken, 涓篺alse鏃舵瘡娆＄櫥褰曟柊寤轰竴涓猼oken)
+  is-share: false
+  # 鏄惁灏濊瘯浠庤姹備綋閲岃鍙杢oken
+  is-read-body: false
+  # 鏄惁灏濊瘯浠巋eader閲岃鍙杢oken
+  is-read-head: true
+  # 鏄惁灏濊瘯浠巆ookie閲岃鍙杢oken
+  is-read-cookie: false
+  # token鍓嶇紑
+  token-prefix: "Bearer"
+  # token椋庢牸
+  token-style: random-128
+  # 鏄惁杈撳嚭鎿嶄綔鏃ュ織
+  is-log: true
 
 # 閲嶅鎻愪氦
 repeat-submit:
   # 鍏ㄥ眬闂撮殧鏃堕棿(姣)
-  intervalTime: 1000
+  interval: 5000
 
 # MyBatisPlus閰嶇疆
 # https://baomidou.com/config/
@@ -135,8 +150,6 @@
   # REUSE锛氳鎵ц鍣ㄧ被鍨嬩細澶嶇敤棰勫鐞嗚鍙ワ紙PreparedStatement锛�
   # BATCH锛氳鎵ц鍣ㄧ被鍨嬩細鎵归噺鎵ц鎵�鏈夌殑鏇存柊璇彞
   executorType: SIMPLE
-  # 鎸囧畾澶栭儴鍖� MyBatis Properties 閰嶇疆锛岄�氳繃璇ラ厤缃彲浠ユ娊绂婚厤缃紝瀹炵幇涓嶅悓鐜鐨勯厤缃儴缃�
-  configurationProperties: null
   configuration:
     # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
     # 濡傛灉鎮ㄧ殑鏁版嵁搴撳懡鍚嶇鍚堣鍒欐棤闇�浣跨敤 @TableField 娉ㄨВ鎸囧畾鏁版嵁搴撳瓧娈靛悕
@@ -164,8 +177,10 @@
     localCacheScope: SESSION
     # 寮�鍚疢ybatis浜岀骇缂撳瓨锛岄粯璁や负 true
     cacheEnabled: false
-    # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻��
-    # logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻�� org.apache.ibatis.logging.stdout.StdOutImpl
+    # 鍏抽棴鏃ュ織璁板綍 (鍙崟绾娇鐢� p6spy 鍒嗘瀽) org.apache.ibatis.logging.nologging.NoLoggingImpl
+    # 榛樿鏃ュ織杈撳嚭 org.apache.ibatis.logging.slf4j.Slf4jImpl
+    logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
     # 鏄惁鎵撳嵃 Logo banner
     banner: true
@@ -199,11 +214,11 @@
       # NOT_EMPTY 闈炵┖鍒ゆ柇(鍙瀛楃涓茬被鍨嬪瓧娈�,鍏朵粬绫诲瀷瀛楁渚濈劧涓洪潪NULL鍒ゆ柇)
       # DEFAULT 榛樿鐨�,涓�鑸彧鐢ㄤ簬娉ㄨВ閲�
       # NEVER 涓嶅姞鍏� SQL
-      insertStrategy: NOT_EMPTY
+      insertStrategy: NOT_NULL
       # 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
-      updateStrategy: NOT_EMPTY
+      updateStrategy: NOT_NULL
       # 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
-      selectStrategy: NOT_EMPTY
+      where-strategy: NOT_NULL
 
 # Swagger閰嶇疆
 swagger:
@@ -245,11 +260,11 @@
   # 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
   keepAliveSeconds: 300
   # 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
-  # CallerRunsPolicy 绛夊緟
-  # DiscardOldestPolicy 鏀惧純鏈�鏃х殑
-  # DiscardPolicy 涓㈠純
-  # AbortPolicy 涓
-  rejectedExecutionHandler: CallerRunsPolicy
+  # CALLER_RUNS_POLICY 绛夊緟
+  # DISCARD_OLDEST_POLICY 鏀惧純鏈�鏃х殑
+  # DISCARD_POLICY 涓㈠純
+  # ABORT_POLICY 涓
+  rejectedExecutionHandler: CALLER_RUNS_POLICY
 
 # feign 鐩稿叧閰嶇疆
 feign:
@@ -289,6 +304,20 @@
   # 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 姣
   expire: 30000
 
+--- # Actuator 鐩戞帶绔偣鐨勯厤缃」
+management:
+  endpoints:
+    web:
+      # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
+      base-path: /actuator
+      exposure:
+        # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
+        # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
+        include: @endpoints.include@
+  endpoint:
+    logfile:
+      external-file: ./logs/sys-console.log
+
 --- # 瀹氭椂浠诲姟閰嶇疆
 spring:
   quartz:

--
Gitblit v1.9.3