diff --git a/pom.xml b/pom.xml index f6194b5..5e7bc4b 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 @@ -90,10 +90,17 @@ ${mysql.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 75784cf..03938c3 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/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 @@ + + + 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/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 @@ compile + - org.slf4j - slf4j-log4j12 + org.apache.logging.log4j + log4j-web + + + + org.apache.logging.log4j + log4j-slf4j-impl