From 29ca22f1102e3349d0d103c12fbbb4691ce41df1 Mon Sep 17 00:00:00 2001 From: gaibu <1016771049@qq.com> Date: Sat, 28 Jan 2023 18:14:02 +0800 Subject: [PATCH] =?UTF-8?q?feat=20#I6BDN3=20groovy=20=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E7=BB=9D?= =?UTF-8?q?=E5=AF=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liteflow/builder/LiteFlowNodeBuilder.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowNodeBuilder.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowNodeBuilder.java index 29d3095ff..542974912 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowNodeBuilder.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/LiteFlowNodeBuilder.java @@ -1,23 +1,19 @@ package com.yomahub.liteflow.builder; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.io.resource.ResourceUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.enums.NodeTypeEnum; import com.yomahub.liteflow.exception.NodeBuildException; import com.yomahub.liteflow.flow.FlowBus; import com.yomahub.liteflow.flow.element.Node; +import com.yomahub.liteflow.spi.holder.PathContentParserHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Objects; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Consumer; public class LiteFlowNodeBuilder { @@ -134,8 +130,15 @@ public class LiteFlowNodeBuilder { if (StrUtil.isBlank(filePath)) { return this; } - String script = ResourceUtil.readUtf8Str(StrUtil.format("classpath: {}", filePath.trim())); - return setScript(script); + try { + List scriptList = PathContentParserHolder.loadContextAware().parseContent(ListUtil.toList(filePath)); + String script = CollUtil.getFirst(scriptList); + setScript(script); + } catch (Exception e) { + String errMsg = StrUtil.format("An exception occurred while building the node[{}],{}", this.node.getId(), e.getMessage()); + throw new NodeBuildException(errMsg); + } + return this; } public void build() {