From f661d2ce13da8f5597c4636fef0944e9c32f9cd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Fri, 10 Jun 2022 14:08:55 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20maven=20=E5=8F=98=E9=87=8F=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=8C=96=20logback=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8D=20=E7=AE=80=E5=8C=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                              |  1 +
 ruoyi-auth/src/main/resources/logback.xml            | 12 ++----------
 .../ruoyi-demo/src/main/resources/logback.xml        |  7 ++-----
 ruoyi-gateway/src/main/resources/logback.xml         | 12 ++----------
 .../ruoyi-gen/src/main/resources/logback.xml         | 12 ++----------
 .../ruoyi-job/src/main/resources/logback.xml         | 12 ++----------
 .../ruoyi-resource/src/main/resources/logback.xml    | 12 ++----------
 .../ruoyi-system/src/main/resources/logback.xml      | 12 ++----------
 .../ruoyi-doc/src/main/resources/logback.xml         | 12 ++----------
 .../ruoyi-monitor/src/main/resources/logback.xml     | 12 ++----------
 .../src/main/resources/logback.xml                   | 10 ++--------
 .../src/main/resources/logback.xml                   | 12 ++----------
 12 files changed, 23 insertions(+), 103 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef8021a8e..cf343c799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,6 +344,7 @@
                 <includes>
                     <include>application*</include>
                     <include>bootstrap*</include>
+                    <include>logback*</include>
                 </includes>
                 <!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 -->
                 <filtering>true</filtering>
diff --git a/ruoyi-auth/src/main/resources/logback.xml b/ruoyi-auth/src/main/resources/logback.xml
index 449b8f0c3..5171e30e6 100644
--- a/ruoyi-auth/src/main/resources/logback.xml
+++ b/ruoyi-auth/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/ruoyi-auth"/>
+    <property name="log.path" value="logs/${project.artifactId}"/>
     <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,17 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
     <!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console"/>
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console"/>
diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/logback.xml b/ruoyi-example/ruoyi-demo/src/main/resources/logback.xml
index b9c035faa..758a72051 100644
--- a/ruoyi-example/ruoyi-demo/src/main/resources/logback.xml
+++ b/ruoyi-example/ruoyi-demo/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/ruoyi-demo" />
+	<property name="log.path" value="logs/${project.artifactId}" />
    <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,12 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-	<root level="info">
-		<appender-ref ref="console" />
-	</root>
-
 	<!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console" />
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console" />
diff --git a/ruoyi-gateway/src/main/resources/logback.xml b/ruoyi-gateway/src/main/resources/logback.xml
index fdaccbd93..5171e30e6 100644
--- a/ruoyi-gateway/src/main/resources/logback.xml
+++ b/ruoyi-gateway/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/ruoyi-gateway"/>
+    <property name="log.path" value="logs/${project.artifactId}"/>
     <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,17 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
     <!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console"/>
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console"/>
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml
index ae68ca709..5171e30e6 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/ruoyi-gen"/>
+    <property name="log.path" value="logs/${project.artifactId}"/>
     <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,17 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
     <!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console"/>
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console"/>
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml
index d890be15a..5171e30e6 100644
--- a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/ruoyi-job"/>
+    <property name="log.path" value="logs/${project.artifactId}"/>
     <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,17 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
     <!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console"/>
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console"/>
diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml
index 37bffab5a..5171e30e6 100644
--- a/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-resource/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/ruoyi-resource"/>
+    <property name="log.path" value="logs/${project.artifactId}"/>
     <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,17 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
     <!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console"/>
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console"/>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
index dc59d7b9f..758a72051 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/ruoyi-system" />
+	<property name="log.path" value="logs/${project.artifactId}" />
    <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,17 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
-	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
-
-	<root level="info">
-		<appender-ref ref="console" />
-	</root>
-
 	<!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console" />
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console" />
diff --git a/ruoyi-visual/ruoyi-doc/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-doc/src/main/resources/logback.xml
index 945aa749c..5171e30e6 100644
--- a/ruoyi-visual/ruoyi-doc/src/main/resources/logback.xml
+++ b/ruoyi-visual/ruoyi-doc/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/ruoyi-doc"/>
+    <property name="log.path" value="logs/${project.artifactId}"/>
     <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,17 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
     <!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console"/>
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console"/>
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml
index 87572d134..758a72051 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml
+++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/ruoyi-monitor" />
+	<property name="log.path" value="logs/${project.artifactId}" />
    <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,17 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
-	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
-
-	<root level="info">
-		<appender-ref ref="console" />
-	</root>
-
 	<!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console" />
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console" />
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml
index cdf5882cb..5171e30e6 100644
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/ruoyi-sentinel-dashboard"/>
+    <property name="log.path" value="logs/${project.artifactId}"/>
     <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,15 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
     <!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console"/>
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console"/>
diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml
index 564cf0d7a..5171e30e6 100644
--- a/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml
+++ b/ruoyi-visual/ruoyi-xxl-job-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/ruoyi-xxl-job-admin"/>
+    <property name="log.path" value="logs/${project.artifactId}"/>
     <!-- 日志输出格式 -->
     <property name="console.log.pattern"
               value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
@@ -99,17 +99,9 @@
         <appender-ref ref="file_error"/>
     </appender>
 
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.ruoyi" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
     <!--系统操作日志-->
     <root level="info">
+        <appender-ref ref="console"/>
         <appender-ref ref="async_info"/>
         <appender-ref ref="async_error"/>
         <appender-ref ref="file_console"/>