Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/log4j.properties

@@ -12,21 +12,25 @@ log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
 
 ### 输出DEBUG 级别以上的日志到=E://logs/error.log ###
-log4j.appender.D = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.D = com.yxproject.start.utils.MyDailyRollingFileAppender
 log4j.appender.D.File = ./logs/debug.log
 log4j.appender.D.Append = true
 log4j.appender.D.Threshold = DEBUG
+log4j.appender.D.MaxFileSize=20MB
+log4j.appender.D.DatePattern = '_'yyyy-MM-dd'.log'
 log4j.appender.D.layout = org.apache.log4j.PatternLayout
 log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [%X{ip}]  [ %t:%r ] - [ %p ] %l %m%n
 
 ### 输出ERROR 级别以上的日志到=E://logs/error.log ###
-log4j.appender.E = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.E = com.yxproject.start.utils.MyDailyRollingFileAppender
 log4j.appender.E.File =./logs/error.log
 log4j.appender.E.Append = true
 log4j.appender.E.Threshold = ERROR
+log4j.appender.E.MaxFileSize=20MB
 log4j.appender.E.layout = org.apache.log4j.PatternLayout
 log4j.appender.E.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [%X{ip}]  [ %t:%r ] - [ %p ] %l %m%n
 
+
 ###打印SQL###
 log4j.logger.org.mybatis = DEBUG
 log4j.logger.java.sql = DEBUG