From 7a93a0c267ecce9806ba8ba3e4b7f12e6e0f067a Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 15 Dec 2021 16:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=97=A5=E5=BF=97=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 15 +++--
 power-admin/pom.xml                           | 10 +++-
 .../controller/GlobalExceptionHandler.java    |  5 +-
 .../src/main/resources/log4j.properties       | 18 ------
 power-admin/src/main/resources/log4j2.xml     | 59 +++++++++++++++++++
 power-foundaton/pom.xml                       | 10 +++-
 .../com/manage/util/ExceptionPrintUtil.java   |  6 +-
 7 files changed, 93 insertions(+), 30 deletions(-)
 delete mode 100644 power-admin/src/main/resources/log4j.properties
 create mode 100644 power-admin/src/main/resources/log4j2.xml

diff --git a/pom.xml b/pom.xml
index f6194b5..5e7bc4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
         <mybatis.version>3.4.6</mybatis.version>
         <mybatis.spring.version>1.3.2</mybatis.spring.version>
         <mysql.version>5.1.32</mysql.version>
-        <slf4j.version>1.6.4</slf4j.version>
+        <log4j2.version>2.15.0</log4j2.version>
         <jackson.version>2.9.4</jackson.version>
         <druid.version>1.0.9</druid.version>
         <httpclient.version>4.3.5</httpclient.version>
@@ -90,10 +90,17 @@
                 <version>${mysql.version}</version>
             </dependency>
             <!-- 日志处理 -->
+            <!-- Web项目需添加 -->
             <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${slf4j.version}</version>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-web</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
+            <!--用于与slf4j保持桥接-->
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j-impl</artifactId>
+                <version>${log4j2.version}</version>
             </dependency>
             <!-- Mybatis -->
             <dependency>
diff --git a/power-admin/pom.xml b/power-admin/pom.xml
index 75784cf..03938c3 100644
--- a/power-admin/pom.xml
+++ b/power-admin/pom.xml
@@ -123,9 +123,15 @@
             <artifactId>commons-fileupload</artifactId>
         </dependency>
         <!--日志处理-->
+        <!-- Web项目需添加 -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-web</artifactId>
+        </dependency>
+        <!--用于与slf4j保持桥接-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
         </dependency>
     </dependencies>
     <build>
