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

nacos rule

Browse Source 
1.调整填充初始化数据
2.调整listener
3.测试用例调整
This commit is contained in:
mll
2022-09-20 09:11:58 +08:00
parent 73084b8da3
commit 0a1671b5ab
7 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/NacosXmlELParser.java
View File

@@ -21,13 +21,6 @@ public class NacosXmlELParser extends ClassXmlFlowELParser {
private final NacosParserHelper helper;
public NacosXmlELParser() {
Consumer<String> parseConsumer = t -> {
try {
parse(t);
} catch (Exception e) {
throw new RuntimeException(e);
}
};
LiteflowConfig liteflowConfig = LiteflowConfigGetter.get();
if (StrUtil.isBlank(liteflowConfig.getRuleSourceExtData())){
@@ -44,7 +37,7 @@ public class NacosXmlELParser extends ClassXmlFlowELParser {
nacosParserVO.setNamespace("");
}
if (StrUtil.isBlank(nacosParserVO.getDataId())){
nacosParserVO.setDataId("LiteFLow");
nacosParserVO.setDataId("LiteFlow");
}
if (StrUtil.isBlank(nacosParserVO.getGroup())){
nacosParserVO.setGroup("LITE_FLOW_GROUP");
@@ -55,7 +48,7 @@ public class NacosXmlELParser extends ClassXmlFlowELParser {
if (StrUtil.isBlank(nacosParserVO.getPassword())){
nacosParserVO.setPassword("");
}
helper = new NacosParserHelper(nacosParserVO, parseConsumer);
helper = new NacosParserHelper(nacosParserVO);
}catch (Exception e){
throw new NacosException(e.getMessage());
}
@@ -63,10 +56,17 @@ public class NacosXmlELParser extends ClassXmlFlowELParser {
@Override
public String parseCustom() {
Consumer<String> parseConsumer = t -> {
try {
parse(t);
} catch (Exception e) {
throw new RuntimeException(e);
}
};
try{
String content = helper.getContent();
helper.checkContent(content);
helper.listener();
helper.listener(parseConsumer);
return content;
}catch (Exception e){
throw new NacosException(e.getMessage());

24
liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/util/NacosParserHelper.java
View File

@@ -1,10 +1,9 @@
package com.yomahub.liteflow.parser.nacos.util;
import cn.hutool.core.util.StrUtil;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.PropertyKeyConst;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.config.listener.Listener;
import com.alibaba.nacos.client.config.NacosConfigService;
import com.yomahub.liteflow.exception.ParseException;
import com.yomahub.liteflow.parser.nacos.exception.NacosException;
import com.yomahub.liteflow.parser.nacos.vo.NacosParserVO;
@@ -13,7 +12,6 @@ import org.slf4j.LoggerFactory;
import java.text.MessageFormat;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import java.util.function.Consumer;
@@ -27,27 +25,18 @@ public class NacosParserHelper {
private static final Logger LOG = LoggerFactory.getLogger(NacosParserHelper.class);
private final NacosParserVO nacosParserVO;
private final Consumer<String> parseConsumer;
private static final ConcurrentHashMap<String,String> CONFIG_MAP = new ConcurrentHashMap<>(1);
private final NacosConfigService configService;
private final ConfigService configService;
static {
CONFIG_MAP.put("Content","");
}
public NacosParserHelper(NacosParserVO nacosParserVO, Consumer<String> parseConsumer) {
public NacosParserHelper(NacosParserVO nacosParserVO) {
this.nacosParserVO = nacosParserVO;
this.parseConsumer = parseConsumer;
try{
Properties properties = new Properties();
properties.put(PropertyKeyConst.SERVER_ADDR, nacosParserVO.getServerAddr());
properties.put(PropertyKeyConst.NAMESPACE,nacosParserVO.getNamespace());
properties.put(PropertyKeyConst.USERNAME,nacosParserVO.getUsername());
properties.put(PropertyKeyConst.PASSWORD,nacosParserVO.getPassword());
this.configService = NacosFactory.createConfigService(properties);
CONFIG_MAP.put("Content",configService.getConfig(nacosParserVO.getDataId(), nacosParserVO.getGroup(), 3000L));
this.configService = new NacosConfigService(properties);
}catch (Exception e){
throw new NacosException(e.getMessage());
}
@@ -55,7 +44,7 @@ public class NacosParserHelper {
public String getContent(){
try{
return CONFIG_MAP.get("Content");
return configService.getConfig(nacosParserVO.getDataId(), nacosParserVO.getGroup(), 3000L);
}catch (Exception e){
throw new NacosException(e.getMessage());
}
@@ -74,13 +63,12 @@ public class NacosParserHelper {
/**
* 监听 nacos 数据变化
*/
public void listener() {
public void listener(Consumer<String> parseConsumer) {
try {
this.configService.addListener(nacosParserVO.getDataId(), nacosParserVO.getGroup(), new Listener() {
@Override
public void receiveConfigInfo(String configInfo) {
LOG.info("stating load flow config.... {} " , configInfo);
CONFIG_MAP.put("Content",configInfo);
parseConsumer.accept(configInfo);
}
@Override