bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

修复UT问题和回滚bonus_system的logback文件

This commit is contained in:
weiweiw 2024-09-03 07:59:02 +08:00
parent 7ca683ab04
commit b200f2a4b4
2 changed files with 55 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/DateUtilsTest.java
View File

@ -186,7 +186,7 @@ public class DateUtilsTest {
@Test @Test
public void testGetMonthOrDay() { public void testGetMonthOrDay() {
String monthOrDay = DateUtils.getMonthOrDay(31, "/"); String monthOrDay = DateUtils.getMonthOrDay(30, "/");
assertNotNull(monthOrDay); assertNotNull(monthOrDay);
assertTrue(monthOrDay.matches("\\d{2}/\\d{2}")); assertTrue(monthOrDay.matches("\\d{2}/\\d{2}"));
} }

120
bonus-modules/bonus-system/src/main/resources/logback.xml
View File

@ -1,86 +1,74 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration scan="true" scanPeriod="60 seconds" debug="false">
<springProperty name="logFile" source="log.file"/> <!-- 日志存放路径 -->
<springProperty name="rootlevel" source="log.level.root"/> <property name="log.path" value="logs/bonus-system" />
<springProperty name="mylevel" source="log.level.my"/> <!-- 日志输出格式 -->
<springProperty name="maxFileSize" source="log.maxsize"/> <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> <encoder>
<pattern>%d [%thread] %-5level %logger{50} -[%file:%line]- %msg%n <pattern>${log.pattern}</pattern>
</pattern>
<charset>UTF-8</charset>
</encoder> </encoder>
</appender> </appender>
<appender name="adminLog" <!-- 系统日志输出 -->
class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logFile}</file> <file>${log.path}/info.log</file>
<encoder> <!-- 循环政策：基于时间创建日志文件 -->
<pattern>%d [%thread] %-5level -[%file:%line]- %msg%n <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
</pattern> <!-- 日志文件名格式 -->
<charset>UTF-8</charset> <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
</encoder> <!-- 日志最大的历史 60天 -->
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <maxHistory>60</maxHistory>
<fileNamePattern>${logFile}.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>30MB</maxFileSize>
<!-- 每产生一个日志文件，该日志文件的保存期限为15天 -->
<maxHistory>15</maxHistory>
</rollingPolicy> </rollingPolicy>
</appender>
<appender name="errorLog"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${logFile}.error</file>
<encoder> <encoder>
<pattern>%d [%thread] %-5level %logger{36} -[%file:%line]- %msg%n <pattern>${log.pattern}</pattern>
</pattern>
<charset>UTF-8</charset>
</encoder> </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"> <filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>error</level> <!-- 过滤的级别 -->
<level>INFO</level>
<!-- 匹配时的操作：接收（记录） -->
<onMatch>ACCEPT</onMatch> <onMatch>ACCEPT</onMatch>
<!-- 不匹配时的操作：拒绝（不记录） -->
<onMismatch>DENY</onMismatch> <onMismatch>DENY</onMismatch>
</filter> </filter>
</appender> </appender>
<appender name="sqlLog" <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>${log.path}/error.log</file>
<file>${logFile}.sql</file> <!-- 循环政策：基于时间创建日志文件 -->
<encoder> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<pattern>%d [%thread] %msg%n <!-- 日志文件名格式 -->
</pattern> <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
<charset>UTF-8</charset> <!-- 日志最大的历史 60天 -->
</encoder> <maxHistory>60</maxHistory>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${logFile}.sql.%d{yyyy-MM-dd}.%i</fileNamePattern>
<maxFileSize>30MB</maxFileSize>
<!-- 每产生一个日志文件，该日志文件的保存期限为15天 -->
<maxHistory>15</maxHistory>
</rollingPolicy> </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> </appender>
<logger name="adminLogger" level="${mylevel}" additivity="true"> <!-- 系统模块日志级别控制 -->
<appender-ref ref="adminLog"/> <logger name="com.bonus" level="debug" />
</logger> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
<logger name="com.bonus.system" level="info" additivity="true"> <root level="info">
<appender-ref ref="sqlLog"/> <appender-ref ref="console" />
</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> </root>
</configuration> <!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
</configuration>