diff --git a/docs/guide_cn.md b/docs/guide_cn.md index a8ed0894c..c092e3ed0 100644 --- a/docs/guide_cn.md +++ b/docs/guide_cn.md @@ -94,7 +94,7 @@ liteFlow提供了liteflow-spring-boot-starter依赖包,提供自动装配功 在application.properties里加上配置地址后,就可以在容器中依赖拿到`FlowExecutor`实例 ```properties -liteflow.ruleSource=config/flow.xml +liteflow.rule-source=config/flow.xml ``` 工程中的liteflow-test演示了如何在springboot下进行快速配置 @@ -162,7 +162,7 @@ liteFlow支持把配置放在zk集群中,并支持实时修改流程 ## 4.2 Springboot配置 ```properties -liteflow.ruleSource=127.0.0.1:2181,127.0.0.1:2182,127.0.0.1:2183 +liteflow.rule-source=127.0.0.1:2181,127.0.0.1:2182,127.0.0.1:2183 ``` @@ -202,7 +202,7 @@ spring中需要改的地方还是执行器的配置,只需要在配置的路 ## 5.3 Springboot配置 ```properties -liteflow.ruleSource=com.yomahub.liteflow.test.TestCustomParser +liteflow.rule-source=com.yomahub.liteflow.test.TestCustomParser ``` diff --git a/liteflow-core/pom.xml b/liteflow-core/pom.xml index 8292b9591..4e0da4b43 100644 --- a/liteflow-core/pom.xml +++ b/liteflow-core/pom.xml @@ -9,7 +9,7 @@ com.yomahub liteflow - 2.3.1 + 2.3.2 diff --git a/liteflow-spring-boot-starter/pom.xml b/liteflow-spring-boot-starter/pom.xml index abd264186..4140b540a 100644 --- a/liteflow-spring-boot-starter/pom.xml +++ b/liteflow-spring-boot-starter/pom.xml @@ -10,7 +10,7 @@ liteflow com.yomahub - 2.3.1 + 2.3.2 diff --git a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowAutoConfiguration.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowAutoConfiguration.java index 0d40237fa..cef85b729 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowAutoConfiguration.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowAutoConfiguration.java @@ -5,13 +5,15 @@ import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.spring.ComponentScaner; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import java.util.List; @Configuration -@ConditionalOnProperty(name = "liteflow.ruleSource") +@EnableConfigurationProperties(LiteflowProperty.class) +@ConditionalOnProperty(prefix = "liteflow", name = "rule-source") public class LiteflowAutoConfiguration { @Bean diff --git a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java index e0c148356..993e70d2b 100644 --- a/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java +++ b/liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java @@ -1,12 +1,10 @@ package com.yomahub.liteflow.springboot; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; +import org.springframework.boot.context.properties.ConfigurationProperties; -@Configuration +@ConfigurationProperties(prefix = "liteflow", ignoreUnknownFields = true) public class LiteflowProperty { - @Value("${liteflow.ruleSource}") private String ruleSource; public String getRuleSource() { 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 c580d8db2..961b67a87 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,5 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.yomahub.liteflow.springboot.LiteflowProperty,\ com.yomahub.liteflow.springboot.LiteflowAutoConfiguration,\ com.yomahub.liteflow.springboot.LiteflowExecutorInit diff --git a/liteflow-test-spring/pom.xml b/liteflow-test-spring/pom.xml index 6b9950e70..33a75186d 100644 --- a/liteflow-test-spring/pom.xml +++ b/liteflow-test-spring/pom.xml @@ -9,7 +9,7 @@ liteflow com.yomahub - 2.3.1 + 2.3.2 diff --git a/liteflow-test-springboot/pom.xml b/liteflow-test-springboot/pom.xml index 2c2a81cc7..00b0c27a6 100644 --- a/liteflow-test-springboot/pom.xml +++ b/liteflow-test-springboot/pom.xml @@ -9,7 +9,7 @@ liteflow com.yomahub - 2.3.1 + 2.3.2 diff --git a/pom.xml b/pom.xml index 7b26be55d..e4916ed0c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.yomahub liteflow pom - 2.3.1 + 2.3.2 liteflow a lightweight and practical micro-process framework https://github.com/bryan31/liteflow