From 6f6a3566ac50bcb9bcae4ae68744c9f49b75933c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 26 九月 2021 17:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

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

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 6e4888d..3d5e8df 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -97,19 +97,57 @@
       # 鍏佽瀵硅薄蹇界暐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
+
+# security閰嶇疆
+security:
+  # 鐧诲嚭璺緞
+  logout-url: /logout
+  # 鍖垮悕璺緞
+  anonymous:
+    - /login
+    - /register
+    - /captchaImage
+    # swagger 鏂囨。閰嶇疆
+    - /doc.html
+    - /swagger-resources/**
+    - /webjars/**
+    - /*/api-docs
+    # druid 鐩戞帶閰嶇疆
+    - /druid/**
+    # actuator 鐩戞帶閰嶇疆
+    - /actuator
+    - /actuator/**
+  # 鐢ㄦ埛鏀捐
+  permit-all:
 
 # 閲嶅鎻愪氦
 repeat-submit:
   # 鍏ㄥ眬闂撮殧鏃堕棿(姣)
-  intervalTime: 1000
+  interval: 5000
 
 # MyBatisPlus閰嶇疆
 # https://baomidou.com/config/
@@ -134,8 +172,6 @@
   # REUSE锛氳鎵ц鍣ㄧ被鍨嬩細澶嶇敤棰勫鐞嗚鍙ワ紙PreparedStatement锛�
   # BATCH锛氳鎵ц鍣ㄧ被鍨嬩細鎵归噺鎵ц鎵�鏈夌殑鏇存柊璇彞
   executorType: SIMPLE
-  # 鎸囧畾澶栭儴鍖� MyBatis Properties 閰嶇疆锛岄�氳繃璇ラ厤缃彲浠ユ娊绂婚厤缃紝瀹炵幇涓嶅悓鐜鐨勯厤缃儴缃�
-  configurationProperties: null
   configuration:
     # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
     # 濡傛灉鎮ㄧ殑鏁版嵁搴撳懡鍚嶇鍚堣鍒欐棤闇�浣跨敤 @TableField 娉ㄨВ鎸囧畾鏁版嵁搴撳瓧娈靛悕
@@ -204,7 +240,7 @@
       # 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
       updateStrategy: NOT_NULL
       # 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
-      selectStrategy: NOT_NULL
+      where-strategy: NOT_NULL
 
 # Swagger閰嶇疆
 swagger:
@@ -223,6 +259,11 @@
     name: Lion Li
     email: crazylionli@163.com
     url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
+  groups:
+    - name: 婕旂ず妗堜緥
+      basePackage: com.ruoyi.demo
+    - name: 绯荤粺妯″潡
+      basePackage: com.ruoyi.admin
 
 # 闃叉XSS鏀诲嚮
 xss:

--
Gitblit v1.9.3