From 942212f10b1d6cde60cf28fba6c62d9ef0e6a9f5 Mon Sep 17 00:00:00 2001 From: houxinyu Date: Sun, 2 Jul 2023 20:34:14 +0800 Subject: [PATCH] add interface --- .../parser/redis/RedisXmlELParser.java | 21 +- .../redis/util/RedisParserByPolling.java | 22 ++ .../redis/util/RedisParserByPubSub.java | 224 +++++++++++++++++ .../parser/redis/util/RedisParserHelper.java | 229 +----------------- 4 files changed, 273 insertions(+), 223 deletions(-) create mode 100644 liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPolling.java create mode 100644 liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPubSub.java diff --git a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/RedisXmlELParser.java b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/RedisXmlELParser.java index 8cf02e382..cd5cd5ccb 100644 --- a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/RedisXmlELParser.java +++ b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/RedisXmlELParser.java @@ -8,6 +8,8 @@ import cn.hutool.core.util.StrUtil; import com.yomahub.liteflow.core.FlowInitHook; import com.yomahub.liteflow.parser.el.ClassXmlFlowELParser; import com.yomahub.liteflow.parser.redis.exception.RedisException; +import com.yomahub.liteflow.parser.redis.util.RedisParserByPolling; +import com.yomahub.liteflow.parser.redis.util.RedisParserByPubSub; import com.yomahub.liteflow.parser.redis.util.RedisParserHelper; import com.yomahub.liteflow.parser.redis.vo.RedisParserVO; import com.yomahub.liteflow.property.LiteflowConfig; @@ -27,7 +29,7 @@ public class RedisXmlELParser extends ClassXmlFlowELParser { public RedisXmlELParser() { LiteflowConfig liteflowConfig = LiteflowConfigGetter.get(); - try{ + try { RedisParserVO redisParserVO = null; if (MapUtil.isNotEmpty((liteflowConfig.getRuleSourceExtDataMap()))) { redisParserVO = BeanUtil.toBean(liteflowConfig.getRuleSourceExtDataMap(), @@ -43,12 +45,19 @@ public class RedisXmlELParser extends ClassXmlFlowELParser { //检查配置文件 checkParserVO(redisParserVO); - redisParserHelper = new RedisParserHelper(redisParserVO); + //选择Pub/Sub机制 or 轮询机制 + if (StrUtil.equalsIgnoreCase("false", redisParserVO.isPolling())) { + redisParserHelper = new RedisParserByPubSub(redisParserVO); + } else { + //todo 实例化轮询机制 + redisParserHelper = new RedisParserByPolling(redisParserVO); + } + } - catch (RedisException redisException){ + catch (RedisException redisException) { throw redisException; } - catch (Exception e){ + catch (Exception e) { throw new RedisException(e.getMessage()); } } @@ -70,10 +79,10 @@ public class RedisXmlELParser extends ClassXmlFlowELParser { } private void checkParserVO(RedisParserVO redisParserVO) { - if (StrUtil.isEmpty(redisParserVO.getHost())){ + if (StrUtil.isEmpty(redisParserVO.getHost())) { throw new RedisException(StrFormatter.format(ERROR_MSG_PATTERN, "host")); } - if (StrUtil.isEmpty(redisParserVO.getPort())){ + if (StrUtil.isEmpty(redisParserVO.getPort())) { throw new RedisException(StrFormatter.format(ERROR_MSG_PATTERN, "port")); } } diff --git a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPolling.java b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPolling.java new file mode 100644 index 000000000..ef6637d6f --- /dev/null +++ b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPolling.java @@ -0,0 +1,22 @@ +package com.yomahub.liteflow.parser.redis.util; + +import com.yomahub.liteflow.parser.redis.vo.RedisParserVO; + +public class RedisParserByPolling implements RedisParserHelper{ + + private final RedisParserVO redisParserVO; + + public RedisParserByPolling(RedisParserVO redisParserVO) { + this.redisParserVO = redisParserVO; + } + + @Override + public String getContent() { + return null; + } + + @Override + public void listenRedis() { + + } +} diff --git a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPubSub.java b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPubSub.java new file mode 100644 index 000000000..cad9880ea --- /dev/null +++ b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPubSub.java @@ -0,0 +1,224 @@ +package com.yomahub.liteflow.parser.redis.util; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.text.StrFormatter; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ReUtil; +import cn.hutool.core.util.StrUtil; +import com.yomahub.liteflow.builder.LiteFlowNodeBuilder; +import com.yomahub.liteflow.builder.el.LiteFlowChainELBuilder; +import com.yomahub.liteflow.enums.NodeTypeEnum; +import com.yomahub.liteflow.flow.FlowBus; +import com.yomahub.liteflow.parser.redis.exception.RedisException; +import com.yomahub.liteflow.parser.redis.vo.RedisParserVO; +import com.yomahub.liteflow.spi.holder.ContextAwareHolder; +import org.redisson.Redisson; +import org.redisson.api.RMapCache; +import org.redisson.api.RedissonClient; +import org.redisson.api.map.event.EntryCreatedListener; +import org.redisson.api.map.event.EntryRemovedListener; +import org.redisson.api.map.event.EntryUpdatedListener; +import org.redisson.config.Config; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Set; + +public class RedisParserByPubSub implements RedisParserHelper { + + private final RedisParserVO redisParserVO; + + private RedissonClient chainClient; + + private RedissonClient scriptClient; + + public RedisParserByPubSub(RedisParserVO redisParserVO) { + this.redisParserVO = redisParserVO; + + try { + try { + this.chainClient = ContextAwareHolder.loadContextAware().getBean("chainClient"); + this.scriptClient = ContextAwareHolder.loadContextAware().getBean("scriptClient"); + } + catch (Exception ignored) { + } + if (ObjectUtil.isNull(chainClient)) { + Config config = getRedissonConfig(redisParserVO, + Integer.parseInt(redisParserVO.getChainDataBase())); + this.chainClient = Redisson.create(config); + //如果有脚本数据 + if (StrUtil.isNotBlank(redisParserVO.getScriptDataBase())) { + config = getRedissonConfig(redisParserVO, + Integer.parseInt(redisParserVO.getScriptDataBase())); + this.scriptClient = Redisson.create(config); + } + } + } + catch (Exception e) { + throw new RedisException(e.getMessage()); + } + + } + + private Config getRedissonConfig(RedisParserVO redisParserVO, Integer dataBase) { + Config config = new Config(); + String redisAddress = StrFormatter.format(REDIS_URL_PATTERN, redisParserVO.getHost(), redisParserVO.getPort()); + if (StrUtil.isNotBlank(redisParserVO.getPassword())) { + config.useSingleServer().setAddress(redisAddress) + .setPassword(redisParserVO.getPassword()) + .setDatabase(dataBase); + } + else { + config.useSingleServer().setAddress(redisAddress) + .setDatabase(dataBase); + } + return config; + } + + @Override + public String getContent() { + try { + // 检查chainKey下有没有子节点 + RMapCache chainKey = chainClient.getMapCache(redisParserVO.getChainKey()); + Set chainNameSet = chainKey.keySet(); + if (CollectionUtil.isEmpty(chainNameSet)) { + throw new RedisException(StrUtil.format("There are no chains in key [{}]", + redisParserVO.getChainKey())); + } + // 获取chainKey下的所有子节点内容List + List chainItemContentList = new ArrayList<>(); + for (String chainName : chainNameSet) { + String chainData = chainKey.get(chainName); + if (StrUtil.isNotBlank(chainData)) { + chainItemContentList.add(StrUtil.format(CHAIN_XML_PATTERN, chainName, chainData)); + } + } + // 合并成所有chain的xml内容 + String chainAllContent = CollUtil.join(chainItemContentList, StrUtil.EMPTY); + + // 检查是否有脚本内容，如果有，进行脚本内容的获取 + String scriptAllContent = StrUtil.EMPTY; + if (hasScript()) { + RMapCache scriptKey = scriptClient.getMapCache(redisParserVO.getScriptKey()); + Set scriptKeySet = scriptKey.keySet(); + + List scriptItemContentList = new ArrayList<>(); + for (String scriptKeyValue : scriptKeySet) { + NodeSimpleVO nodeSimpleVO = convert(scriptKeyValue); + if (Objects.isNull(nodeSimpleVO)) { + throw new RedisException( + StrUtil.format("The name of the redis key is invalid:{}", scriptKeyValue)); + } + String scriptData = scriptKey.get(scriptKeyValue); + + // 有语言类型 + if (StrUtil.isNotBlank(nodeSimpleVO.getLanguage())) { + scriptItemContentList.add(StrUtil.format(NODE_ITEM_WITH_LANGUAGE_XML_PATTERN, + nodeSimpleVO.getNodeId(), nodeSimpleVO.getName(), nodeSimpleVO.getType(), + nodeSimpleVO.getLanguage(), scriptData)); + } + // 没有语言类型 + else { + scriptItemContentList.add(StrUtil.format(NODE_ITEM_XML_PATTERN, nodeSimpleVO.getNodeId(), + nodeSimpleVO.getName(), nodeSimpleVO.getType(), scriptData)); + } + + scriptAllContent = StrUtil.format(NODE_XML_PATTERN, + CollUtil.join(scriptItemContentList, StrUtil.EMPTY)); + } + } + + return StrUtil.format(XML_PATTERN, scriptAllContent, chainAllContent); + } + catch (Exception e) { + throw new RedisException(e.getMessage()); + } + } + + public boolean hasScript() { + // 没有scriptClient或没有配置scriptDataBase + if (Objects.isNull(scriptClient) || StrUtil.isNotBlank(redisParserVO.getScriptDataBase())) { + return false; + } + try { + // 存在这个节点，但是子节点不存在 + RMapCache scriptKey = scriptClient.getMapCache(redisParserVO.getScriptKey()); + Set scriptKeySet = scriptKey.keySet(); + return !CollUtil.isEmpty(scriptKeySet); + } + catch (Exception e) { + return false; + } + } + + /** + * 监听 redis key + */ + @Override + public void listenRedis() { + //监听 chain + RMapCache chainKey = chainClient.getMapCache(redisParserVO.getChainKey()); + //添加新 chain + chainKey.addListener((EntryCreatedListener) event -> { + LOG.info("starting reload flow config... create key={} value={},", event.getKey(), event.getValue()); + LiteFlowChainELBuilder.createChain().setChainId(event.getKey()).setEL(event.getValue()).build(); + }); + //修改 chain + chainKey.addListener((EntryUpdatedListener) event -> { + LOG.info("starting reload flow config... update path={} new value={},", event.getKey(), event.getValue()); + LiteFlowChainELBuilder.createChain().setChainId(event.getKey()).setEL(event.getValue()).build(); + }); + //删除 chain + chainKey.addListener((EntryRemovedListener) event -> { + LOG.info("starting reload flow config... delete key={}", event.getKey()); + FlowBus.removeChain(event.getKey()); + }); + + //监听 script + if (Objects.nonNull(scriptClient) && StrUtil.isNotBlank(redisParserVO.getScriptDataBase())) { + RMapCache scriptKey = scriptClient.getMapCache(redisParserVO.getScriptKey()); + //添加 script + scriptKey.addListener((EntryCreatedListener) event -> { + LOG.info("starting reload flow config... create key={} value={},", event.getKey(), event.getValue()); + NodeSimpleVO nodeSimpleVO = convert(event.getKey()); + changeScriptNode(nodeSimpleVO, event.getValue()); + }); + //修改 script + scriptKey.addListener((EntryUpdatedListener) event -> { + LOG.info("starting reload flow config... update path={} new value={},", event.getKey(), event.getValue()); + NodeSimpleVO nodeSimpleVO = convert(event.getKey()); + changeScriptNode(nodeSimpleVO, event.getValue()); + }); + //删除 script + scriptKey.addListener((EntryRemovedListener) event -> { + LOG.info("starting reload flow config... delete key={}", event.getKey()); + NodeSimpleVO nodeSimpleVO = convert(event.getKey()); + FlowBus.getNodeMap().remove(nodeSimpleVO.getNodeId()); + }); + } + } + + private void changeScriptNode(NodeSimpleVO nodeSimpleVO, String newValue) { + // 有语言类型 + if (StrUtil.isNotBlank(nodeSimpleVO.getLanguage())) { + LiteFlowNodeBuilder.createScriptNode() + .setId(nodeSimpleVO.getNodeId()) + .setType(NodeTypeEnum.getEnumByCode(nodeSimpleVO.getType())) + .setName(nodeSimpleVO.getName()) + .setScript(newValue) + .setLanguage(nodeSimpleVO.getLanguage()) + .build(); + } + // 没有语言类型 + else { + LiteFlowNodeBuilder.createScriptNode() + .setId(nodeSimpleVO.getNodeId()) + .setType(NodeTypeEnum.getEnumByCode(nodeSimpleVO.getType())) + .setName(nodeSimpleVO.getName()) + .setScript(newValue) + .build(); + } + } +} diff --git a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserHelper.java b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserHelper.java index ee9fa67a2..b784e0f84 100644 --- a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserHelper.java +++ b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserHelper.java @@ -1,238 +1,33 @@ package com.yomahub.liteflow.parser.redis.util; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.text.StrFormatter; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; -import com.yomahub.liteflow.builder.LiteFlowNodeBuilder; -import com.yomahub.liteflow.builder.el.LiteFlowChainELBuilder; -import com.yomahub.liteflow.enums.NodeTypeEnum; -import com.yomahub.liteflow.flow.FlowBus; -import com.yomahub.liteflow.parser.redis.exception.RedisException; -import com.yomahub.liteflow.parser.redis.vo.RedisParserVO; -import com.yomahub.liteflow.spi.holder.ContextAwareHolder; -import org.redisson.Redisson; -import org.redisson.api.RMapCache; -import org.redisson.api.RedissonClient; -import org.redisson.api.map.event.EntryCreatedListener; -import org.redisson.api.map.event.EntryEvent; -import org.redisson.api.map.event.EntryRemovedListener; -import org.redisson.api.map.event.EntryUpdatedListener; -import org.redisson.config.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; import java.util.List; -import java.util.Objects; -import java.util.Set; -public class RedisParserHelper { +public interface RedisParserHelper { - private static final Logger LOG = LoggerFactory.getLogger(RedisParserHelper.class); + Logger LOG = LoggerFactory.getLogger(RedisParserByPubSub.class); + String REDIS_URL_PATTERN = "redis://{}:{}"; - private final RedisParserVO redisParserVO; + String CHAIN_XML_PATTERN = "{}"; - private final String REDIS_URL_PATTERN = "redis://{}:{}"; + String NODE_XML_PATTERN = "{}"; - private final String CHAIN_XML_PATTERN = "{}"; + String NODE_ITEM_XML_PATTERN = ""; - private final String NODE_XML_PATTERN = "{}"; + String NODE_ITEM_WITH_LANGUAGE_XML_PATTERN = ""; - private static final String NODE_ITEM_XML_PATTERN = ""; + String XML_PATTERN = "{}{}"; - private static final String NODE_ITEM_WITH_LANGUAGE_XML_PATTERN = ""; + String getContent(); - private static final String XML_PATTERN = "{}{}"; + void listenRedis(); - private RedissonClient chainClient; - - private RedissonClient scriptClient; - - public RedisParserHelper(RedisParserVO redisParserVO) { - this.redisParserVO = redisParserVO; - - try { - try { - this.chainClient = ContextAwareHolder.loadContextAware().getBean("chainClient"); - this.scriptClient = ContextAwareHolder.loadContextAware().getBean("scriptClient"); - } catch (Exception ignored) { - } - if (ObjectUtil.isNull(chainClient)) { - Config config = getRedissonConfig(redisParserVO, - Integer.parseInt(redisParserVO.getChainDataBase())); - this.chainClient = Redisson.create(config); - //如果有脚本数据 - if (StrUtil.isNotBlank(redisParserVO.getScriptDataBase())) { - config = getRedissonConfig(redisParserVO, - Integer.parseInt(redisParserVO.getScriptDataBase())); - this.scriptClient = Redisson.create(config); - } - } - } catch (Exception e) { - throw new RedisException(e.getMessage()); - } - - } - - private Config getRedissonConfig(RedisParserVO redisParserVO, Integer dataBase) { - Config config = new Config(); - String redisAddress = StrFormatter.format(REDIS_URL_PATTERN, redisParserVO.getHost(), redisParserVO.getPort()); - if (StrUtil.isNotBlank(redisParserVO.getPassword())) { - config.useSingleServer().setAddress(redisAddress) - .setPassword(redisParserVO.getPassword()) - .setDatabase(dataBase); - } else { - config.useSingleServer().setAddress(redisAddress) - .setDatabase(dataBase); - } - return config; - } - - public String getContent() { - try { - // 检查chainKey下有没有子节点 - RMapCache chainKey = chainClient.getMapCache(redisParserVO.getChainKey()); - Set chainNameSet = chainKey.keySet(); - if (CollectionUtil.isEmpty(chainNameSet)) { - throw new RedisException(StrUtil.format("There are no chains in key [{}]", - redisParserVO.getChainKey())); - } - // 获取chainKey下的所有子节点内容List - List chainItemContentList = new ArrayList<>(); - for (String chainName : chainNameSet) { - String chainData = chainKey.get(chainName); - if (StrUtil.isNotBlank(chainData)) { - chainItemContentList.add(StrUtil.format(CHAIN_XML_PATTERN, chainName, chainData)); - } - } - // 合并成所有chain的xml内容 - String chainAllContent = CollUtil.join(chainItemContentList, StrUtil.EMPTY); - - // 检查是否有脚本内容，如果有，进行脚本内容的获取 - String scriptAllContent = StrUtil.EMPTY; - if (hasScript()) { - RMapCache scriptKey = scriptClient.getMapCache(redisParserVO.getScriptKey()); - Set scriptKeySet = scriptKey.keySet(); - - List scriptItemContentList = new ArrayList<>(); - for (String scriptKeyValue : scriptKeySet) { - NodeSimpleVO nodeSimpleVO = convert(scriptKeyValue); - if (Objects.isNull(nodeSimpleVO)) { - throw new RedisException( - StrUtil.format("The name of the redis key is invalid:{}", scriptKeyValue)); - } - String scriptData = scriptKey.get(scriptKeyValue); - - // 有语言类型 - if (StrUtil.isNotBlank(nodeSimpleVO.getLanguage())) { - scriptItemContentList.add(StrUtil.format(NODE_ITEM_WITH_LANGUAGE_XML_PATTERN, - nodeSimpleVO.getNodeId(), nodeSimpleVO.getName(), nodeSimpleVO.getType(), - nodeSimpleVO.getLanguage(), scriptData)); - } - // 没有语言类型 - else { - scriptItemContentList.add(StrUtil.format(NODE_ITEM_XML_PATTERN, nodeSimpleVO.getNodeId(), - nodeSimpleVO.getName(), nodeSimpleVO.getType(), scriptData)); - } - - scriptAllContent = StrUtil.format(NODE_XML_PATTERN, - CollUtil.join(scriptItemContentList, StrUtil.EMPTY)); - } - } - - return StrUtil.format(XML_PATTERN, scriptAllContent, chainAllContent); - } catch (Exception e) { - throw new RedisException(e.getMessage()); - } - } - - public boolean hasScript() { - // 没有scriptClient或没有配置scriptDataBase - if (Objects.isNull(scriptClient) || StrUtil.isNotBlank(redisParserVO.getScriptDataBase())) { - return false; - } - try { - // 存在这个节点，但是子节点不存在 - RMapCache scriptKey = scriptClient.getMapCache(redisParserVO.getScriptKey()); - Set scriptKeySet = scriptKey.keySet(); - return !CollUtil.isEmpty(scriptKeySet); - } catch (Exception e) { - return false; - } - } - - /** - * 监听 redis key - */ - public void listenRedis() { - //监听 chain - RMapCache chainKey = chainClient.getMapCache(redisParserVO.getChainKey()); - //添加新 chain - chainKey.addListener((EntryCreatedListener) event -> { - LOG.info("starting reload flow config... create key={} value={},", event.getKey(), event.getValue()); - LiteFlowChainELBuilder.createChain().setChainId(event.getKey()).setEL(event.getValue()).build(); - }); - //修改 chain - chainKey.addListener((EntryUpdatedListener) event -> { - LOG.info("starting reload flow config... update path={} new value={},", event.getKey(), event.getValue()); - LiteFlowChainELBuilder.createChain().setChainId(event.getKey()).setEL(event.getValue()).build(); - }); - //删除 chain - chainKey.addListener((EntryRemovedListener) event -> { - LOG.info("starting reload flow config... delete key={}", event.getKey()); - FlowBus.removeChain(event.getKey()); - }); - - //监听 script - if (Objects.nonNull(scriptClient) && StrUtil.isNotBlank(redisParserVO.getScriptDataBase())) { - RMapCache scriptKey = scriptClient.getMapCache(redisParserVO.getScriptKey()); - //添加 script - scriptKey.addListener((EntryCreatedListener) event -> { - LOG.info("starting reload flow config... create key={} value={},", event.getKey(), event.getValue()); - NodeSimpleVO nodeSimpleVO = convert(event.getKey()); - changeScriptNode(nodeSimpleVO, event.getValue()); - }); - //修改 script - scriptKey.addListener((EntryUpdatedListener) event -> { - LOG.info("starting reload flow config... update path={} new value={},", event.getKey(), event.getValue()); - NodeSimpleVO nodeSimpleVO = convert(event.getKey()); - changeScriptNode(nodeSimpleVO, event.getValue()); - }); - //删除 script - scriptKey.addListener((EntryRemovedListener) event -> { - LOG.info("starting reload flow config... delete key={}", event.getKey()); - NodeSimpleVO nodeSimpleVO = convert(event.getKey()); - FlowBus.getNodeMap().remove(nodeSimpleVO.getNodeId()); - }); - } - } - - private void changeScriptNode(NodeSimpleVO nodeSimpleVO, String newValue) { - // 有语言类型 - if (StrUtil.isNotBlank(nodeSimpleVO.getLanguage())) { - LiteFlowNodeBuilder.createScriptNode() - .setId(nodeSimpleVO.getNodeId()) - .setType(NodeTypeEnum.getEnumByCode(nodeSimpleVO.type)) - .setName(nodeSimpleVO.getName()) - .setScript(newValue) - .setLanguage(nodeSimpleVO.getLanguage()) - .build(); - } - // 没有语言类型 - else { - LiteFlowNodeBuilder.createScriptNode() - .setId(nodeSimpleVO.getNodeId()) - .setType(NodeTypeEnum.getEnumByCode(nodeSimpleVO.type)) - .setName(nodeSimpleVO.getName()) - .setScript(newValue) - .build(); - } - } - - public NodeSimpleVO convert(String str) { + default NodeSimpleVO convert(String str) { // 不需要去理解这串正则，就是一个匹配冒号的 // 一定得是a:b，或是a:b:c...这种完整类型的字符串的 List matchItemList = ReUtil.findAllGroup0("(?<=[^:]:)[^:]+|[^:]+(?=:[^:])", str); @@ -257,7 +52,7 @@ public class RedisParserHelper { return nodeSimpleVO; } - private static class NodeSimpleVO { + class NodeSimpleVO { private String nodeId;