Merge branch 'dev' of https://gitee.com/dromara/liteFlow into dev

update dev branch to fork repository

liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathELDeclMultiSpringbootTest.java

@@ -1,6 +1,7 @@
 package com.yomahub.liteflow.test.absoluteConfigPath;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import com.yomahub.liteflow.core.FlowExecutor;
@@ -64,7 +65,7 @@ public class AbsoluteConfigPathELDeclMultiSpringbootTest extends BaseTest {
 
 	@BeforeAll
 	public static void createFiles() {
-		rootDir = Objects.requireNonNull(AbsoluteConfigPathELDeclMultiSpringbootTest.class.getResource("/")).getPath();
+		rootDir = FileUtil.getAbsolutePath(ResourceUtil.getResource("").getPath());
 
 		String path1 = StrUtil.format("{}/sub/a", rootDir);
 		String path2 = StrUtil.format("{}/sub/b", rootDir);

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathELDeclSpringbootTest.java

@@ -1,6 +1,7 @@
 package com.yomahub.liteflow.test.absoluteConfigPath;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import com.yomahub.liteflow.core.FlowExecutor;
@@ -8,6 +9,8 @@ import com.yomahub.liteflow.flow.LiteflowResponse;
 import com.yomahub.liteflow.property.LiteflowConfig;
 import com.yomahub.liteflow.property.LiteflowConfigGetter;
 import com.yomahub.liteflow.test.BaseTest;
+import com.yomahub.liteflow.util.PathMatchUtil;
+import org.apache.commons.collections.ListUtils;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -64,7 +67,7 @@ public class AbsoluteConfigPathELDeclSpringbootTest extends BaseTest {
 
 	@BeforeAll
 	public static void createFiles() {
-		rootDir = Objects.requireNonNull(AbsoluteConfigPathELDeclSpringbootTest.class.getResource("/")).getPath();
+		rootDir = FileUtil.getAbsolutePath(ResourceUtil.getResource("").getPath());
 
 		String path1 = StrUtil.format("{}/sub/a", rootDir);
 		String path2 = StrUtil.format("{}/sub/b", rootDir);

liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathTest.java

@@ -1,6 +1,7 @@
 package com.yomahub.liteflow.test.absoluteConfigPath;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import com.yomahub.liteflow.core.FlowExecutor;
@@ -51,7 +52,7 @@ public class AbsoluteConfigPathTest extends BaseTest {
 
 	@BeforeAll
 	public static void createFiles() {
-		rootDir = Objects.requireNonNull(AbsoluteConfigPathTest.class.getResource("/")).getPath();
+		rootDir = FileUtil.getAbsolutePath(ResourceUtil.getResource("").getPath());
 
 		String path1 = StrUtil.format("{}/sub/a", rootDir);
 		String path2 = StrUtil.format("{}/sub/b", rootDir);

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathELSpringbootTest.java

@@ -1,6 +1,7 @@
 package com.yomahub.liteflow.test.absoluteConfigPath;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import com.yomahub.liteflow.core.FlowExecutor;
@@ -57,7 +58,7 @@ public class AbsoluteConfigPathELSpringbootTest extends BaseTest {
 
 	@BeforeAll
 	public static void createFiles() {
-		rootDir = Objects.requireNonNull(AbsoluteConfigPathELSpringbootTest.class.getResource("/")).getPath();
+		rootDir = FileUtil.getAbsolutePath(ResourceUtil.getResource("").getPath());
 
 		String path1 = StrUtil.format("{}/sub/a", rootDir);
 		String path2 = StrUtil.format("{}/sub/b", rootDir);

liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathELSpringbootTest.java

@@ -1,6 +1,7 @@
 package com.yomahub.liteflow.test.absoluteConfigPath;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import com.yomahub.liteflow.core.FlowExecutor;
@@ -61,7 +62,7 @@ public class AbsoluteConfigPathELSpringbootTest extends BaseTest {
 
 	@BeforeAll
 	public static void createFiles() {
-		rootDir = Objects.requireNonNull(AbsoluteConfigPathELSpringbootTest.class.getResource("/")).getPath();
+		rootDir = FileUtil.getAbsolutePath(ResourceUtil.getResource("").getPath());
 
 		String path1 = StrUtil.format("{}/sub/a", rootDir);
 		String path2 = StrUtil.format("{}/sub/b", rootDir);

liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathELSpringTest.java

@@ -1,6 +1,7 @@
 package com.yomahub.liteflow.test.absoluteConfigPath;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import com.yomahub.liteflow.core.FlowExecutor;
@@ -56,7 +57,7 @@ public class AbsoluteConfigPathELSpringTest extends BaseTest {
 
 	@BeforeAll
 	public static void createFiles() {
-		rootDir = Objects.requireNonNull(AbsoluteConfigPathELSpringTest.class.getResource("/")).getPath();
+		rootDir = FileUtil.getAbsolutePath(ResourceUtil.getResource("").getPath());
 
 		String path1 = StrUtil.format("{}/sub/a", rootDir);
 		String path2 = StrUtil.format("{}/sub/b", rootDir);