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

luliqiang

2020-08-27 c49b95fc3576f9a5dad5bcaa6874157d5091f6e0

 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 {}
}