From b200f2a4b4f2ab51fe82190dcafc49fe04f7c8d9 Mon Sep 17 00:00:00 2001
From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com>
Date: Tue, 3 Sep 2024 07:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUT=E9=97=AE=E9=A2=98=E5=92=8C?=
 =?UTF-8?q?=E5=9B=9E=E6=BB=9Abonus=5Fsystem=E7=9A=84logback=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/utils/DateUtilsTest.java      |   2 +-
 .../src/main/resources/logback.xml            | 120 ++++++++----------
 2 files changed, 55 insertions(+), 67 deletions(-)

diff --git a/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/DateUtilsTest.java b/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/DateUtilsTest.java
index e1d4a4a..def0b9d 100644
--- a/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/DateUtilsTest.java
+++ b/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/DateUtilsTest.java
@@ -186,7 +186,7 @@ public class DateUtilsTest {
 
     @Test
     public void testGetMonthOrDay() {
-        String monthOrDay = DateUtils.getMonthOrDay(31, "/");
+        String monthOrDay = DateUtils.getMonthOrDay(30, "/");
         assertNotNull(monthOrDay);
         assertTrue(monthOrDay.matches("\\d{2}/\\d{2}"));
     }
diff --git a/bonus-modules/bonus-system/src/main/resources/logback.xml b/bonus-modules/bonus-system/src/main/resources/logback.xml
index b368f5a..64d7acb 100644
--- a/bonus-modules/bonus-system/src/main/resources/logback.xml
+++ b/bonus-modules/bonus-system/src/main/resources/logback.xml
@@ -1,86 +1,74 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<configuration>
-    <springProperty name="logFile" source="log.file"/>
-    <springProperty name="rootlevel" source="log.level.root"/>
-    <springProperty name="mylevel" source="log.level.my"/>
-    <springProperty name="maxFileSize" source="log.maxsize"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="logs/bonus-system" />
+    <!-- 日志输出格式 -->
+    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d [%thread] %-5level %logger{50} -[%file:%line]- %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
+            <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
 
-    <appender name="adminLog"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${logFile}</file>
-        <encoder>
-            <pattern>%d [%thread] %-5level -[%file:%line]- %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logFile}.%d{yyyy-MM-dd}.%i</fileNamePattern>
-            <maxFileSize>30MB</maxFileSize>
-            <!-- 每产生一个日志文件，该日志文件的保存期限为15天 -->
-            <maxHistory>15</maxHistory>
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
         </rollingPolicy>
-    </appender>
-
-    <appender name="errorLog"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${logFile}.error</file>
         <encoder>
-            <pattern>%d [%thread] %-5level %logger{36} -[%file:%line]- %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
+            <pattern>${log.pattern}</pattern>
         </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logFile}.error.%d{yyyy-MM-dd}.%i</fileNamePattern>
-            <maxFileSize>30MB</maxFileSize>
-            <!-- 每产生一个日志文件，该日志文件的保存期限为15天 -->
-            <maxHistory>15</maxHistory>
-        </rollingPolicy>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>error</level>
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
 
-    <appender name="sqlLog"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${logFile}.sql</file>
-        <encoder>
-            <pattern>%d [%thread] %msg%n
-            </pattern>
-            <charset>UTF-8</charset>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logFile}.sql.%d{yyyy-MM-dd}.%i</fileNamePattern>
-            <maxFileSize>30MB</maxFileSize>
-            <!-- 每产生一个日志文件，该日志文件的保存期限为15天 -->
-            <maxHistory>15</maxHistory>
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
         </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
     </appender>
 
-    <logger name="adminLogger" level="${mylevel}" additivity="true">
-        <appender-ref ref="adminLog"/>
-    </logger>
+    <!-- 系统模块日志级别控制  -->
+    <logger name="com.bonus" level="debug" />
+    <!-- Spring日志级别控制  -->
+    <logger name="org.springframework" level="warn" />
 
-    <logger name="com.bonus.system" level="info" additivity="true">
-        <appender-ref ref="sqlLog"/>
-    </logger>
-
-    <logger name="org.springframework.scheduling.quartz" level="error" additivity="true">
-        <appender-ref ref="adminLog"/>
-    </logger>
-
-    <root level="${rootlevel}">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="errorLog"/>
+    <root level="info">
+        <appender-ref ref="console" />
     </root>
 
-</configuration>
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+</configuration>
\ No newline at end of file