Skip to content

Commit 221bdd2

Browse files
committed
Merge branch 'springboot3' of gitee.com:dromara/dynamic-tp into springboot3
2 parents 847c383 + 0ec0db2 commit 221bdd2

File tree

2 files changed

+13
-2
lines changed
  • common/src/main/java/org/dromara/dynamictp/common/properties
  • starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util

2 files changed

+13
-2
lines changed

common/src/main/java/org/dromara/dynamictp/common/properties/DtpProperties.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ public static class Zookeeper {
188188
private String node;
189189

190190
private String configKey;
191+
192+
private String scheme;
193+
194+
private String auth;
191195
}
192196

193197
/**

starter/starter-configcenter/starter-zookeeper/src/main/java/org/dromara/dynamictp/starter/zookeeper/util/CuratorUtil.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import java.util.List;
3838
import java.util.Map;
3939
import java.util.concurrent.CountDownLatch;
40+
import cn.hutool.core.text.CharSequenceUtil;
4041

4142
import static org.dromara.dynamictp.common.em.ConfigFileTypeEnum.JSON;
4243
import static org.dromara.dynamictp.common.em.ConfigFileTypeEnum.PROPERTIES;
@@ -59,8 +60,14 @@ private CuratorUtil() { }
5960
public static CuratorFramework getCuratorFramework(DtpProperties dtpProperties) {
6061
if (curatorFramework == null) {
6162
DtpProperties.Zookeeper zookeeper = dtpProperties.getZookeeper();
62-
curatorFramework = CuratorFrameworkFactory.newClient(zookeeper.getZkConnectStr(),
63-
new ExponentialBackoffRetry(1000, 3));
63+
CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory
64+
.builder()
65+
.connectString(zookeeper.getZkConnectStr())
66+
.retryPolicy(new ExponentialBackoffRetry(1000, 3));
67+
if (CharSequenceUtil.isAllNotBlank(zookeeper.getScheme(), zookeeper.getAuth())){
68+
builder.authorization(zookeeper.getScheme(), zookeeper.getAuth().getBytes());
69+
}
70+
curatorFramework = builder.build();
6471
final ConnectionStateListener connectionStateListener = (client, newState) -> {
6572
if (newState == ConnectionState.CONNECTED) {
6673
COUNT_DOWN_LATCH.countDown();

0 commit comments

Comments
 (0)