From 676e974c913633ec92e82201d64e42c3b3ce05b2 Mon Sep 17 00:00:00 2001
From: "everywhere.z" <weenyc31@163.com>
Date: Sun, 23 Oct 2022 15:39:32 +0800
Subject: [PATCH] =?UTF-8?q?enhancement=20#I5X1O6=20=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=80=A7=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=B8=8D?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=9A=84=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 liteflow-core/pom.xml                               |  4 ++++
 liteflow-rule-plugin/liteflow-rule-etcd/pom.xml     |  6 ------
 .../yomahub/liteflow/parser/etcd/EtcdClient.java    |  2 +-
 .../liteflow/parser/zk/util/ZkParserHelper.java     | 13 ++++++++-----
 pom.xml                                             |  7 ++++++-
 5 files changed, 19 insertions(+), 13 deletions(-)

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 @@
 			<groupId>com.alibaba</groupId>
 			<artifactId>QLExpress</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+		</dependency>
 	</dependencies>
 </project>
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 @@
         <dependency>
             <groupId>io.etcd</groupId>
             <artifactId>jetcd-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jetcd-grpc</artifactId>
-                    <groupId>io.etcd</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
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<String, Watch.Watcher> 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 @@
 		<netty.version>4.1.84.Final</netty.version>
 		<guava.version>31.1-jre</guava.version>
 		<httpclient.version>4.5.13</httpclient.version>
+		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 	</properties>
 
 	<dependencyManagement>
@@ -212,7 +213,11 @@
 				<artifactId>byte-buddy</artifactId>
 				<version>${bytebuddy.version}</version>
 			</dependency>
-
+			<dependency>
+				<groupId>commons-beanutils</groupId>
+				<artifactId>commons-beanutils</artifactId>
+				<version>${commons-beanutils.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjweaver</artifactId>