From 29118ae78c202f4e1f54f3220a69304f2149a97a Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期一, 23 十月 2023 09:28:11 +0800
Subject: [PATCH] !433 更新登录日志以及在线用户展示信息 * update 更新登录日志, 在线用户展示信息(增加 客户端, 设备类型)
---
ruoyi-admin/src/main/resources/application.yml | 148 +++++++++++++++++++++++++-----------------------
1 files changed, 77 insertions(+), 71 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 81e22b7..2b508e2 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,17 +3,12 @@
# 鍚嶇О
name: RuoYi-Vue-Plus
# 鐗堟湰
- version: ${ruoyi-vue-plus.version}
+ version: ${revision}
# 鐗堟潈骞翠唤
- copyrightYear: 2022
- # 瀹炰緥婕旂ず寮�鍏�
- demoEnabled: true
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: true
- # 缂撳瓨鎳掑姞杞�
- cacheLazy: false
+ copyrightYear: 2023
captcha:
+ enable: true
# 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
type: MATH
@@ -49,9 +44,10 @@
# 鏃ュ織閰嶇疆
logging:
level:
- com.ruoyi: @logging.level@
+ org.dromara: @logging.level@
org.springframework: warn
- config: classpath:logback.xml
+ tech.powerjob.worker.background: warn
+ config: classpath:logback-plus.xml
# 鐢ㄦ埛閰嶇疆
user:
@@ -78,11 +74,6 @@
max-file-size: 10MB
# 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
max-request-size: 20MB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: true
mvc:
format:
date-time: yyyy-MM-dd HH:mm:ss
@@ -102,20 +93,15 @@
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
- # 鏄惁灏濊瘯浠巋eader閲岃鍙杢oken
- is-read-header: true
- # 鏄惁灏濊瘯浠巆ookie閲岃鍙杢oken
- is-read-cookie: false
- # token鍓嶇紑
- token-prefix: "Bearer"
# jwt绉橀挜
jwt-secret-key: abcdefghijklmnopqrstuvwxyz
@@ -128,74 +114,91 @@
- /**/*.html
- /**/*.css
- /**/*.js
- # swagger 鏂囨。閰嶇疆
+ # 鍏叡璺緞
- /favicon.ico
+ - /error
+ # swagger 鏂囨。閰嶇疆
- /*/api-docs
- /*/api-docs/**
# actuator 鐩戞帶閰嶇疆
- /actuator
- /actuator/**
+# 澶氱鎴烽厤缃�
+tenant:
+ # 鏄惁寮�鍚�
+ enable: true
+ # 鎺掗櫎琛�
+ excludes:
+ - sys_menu
+ - sys_tenant
+ - sys_tenant_package
+ - sys_role_dept
+ - sys_role_menu
+ - sys_user_post
+ - sys_user_role
+ - sys_client
+
# 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
- configuration:
- # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
- mapUnderscoreToCamelCase: true
- # MyBatis 鑷姩鏄犲皠绛栫暐
- # NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
- autoMappingBehavior: FULL
- # MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
- # NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
- autoMappingUnknownColumnBehavior: NONE
- # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻�� 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
dbConfig:
# 涓婚敭绫诲瀷
# AUTO 鑷 NONE 绌� INPUT 鐢ㄦ埛杈撳叆 ASSIGN_ID 闆姳 ASSIGN_UUID 鍞竴 UUID
+ # 濡傞渶鏀逛负鑷 闇�瑕佸皢鏁版嵁搴撹〃鍏ㄩ儴璁剧疆涓鸿嚜澧�
idType: ASSIGN_ID
- # 閫昏緫宸插垹闄ゅ��
- 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
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
+# 鏁版嵁鍔犲瘑
+mybatis-encryptor:
+ # 鏄惁寮�鍚姞瀵�
+ enable: false
+ # 榛樿鍔犲瘑绠楁硶
+ algorithm: BASE64
+ # 缂栫爜鏂瑰紡 BASE64/HEX銆傞粯璁ASE64
+ encode: BASE64
+ # 瀹夊叏绉橀挜 瀵圭О绠楁硶鐨勭閽� 濡傦細AES锛孲M4
+ password:
+ # 鍏閽� 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA
+ publicKey:
+ privateKey:
+
+# api鎺ュ彛鍔犲瘑
+api-decrypt:
+ # 鏄惁寮�鍚叏灞�鎺ュ彛鍔犲瘑
enabled: true
+ # AES 鍔犲瘑澶存爣璇�
+ headerFlag: encrypt-key
+ # 鍏閽� 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA 浣跨敤鑰呰鑷鏇存崲
+ publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==
+ privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=
+
+springdoc:
+ api-docs:
+ # 鏄惁寮�鍚帴鍙ｆ枃妗�
+ enabled: true
+# swagger-ui:
+# # 鎸佷箙鍖栬璇佹暟鎹�
+# persistAuthorization: true
info:
# 鏍囬
- title: '鏍囬锛�${ruoyi.name}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
+ title: '鏍囬锛�${ruoyi.name}澶氱鎴风鐞嗙郴缁焈鎺ュ彛鏂囨。'
# 鎻忚堪
description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
# 鐗堟湰
- version: '鐗堟湰鍙�: ${ruoyi-vue-plus.version}'
+ version: '鐗堟湰鍙�: ${ruoyi.version}'
# 浣滆�呬俊鎭�
contact:
name: Lion Li
email: crazylionli@163.com
- url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
+ url: https://gitee.com/dromara/RuoYi-Vue-Plus
components:
# 閴存潈鏂瑰紡閰嶇疆
security-schemes:
@@ -203,21 +206,16 @@
type: APIKEY
in: HEADER
name: ${sa-token.token-name}
-
-springdoc:
- swagger-ui:
- # 鎸佷箙鍖栬璇佹暟鎹�
- persistAuthorization: true
#杩欓噷瀹氫箟浜嗕袱涓垎缁勶紝鍙畾涔夊涓紝涔熷彲浠ヤ笉瀹氫箟
group-configs:
- group: 1.婕旂ず妯″潡
- packages-to-scan: com.ruoyi.demo
+ packages-to-scan: org.dromara.demo
- group: 2.閫氱敤妯″潡
- packages-to-scan: com.ruoyi.web
+ packages-to-scan: org.dromara.web
- group: 3.绯荤粺妯″潡
- packages-to-scan: com.ruoyi.system
+ packages-to-scan: org.dromara.system
- group: 4.浠ｇ爜鐢熸垚妯″潡
- packages-to-scan: com.ruoyi.generator
+ packages-to-scan: org.dromara.generator
# 闃叉XSS鏀诲嚮
xss:
@@ -255,3 +253,11 @@
show-details: ALWAYS
logfile:
external-file: ./logs/sys-console.log
+
+--- # websocket
+websocket:
+ enabled: true
+ # 璺緞
+ path: /resource/websocket
+ # 璁剧疆璁块棶婧愬湴鍧�
+ allowedOrigins: '*'
--
Gitblit v1.9.3