diff --git a/liteflow-testcase-script-groovy/src/test/resources/json-script/flow.json b/liteflow-testcase-script-groovy/src/test/resources/json-script/flow.json index b3454c1f2..c6a62b4b0 100644 --- a/liteflow-testcase-script-groovy/src/test/resources/json-script/flow.json +++ b/liteflow-testcase-script-groovy/src/test/resources/json-script/flow.json @@ -13,6 +13,12 @@ "name": "条件脚本", "type": "cond_script", "value": "count = slot.getData(\"count\");if(count > 100){return \"a\";}else{return \"b\";}" + }, + { + "id": "s3", + "name": "普通脚本2", + "type": "script", + "value": "def a=30;def b=2;slot.setData(\"s1\",a*b);" } ] }, diff --git a/liteflow-testcase-script-groovy/src/test/resources/xml-script/flow.xml b/liteflow-testcase-script-groovy/src/test/resources/xml-script/flow.xml index bd408feec..62c9b3ded 100644 --- a/liteflow-testcase-script-groovy/src/test/resources/xml-script/flow.xml +++ b/liteflow-testcase-script-groovy/src/test/resources/xml-script/flow.xml @@ -1,7 +1,7 @@ - + + + + + + diff --git a/liteflow-testcase-script-qlexpress/src/test/resources/json-script/flow.json b/liteflow-testcase-script-qlexpress/src/test/resources/json-script/flow.json index f43f53971..f57c1e084 100644 --- a/liteflow-testcase-script-qlexpress/src/test/resources/json-script/flow.json +++ b/liteflow-testcase-script-qlexpress/src/test/resources/json-script/flow.json @@ -13,6 +13,12 @@ "name": "条件脚本", "type": "cond_script", "value": "count = slot.getData(\"count\");if(count > 100){return \"a\";}else{return \"b\";}" + }, + { + "id": "s3", + "name": "普通脚本2", + "type": "script", + "value": "a=30;b=2;slot.setData(\"s1\",a*b);" } ] }, diff --git a/liteflow-testcase-script-qlexpress/src/test/resources/xml-script/flow.xml b/liteflow-testcase-script-qlexpress/src/test/resources/xml-script/flow.xml index 1e4b73433..35876421d 100644 --- a/liteflow-testcase-script-qlexpress/src/test/resources/xml-script/flow.xml +++ b/liteflow-testcase-script-qlexpress/src/test/resources/xml-script/flow.xml @@ -19,6 +19,15 @@ } ]]> + + + + + diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesSpringbootTest.java index 5627a0180..12fb3cb82 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesSpringbootTest.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesSpringbootTest.java @@ -26,6 +26,7 @@ import javax.annotation.Resource; @TestPropertySource(value = "classpath:/customNodes/application.properties") @SpringBootTest(classes = CustomNodesSpringbootTest.class) @EnableAutoConfiguration +@ComponentScan({"com.yomahub.liteflow.test.customNodes.domain"}) public class CustomNodesSpringbootTest extends BaseTest { private final Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ACmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ACmp.java index fdf6ddc1c..d93561044 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ACmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ACmp.java @@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.customNodes.cmp; import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; -@Component("a") public class ACmp extends NodeComponent { @Override diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/BCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/BCmp.java index 2aa0dcd2f..ba21f7192 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/BCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/BCmp.java @@ -8,13 +8,20 @@ package com.yomahub.liteflow.test.customNodes.cmp; import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.test.customNodes.domain.DemoDomain; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -@Component("b") +import javax.annotation.Resource; + public class BCmp extends NodeComponent { + @Resource + private DemoDomain demoDomain; + @Override public void process() { + demoDomain.sayHi(); System.out.println("BCmp executed!"); } diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/CCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/CCmp.java index a20a7951f..1190c76a8 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/CCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/CCmp.java @@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.customNodes.cmp; import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; -@Component("c") public class CCmp extends NodeComponent { @Override diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/DCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/DCmp.java index 1230ae2f2..46455f3d4 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/DCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/DCmp.java @@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.customNodes.cmp; import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; -@Component("d") public class DCmp extends NodeComponent { @Override diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ECmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ECmp.java index ccf03451b..a76a740a9 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ECmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ECmp.java @@ -8,13 +8,20 @@ package com.yomahub.liteflow.test.customNodes.cmp; import com.yomahub.liteflow.core.NodeComponent; +import com.yomahub.liteflow.test.customNodes.domain.DemoDomain; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -@Component("e") +import javax.annotation.Resource; + public class ECmp extends NodeComponent { + @Resource + private DemoDomain demoDomain; + @Override public void process() { + demoDomain.sayHi(); System.out.println("ECmp executed!"); } diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/FCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/FCmp.java index d11ec255c..f791500e9 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/FCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/FCmp.java @@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.customNodes.cmp; import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; -@Component("f") public class FCmp extends NodeComponent { @Override diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/domain/DemoDomain.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/domain/DemoDomain.java new file mode 100644 index 000000000..d0b10dc0b --- /dev/null +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/domain/DemoDomain.java @@ -0,0 +1,11 @@ +package com.yomahub.liteflow.test.customNodes.domain; + +import org.springframework.stereotype.Component; + +@Component +public class DemoDomain { + + public void sayHi(){ + System.out.println("hi"); + } +} diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/flowmeta/cmp2/DCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/flowmeta/cmp2/DCmp.java index 9bb5283b9..f4f20957d 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/flowmeta/cmp2/DCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/flowmeta/cmp2/DCmp.java @@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.flowmeta.cmp2; import com.yomahub.liteflow.core.NodeComponent; import org.springframework.stereotype.Component; -@Component("d") public class DCmp extends NodeComponent { @Override