From fc94063b335c334ebb0721eeceeca46becd90ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=B2?= <yanxx@shinemo.com>
Date: Mon, 19 Dec 2016 15:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4Redis=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cache/redis/connection/RedisConnectionFactory.java   | 9 +++++----
 .../java/com/mpush/cache/redis/manager/RedisManager.java | 4 +---
 .../mpush/cache/redis/manager/ZKRedisClusterManager.java | 5 +++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mpush-cache/src/main/java/com/mpush/cache/redis/connection/RedisConnectionFactory.java b/mpush-cache/src/main/java/com/mpush/cache/redis/connection/RedisConnectionFactory.java
index ab57ff9f..70895d49 100644
--- a/mpush-cache/src/main/java/com/mpush/cache/redis/connection/RedisConnectionFactory.java
+++ b/mpush-cache/src/main/java/com/mpush/cache/redis/connection/RedisConnectionFactory.java
@@ -16,6 +16,7 @@
 package com.mpush.cache.redis.connection;
 
 import com.mpush.cache.redis.RedisServer;
+import com.mpush.tools.config.data.RedisNode;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.slf4j.Logger;
@@ -49,7 +50,7 @@ public class RedisConnectionFactory {
     private JedisPoolConfig poolConfig = new JedisPoolConfig();
     private int dbIndex = 0;
     private JedisCluster cluster;
-    private List<RedisServer> redisServers;
+    private List<RedisNode> redisServers;
     private boolean isCluster = false;
 
     /**
@@ -127,11 +128,11 @@ private JedisCluster createCluster() {
      * @return
      * @since 1.7
      */
-    protected JedisCluster createCluster(List<RedisServer> servers, GenericObjectPoolConfig poolConfig) {
+    protected JedisCluster createCluster(List<RedisNode> servers, GenericObjectPoolConfig poolConfig) {
 
         Set<HostAndPort> hostAndPort = servers
                 .stream()
-                .map(RedisServer::convert)
+                .map(redisNode -> new HostAndPort(redisNode.host, redisNode.port))
                 .collect(Collectors.toSet());
 
         int redirects = 5;
@@ -318,7 +319,7 @@ public void setCluster(boolean cluster) {
         isCluster = cluster;
     }
 
-    public void setRedisServers(List<RedisServer> redisServers) {
+    public void setRedisServers(List<RedisNode> redisServers) {
         Objects.requireNonNull(redisServers);
         this.redisServers = redisServers;
         this.hostName = redisServers.get(0).getHost();
diff --git a/mpush-cache/src/main/java/com/mpush/cache/redis/manager/RedisManager.java b/mpush-cache/src/main/java/com/mpush/cache/redis/manager/RedisManager.java
index fbb8ccdd..da4d0cad 100644
--- a/mpush-cache/src/main/java/com/mpush/cache/redis/manager/RedisManager.java
+++ b/mpush-cache/src/main/java/com/mpush/cache/redis/manager/RedisManager.java
@@ -42,11 +42,9 @@ public final class RedisManager {
 
     public void init() {
         Logs.REDIS.info("begin init redis...");
-        RedisClusterManager clusterManager = new ZKRedisClusterManager();
-        clusterManager.init();
         factory.setPassword(CC.mp.redis.password);
         factory.setPoolConfig(CC.mp.redis.getPoolConfig(JedisPoolConfig.class));
-        factory.setRedisServers(clusterManager.getServers());
+        factory.setRedisServers(CC.mp.redis.nodes);
         factory.setCluster(CC.mp.redis.isCluster());
         factory.init();
         test();
diff --git a/mpush-cache/src/main/java/com/mpush/cache/redis/manager/ZKRedisClusterManager.java b/mpush-cache/src/main/java/com/mpush/cache/redis/manager/ZKRedisClusterManager.java
index 749f1b60..f66d3bdd 100644
--- a/mpush-cache/src/main/java/com/mpush/cache/redis/manager/ZKRedisClusterManager.java
+++ b/mpush-cache/src/main/java/com/mpush/cache/redis/manager/ZKRedisClusterManager.java
@@ -36,10 +36,11 @@
 
 import static com.mpush.zk.ZKPath.REDIS_SERVER;
 
-public class ZKRedisClusterManager implements RedisClusterManager {
+@Deprecated
+class ZKRedisClusterManager implements RedisClusterManager {
     private final ZKRedisNodeWatcher watcher = new ZKRedisNodeWatcher();
 
-    public ZKRedisClusterManager() {
+    private ZKRedisClusterManager() {
     }
 
     /**