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

src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java

@@ -7,12 +7,13 @@ import com.stylefeng.guns.common.exception.InvalidKaptchaException;
 import com.stylefeng.guns.core.log.LogManager;
 import com.stylefeng.guns.core.log.factory.LogTaskFactory;
 import com.stylefeng.guns.core.shiro.ShiroKit;
-import org.apache.log4j.Logger;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.CredentialsException;
 import org.apache.shiro.authc.DisabledAccountException;
 import org.apache.shiro.session.InvalidSessionException;
 import org.apache.shiro.session.UnknownSessionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -36,7 +37,7 @@ import static com.stylefeng.guns.core.support.HttpKit.getRequest;
 @ControllerAdvice
 public class GlobalExceptionHandler {
 
-    private Logger log = Logger.getLogger(this.getClass());
+    private Logger log = LoggerFactory.getLogger(this.getClass());
 
     /**
      * 拦截业务异常

src/main/java/com/stylefeng/guns/core/aop/LogAop.java

@@ -10,13 +10,14 @@ import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.shiro.ShiroUser;
 import com.stylefeng.guns.core.support.HttpKit;
 import com.stylefeng.guns.core.util.Contrast;
-import org.apache.log4j.Logger;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
@@ -32,7 +33,7 @@ import java.util.Map;
 @Component
 public class LogAop {
 
-    private Logger log = Logger.getLogger(this.getClass());
+    private Logger log = LoggerFactory.getLogger(this.getClass());
 
     @Pointcut(value = "@annotation(com.stylefeng.guns.common.annotion.log.BussinessLog)")
     public void cutService() {

src/main/java/com/stylefeng/guns/core/aop/MultiSourceExAop.java

@@ -3,13 +3,14 @@ package com.stylefeng.guns.core.aop;
 import com.stylefeng.guns.common.annotion.DataSource;
 import com.stylefeng.guns.common.constant.DSEnum;
 import com.stylefeng.guns.core.mutidatesource.DataSourceContextHolder;
-import org.apache.log4j.Logger;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.Ordered;
 import org.springframework.stereotype.Component;
@@ -28,7 +29,7 @@ import java.lang.reflect.Method;
 @ConditionalOnProperty(prefix = "guns", name = "muti-datasource-open", havingValue = "true")
 public class MultiSourceExAop implements Ordered {
 	
-	private Logger log = Logger.getLogger(this.getClass());
+	private Logger log = LoggerFactory.getLogger(this.getClass());
 
 	
 	@Pointcut(value = "@annotation(com.stylefeng.guns.common.annotion.DataSource)")

src/main/java/com/stylefeng/guns/core/cache/EhcacheFactory.java

@@ -18,7 +18,8 @@ package com.stylefeng.guns.core.cache;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
@@ -29,7 +30,7 @@ public class EhcacheFactory extends BaseCacheFactory {
 	
 	private static CacheManager cacheManager;
 	private static volatile Object locker = new Object();
-	private static final Logger log = Logger.getLogger(EhcacheFactory.class);
+	private static final Logger log = LoggerFactory.getLogger(EhcacheFactory.class);
 	
 	private static CacheManager getCacheManager() {
 		if (cacheManager == null) {

src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java

@@ -2,14 +2,15 @@ package com.stylefeng.guns.core.log.factory;
 
 import com.stylefeng.guns.common.constant.state.LogSucceed;
 import com.stylefeng.guns.common.constant.state.LogType;
-import com.stylefeng.guns.core.db.Db;
-import com.stylefeng.guns.core.log.LogManager;
-import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.common.persistence.dao.LoginLogMapper;
 import com.stylefeng.guns.common.persistence.dao.OperationLogMapper;
 import com.stylefeng.guns.common.persistence.model.LoginLog;
 import com.stylefeng.guns.common.persistence.model.OperationLog;
-import org.apache.log4j.Logger;
+import com.stylefeng.guns.core.db.Db;
+import com.stylefeng.guns.core.log.LogManager;
+import com.stylefeng.guns.core.util.ToolUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.TimerTask;
 
@@ -21,7 +22,7 @@ import java.util.TimerTask;
  */
 public class LogTaskFactory {
 
-    private static Logger logger = Logger.getLogger(LogManager.class);
+    private static Logger logger = LoggerFactory.getLogger(LogManager.class);
     private static LoginLogMapper loginLogMapper = Db.getMapper(LoginLogMapper.class);
     private static OperationLogMapper operationLogMapper = Db.getMapper(OperationLogMapper.class);
 

src/main/java/com/stylefeng/guns/core/util/FileUtil.java

@@ -2,7 +2,8 @@ package com.stylefeng.guns.core.util;
 
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -12,7 +13,7 @@ import java.nio.channels.FileChannel;
 
 public class FileUtil {
 	
-	private static Logger log = Logger.getLogger(FileUtil.class);
+	private static Logger log = LoggerFactory.getLogger(FileUtil.class);
 	
 	/**
 	 * NIO way

src/main/java/com/stylefeng/guns/core/util/qr/ImgQrTool.java

 package com.stylefeng.guns.core.util.qr;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Image;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.image.AffineTransformOp;
 import java.awt.image.BufferedImage;
@@ -15,17 +21,6 @@ import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.imageio.ImageIO;
-
-import org.apache.log4j.Logger;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.MultiFormatWriter;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-
 /**
  * 内嵌图片的二维码生成器
  *
@@ -33,7 +28,7 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
  */
 public class ImgQrTool {
 
-    private static Logger log = Logger.getLogger(ImgQrTool.class);
+    private static Logger log = LoggerFactory.getLogger(ImgQrTool.class);
 
     // 镶嵌的图片宽度的一般
     private static final int IMAGE_WIDTH = 80;

src/main/resources/application.yml

@@ -85,8 +85,10 @@ biz:
     password: root
 
 logging:
-  level: debug
-  file: logs/guns.log
+  level.root: info
+  level.com.stylefeng: debug
+  path: logs/
+  file: guns.log
 
 ---
 
@@ -102,6 +104,7 @@ spring:
       filters: log4j,wall,mergeStat
 
 logging:
-  level: warn
-  file: logs/guns.log
+  level.root: warn
+  path: logs/
+  file: guns.log
 

src/main/resources/logback-spring.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <!-- 此xml在spring-boot-1.5.3.RELEASE.jar里 -->
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <!-- 开启后可以通过jmx动态控制日志级别(springboot Admin的功能) -->
+    <!--<jmxConfigurator/>-->
+
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+        <Target>System.out</Target>
+        <encoder>
+            <pattern>%date [%level] [%thread] %logger{60} [%file : %line] %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <File>${LOG_PATH}${LOG_FILE}</File>
+        <encoder>
+            <pattern>%date [%level] [%thread] %logger{60} [%file : %line] %msg%n</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 添加.gz 历史日志会启用压缩 大大缩小日志文件所占空间 -->
+            <fileNamePattern>${LOG_PATH}daily/${LOG_FILE}.%d{yyyy-MM-dd}.gz</fileNamePattern>
+            <maxHistory>30</maxHistory><!--  保留30天日志 -->
+        </rollingPolicy>
+    </appender>
+
+    <!--<logger name="org.springframework" level="error"/>-->
+    <!--<logger name="jdbc.connection" level="OFF"/>-->
+    <!--<logger name="org.apache" level="error"/>-->
+    <!--<logger name="com.alibaba" level="error"/>-->
+    <!--<logger name="org.apache.kafka.clients.producer.ProducerConfig" level="warn"/>-->
+
+    <root level="INFO">
+        <!--<appender-ref ref="Console"/>-->
+        <appender-ref ref="FILE"/>
+    </root>
+</configuration>
\ No newline at end of file