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 |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zq-erp/src/main/resources/log4j.properties b/zq-erp/src/main/resources/log4j.properties
index bc5c1bb..f4c37b7 100644
--- a/zq-erp/src/main/resources/log4j.properties
+++ b/zq-erp/src/main/resources/log4j.properties
@@ -45,13 +45,13 @@
 #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.Append = true
-#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
+### 输出ERROR 级别以上的日志到=/error.log ###
+log4j.appender.ERROR = com.matrix.core.tools.MatrixFileAppender
+log4j.appender.ERROR.File =/error.log
+log4j.appender.ERROR.Append = true
+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
 
 #mybatis log
 log4j.logger.druid.sql=INFO

--
Gitblit v1.9.1