From c41e8d372cdabbe1fd5973c9322e38a40bfa1a39 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Thu, 05 May 2022 15:50:07 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 zq-erp/src/main/resources/log4j.properties |   40 ++++++++++++++++++++++------------------
 1 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/zq-erp/src/main/resources/log4j.properties b/zq-erp/src/main/resources/log4j.properties
index ddcc0ef..f4c37b7 100644
--- a/zq-erp/src/main/resources/log4j.properties
+++ b/zq-erp/src/main/resources/log4j.properties
@@ -15,37 +15,41 @@
 log4j.appender.STDOUT = org.apache.log4j.ConsoleAppender
 log4j.appender.STDOUT.Target = System.out
 log4j.appender.STDOUT.Threshold = DEBUG
+log4j.appender.STDOUT.MaxFileSize = 100M
 log4j.appender.STDOUT.layout = org.apache.log4j.PatternLayout
-log4j.appender.STDOUT.layout.ConversionPattern =  %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n 
+log4j.appender.STDOUT.layout.ConversionPattern =  %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
 
 
-### 输出DEBUG 级别以上的日志到=/error.log ###
+# 输出DEBUG 级别以上的日志到=/error.log ###
 log4j.appender.DEBUG = com.matrix.core.tools.MatrixFileAppender
 log4j.appender.DEBUG.File = /debug.log
 log4j.appender.DEBUG.Append = true
-log4j.appender.DEBUG.Threshold = DEBUG 
+log4j.appender.DEBUG.Threshold = DEBUG
+log4j.appender.DEBUG.MaxFileSize = 100M
+log4j.appender.DEBUG.MaxBackupIndex = 7
 log4j.appender.DEBUG.layout = org.apache.log4j.PatternLayout
 log4j.appender.DEBUG.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
 
-log4j.appender.INFO = com.matrix.core.tools.MatrixFileAppender
-log4j.appender.INFO.File = /info.log
-log4j.appender.INFO.Append = true
-log4j.appender.INFO.Threshold = INFO 
-log4j.appender.INFO.layout = org.apache.log4j.PatternLayout
-log4j.appender.INFO.layout.ConversionPattern =  %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
+#log4j.appender.INFO = com.matrix.core.tools.MatrixFileAppender
+#log4j.appender.INFO.File = /info.log
+#log4j.appender.INFO.Append = true
+#log4j.appender.INFO.Threshold = INFO
+#log4j.appender.INFO.MaxBackupIndex = 5
+#log4j.appender.INFO.layout = org.apache.log4j.PatternLayout
+#log4j.appender.INFO.layout.ConversionPattern =  %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
 
-log4j.appender.WARN = com.matrix.core.tools.MatrixFileAppender
-log4j.appender.WARN.File = /warn.log
-log4j.appender.WARN.Append = true
-log4j.appender.WARN.Threshold = WARN 
-log4j.appender.WARN.layout = org.apache.log4j.PatternLayout
-log4j.appender.WARN.layout.ConversionPattern =  %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
-
+#log4j.appender.WARN = com.matrix.core.tools.MatrixFileAppender
+#log4j.appender.WARN.File = /warn.log
+#log4j.appender.WARN.Append = true
+#log4j.appender.WARN.Threshold = WARN
+#log4j.appender.WARN.layout = org.apache.log4j.PatternLayout
+#log4j.appender.WARN.layout.ConversionPattern =  %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
+#
 ### 输出ERROR 级别以上的日志到=/error.log ###
 log4j.appender.ERROR = com.matrix.core.tools.MatrixFileAppender
-log4j.appender.ERROR.File =/error.log 
+log4j.appender.ERROR.File =/error.log
 log4j.appender.ERROR.Append = true
-log4j.appender.ERROR.Threshold = ERROR 
+log4j.appender.ERROR.Threshold = ERROR
 log4j.appender.ERROR.layout = org.apache.log4j.PatternLayout
 log4j.appender.ERROR.layout.ConversionPattern =  %-d{yyyy-MM-dd HH:mm:ss.SSS}-[ %X{Tr} ] [ %p ]-[ %t ] %m%n
 

--
Gitblit v1.9.1