diff --git a/liteflow-core/pom.xml b/liteflow-core/pom.xml
index 50339d437..537f03d64 100644
--- a/liteflow-core/pom.xml
+++ b/liteflow-core/pom.xml
@@ -46,5 +46,9 @@
com.alibaba
QLExpress
+
+ commons-beanutils
+ commons-beanutils
+
diff --git a/liteflow-rule-plugin/liteflow-rule-etcd/pom.xml b/liteflow-rule-plugin/liteflow-rule-etcd/pom.xml
index 60ed59a3b..f1c75a42e 100644
--- a/liteflow-rule-plugin/liteflow-rule-etcd/pom.xml
+++ b/liteflow-rule-plugin/liteflow-rule-etcd/pom.xml
@@ -23,12 +23,6 @@
io.etcd
jetcd-core
-
-
- jetcd-grpc
- io.etcd
-
-
io.netty
diff --git a/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/EtcdClient.java b/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/EtcdClient.java
index 8983ce9f9..3b862752f 100644
--- a/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/EtcdClient.java
+++ b/liteflow-rule-plugin/liteflow-rule-etcd/src/main/java/com/yomahub/liteflow/parser/etcd/EtcdClient.java
@@ -25,7 +25,7 @@ public class EtcdClient {
private static final Logger LOG = LoggerFactory.getLogger(EtcdClient.class);
- private Client client;
+ private final Client client;
private final ConcurrentHashMap watchCache = new ConcurrentHashMap<>();
diff --git a/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java
index 96b1e476d..7f62697c1 100644
--- a/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java
+++ b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java
@@ -6,6 +6,9 @@ import com.yomahub.liteflow.parser.zk.exception.ZkException;
import com.yomahub.liteflow.parser.zk.vo.ZkParserVO;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.framework.recipes.cache.ChildData;
+import org.apache.curator.framework.recipes.cache.CuratorCache;
+import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
import org.apache.curator.framework.recipes.cache.NodeCache;
import org.apache.curator.retry.RetryNTimes;
import org.slf4j.Logger;
@@ -65,15 +68,15 @@ public class ZkParserHelper {
/**
* 监听 zk 节点
*/
- public void listenZkNode() throws Exception {
- final NodeCache cache = new NodeCache(client, zkParserVO.getNodePath());
+ public void listenZkNode() {
+ CuratorCache cache = CuratorCache.build(client, zkParserVO.getNodePath());
+
cache.start();
- cache.getListenable().addListener(() -> {
- String content1 = new String(cache.getCurrentData().getData());
+ cache.listenable().addListener((type, oldData, data) -> {
+ String content1 = new String(data.getData());
LOG.info("stating load flow config....");
parseConsumer.accept(content1);
});
}
-
}
diff --git a/pom.xml b/pom.xml
index 3c2a02c2c..677606500 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
4.1.84.Final
31.1-jre
4.5.13
+ 1.9.4
@@ -212,7 +213,11 @@
byte-buddy
${bytebuddy.version}
-
+
+ commons-beanutils
+ commons-beanutils
+ ${commons-beanutils.version}
+
org.aspectj
aspectjweaver