From 8573ffdd7f2da009c9adad9f5eb9f50810c2f184 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 25 六月 2023 22:19:27 +0800
Subject: [PATCH] update satoken 1.34.0 => 1.35.0.RC 优化过期配置 支持多端token自定义有效期
---
ruoyi-admin/src/main/resources/application.yml | 266 ++++++++++++++++++++--------------------------------
1 files changed, 102 insertions(+), 164 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index dbd182f..91429f3 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,17 +3,16 @@
# 鍚嶇О
name: RuoYi-Vue-Plus
# 鐗堟湰
- version: ${ruoyi-vue-plus.version}
+ version: ${revision}
# 鐗堟潈骞翠唤
- copyrightYear: 2021
+ copyrightYear: 2023
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
- # 缂撳瓨鎳掑姞杞�
- cacheLazy: true
captcha:
+ enable: true
# 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
type: MATH
@@ -49,13 +48,17 @@
# 鏃ュ織閰嶇疆
logging:
level:
- com.ruoyi: @logging.level@
+ org.dromara: @logging.level@
org.springframework: warn
- config: classpath:logback.xml
+ config: classpath:logback-plus.xml
-# tlog 鍏ㄥ眬璁块棶鎬ц兘鎷︽埅
-tlog:
- enable-invoke-time-print: true
+# 鐢ㄦ埛閰嶇疆
+user:
+ password:
+ # 瀵嗙爜鏈�澶ч敊璇鏁�
+ maxRetryCount: 5
+ # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+ lockTime: 10
# Spring閰嶇疆
spring:
@@ -74,15 +77,9 @@
max-file-size: 10MB
# 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
max-request-size: 20MB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: true
- # 涓巚ue鏁村悎閮ㄧ讲浣跨敤
- thymeleaf:
- # 灏嗙郴缁熸ā鏉挎斁缃埌鏈�鍓嶉潰 鍚﹀垯浼氫笌 springboot-admin 椤甸潰鍐茬獊
- template-resolver-order: 1
+ mvc:
+ format:
+ date-time: yyyy-MM-dd HH:mm:ss
jackson:
# 鏃ユ湡鏍煎紡鍖�
date-format: yyyy-MM-dd HH:mm:ss
@@ -99,158 +96,118 @@
sa-token:
# token鍚嶇О (鍚屾椂涔熸槸cookie鍚嶇О)
token-name: Authorization
- # token鏈夋晥鏈� 璁句负涓�澶� (蹇呭畾杩囨湡) 鍗曚綅: 绉�
- timeout: 86400
- # token涓存椂鏈夋晥鏈� (鎸囧畾鏃堕棿鏃犳搷浣滃氨杩囨湡) 鍗曚綅: 绉�
- activity-timeout: 1800
+ # token鍥哄畾瓒呮椂 璁句负涓冨ぉ (蹇呭畾杩囨湡) 鍗曚綅: 绉�
+ timeout: 604800
+ # 澶氱涓嶅悓 token 鏈夋晥鏈� 鍙煡鐪� LoginHelper.loginByDevice 鏂规硶鑷畾涔�
+ # token鏈�浣庢椿璺冩椂闂� (鎸囧畾鏃堕棿鏃犳搷浣滃氨杩囨湡) 鍗曚綅: 绉�
+ active-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:
# 鎺掗櫎璺緞
excludes:
- - /login
- - /logout
- - /register
- - /captchaImage
# 闈欐�佽祫婧�
- /*.html
- /**/*.html
- /**/*.css
- /**/*.js
+ # 鍏叡璺緞
+ - /favicon.ico
+ - /error
# swagger 鏂囨。閰嶇疆
- - /doc.html
- - /swagger-resources/**
- - /webjars/**
- /*/api-docs
- # druid 鐩戞帶閰嶇疆
- - /druid/**
+ - /*/api-docs/**
# actuator 鐩戞帶閰嶇疆
- /actuator
- /actuator/**
-# 閲嶅鎻愪氦
-repeat-submit:
- # 鍏ㄥ眬闂撮殧鏃堕棿(姣)
- interval: 5000
+# 澶氱鎴烽厤缃�
+tenant:
+ # 鏄惁寮�鍚�
+ enable: true
+ # 鎺掗櫎琛�
+ excludes:
+ - sys_menu
+ - sys_tenant
+ - sys_tenant_package
+ - sys_role_dept
+ - sys_role_menu
+ - sys_user_post
+ - sys_user_role
# MyBatisPlus閰嶇疆
# https://baomidou.com/config/
mybatis-plus:
# 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
# 渚嬪 com.**.**.mapper
- mapperPackage: com.ruoyi.**.mapper
+ mapperPackage: org.dromara.**.mapper
# 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
- typeAliasesPackage: com.ruoyi.**.domain
- # 鍚姩鏃舵槸鍚︽鏌� MyBatis XML 鏂囦欢鐨勫瓨鍦紝榛樿涓嶆鏌�
- checkConfigLocation: false
- # 閫氳繃璇ュ睘鎬у彲鎸囧畾 MyBatis 鐨勬墽琛屽櫒锛孧yBatis 鐨勬墽琛屽櫒鎬诲叡鏈変笁绉嶏細
- # SIMPLE锛氭瘡涓鍙ュ垱寤烘柊鐨勯澶勭悊鍣� REUSE锛氫細澶嶇敤棰勫鐞嗗櫒 BATCH锛氭壒閲忔墽琛屾墍鏈夌殑鏇存柊
- executorType: SIMPLE
- configuration:
- # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
- mapUnderscoreToCamelCase: true
- # 褰撹缃负 true 鐨勬椂鍊欙紝鎳掑姞杞界殑瀵硅薄鍙兘琚换浣曟噿灞炴�у叏閮ㄥ姞杞斤紝鍚﹀垯锛屾瘡涓睘鎬ч兘鎸夐渶鍔犺浇銆傞渶瑕佸拰 lazyLoadingEnabled 涓�璧蜂娇鐢ㄣ��
- aggressiveLazyLoading: true
- # MyBatis 鑷姩鏄犲皠绛栫暐
- # NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
- autoMappingBehavior: PARTIAL
- # MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
- # NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
- autoMappingUnknownColumnBehavior: NONE
- # Mybatis涓�绾х紦瀛橈紝榛樿涓� SESSION
- # SESSION session绾у埆缂撳瓨 STATEMENT 鍏抽棴涓�绾х紦瀛�
- localCacheScope: SESSION
- # 寮�鍚疢ybatis浜岀骇缂撳瓨锛岄粯璁や负 true
- cacheEnabled: false
- # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻�� 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
+ typeAliasesPackage: org.dromara.**.domain
global-config:
- # 鏄惁鎵撳嵃 Logo banner
- banner: true
- # 鏄惁鍒濆鍖� SqlRunner
- enableSqlRunner: false
dbConfig:
# 涓婚敭绫诲瀷
# AUTO 鑷 NONE 绌� INPUT 鐢ㄦ埛杈撳叆 ASSIGN_ID 闆姳 ASSIGN_UUID 鍞竴 UUID
- idType: AUTO
- # 琛ㄥ悕鏄惁浣跨敤椹煎嘲杞笅鍒掔嚎鍛藉悕,鍙琛ㄥ悕鐢熸晥
- tableUnderline: true
- # 澶у啓鍛藉悕,瀵硅〃鍚嶅拰瀛楁鍚嶅潎鐢熸晥
- capitalMode: false
- # 閫昏緫宸插垹闄ゅ��
- logicDeleteValue: 2
- # 閫昏緫鏈垹闄ゅ��
- logicNotDeleteValue: 0
- # 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
- # IGNORED 蹇界暐 NOT_NULL 闈濶ULL NOT_EMPTY 闈炵┖ DEFAULT 榛樿 NEVER 涓嶅姞鍏� SQL
- insertStrategy: NOT_NULL
- # 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
- updateStrategy: NOT_NULL
- # 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
- where-strategy: NOT_NULL
+ # 濡傞渶鏀逛负鑷 闇�瑕佸皢鏁版嵁搴撹〃鍏ㄩ儴璁剧疆涓鸿嚜澧�
+ idType: ASSIGN_ID
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
- # 鏍囬
- title: '鏍囬锛�${ruoyi.name}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
- # 鎻忚堪
- description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
- # 鐗堟湰
- version: '鐗堟湰鍙�: ${ruoyi-vue-plus.version}'
- # 浣滆�呬俊鎭�
- contact:
- name: Lion Li
- email: crazylionli@163.com
- url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
- groups:
- - name: 1.婕旂ず妗堜緥
- basePackage: com.ruoyi.demo
- - name: 2.绯荤粺妯″潡
- basePackage: com.ruoyi.web
- - name: 3.浠ｇ爜鐢熸垚妯″潡
- basePackage: com.ruoyi.generator
+# 鏁版嵁鍔犲瘑
+mybatis-encryptor:
+ # 鏄惁寮�鍚姞瀵�
+ enable: false
+ # 榛樿鍔犲瘑绠楁硶
+ algorithm: BASE64
+ # 缂栫爜鏂瑰紡 BASE64/HEX銆傞粯璁ASE64
+ encode: BASE64
+ # 瀹夊叏绉橀挜 瀵圭О绠楁硶鐨勭閽� 濡傦細AES锛孲M4
+ password:
+ # 鍏閽� 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA
+ publicKey:
+ privateKey:
-knife4j:
- # 鏄惁寮�鍚疜nife4j澧炲己妯″紡
- enable: true
- # 鏄惁寮�鍚敓浜х幆澧冧繚鎶ょ瓥鐣�
- production: @knife4j.production@
- # 鍓嶇Ui鐨勪釜鎬у寲閰嶇疆灞炴��
- setting:
- # 榛樿璇█
- language: zh-CN
- # 鏄惁鏄剧ずFooter
- enableFooter: false
- # 鏄惁寮�鍚姩鎬佸弬鏁拌皟璇曞姛鑳�
- enableDynamicParameter: true
- # 鏄惁鍦ㄦ瘡涓狣ebug璋冭瘯鏍忓悗鏄剧ず鍒锋柊鍙橀噺鎸夐挳
- enableReloadCacheParameter: true
+springdoc:
+ api-docs:
+ # 鏄惁寮�鍚帴鍙ｆ枃妗�
+ enabled: true
+ swagger-ui:
+ # 鎸佷箙鍖栬璇佹暟鎹�
+ persistAuthorization: true
+ info:
+ # 鏍囬
+ title: '鏍囬锛�${ruoyi.name}澶氱鎴风鐞嗙郴缁焈鎺ュ彛鏂囨。'
+ # 鎻忚堪
+ description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
+ # 鐗堟湰
+ version: '鐗堟湰鍙�: ${ruoyi.version}'
+ # 浣滆�呬俊鎭�
+ contact:
+ name: Lion Li
+ email: crazylionli@163.com
+ url: https://gitee.com/dromara/RuoYi-Vue-Plus
+ components:
+ # 閴存潈鏂瑰紡閰嶇疆
+ security-schemes:
+ apiKey:
+ type: APIKEY
+ in: HEADER
+ name: ${sa-token.token-name}
+ #杩欓噷瀹氫箟浜嗕袱涓垎缁勶紝鍙畾涔夊涓紝涔熷彲浠ヤ笉瀹氫箟
+ group-configs:
+ - group: 1.婕旂ず妯″潡
+ packages-to-scan: org.dromara.demo
+ - group: 2.閫氱敤妯″潡
+ packages-to-scan: org.dromara.web
+ - group: 3.绯荤粺妯″潡
+ packages-to-scan: org.dromara.system
+ - group: 4.浠ｇ爜鐢熸垚妯″潡
+ packages-to-scan: org.dromara.generator
# 闃叉XSS鏀诲嚮
xss:
@@ -265,53 +222,34 @@
thread-pool:
# 鏄惁寮�鍚嚎绋嬫睜
enabled: false
- # 鏍稿績绾跨▼姹犲ぇ灏�
- corePoolSize: 8
- # 鏈�澶у彲鍒涘缓鐨勭嚎绋嬫暟
- maxPoolSize: 16
# 闃熷垪鏈�澶ч暱搴�
queueCapacity: 128
# 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
keepAliveSeconds: 300
- # 绾跨▼姹犲鎷掔粷浠诲姟(鏃犵嚎绋嬪彲鐢�)鐨勫鐞嗙瓥鐣�
- # CALLER_RUNS_POLICY 璋冪敤鏂规墽琛�
- # DISCARD_OLDEST_POLICY 鏀惧純鏈�鏃х殑
- # DISCARD_POLICY 涓㈠純
- # ABORT_POLICY 涓
- rejectedExecutionHandler: CALLER_RUNS_POLICY
-
---- # redisson 缂撳瓨閰嶇疆
-redisson:
- cacheGroup:
- # 鐢ㄤ緥: @Cacheable(cacheNames="groupId", key="#XXX") 鏂瑰彲浣跨敤缂撳瓨缁勯厤缃�
- - groupId: redissonCacheMap
- # 缁勮繃鏈熸椂闂�(鑴氭湰鐩戞帶)
- ttl: 60000
- # 缁勬渶澶х┖闂叉椂闂�(鑴氭湰鐩戞帶)
- maxIdleTime: 60000
- # 缁勬渶澶ч暱搴�
- maxSize: 0
- - groupId: testCache
- ttl: 1000
- maxIdleTime: 500
--- # 鍒嗗竷寮忛攣 lock4j 鍏ㄥ眬閰嶇疆
lock4j:
# 鑾峰彇鍒嗗竷寮忛攣瓒呮椂鏃堕棿锛岄粯璁や负 3000 姣
acquire-timeout: 3000
- # 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 姣
+ # 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 绉�
expire: 30000
--- # Actuator 鐩戞帶绔偣鐨勯厤缃」
management:
endpoints:
web:
- # Actuator 鎻愪緵鐨� API 鎺ュ彛鐨勬牴鐩綍銆傞粯璁や负 /actuator
- base-path: /actuator
exposure:
- # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
- # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
- include: @endpoints.include@
+ include: '*'
endpoint:
+ health:
+ show-details: ALWAYS
logfile:
external-file: ./logs/sys-console.log
+
+--- # websocket
+websocket:
+ enabled: true
+ # 璺緞
+ path: /websocket
+ # 璁剧疆璁块棶婧愬湴鍧�
+ allowedOrigins: '*'
--
Gitblit v1.9.3