From 5f5a6fc23a8cc061cc10363ec539b2a98af85c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=81=E6=A0=8B?= Date: Tue, 17 Aug 2021 11:59:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drtc=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=97=B6=E8=8E=B7=E5=8F=96redis=E9=9B=86=E7=BE=A4=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=9C=89=E5=AF=86=E7=A0=81=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/newegg/ec/redis/client/RedisClient.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/redis-manager-dashboard/src/main/java/com/newegg/ec/redis/client/RedisClient.java b/redis-manager-dashboard/src/main/java/com/newegg/ec/redis/client/RedisClient.java index 4257e49e..cc8b52d4 100644 --- a/redis-manager-dashboard/src/main/java/com/newegg/ec/redis/client/RedisClient.java +++ b/redis-manager-dashboard/src/main/java/com/newegg/ec/redis/client/RedisClient.java @@ -5,6 +5,7 @@ import com.newegg.ec.redis.util.RedisUtil; import com.newegg.ec.redis.util.SignUtil; import org.apache.commons.lang.StringUtils; +import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.*; @@ -18,6 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.*; +import static com.newegg.ec.redis.client.RedisURI.MAX_ATTEMPTS; import static com.newegg.ec.redis.client.RedisURI.TIMEOUT; import static com.newegg.ec.redis.util.RedisUtil.*; @@ -738,7 +740,12 @@ public Map clusterNodesIP(Cluster cluster) { String redisUrl = cluster.getNodes().split(",")[0]; String redisHost = redisUrl.split(":")[0]; int redisPort = Integer.parseInt(redisUrl.split(":")[1]); - JedisCluster jedisCluster = new JedisCluster(new HostAndPort(redisHost,redisPort)); + JedisCluster jedisCluster = null; + if (Strings.isNullOrEmpty(cluster.getRedisPassword())) { + jedisCluster = new JedisCluster(new HostAndPort(redisHost,redisPort)); + } else { + jedisCluster = new JedisCluster(new HostAndPort(redisHost,redisPort), TIMEOUT, TIMEOUT, MAX_ATTEMPTS, cluster.getRedisPassword(), new GenericObjectPoolConfig()); + } Map nodes = jedisCluster.getClusterNodes(); Map clusterNodesIP = new HashMap<>(); nodes.forEach((k, v) -> { @@ -861,7 +868,12 @@ public Map> clusterNodesMap(Cluster cluster) { String redisUrl = cluster.getNodes().split(",")[0]; String redisHost = redisUrl.split(":")[0]; int redisPort = Integer.parseInt(redisUrl.split(":")[1]); - JedisCluster jedisCluster = new JedisCluster(new HostAndPort(redisHost,redisPort)); + JedisCluster jedisCluster = null; + if (Strings.isNullOrEmpty(cluster.getRedisPassword())) { + jedisCluster = new JedisCluster(new HostAndPort(redisHost,redisPort)); + } else { + jedisCluster = new JedisCluster(new HostAndPort(redisHost,redisPort), TIMEOUT, TIMEOUT, MAX_ATTEMPTS, cluster.getRedisPassword(), new GenericObjectPoolConfig()); + } Map nodes = jedisCluster.getClusterNodes(); Map> clusterNodes = new HashMap<>();