优化kidgrow-log-spring-boot-starter，扩展链路日志

克 刘

2020-03-26 912bb305f0c0f715058ea43ff80769d41c97c42a

优化kidgrow-log-spring-boot-starter，扩展链路日志

 kidgrow-business/kidgrow-code-generator/src/main/resources/application.yml

@@ -4,7 +4,7 @@
  application:
    name: code-generator
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
#    driver-class-name: com.mysql.jdbc.Driver

 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml

@@ -10,7 +10,7 @@
  application:
    name: filecenter-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
#    driver-class-name: com.mysql.jdbc.Driver

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml

@@ -10,7 +10,7 @@
  application:
    name: usercenter-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
#    driver-class-name: com.mysql.jdbc.Driver

 kidgrow-commons/kidgrow-log-spring-boot-starter/pom.xml

@@ -18,7 +18,7 @@
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot</artifactId>
            <artifactId>spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>org.slf4j</groupId>
@@ -29,20 +29,28 @@
            <artifactId>transmittable-thread-local</artifactId>
        </dependency>
        <dependency>
            <groupId>org.aspectj</groupId>
            <artifactId>aspectjweaver</artifactId>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-jdbc</artifactId>
            <artifactId>spring-web</artifactId>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>com.zaxxer</groupId>
            <artifactId>HikariCP</artifactId>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>com.zaxxer</groupId>
            <artifactId>HikariCP</artifactId>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-jdbc</artifactId>
            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-configuration-processor</artifactId>
            <optional>true</optional>
        </dependency>
    </dependencies>
</project>

 kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/aspect/AuditLogAspect.java

@@ -9,8 +9,10 @@
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
@@ -32,18 +34,20 @@
 */
@Slf4j
@Aspect
@EnableConfigurationProperties(AuditLogProperties.class)
@ConditionalOnClass({HttpServletRequest.class, RequestContextHolder.class})
public class AuditLogAspect {
    @Value("${spring.application.name}")
    private String applicationName;

    @Autowired
    private AuditLogProperties auditLogProperties;
    @Autowired(required = false)
    private IAuditService auditService;

    public AuditLogAspect(AuditLogProperties auditLogProperties, IAuditService auditService) {
        this.auditLogProperties = auditLogProperties;
        this.auditService = auditService;
    }
//    public AuditLogAspect(AuditLogProperties auditLogProperties, IAuditService auditService) {
//        this.auditLogProperties = auditLogProperties;
//        this.auditService = auditService;
//    }

    /**
     * 用于SpEL表达式解析.

 kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/config/LogAutoConfigure.java

@@ -1,7 +1,12 @@
package com.kidgrow.log.config;

import com.kidgrow.log.properties.AuditLogProperties;
import com.kidgrow.log.properties.LogDbProperties;
import com.kidgrow.log.properties.TraceProperties;
import com.zaxxer.hikari.HikariConfig;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -11,6 +16,13 @@
 * @CreateDate: Created in 2020/2/4 16:05 <br>
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
 */
@EnableConfigurationProperties(TraceProperties.class)
@EnableConfigurationProperties({TraceProperties.class, AuditLogProperties.class})
public class LogAutoConfigure {
    /**
     * 日志数据库配置
     */
    @Configuration
    @ConditionalOnClass(HikariConfig.class)
    @EnableConfigurationProperties(LogDbProperties.class)
    public static class LogDbAutoConfigure {}
}

 kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/properties/AuditLogProperties.java

@@ -1,6 +1,8 @@
package com.kidgrow.log.properties;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope;

@@ -13,6 +15,8 @@
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
 */
@Data
@NoArgsConstructor
@AllArgsConstructor
@ConfigurationProperties(prefix = "kidgrow.audit-log")
@RefreshScope
public class AuditLogProperties {

 kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/META-INF/spring.factories

@@ -2,7 +2,7 @@
com.kidgrow.log.config.TtlMDCAdapterInitializer

org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.kidgrow.log.config.LogAutoConfigure
com.kidgrow.log.config.LogAutoConfigure,\
com.kidgrow.log.service.impl.LoggerAuditServiceImpl,\
com.kidgrow.log.service.impl.DbAuditServiceImpl,\
com.kidgrow.log.aspect.AuditLogAspect

 kidgrow-config/src/main/resources/application-dev.properties

@@ -44,3 +44,11 @@

##### mybatis-plus\u6253\u5370\u5B8C\u6574sql(\u53EA\u9002\u7528\u4E8E\u5F00\u53D1\u73AF\u5883)
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl

##### \u5BA1\u8BA1\u65E5\u5FD7\u914D\u7F6E
kidgrow.audit-log.enabled=true
kidgrow.audit-log.log-type=db
kidgrow.audit-log.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
kidgrow.audit-log.datasource.jdbc-url=jdbc:mysql://${kidgrow.datasource.ip}:3306/logger_center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
kidgrow.audit-log.datasource.username=${kidgrow.datasource.username}
kidgrow.audit-log.datasource.password=${kidgrow.datasource.password}

 kidgrow-config/src/main/resources/application-fat.properties

@@ -44,3 +44,11 @@

##### mybatis-plus\u6253\u5370\u5B8C\u6574sql(\u53EA\u9002\u7528\u4E8E\u5F00\u53D1\u73AF\u5883)
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl

##### \u5BA1\u8BA1\u65E5\u5FD7\u914D\u7F6E
kidgrow.audit-log.enabled=true
kidgrow.audit-log.log-type=db
kidgrow.audit-log.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
kidgrow.audit-log.datasource.jdbc-url=jdbc:mysql://${kidgrow.datasource.ip}:3306/logger_center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
kidgrow.audit-log.datasource.username=${kidgrow.datasource.username}
kidgrow.audit-log.datasource.password=${kidgrow.datasource.password}

 kidgrow-config/src/main/resources/application.properties

@@ -94,3 +94,4 @@
# \u539F\u751F\u914D\u7F6E
mybatis-plus.configuration.map-underscore-to-camel-case=true
mybatis-plus.configuration.cache-enabled=false


 kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml

@@ -11,7 +11,7 @@
  application:
    name: demo-order-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/demo_order?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/demo_order?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
#    driver-class-name: com.mysql.jdbc.Driver

 kidgrow-jobs/kidgrow-jobs-admin/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@
kidgrow.datasource.username=root
kidgrow.datasource.password=root

spring.datasource.url=jdbc:mysql://${kidgrow.datasource.ip}:3306/xxl_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
spring.datasource.url=jdbc:mysql://${kidgrow.datasource.ip}:3306/xxl_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.username=${kidgrow.datasource.username}
spring.datasource.password=${kidgrow.datasource.password}


 kidgrow-jobs/kidgrow-jobs-admin/src/main/resources/application-test.properties

@@ -3,7 +3,7 @@
kidgrow.datasource.username=root
kidgrow.datasource.password=root

spring.datasource.url=jdbc:mysql://${kidgrow.datasource.ip}:3306/xxl_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
spring.datasource.url=jdbc:mysql://${kidgrow.datasource.ip}:3306/xxl_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.username=${kidgrow.datasource.username}
spring.datasource.password=${kidgrow.datasource.password}


 kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml

@@ -14,7 +14,7 @@
  application:
    name: uaa-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/oauth_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/oauth_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
#    driver-class-name: com.mysql.jdbc.Driver