From b9e6ea80842614ee1d988373a23d720a2f875735 Mon Sep 17 00:00:00 2001 From: bryan31 Date: Mon, 9 Aug 2021 11:50:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96springboot=E7=9A=84=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=A3=85=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => config}/LiteflowExecutorAutoConfiguration.java | 2 +- .../{ => config}/LiteflowMainAutoConfiguration.java | 3 ++- .../{ => config}/LiteflowPropertyAutoConfiguration.java | 6 ++++-- .../src/main/resources/META-INF/spring.factories | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) rename liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/{ => config}/LiteflowExecutorAutoConfiguration.java (96%) rename liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/{ => config}/LiteflowMainAutoConfiguration.java (95%) rename liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/{ => config}/LiteflowPropertyAutoConfiguration.java (88%) diff --git a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorAutoConfiguration.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowExecutorAutoConfiguration.java similarity index 96% rename from liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorAutoConfiguration.java rename to liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowExecutorAutoConfiguration.java index 12c1af196..75879aa0e 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowExecutorAutoConfiguration.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowExecutorAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.springboot; +package com.yomahub.liteflow.springboot.config; import com.yomahub.liteflow.property.LiteflowConfig; import com.yomahub.liteflow.util.ExecutorHelper; diff --git a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowMainAutoConfiguration.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowMainAutoConfiguration.java similarity index 95% rename from liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowMainAutoConfiguration.java rename to liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowMainAutoConfiguration.java index 150dabcc4..6f79a72b2 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowMainAutoConfiguration.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowMainAutoConfiguration.java @@ -1,10 +1,11 @@ -package com.yomahub.liteflow.springboot; +package com.yomahub.liteflow.springboot.config; import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.monitor.MonitorBus; import com.yomahub.liteflow.property.LiteflowConfig; import com.yomahub.liteflow.spring.ComponentScanner; +import com.yomahub.liteflow.springboot.LiteflowExecutorInit; import com.yomahub.liteflow.util.SpringAware; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowPropertyAutoConfiguration.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowPropertyAutoConfiguration.java similarity index 88% rename from liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowPropertyAutoConfiguration.java rename to liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowPropertyAutoConfiguration.java index 885c6c3dc..cf4855796 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowPropertyAutoConfiguration.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowPropertyAutoConfiguration.java @@ -1,6 +1,8 @@ -package com.yomahub.liteflow.springboot; +package com.yomahub.liteflow.springboot.config; import com.yomahub.liteflow.property.LiteflowConfig; +import com.yomahub.liteflow.springboot.LiteflowMonitorProperty; +import com.yomahub.liteflow.springboot.LiteflowProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -14,7 +16,7 @@ import org.springframework.context.annotation.PropertySource; * @author Bryan.Zhang */ @Configuration -@EnableConfigurationProperties({LiteflowProperty.class,LiteflowMonitorProperty.class}) +@EnableConfigurationProperties({LiteflowProperty.class, LiteflowMonitorProperty.class}) @PropertySource( name = "Liteflow Default Properties", value = "classpath:/META-INF/liteflow-default.properties") diff --git a/liteflow-spring-boot-starter/src/main/resources/META-INF/spring.factories b/liteflow-spring-boot-starter/src/main/resources/META-INF/spring.factories index dfe0d71ef..14e35e941 100644 --- a/liteflow-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/liteflow-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,6 +1,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.yomahub.liteflow.springboot.LiteflowPropertyAutoConfiguration,\ - com.yomahub.liteflow.springboot.LiteflowExecutorAutoConfiguration,\ - com.yomahub.liteflow.springboot.LiteflowMainAutoConfiguration + com.yomahub.liteflow.springboot.config.LiteflowPropertyAutoConfiguration,\ + com.yomahub.liteflow.springboot.config.LiteflowExecutorAutoConfiguration,\ + com.yomahub.liteflow.springboot.config.LiteflowMainAutoConfiguration