diff --git a/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java b/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java
index c7bb99e..57eab7d 100644
--- a/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java
+++ b/power-admin/src/main/java/com/manage/controller/GlobalExceptionHandler.java
@@ -15,7 +15,8 @@ package com.manage.controller;
 
 import com.alibaba.fastjson.support.spring.FastJsonJsonView;
 import com.manage.util.ExceptionPrintUtil;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -28,7 +29,7 @@ import java.util.Map;
 
 @ControllerAdvice
 public class GlobalExceptionHandler {
-    private static Logger log = Logger.getLogger("errorMsg");
+    private static Logger log = LogManager.getLogger("errorLog");
     @ExceptionHandler(value = Exception.class)//指定拦截的异常
     public ModelAndView errorHandler(Exception e) {
         return returnMv(e, "服务器出错了,请联系系统管理员");
diff --git a/power-admin/src/main/resources/log4j.properties b/power-admin/src/main/resources/log4j.properties
deleted file mode 100644
index 817ab7b..0000000
--- a/power-admin/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-log4j.logger.myLog=debug,myLog
-log4j.appender.myLog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.myLog.File=D:\\logs\\power\\info\\info_log
-log4j.appender.myLog.DatePattern=-yyyy-MM-dd'.log'
-log4j.appender.myLog.Append = true
-log4j.appender.myLog.Threshold = INFO
-log4j.appender.myLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.myLog.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n
-
-log4j.logger.errorMsg=error,errorMsg
-log4j.appender.errorMsg=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.errorMsg.File=D:\\logs\\power\\error\\error_log
-log4j.appender.errorMsg.DatePattern=-yyyy-MM-dd'.log'
-log4j.appender.errorMsg.Append = true
-log4j.appender.errorMsg.Threshold = error 
-log4j.appender.errorMsg.layout=org.apache.log4j.PatternLayout
-log4j.appender.errorMsg.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n
-
diff --git a/power-admin/src/main/resources/log4j2.xml b/power-admin/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..c1d8478
--- /dev/null
+++ b/power-admin/src/main/resources/log4j2.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?><configuration status="warn">
+    <Properties>
+        <Property name="infoLogFileDir">D:docus_logs/power/info</Property>
+        <Property name="infoLogFileName">info_log</Property>
+        <Property name="infoLogFileSrc">${infoLogFileDir}/${infoLogFileName}</Property>
+        <Property name="errorLogFileDir">D:docus_logs/power/error</Property>
+        <Property name="errorLogFileName">error_log</Property>
+        <Property name="errorLogFileSrc">${errorLogFileDir}/${errorLogFileName}</Property>
+    </Properties>
+
+    <appenders>
+        <RollingFile name="infoLogRollingFile" fileName="${infoLogFileSrc}"
+                     filePattern="${infoLogFileSrc}-%d{yyyy-MM-dd}-%i.log">
+            <PatternLayout pattern="%d{yyyy-MM-dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n"/>
+            <!--配置1天存储一个文件-->
+            <TimeBasedTriggeringPolicy interval="1" modulate="true" />
+            <!--配置超过文件大小切割成多个文件%i区分序号，目前配一个文件20M-->
+            <SizeBasedTriggeringPolicy size="20MB"/>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20">
+                <Delete basePath="${infoLogFileDir}/" maxDepth="1">
+                    <IfFileName glob="*.log" />
+                    <!--!Note: 这里的age必须和filePattern协调, 后者是精确到HH, 这里就要写成xH, xd就不起作用
+                    另外, 数字最好>2, 否则可能造成删除的时候, 最近的文件还处于被占用状态,导致删除不成功!-->
+                    <!--保留30天-->
+                    <IfLastModified age="30d" />
+                </Delete>
+            </DefaultRolloverStrategy>
+        </RollingFile>
+
+        <RollingFile name="errorLogRollingFile" fileName="${errorLogFileSrc}"
+                     filePattern="${errorLogFileSrc}-%d{yyyy-MM-dd}-%i.log">
+            <PatternLayout pattern="%d{yyyy-MM-dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n"/>
+            <!--配置1天存储一个文件-->
+            <TimeBasedTriggeringPolicy interval="1" modulate="true" />
+            <!--配置超过文件大小切割成多个文件%i区分序号，目前配一个文件20M-->
+            <SizeBasedTriggeringPolicy size="20MB"/>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20">
+                <Delete basePath="${errorLogFileDir}/" maxDepth="1">
+                    <IfFileName glob="*.log" />
+                    <!--!Note: 这里的age必须和filePattern协调, 后者是精确到HH, 这里就要写成xH, xd就不起作用
+                    另外, 数字最好>2, 否则可能造成删除的时候, 最近的文件还处于被占用状态,导致删除不成功!-->
+                    <!--保留30天-->
+                    <IfLastModified age="30d" />
+                </Delete>
+            </DefaultRolloverStrategy>
+        </RollingFile>
+    </appenders>
+
+    <loggers>
+        <Logger name="infoLog" additivity="TRUE" level="ALL">
+            <AppenderRef ref="infoLogRollingFile" level="INFO" />
+        </Logger>
+        <Logger name="errorLog" additivity="TRUE" level="ALL">
+            <AppenderRef ref="errorLogRollingFile" level="ERROR" />
+        </Logger>
+    </loggers>
+</configuration>
\ No newline at end of file
diff --git a/power-foundaton/pom.xml b/power-foundaton/pom.xml
index f4d8ead..b5cffd7 100644
--- a/power-foundaton/pom.xml
+++ b/power-foundaton/pom.xml
@@ -47,9 +47,15 @@
             <scope>compile</scope>
         </dependency>
         <!--日志处理-->
+        <!-- Web项目需添加 -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-web</artifactId>
+        </dependency>
+        <!--用于与slf4j保持桥接-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
         </dependency>
         <!--系统使用率导包开始-->
         <!--<dependency>  &lt;!&ndash;工具类 小数格式化 可以改为其他&ndash;&gt;
diff --git a/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java b/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java
index cffbf13..f786a85 100644
--- a/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java
+++ b/power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java
@@ -1,6 +1,8 @@
 package com.manage.util;
 
-import org.apache.log4j.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -19,7 +21,7 @@ import java.io.PrintStream;
  * @Version: 1.0
  */
 public class ExceptionPrintUtil {
-    private static Logger log = Logger.getLogger("errorMsg");
+    private static Logger log = LogManager.getLogger("errorLog");
     public static void printException(Exception e){
         //方法名
         ByteArrayOutputStream baos = new ByteArrayOutputStream();