diff --git a/pom.xml b/pom.xml
index 3f8e780..5b9eae3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
         <spring.version>5.0.2.RELEASE</spring.version>
         <mybatis.version>3.2.8</mybatis.version>
         <mybatis.spring.version>1.2.2</mybatis.spring.version>
-        <slf4j.version>1.6.4</slf4j.version>
+        <log4j2.version>2.15.0</log4j2.version>
         <json-lib.version>2.4</json-lib.version>
         <jackson.version>2.9.4</jackson.version>
         <druid.version>1.0.9</druid.version>
@@ -64,10 +64,17 @@
             <scope>test</scope>
         </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/src/main/java/com/emr/controller/UploadFilesController.java b/src/main/java/com/emr/controller/UploadFilesController.java
index 0079724..31b1b65 100644
--- a/src/main/java/com/emr/controller/UploadFilesController.java
+++ b/src/main/java/com/emr/controller/UploadFilesController.java
@@ -7,7 +7,8 @@
 package com.emr.controller;
 
 import com.emr.util.ExceptionPrintUtil;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,7 +25,7 @@ import java.io.PrintWriter;
 @Controller
 @RequestMapping(value = "/Upload")
 public class UploadFilesController {
-    private Logger logger = Logger.getLogger(UploadFilesController.class);
+    private Logger logger = LogManager.getLogger("infoLog");
     /**
      * app申请打印图片
      *
diff --git a/src/main/java/com/emr/quart/Task1.java b/src/main/java/com/emr/quart/Task1.java
index a37175f..636e66a 100644
--- a/src/main/java/com/emr/quart/Task1.java
+++ b/src/main/java/com/emr/quart/Task1.java
@@ -17,7 +17,8 @@ import com.emr.vo.RecordSearch;
 import com.emr.vo.SubmitRecord;
 import com.emr.vo.User;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -39,7 +40,7 @@ import java.util.*;
  */
 @Component
 public class Task1 {
-    private static Logger log = Logger.getLogger("myMsg");
+    private static Logger log = LogManager.getLogger("infoLog");
     @Autowired
     private RecordMapper recordMapper;
     @Autowired
diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index c692b44..f0848f1 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -16,7 +16,8 @@ import com.emr.util.OracleConnect;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -39,7 +40,7 @@ import java.util.*;
 public class Archive_MasterServiceImpl implements Archive_MasterService {
     @Value("${notJudgeTasks}")
     private String notJudgeTasks;
-    private static Logger log = Logger.getLogger("myLog");
+    private static Logger log = LogManager.getLogger("infoLog");
     @Autowired
     private Archive_MasterMapper archiveMasterMapper;
     @Autowired
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/java/com/emr/util/Jpg2PdfUtil.java b/src/main/java/com/emr/util/Jpg2PdfUtil.java
index 26758f2..ada6d5a 100644
--- a/src/main/java/com/emr/util/Jpg2PdfUtil.java
+++ b/src/main/java/com/emr/util/Jpg2PdfUtil.java
@@ -4,7 +4,8 @@ import com.lowagie.text.*;
 import com.lowagie.text.Image;
 import com.lowagie.text.pdf.*;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
@@ -29,7 +30,7 @@ import java.util.List;
  * @Version: 1.0
  */
 public class Jpg2PdfUtil {
-    private static Logger log = Logger.getLogger("myMsg");
+    private static Logger log = LogManager.getLogger("infoLog");
     /**
      * 利用itext打开pdf文档
      */
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index b5f96f4..0000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-log4j.rootLogger=info,myLog,errorMsg,compeleteMsg
-log4j.appender.myLog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.myLog.File=D:\\logs\\emr_medical_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.appender.errorMsg=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.errorMsg.File=D:\\logs\\emr_medical_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
-
-log4j.appender.compeleteMsg=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.compeleteMsg.File=D:\\logs\\emr_medical_record\\compeleteTask\\compeleteTask_log
-log4j.appender.compeleteMsg.DatePattern=-yyyy-MM-dd'.log'
-log4j.appender.compeleteMsg.Append = true
-log4j.appender.compeleteMsg.Threshold = INFO
-log4j.appender.compeleteMsg.layout=org.apache.log4j.PatternLayout
-log4j.appender.compeleteMsg.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n
-
-#Console sql
-#log4j.rootLogger=debug,myLog,errorMsg,compeleteMsg,CONSOLE
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern =%d %-5p [%c{5}] - %m%n
-
-log4j.logger.com.emr=debug
-log4j.logger.com.alibaba=error
-log4j.logger.org=error
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..1dce374
--- /dev/null
+++ b/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/emr_medical_record/info</Property>
+        <Property name="infoLogFileName">info_log</Property>
+        <Property name="infoLogFileSrc">${infoLogFileDir}/${infoLogFileName}</Property>
+        <Property name="errorLogFileDir">D:docus_logs/emr_medical_record/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