From f70951d374cc7859c00edbf2685127ae3934529c Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: 星期一, 05 十二月 2022 17:59:58 +0800
Subject: [PATCH] update 单元格合并判断cellValue是否相等方法调整
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
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.xml
index d4b08c2..9c2e772 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml
@@ -2,22 +2,27 @@
<configuration debug="false" scan="true" scanPeriod="1 seconds">
<contextName>logback</contextName>
- <property name="log.path" value="/data/applogs/xxl-job/xxl-job-admin.log"/>
+ <property name="log.path" value="./logs/ruoyi-xxl-job-admin"/>
+ <property name="console.log.pattern"
+ value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+ <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+ <pattern>${console.log.pattern}</pattern>
+ <charset>utf-8</charset>
</encoder>
</appender>
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}</file>
+ <file>${log.path}.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${log.path}.%d{yyyy-MM-dd}.zip</fileNamePattern>
+ <fileNamePattern>${log.path}.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
+ <maxHistory>60</maxHistory>
</rollingPolicy>
<encoder>
- <pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
- </pattern>
+ <pattern>${log.pattern}</pattern>
</encoder>
</appender>
--
Gitblit v1.9.3