From c9e0af4886731ad0315b75a27d0fe3eaaa93bde3 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 23 Jun 2020 14:52:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/config/LogAutoConfigure.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/config/LogAutoConfigure.java b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/config/LogAutoConfigure.java
index e2f6630..d33660e 100644
--- a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/config/LogAutoConfigure.java
+++ b/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 {}
}
--
Gitblit v1.8.0