diff --git a/pom.xml b/pom.xml index 73da4fc..f448e19 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 7.4.1.jre8 1.1.22 1.2.5 - 1.6.4 + 2.15.0 4.12 2.4 1.2 @@ -161,10 +161,17 @@ ${shiro.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/src/main/java/com/emr/controller/GlobalExceptionHandler.java b/src/main/java/com/emr/controller/GlobalExceptionHandler.java index d6f2e69..f285e00 100644 --- a/src/main/java/com/emr/controller/GlobalExceptionHandler.java +++ b/src/main/java/com/emr/controller/GlobalExceptionHandler.java @@ -15,7 +15,8 @@ package com.emr.controller; import com.alibaba.fastjson.support.spring.FastJsonJsonView; import com.emr.util.ExceptionPrintUtil; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.shiro.authz.UnauthorizedException; import org.springframework.validation.BindException; import org.springframework.validation.BindingResult; @@ -24,14 +25,12 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; import java.util.HashMap; 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/src/main/java/com/emr/util/ExceptionPrintUtil.java b/src/main/java/com/emr/util/ExceptionPrintUtil.java index d1003b3..900399e 100644 --- a/src/main/java/com/emr/util/ExceptionPrintUtil.java +++ b/src/main/java/com/emr/util/ExceptionPrintUtil.java @@ -1,6 +1,7 @@ package com.emr.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 +20,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(); diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties deleted file mode 100644 index da7d2e3..0000000 --- a/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\\emr_record\\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\\emr_record\\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/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 0000000..c9ffca6 --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,59 @@ + + + D:docus_logs/emr_record/info + info_log + ${infoLogFileDir}/${infoLogFileName} + D:docus_logs/emr_record/error + error_log + ${errorLogFileDir}/${errorLogFileName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file