From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev

---
 ruoyi-admin/src/main/resources/application.yml |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ed9f1d2..ab692f0 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -95,24 +95,46 @@
       # 鍏佽瀵硅薄蹇界暐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鏈夋晥鏈� 璁句负涓�澶� (蹇呭畾杩囨湡) 鍗曚綅: 绉�
+  timeout: 86400
+  # token涓存椂鏈夋晥鏈� (鎸囧畾鏃堕棿鏃犳搷浣滃氨杩囨湡) 鍗曚綅: 绉�
+  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: uuid
+  # jwt绉橀挜
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+  # 鏄惁杈撳嚭鎿嶄綔鏃ュ織
+  is-log: true
 
 # security閰嶇疆
 security:
-  # 鐧诲嚭璺緞
-  logout-url: /logout
-  # 鍖垮悕璺緞
-  anonymous:
+  # 鎺掗櫎璺緞
+  excludes:
     - /login
+    - /logout
     - /register
     - /captchaImage
+    # 闈欐�佽祫婧�
+    - /*.html
+    - /**/*.html
+    - /**/*.css
+    - /**/*.js
     # swagger 鏂囨。閰嶇疆
     - /doc.html
     - /swagger-resources/**

--
Gitblit v1.9.3