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-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml | 3 +++
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback-plus.xml | 0
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml | 0
ruoyi-admin/src/main/resources/logback-plus.xml | 0
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml | 3 +++
ruoyi-admin/src/main/resources/application.yml | 2 +-
6 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index bd307fb..31d0de5 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -50,7 +50,7 @@
level:
org.dromara: @logging.level@
org.springframework: warn
- config: classpath:logback.xml
+ config: classpath:logback-plus.xml
# 鐢ㄦ埛閰嶇疆
user:
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback-plus.xml
similarity index 100%
rename from ruoyi-admin/src/main/resources/logback.xml
rename to ruoyi-admin/src/main/resources/logback-plus.xml
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index 22ef1ab..1b729ef 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -6,6 +6,9 @@
profiles:
active: @profiles.active@
+logging:
+ config: classpath:logback-plus.xml
+
--- # 鐩戞帶涓績鏈嶅姟绔厤缃�
spring:
security:
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml
similarity index 100%
rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml
rename to ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
index d4fda93..6d08292 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml
@@ -16,6 +16,9 @@
resources:
static-locations: classpath:/static/
+logging:
+ config: classpath:logback-plus.xml
+
--- # mybatis 閰嶇疆
mybatis:
mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback-plus.xml
similarity index 100%
rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml
rename to ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback-plus.xml
--
Gitblit v1.9.3