Merge branch 'dev' into issue/IAPI07

# Conflicts:
#	liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java
#	liteflow-core/src/main/java/com/yomahub/liteflow/property/LiteflowConfig.java
#	liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/config/LiteflowAutoConfiguration.java
#	liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/config/LiteflowProperty.java
#	liteflow-solon-plugin/src/main/resources/META-INF/liteflow-default.properties
#	liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/LiteflowProperty.java
#	liteflow-spring-boot-starter/src/main/java/com/yomahub/liteflow/springboot/config/LiteflowPropertyAutoConfiguration.java
#	liteflow-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
#	liteflow-spring-boot-starter/src/main/resources/META-INF/liteflow-default.properties
This commit is contained in:
jason
2024-11-12 11:19:55 +08:00
69 changed files with 1265 additions and 723 deletions

View File

@@ -190,7 +190,7 @@ public class FallbackELSolonTest extends BaseTest {
@Test
public void testWithElBuild(){
ELWrapper el = ELBus.then("a", "b", "az");
ELWrapper el = ELBus.then("a", "b", ELBus.node("az"));
LiteFlowChainELBuilder.createChain().setChainId("elBuilder").setEL(el.toEL()).build();
LiteflowResponse response = flowExecutor.execute2Resp("elBuilder");
Assertions.assertTrue(response.isSuccess());

View File

@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<flow>
<chain name="chain1">
// 单行注释
/**
* 多行注释
**/
THEN(
// 单行注释
a,
b,
WHEN(
/**
* 多行注释
**/
c,
b
)