diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ClassYmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ClassYmlFlowParser.java index c18246516..ca7f29003 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ClassYmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ClassYmlFlowParser.java @@ -2,8 +2,8 @@ package com.yomahub.liteflow.parser; /** * 基于自定义的Yml方式解析器 - * @author: guodongqing - * @since: 2.5.0 + * @author guodongqing + * @since 2.5.0 */ public abstract class ClassYmlFlowParser extends YmlFlowParser{ @Override diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/FlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/FlowParser.java index 0eb3e8395..9f6705c7a 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/FlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/FlowParser.java @@ -12,8 +12,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * @author: guodongqing - * @since: 2.5.0 + * @author guodongqing + * @since 2.5.0 */ public abstract class FlowParser { diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java index 5fe9e8c27..0044a88c5 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java @@ -19,8 +19,8 @@ import java.util.*; /** * Json格式解析器 - * @author: guodongqing - * @since: 2.5.0 + * @author guodongqing + * @since 2.5.0 */ public abstract class JsonFlowParser extends FlowParser{ diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalJsonFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalJsonFlowParser.java index d7db9d6ac..9b2537656 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalJsonFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalJsonFlowParser.java @@ -1,16 +1,18 @@ package com.yomahub.liteflow.parser; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.resource.ResourceUtil; +import cn.hutool.core.util.StrUtil; /** - * @author: guodongqing - * @since: 2.5.0 + * @author guodongqing + * @since 2.5.0 */ public class LocalJsonFlowParser extends JsonFlowParser{ @Override public void parseMain(String rulePath) throws Exception { - String ruleContent = FileUtil.readUtf8String(rulePath); + String ruleContent = ResourceUtil.readUtf8Str(StrUtil.format("classpath:{}",rulePath)); parse(ruleContent); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalXmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalXmlFlowParser.java index c8b5fcf43..5e9c696ab 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalXmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalXmlFlowParser.java @@ -8,6 +8,8 @@ package com.yomahub.liteflow.parser; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.resource.ResourceUtil; +import cn.hutool.core.util.StrUtil; /** * 基于本地的xml方式解析器 @@ -16,7 +18,7 @@ import cn.hutool.core.io.FileUtil; public class LocalXmlFlowParser extends XmlFlowParser{ public void parseMain(String rulePath) throws Exception { - String ruleContent = FileUtil.readUtf8String(rulePath); + String ruleContent = ResourceUtil.readUtf8Str(StrUtil.format("classpath:{}",rulePath)); parse(ruleContent); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalYmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalYmlFlowParser.java index 307f79c95..99f03a404 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalYmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/LocalYmlFlowParser.java @@ -3,8 +3,8 @@ package com.yomahub.liteflow.parser; /** * Yaml格式转换 * - * @author: guodongqing - * @since: 2.5.0 + * @author guodongqing + * @since 2.5.0 */ public class LocalYmlFlowParser extends YmlFlowParser { diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java index ab611b34f..dc748bf52 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java @@ -1,6 +1,8 @@ package com.yomahub.liteflow.parser; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.resource.ResourceUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,8 +12,8 @@ import java.util.Map; /** * Yml格式解析器,转换为json格式进行解析 - * @author: guodongqing - * @since: 2.5.0 + * @author guodongqing + * @since 2.5.0 */ public abstract class YmlFlowParser extends JsonFlowParser{ @@ -19,7 +21,7 @@ public abstract class YmlFlowParser extends JsonFlowParser{ @Override public void parseMain(String rulePath) throws Exception { - String ruleContent = FileUtil.readUtf8String(rulePath); + String ruleContent = ResourceUtil.readUtf8Str(StrUtil.format("classpath:{}",rulePath)); JSONObject ruleObject = convertToJson(ruleContent); parse(ruleObject.toJSONString()); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperJsonFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperJsonFlowParser.java index 073224d9d..58c8a0107 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperJsonFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperJsonFlowParser.java @@ -14,8 +14,8 @@ import java.text.MessageFormat; /** * 基于zk方式的json形式的解析器 - * @author: guodongqing - * @since: 2.5.0 + * @author guodongqing + * @since 2.5.0 */ public class ZookeeperJsonFlowParser extends JsonFlowParser{ diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java index a5fc3b826..ad5f51ea2 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java @@ -15,8 +15,8 @@ import java.text.MessageFormat; /** * 基于zk方式的yml形式的解析器 - * @author: guodongqing - * @since: 2.5.0 + * @author guodongqing + * @since 2.5.0 */ public class ZookeeperYmlFlowParser extends YmlFlowParser{