From 47c17d3d6ef1d5100c5739a5e37090fb95884b57 Mon Sep 17 00:00:00 2001 From: linxuekai Date: Tue, 14 Jan 2025 15:53:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?DtpProperties.Zookeeper=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20schema=E3=80=81auth=20=E8=AE=A4=E8=AF=81=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=AD=97=E6=AE=B5=20CuratorUtil.getCuratorFramework?= =?UTF-8?q?=20=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamictp/common/properties/DtpProperties.java | 4 ++++ .../dynamictp/starter/zookeeper/util/CuratorUtil.java | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java b/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java index c4610564..41128dd9 100644 --- a/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java +++ b/common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java @@ -188,6 +188,10 @@ public class DtpProperties { private String node; private String configKey; + + private String scheme; + + private String auth; } /** diff --git a/starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util/CuratorUtil.java b/starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util/CuratorUtil.java index d71f2400..7515a736 100644 --- a/starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util/CuratorUtil.java +++ b/starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util/CuratorUtil.java @@ -59,8 +59,12 @@ public class CuratorUtil { public static CuratorFramework getCuratorFramework(DtpProperties dtpProperties) { if (curatorFramework == null) { DtpProperties.Zookeeper zookeeper = dtpProperties.getZookeeper(); - curatorFramework = CuratorFrameworkFactory.newClient(zookeeper.getZkConnectStr(), - new ExponentialBackoffRetry(1000, 3)); + curatorFramework = CuratorFrameworkFactory + .builder() + .authorization(zookeeper.getScheme(), zookeeper.getAuth().getBytes()) + .connectString(zookeeper.getZkConnectStr()) + .retryPolicy(new ExponentialBackoffRetry(1000, 3)) + .build(); final ConnectionStateListener connectionStateListener = (client, newState) -> { if (newState == ConnectionState.CONNECTED) { COUNT_DOWN_LATCH.countDown(); -- Gitee From 1b78d42036b8eaf9de39484c53f2040ca9172d56 Mon Sep 17 00:00:00 2001 From: linxuekai Date: Tue, 14 Jan 2025 17:38:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8hutool-CharSequenceUtil?= =?UTF-8?q?=20=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starter/zookeeper/util/CuratorUtil.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util/CuratorUtil.java b/starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util/CuratorUtil.java index 7515a736..7c0b14b5 100644 --- a/starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util/CuratorUtil.java +++ b/starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util/CuratorUtil.java @@ -17,6 +17,8 @@ package org.dromara.dynamictp.starter.zookeeper.util; +import cn.hutool.core.text.CharSequenceUtil; +import cn.hutool.core.util.StrUtil; import org.dromara.dynamictp.common.properties.DtpProperties; import org.dromara.dynamictp.core.handler.ConfigHandler; import com.google.common.collect.Maps; @@ -59,12 +61,14 @@ public class CuratorUtil { public static CuratorFramework getCuratorFramework(DtpProperties dtpProperties) { if (curatorFramework == null) { DtpProperties.Zookeeper zookeeper = dtpProperties.getZookeeper(); - curatorFramework = CuratorFrameworkFactory + CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory .builder() - .authorization(zookeeper.getScheme(), zookeeper.getAuth().getBytes()) .connectString(zookeeper.getZkConnectStr()) - .retryPolicy(new ExponentialBackoffRetry(1000, 3)) - .build(); + .retryPolicy(new ExponentialBackoffRetry(1000, 3)); + if (CharSequenceUtil.isAllNotBlank(zookeeper.getScheme(), zookeeper.getAuth())){ + builder .authorization(zookeeper.getScheme(), zookeeper.getAuth().getBytes()); + } + curatorFramework = builder.build(); final ConnectionStateListener connectionStateListener = (client, newState) -> { if (newState == ConnectionState.CONNECTED) { COUNT_DOWN_LATCH.countDown(); -- Gitee