From 30819dab8469a119e265b5b2756f517e25eff8e9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 10 四月 2023 18:35:15 +0800
Subject: [PATCH] update 优化 更改系统所有服务日志配置文件命名为 logback-plus.xml 避免与其他框架默认配置冲突
---
ruoyi-admin/src/main/resources/application.yml | 141 ++++++++++++++++++++++++++---------------------
1 files changed, 78 insertions(+), 63 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 017b5df..31d0de5 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: 2022
+ copyrightYear: 2023
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
- # 缂撳瓨鎳掑姞杞�
- cacheLazy: false
captcha:
+ enable: true
# 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
type: MATH
@@ -49,9 +48,17 @@
# 鏃ュ織閰嶇疆
logging:
level:
- com.ruoyi: @logging.level@
+ org.dromara: @logging.level@
org.springframework: warn
- config: classpath:logback.xml
+ config: classpath:logback-plus.xml
+
+# 鐢ㄦ埛閰嶇疆
+user:
+ password:
+ # 瀵嗙爜鏈�澶ч敊璇鏁�
+ maxRetryCount: 5
+ # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+ lockTime: 10
# Spring閰嶇疆
spring:
@@ -70,15 +77,9 @@
max-file-size: 10MB
# 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
max-request-size: 20MB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: true
mvc:
- pathmatch:
- # 閫傞厤 boot 2.6 璺敱涓� springfox 鍏煎
- matching-strategy: ANT_PATH_MATCHER
+ format:
+ date-time: yyyy-MM-dd HH:mm:ss
jackson:
# 鏃ユ湡鏍煎紡鍖�
date-format: yyyy-MM-dd HH:mm:ss
@@ -104,15 +105,13 @@
# 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓猼oken (涓簍rue鏃舵墍鏈夌櫥褰曞叡鐢ㄤ竴涓猼oken, 涓篺alse鏃舵瘡娆＄櫥褰曟柊寤轰竴涓猼oken)
is-share: false
# 鏄惁灏濊瘯浠巋eader閲岃鍙杢oken
- is-read-head: true
+ is-read-header: true
# 鏄惁灏濊瘯浠巆ookie閲岃鍙杢oken
is-read-cookie: false
# token鍓嶇紑
token-prefix: "Bearer"
# jwt绉橀挜
jwt-secret-key: abcdefghijklmnopqrstuvwxyz
- # 鏄惁杈撳嚭鎿嶄綔鏃ュ織
- is-log: true
# security閰嶇疆
security:
@@ -123,27 +122,40 @@
- /**/*.html
- /**/*.css
- /**/*.js
- # swagger 鏂囨。閰嶇疆
+ # 鍏叡璺緞
- /favicon.ico
- - /doc.html
- - /swagger-ui/**
+ - /error
+ # swagger 鏂囨。閰嶇疆
+ - /*/api-docs
- /*/api-docs/**
- # druid 鐩戞帶閰嶇疆
- - /druid/**
# 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
# 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
+ typeAliasesPackage: org.dromara.**.domain
# 鍚姩鏃舵槸鍚︽鏌� MyBatis XML 鏂囦欢鐨勫瓨鍦紝榛樿涓嶆鏌�
checkConfigLocation: false
configuration:
@@ -151,7 +163,7 @@
mapUnderscoreToCamelCase: true
# MyBatis 鑷姩鏄犲皠绛栫暐
# NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
- autoMappingBehavior: PARTIAL
+ autoMappingBehavior: FULL
# MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
# NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
autoMappingUnknownColumnBehavior: NONE
@@ -178,22 +190,34 @@
# 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
where-strategy: NOT_NULL
+# 鏁版嵁鍔犲瘑
+mybatis-encryptor:
+ # 鏄惁寮�鍚姞瀵�
+ enable: false
+ # 榛樿鍔犲瘑绠楁硶
+ algorithm: BASE64
+ # 缂栫爜鏂瑰紡 BASE64/HEX銆傞粯璁ASE64
+ encode: BASE64
+ # 瀹夊叏绉橀挜 瀵圭О绠楁硶鐨勭閽� 濡傦細AES锛孲M4
+ password:
+ # 鍏閽� 闈炲绉扮畻娉曠殑鍏閽� 濡傦細SM2锛孯SA
+ publicKey:
+ privateKey:
+
# Swagger閰嶇疆
swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: 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,24 +227,22 @@
name: ${sa-token.token-name}
springdoc:
- swagger-ui:
- # 淇敼Swagger UI璺緞
- path: /doc.html
- # 寮�鍚疭wagger UI鐣岄潰
- enabled: true
api-docs:
- # 淇敼api-docs璺緞
- path: /v3/api-docs
- # 寮�鍚痑pi-docs
+ # 鏄惁寮�鍚帴鍙ｆ枃妗�
enabled: true
+ swagger-ui:
+ # 鎸佷箙鍖栬璇佹暟鎹�
+ persistAuthorization: true
#杩欓噷瀹氫箟浜嗕袱涓垎缁勶紝鍙畾涔夊涓紝涔熷彲浠ヤ笉瀹氫箟
group-configs:
- - group: 婕旂ず妯″潡
- packages-to-scan: com.ruoyi.demo
- - group: 绯荤粺妯″潡
- packages-to-scan: com.ruoyi.web
- - group: 浠ｇ爜鐢熸垚妯″潡
- packages-to-scan: com.ruoyi.generator
+ - 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:
@@ -240,26 +262,11 @@
# 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
keepAliveSeconds: 300
---- # 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 鐩戞帶绔偣鐨勯厤缃」
@@ -267,9 +274,17 @@
endpoints:
web:
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