zk 迁移spi

mpush-core/src/main/java/com/shinemo/mpush/core/App.java

@@ -7,11 +7,13 @@
 import com.shinemo.mpush.tools.Jsons;
 import com.shinemo.mpush.tools.config.ConfigCenter;
 import com.shinemo.mpush.tools.redis.RedisGroup;
+import com.shinemo.mpush.tools.spi.ServiceContainer;
 import com.shinemo.mpush.tools.thread.ThreadPoolUtil;
 import com.shinemo.mpush.tools.zk.ZKPath;
 import com.shinemo.mpush.tools.zk.ServerApp;
-import com.shinemo.mpush.tools.zk.ZkUtil;
+import com.shinemo.mpush.tools.zk.ZkRegister;
 import com.shinemo.mpush.tools.zk.listener.impl.RedisPathListener;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,6 +28,8 @@ public final class App {
     private static final App APP = new App();
     private ConnectionServer connectionServer;
     private GatewayServer gatewayServer;
+
+    private ZkRegister zkRegister = null;
 
     public static void main(String[] args) throws Exception {
         LOGGER.error("mpush app start begin....");
@@ -102,19 +106,23 @@ public void onFailure(String message) {
 
     private void registerServerToZK(int port, ZKPath path) {
         ServerApp app = new ServerApp(MPushUtil.getLocalIp(), port);
-        ZkUtil.instance.registerEphemeralSequential(path.getWatchPath(), Jsons.toJson(app));
+        zkRegister.registerEphemeralSequential(path.getWatchPath(), Jsons.toJson(app));
         LOGGER.error("mpush app register server:{} to zk success", port);
     }
+
+    public void initZkRegister(){
+    	zkRegister = ServiceContainer.getInstance(ZkRegister.class);
+    }
 
     public void initRedisClient() throws Exception {
 
-    	boolean exist = ZkUtil.instance.isExisted(ZKPath.REDIS_SERVER.getPath());
+    	boolean exist = zkRegister.isExisted(ZKPath.REDIS_SERVER.getPath());
         if (!exist) {
             List<RedisGroup> groupList = ConfigCenter.holder.redisGroups();
-            ZkUtil.instance.registerPersist(ZKPath.REDIS_SERVER.getPath(), Jsons.toJson(groupList));
+            zkRegister.registerPersist(ZKPath.REDIS_SERVER.getPath(), Jsons.toJson(groupList));
         }
         RedisPathListener listener = new RedisPathListener();
-        ZkUtil.instance.getCache().getListenable().addListener(listener);
+        zkRegister.getCache().getListenable().addListener(listener);
         listener.initData(null);
     }
 }

mpush-core/src/main/resources/config.properties

@@ -34,7 +34,7 @@ compress_limit = 10240
 max_packet_size = 10240
 
 ## zk 配置项
-zk_ip = 10.1.10.41:2181
+zk_ip = 10.1.30.2:2181
 zk_namespace = mpush
 zk_digest = shinemoIpo
 

mpush-tools/src/test/java/com/shinemo/mpush/tools/zk/ServerManageTest.java → mpush-core/src/test/java/com/shinemo/mpush/core/zk/ServerManageTest.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.tools.zk;
+package com.shinemo.mpush.core.zk;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
@@ -9,6 +9,8 @@
 import org.slf4j.LoggerFactory;
 
 import com.shinemo.mpush.tools.MPushUtil;
+import com.shinemo.mpush.tools.zk.ServerApp;
+import com.shinemo.mpush.tools.zk.ZKPath;
 import com.shinemo.mpush.tools.zk.manage.ServerManage;
 
 public class ServerManageTest {

mpush-core/src/test/java/com/shinemo/mpush/core/zk/ZkTest.java

@@ -0,0 +1,20 @@
+package com.shinemo.mpush.core.zk;
+
+import org.junit.Test;
+
+import com.shinemo.mpush.tools.zk.ZkRegister;
+import com.shinemo.mpush.tools.zk.curator.services.ZkRegisterManager;
+
+public class ZkTest {
+
+	@Test
+	public void remove(){
+		ZkRegister zkRegister = new ZkRegisterManager();
+
+		zkRegister.init();
+
+		zkRegister.remove("/");
+
+	}
+
+}

mpush-tools/src/test/java/com/shinemo/mpush/tools/zk/ZkUtilTest.java → mpush-core/src/test/java/com/shinemo/mpush/core/zk/ZkUtilTest.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.tools.zk;
+package com.shinemo.mpush.core.zk;
 
 import java.util.List;
 
@@ -13,14 +13,18 @@
 import com.shinemo.mpush.tools.Jsons;
 import com.shinemo.mpush.tools.redis.RedisGroup;
 import com.shinemo.mpush.tools.redis.RedisNode;
+import com.shinemo.mpush.tools.zk.ServerApp;
+import com.shinemo.mpush.tools.zk.ZKPath;
+import com.shinemo.mpush.tools.zk.ZkRegister;
+import com.shinemo.mpush.tools.zk.curator.services.ZkRegisterManager;
 
 public class ZkUtilTest {
 
-    private ZkUtil zkUtil;
+    private ZkRegister zkUtil;
 
     @Before
     public void setUp() throws Exception {
-        zkUtil = ZkUtil.instance;
+        zkUtil = new ZkRegisterManager();
     }
 
     @Test

mpush-tools/src/main/java/com/shinemo/mpush/tools/zk/ZkRegister.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.recipes.cache.TreeCache;
 
 import com.shinemo.mpush.tools.spi.SPI;
 
@@ -33,5 +34,9 @@ public interface ZkRegister {
 	public String get(String key);
 
 	public CuratorFramework getClient();
+
+	public ZkConfig getZkConfig();
+
+	TreeCache getCache();
 
 }