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 remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
everywhere.z
2023-04-20 14:26:11 +08:00
parent b8ee09b210 79a7a7399b
commit 006e63f122
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
liteflow-core/src/main/java/com/yomahub/liteflow/flow/FlowBus.java
View File

@@ -10,7 +10,6 @@ package com.yomahub.liteflow.flow;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.yomahub.liteflow.core.*;
import com.yomahub.liteflow.enums.FlowParserTypeEnum;
@@ -22,7 +21,6 @@ import com.yomahub.liteflow.flow.element.Node;
import com.yomahub.liteflow.parser.el.LocalJsonFlowELParser;
import com.yomahub.liteflow.parser.el.LocalXmlFlowELParser;
import com.yomahub.liteflow.parser.el.LocalYmlFlowELParser;
import com.yomahub.liteflow.script.ScriptExecutor;
import com.yomahub.liteflow.script.ScriptExecutorFactory;
import com.yomahub.liteflow.script.exception.ScriptLoadException;
import com.yomahub.liteflow.script.exception.ScriptSpiException;
@@ -36,10 +34,8 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Collectors;
/**
@@ -86,7 +82,10 @@ public class FlowBus {
return nodeMap.containsKey(nodeId);
}
public static void addSpringScanNode(String nodeId, NodeComponent nodeComponent) {
/**
* 添加已托管的节点（如：Spring、Solon 管理的节点）
* */
public static void addManagedNode(String nodeId, NodeComponent nodeComponent) {
// 根据class来猜测类型
NodeTypeEnum type = NodeTypeEnum.guessType(nodeComponent.getClass());

7
liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/integration/XPluginImpl.java
View File

@@ -3,7 +3,6 @@ package com.yomahub.liteflow.solon.integration;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.annotation.LiteflowMethod;
import com.yomahub.liteflow.core.NodeComponent;
import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
import com.yomahub.liteflow.flow.FlowBus;
import com.yomahub.liteflow.solon.*;
import com.yomahub.liteflow.solon.config.LiteflowAutoConfiguration;
@@ -50,7 +49,7 @@ public class XPluginImpl implements Plugin {
NodeComponent node1 = bw.raw();
node1.setNodeId(bw.name());
FlowBus.addSpringScanNode(bw.name(), bw.raw());
FlowBus.addManagedNode(bw.name(), bw.raw());
});
context.beanExtractorAdd(LiteflowMethod.class, (bw, method, anno) -> {
@@ -79,7 +78,7 @@ public class XPluginImpl implements Plugin {
node1.setNodeId(nodeId);
node1.setType(anno.nodeType());
FlowBus.addSpringScanNode(nodeId, node1);
FlowBus.addManagedNode(nodeId, node1);
});
context.beanBuilderAdd(LiteflowComponent.class, (clz, bw, anno) -> {
@@ -90,7 +89,7 @@ public class XPluginImpl implements Plugin {
node1.setNodeId(nodeId);
node1.setName(anno.name());
FlowBus.addSpringScanNode(nodeId, node1);
FlowBus.addManagedNode(nodeId, node1);
}
else {
context.beanExtract(bw); // 尝试提取 LiteflowMethod 函数

2
liteflow-spring/src/main/java/com/yomahub/liteflow/spi/spring/SpringContextCmpInit.java
View File

@@ -19,7 +19,7 @@ public class SpringContextCmpInit implements ContextCmpInit {
public void initCmp() {
for (Map.Entry<String, NodeComponent> componentEntry : ComponentScanner.nodeComponentMap.entrySet()) {
if (!FlowBus.containNode(componentEntry.getKey())) {
FlowBus.addSpringScanNode(componentEntry.getKey(), componentEntry.getValue());
FlowBus.addManagedNode(componentEntry.getKey(), componentEntry.getValue());
}
}
}