更新logging-starter

febs-cloud/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.0.RELEASE</version>
+        <version>2.2.1.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 

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

@@ -19,14 +19,9 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>cc.mrbird</groupId>
-            <artifactId>febs-common-core</artifactId>
-            <version>${febs-cloud.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -1,18 +1,19 @@
-package cc.mrbird.febs.common.logging.starter.aop;
+package cc.mrbird.febs.common.logging.starter.aspect;
 
-import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.springframework.stereotype.Component;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author xuefrye
  */
-@Slf4j
 @Aspect
-@Component
 public class ControllerLogAspect {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
     @Around("(@within(org.springframework.stereotype.Controller)" +
             "|| @within(org.springframework.web.bind.annotation.RestController))" +
             "&& execution(public * cc.mrbird..*.controller..*.*(..))")

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

@@ -1,5 +1,6 @@
 package cc.mrbird.febs.common.logging.starter.configure;
 
+import cc.mrbird.febs.common.logging.starter.aspect.ControllerLogAspect;
 import cc.mrbird.febs.common.logging.starter.properties.FebsLogProperties;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
@@ -39,13 +40,19 @@ public class FebsLogAutoConfigure {
         ROOTLOGGER = CONTEXT.getLogger("ROOT");
     }
 
-    @ConditionalOnProperty(name = "febs.log.enable-elk", havingValue = "true", matchIfMissing = true)
+    @ConditionalOnProperty(name = "febs.log.enable-log-for-controller", havingValue = "true")
+    @Bean
+    public ControllerLogAspect controllerLogAspect(){
+        return new ControllerLogAspect();
+    }
+
+    @ConditionalOnProperty(name = "febs.log.enable-elk", havingValue = "true")
     @Bean
     public void enableElk() throws JsonProcessingException {
         LogstashTcpSocketAppender appender = new LogstashTcpSocketAppender();
         LogstashEncoder encoder = new LogstashEncoder();
 
-        HashMap<String, String> customFields = new HashMap<>();
+        HashMap<String, String> customFields = new HashMap<>(2);
         customFields.put("application-name", applicationName);
         String customFieldsString = new ObjectMapper().writeValueAsString(customFields);
         encoder.setCustomFields(customFieldsString);

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

@@ -1,12 +1,10 @@
 package cc.mrbird.febs.common.logging.starter.properties;
 
-import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * @author xuefrye
  */
-@Data
 @ConfigurationProperties(prefix = "febs.log")
 public class FebsLogProperties {
     /**
@@ -23,4 +21,28 @@ public class FebsLogProperties {
      * 是否开启ELK日志收集
      */
     private Boolean enableElk = false;
+
+    public String getLogstashHost() {
+        return logstashHost;
+    }
+
+    public void setLogstashHost(String logstashHost) {
+        this.logstashHost = logstashHost;
+    }
+
+    public Boolean getEnableLogForController() {
+        return enableLogForController;
+    }
+
+    public void setEnableLogForController(Boolean enableLogForController) {
+        this.enableLogForController = enableLogForController;
+    }
+
+    public Boolean getEnableElk() {
+        return enableElk;
+    }
+
+    public void setEnableElk(Boolean enableElk) {
+        this.enableElk = enableElk;
+    }
 }

febs-common/febs-common-logging-starter/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cc.mrbird.febs.common.logging.starter.aop.ControllerLogAspect,\
 cc.mrbird.febs.common.logging.starter.configure.FebsLogAutoConfigure

febs-gateway/pom.xml

@@ -55,6 +55,12 @@
             <groupId>cc.mrbird</groupId>
             <artifactId>febs-common-logging-starter</artifactId>
             <version>${febs-cloud.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>