From 7bc9c7d1bbcad021db449dbedae32319d496c5bf Mon Sep 17 00:00:00 2001 From: bryan31 Date: Thu, 8 Apr 2021 11:37:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3zkYml=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yomahub/liteflow/parser/YmlFlowParser.java | 2 +- .../yomahub/liteflow/parser/ZookeeperYmlFlowParser.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java index ddd9ff7e7..ab611b34f 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/YmlFlowParser.java @@ -24,7 +24,7 @@ public abstract class YmlFlowParser extends JsonFlowParser{ parse(ruleObject.toJSONString()); } - private JSONObject convertToJson(String yamlString) { + protected JSONObject convertToJson(String yamlString) { Yaml yaml= new Yaml(); Map map = yaml.load(yamlString); JSONObject jsonObject = new JSONObject(map); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java index 2f79bd6ac..9295c4474 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/ZookeeperYmlFlowParser.java @@ -1,6 +1,7 @@ package com.yomahub.liteflow.parser; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; import com.yomahub.liteflow.exception.ParseException; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -45,12 +46,14 @@ public class ZookeeperYmlFlowParser extends YmlFlowParser{ String content = new String(client.getData().forPath(nodePath)); - if (StrUtil.isBlank(content)) { String error = MessageFormat.format("the node[{0}] value is empty", nodePath); throw new ParseException(error); } - parse(content); + + JSONObject ruleObject = convertToJson(content); + + parse(ruleObject.toJSONString()); final NodeCache cache = new NodeCache(client,nodePath);