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

feature #I4GYV2 script节点支持从文件中获取脚本

Browse Source
This commit is contained in:
bryan31
2021-11-05 13:15:52 +08:00
parent 6d113d1b2b
commit 169a47a412
36 changed files with 597 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java
View File

@@ -2,6 +2,7 @@ package com.yomahub.liteflow.parser;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
@@ -63,13 +64,14 @@ public abstract class JsonFlowParser extends FlowParser {
// 当存在<nodes>节点定义时，解析node节点
if (flowJsonObject.getJSONObject("flow").containsKey("nodes")){
JSONArray nodeArrayList = flowJsonObject.getJSONObject("flow").getJSONObject("nodes").getJSONArray("node");
String id, name, clazz, script, type;
String id, name, clazz, script, type, file;
for (int i = 0; i < nodeArrayList.size(); i++) {
JSONObject nodeObject = nodeArrayList.getJSONObject(i);
id = nodeObject.getString("id");
name = nodeObject.getString("name");
clazz = nodeObject.getString("class");
type = nodeObject.getString("type");
file = nodeObject.getString("file");
//初始化type
if (StrUtil.isBlank(type)){
@@ -86,12 +88,19 @@ public abstract class JsonFlowParser extends FlowParser {
if (!FlowBus.containNode(id)){
FlowBus.addCommonNode(id, name, clazz);
}
}else{
}else if(nodeTypeEnum.equals(NodeTypeEnum.SCRIPT) || nodeTypeEnum.equals(NodeTypeEnum.COND_SCRIPT)){
if (!FlowBus.containNode(id)){
script = nodeObject.getString("value");
//如果file字段不为空，则优先从file里面读取脚本文本
if (StrUtil.isNotBlank(file)){
script = ResourceUtil.readUtf8Str(StrUtil.format("classpath: {}", file));
}else{
script = nodeObject.getString("value");
}
//根据节点类型把脚本添加到元数据里
if (nodeTypeEnum.equals(NodeTypeEnum.SCRIPT)){
FlowBus.addCommonScriptNode(id, name, script);
}else if(nodeTypeEnum.equals(NodeTypeEnum.COND_SCRIPT)){
}else {
FlowBus.addCondScriptNode(id, name, script);
}
}

17
liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java
View File

@@ -2,6 +2,7 @@ package com.yomahub.liteflow.parser;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.yomahub.liteflow.common.LocalDefaultFlowConstant;
@@ -68,12 +69,13 @@ public abstract class XmlFlowParser extends FlowParser {
// 当存在<nodes>节点定义时，解析node节点
if (ObjectUtil.isNotNull(nodesElement)){
List<Element> nodeList = nodesElement.elements("node");
String id, name, clazz, type, script;
String id, name, clazz, type, script, file;
for (Element e : nodeList) {
id = e.attributeValue("id");
name = e.attributeValue("name");
clazz = e.attributeValue("class");
type = e.attributeValue("type");
file = e.attributeValue("file");
//初始化type
if (StrUtil.isBlank(type)){
@@ -90,12 +92,19 @@ public abstract class XmlFlowParser extends FlowParser {
if (!FlowBus.containNode(id)){
FlowBus.addCommonNode(id, name, clazz);
}
}else{
}else if(nodeTypeEnum.equals(NodeTypeEnum.SCRIPT) || nodeTypeEnum.equals(NodeTypeEnum.COND_SCRIPT)){
if (!FlowBus.containNode(id)){
script = e.getTextTrim();
//如果file字段不为空，则优先从file里面读取脚本文本
if (StrUtil.isNotBlank(file)){
script = ResourceUtil.readUtf8Str(StrUtil.format("classpath: {}", file));
}else{
script = e.getTextTrim();
}
//根据节点类型把脚本添加到元数据里
if (nodeTypeEnum.equals(NodeTypeEnum.SCRIPT)){
FlowBus.addCommonScriptNode(id, name, script);
}else if(nodeTypeEnum.equals(NodeTypeEnum.COND_SCRIPT)){
}else {
FlowBus.addCondScriptNode(id, name, script);
}
}