diff --git a/pom.xml b/pom.xml
index 4830128..926c0ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
3.4.6
1.3.2
5.1.32
- 1.6.4
+ 2.15.0
2.9.4
1.0.9
4.3.5
@@ -101,10 +101,17 @@
${mybatis.version}
+
- org.slf4j
- slf4j-log4j12
- ${slf4j.version}
+ org.apache.logging.log4j
+ log4j-web
+ ${log4j2.version}
+
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ ${log4j2.version}
diff --git a/power-admin/pom.xml b/power-admin/pom.xml
index 64d4525..5c55010 100644
--- a/power-admin/pom.xml
+++ b/power-admin/pom.xml
@@ -123,9 +123,15 @@
commons-fileupload
+
- org.slf4j
- slf4j-log4j12
+ org.apache.logging.log4j
+ log4j-web
+
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
diff --git a/power-admin/src/main/resources/log4j.properties b/power-admin/src/main/resources/log4j.properties
deleted file mode 100644
index 7a0bdab..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 @@
+
+
+ D:docus_logs/power/info
+ info_log
+ ${infoLogFileDir}/${infoLogFileName}
+ D:docus_logs/power/error
+ error_log
+ ${errorLogFileDir}/${errorLogFileName}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/power-foundaton/lib/log4j-api-2.15.1.jar b/power-foundaton/lib/log4j-api-2.15.1.jar
new file mode 100644
index 0000000..32e7d4a
Binary files /dev/null and b/power-foundaton/lib/log4j-api-2.15.1.jar differ
diff --git a/power-foundaton/pom.xml b/power-foundaton/pom.xml
index d9f60ae..f4c4692 100644
--- a/power-foundaton/pom.xml
+++ b/power-foundaton/pom.xml
@@ -47,9 +47,15 @@
compile
+
- org.slf4j
- slf4j-log4j12
+ org.apache.logging.log4j
+ log4j-web
+
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
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();