public/liteFlow
1
0
Fork 0
mirror of https://gitee.com/dromara/liteFlow.git synced 2026-05-14 12:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.5.5' of gitee.com:dromara/liteFlow into v2.5.5

Browse Source 
 Conflicts:
	liteflow-core/src/main/java/com/yomahub/liteflow/parser/FlowParser.java
This commit is contained in:
bryan31
2021-04-28 17:45:58 +08:00
parent e114de1d26 d756e03e63
commit 1b10059dcd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
liteflow-core/src/main/java/com/yomahub/liteflow/parser/FlowParser.java
View File

@@ -2,7 +2,6 @@ package com.yomahub.liteflow.parser;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.yomahub.liteflow.entity.flow.Condition;
import com.yomahub.liteflow.entity.flow.ThenCondition;
import com.yomahub.liteflow.entity.flow.WhenCondition;
@@ -10,6 +9,8 @@ import com.yomahub.liteflow.enums.ConditionTypeEnum;
import com.yomahub.liteflow.exception.ConfigErrorException;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.util.Assert;
import org.springframework.util.ResourceUtils;
import java.io.IOException;
import java.util.ArrayList;
@@ -73,7 +74,11 @@ public abstract class FlowParser {
* @throws IOException
*/
protected Resource[] matchRuleResources(final String ruleSource) throws IOException {
final String locationPattern = StrUtil.format("classpath:{}",ruleSource);
Assert.notNull(ruleSource, "rule source must not be null");
String locationPattern = ruleSource;
if (!locationPattern.startsWith(ResourceUtils.CLASSPATH_URL_PREFIX)) {
locationPattern = ResourceUtils.CLASSPATH_URL_PREFIX + locationPattern;
}
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
Resource[] resources = resolver.getResources(locationPattern);
if(ArrayUtil.isEmpty(resources)) {