reformat code

febs-cloud/pom.xml

@@ -33,7 +33,7 @@
         <spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
         <com-alibaba-cloud.version>2.1.1.RELEASE</com-alibaba-cloud.version>
         <codingapi.txlcn.version>5.0.2.RELEASE</codingapi.txlcn.version>
-
+        <logstash-logback-encoder.version>6.1</logstash-logback-encoder.version>
         <fastjson.version>1.2.70</fastjson.version>
         <xml-api.version>1.4.01</xml-api.version>
         <ip2region.version>1.7</ip2region.version>

febs-common/febs-common-logging-starter/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
-            <version>6.1</version>
+            <version>${logstash-logback-encoder.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

febs-common/febs-common-logging-starter/src/main/java/cc/mrbird/febs/common/logging/starter/aop/ControllerLogAspect.java

@@ -7,7 +7,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
 
 /**
- * @author: xuefrye
+ * @author xuefrye
  */
 @Slf4j
 @Aspect

febs-common/febs-common-logging-starter/src/main/java/cc/mrbird/febs/common/logging/starter/configure/FebsLogAutoConfigure.java

@@ -1,15 +1,8 @@
 package cc.mrbird.febs.common.logging.starter.configure;
 
 import cc.mrbird.febs.common.logging.starter.properties.FebsLogProperties;
-import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
-import ch.qos.logback.classic.filter.LevelFilter;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.rolling.RollingFileAppender;
-import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
-import ch.qos.logback.core.spi.FilterReply;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.logstash.logback.appender.LogstashTcpSocketAppender;
@@ -20,12 +13,11 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
 
 import java.util.HashMap;
 
 /**
- * @author: xuefrye
+ * @author xuefrye
  */
 @Configuration
 @EnableConfigurationProperties(FebsLogProperties.class)
@@ -39,12 +31,12 @@ public class FebsLogAutoConfigure {
         this.properties = properties;
     }
 
-    private static final LoggerContext context;
-    private static final Logger rootLogger;
+    private static final LoggerContext CONTEXT;
+    private static final Logger ROOTLOGGER;
 
-    static{
-        context = (LoggerContext) LoggerFactory.getILoggerFactory();
-        rootLogger = context.getLogger("ROOT");
+    static {
+        CONTEXT = (LoggerContext) LoggerFactory.getILoggerFactory();
+        ROOTLOGGER = CONTEXT.getLogger("ROOT");
     }
 
     @ConditionalOnProperty(name = "febs.log.enable-elk", havingValue = "true", matchIfMissing = true)
@@ -62,7 +54,7 @@ public class FebsLogAutoConfigure {
         appender.addDestination(properties.getLogstashHost());
         appender.setName("logstash[" + applicationName + "]");
         appender.start();
-        appender.setContext(context);
-        rootLogger.addAppender(appender);
+        appender.setContext(CONTEXT);
+        ROOTLOGGER.addAppender(appender);
     }
 }

febs-common/febs-common-logging-starter/src/main/java/cc/mrbird/febs/common/logging/starter/properties/FebsLogProperties.java

@@ -4,7 +4,7 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * @author: xuefrye
+ * @author xuefrye
  */
 @Data
 @ConfigurationProperties(prefix = "febs.log")
@@ -17,10 +17,10 @@ public class FebsLogProperties {
     /**
      * 是否开启controller层api调用的日志
      */
-    private String enableLogForController;
+    private Boolean enableLogForController = false;
 
     /**
      * 是否开启ELK日志收集
      */
-    private String enableElk;
+    private Boolean enableElk = false;
 }