重构

mpush-client/src/main/java/com/mpush/conn/client/ClientChannelHandler.java

@@ -66,7 +66,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                     byte[] sessionKey = CipherBox.INSTANCE.mixKey(securityNettyClient.getClientKey(), message.serverKey);
                     connection.getSessionContext().changeCipher(new AesCipher(sessionKey, securityNettyClient.getIv()));
                     client.startHeartBeat(message.heartbeat);
-                    LOGGER.info("会话密钥：{}，message={}", sessionKey, message);
+                    LOGGER.warn("会话密钥：{}，message={}", sessionKey, message);
                     bindUser(securityNettyClient);
                     saveToRedisForFastConnection(securityNettyClient, message.sessionId, message.expireTime, sessionKey);
                 } else if (command == Command.FAST_CONNECT) {
@@ -79,7 +79,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                     FastConnectOkMessage message = new FastConnectOkMessage(packet, connection);
                     client.startHeartBeat(message.heartbeat);
                     bindUser(securityNettyClient);
-                    LOGGER.info("fast connect success, message=" + message);
+                    LOGGER.warn("fast connect success, message=" + message);
                 } else if (command == Command.KICK) {
                     KickUserMessage message = new KickUserMessage(packet, connection);
                     LOGGER.error("receive kick user userId={}, deviceId={}, message={},", securityNettyClient.getUserId(), securityNettyClient.getDeviceId(), message);
@@ -89,17 +89,17 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                     LOGGER.error("receive an error packet=" + errorMessage);
                 } else if (command == Command.BIND) {
                     OkMessage okMessage = new OkMessage(packet, connection);
-                    LOGGER.info("receive an success packet=" + okMessage);
+                    LOGGER.warn("receive an success packet=" + okMessage);
                     HttpRequestMessage message = new HttpRequestMessage(connection);
                     message.uri = "http://baidu.com";
                     message.send();
                 } else if (command == Command.PUSH) {
                     PushMessage message = new PushMessage(packet, connection);
-                    LOGGER.info("receive an push message, content=" + message.content);
+                    LOGGER.warn("receive an push message, content=" + message.content);
                 } else if (command == Command.HEARTBEAT) {
-                    LOGGER.info("receive a heartbeat pong...");
+                    LOGGER.warn("receive a heartbeat pong...");
                 } else {
-                    LOGGER.info("receive a message, type=" + command + "," + packet);
+                    LOGGER.warn("receive a message, type=" + command + "," + packet);
                 }
             }
 

mpush-client/src/main/java/com/mpush/push/zk/manager/ConnectZKNodeManager.java

@@ -15,7 +15,7 @@ public class ConnectZKNodeManager implements ZKNodeManager<ZKServerNode> {
 
     private final Logger log = LoggerFactory.getLogger(ConnectZKNodeManager.class);
 
-    private Map<String, ZKServerNode> cache = Maps.newConcurrentMap();
+    private final Map<String, ZKServerNode> cache = Maps.newConcurrentMap();
 
     @Override
     public void addOrUpdate(String fullPath, ZKServerNode node) {

mpush-test/src/test/java/com/mpush/test/connection/client/ConnectTestClient.java

@@ -2,24 +2,19 @@
 
 import com.google.common.collect.Lists;
 import com.mpush.common.AbstractClient;
-import com.mpush.zk.ZKNodeManager;
-import com.mpush.zk.ZKServerNode;
 import com.mpush.push.zk.listener.ConnectZKListener;
-import com.mpush.tools.spi.ServiceContainer;
+import com.mpush.zk.ZKServerNode;
 
 import java.util.List;
 
 public class ConnectTestClient extends AbstractClient {
-
-    @SuppressWarnings("unchecked")
-    private ZKNodeManager<ZKServerNode> connectionServerManage = ServiceContainer.load(ZKNodeManager.class);
+    private final ConnectZKListener listener = new ConnectZKListener();
 
     public ConnectTestClient() {
-        registerListener(new ConnectZKListener());
+        registerListener(listener);
     }
 
     public List<ZKServerNode> getServers() {
-        return Lists.newArrayList(connectionServerManage.getList());
+        return Lists.newArrayList(listener.getManager().getList());
     }
-
 }

mpush-test/src/test/java/com/mpush/test/connection/severs/Main.java

@@ -0,0 +1,12 @@
+package com.mpush.test.connection.severs;
+
+/**
+ * Created by yxx on 2016/5/16.
+ *
+ * @author ohun@live.cn
+ */
+public class Main {
+    public static void main(String[] args) {
+        com.mpush.Main.main(args);
+    }
+}

mpush-test/src/test/java/com/mpush/test/push/Main.java

@@ -23,7 +23,7 @@ public static void main(String[] args) throws Exception {
             PushContent content = PushContent.build(PushType.MESSAGE, "this a first push." + i);
             content.setMsgId("msgId_" + (i % 2));
 
-            client.send(Jsons.toJson(content), Arrays.asList("doctor43test", "huang2", "huang"), new PushSender.Callback() {
+            client.send(Jsons.toJson(content), Arrays.asList("doctor43test", "user-0", "huang"), new PushSender.Callback() {
                 @Override
                 public void onSuccess(String userId) {
                     System.err.println("push onSuccess userId=" + userId);

mpush-test/src/test/resources/config.properties

@@ -1,36 +1,35 @@
 ##
-max_packet_size = 10240
+max_packet_size=10240
 ##
-compress_limit = 10240
+compress_limit=10240
 ##
-min_heartbeat = 10000
+min_heartbeat=10000
 ##
-max_heartbeat = 180000
+max_heartbeat=180000
 ##
-max_hb_timeout_times = 2
+max_hb_timeout_times=2
 ##
-private_key = MIIBNgIBADANBgkqhkiG9w0BAQEFAASCASAwggEcAgEAAoGBAKCE8JYKhsbydMPbiO7BJVq1pbuJWJHFxOR7L8Hv3ZVkSG4eNC8DdwAmDHYu/wadfw0ihKFm2gKDcLHp5yz5UQ8PZ8FyDYvgkrvGV0ak4nc40QDJWws621dm01e/INlGKOIStAAsxOityCLv0zm5Vf3+My/YaBvZcB5mGUsPbx8fAgEAAoGAAy0+WanRqwRHXUzt89OsupPXuNNqBlCEqgTqGAt4Nimq6Ur9u2R1KXKXUotxjp71Ubw6JbuUWvJg+5Rmd9RjT0HOUEQF3rvzEepKtaraPhV5ejEIrB+nJWNfGye4yzLdfEXJBGUQzrG+wNe13izfRNXI4dN/6Q5npzqaqv0E1CkCAQACAQACAQACAQACAQA=
+private_key=MIIBNgIBADANBgkqhkiG9w0BAQEFAASCASAwggEcAgEAAoGBAKCE8JYKhsbydMPbiO7BJVq1pbuJWJHFxOR7L8Hv3ZVkSG4eNC8DdwAmDHYu/wadfw0ihKFm2gKDcLHp5yz5UQ8PZ8FyDYvgkrvGV0ak4nc40QDJWws621dm01e/INlGKOIStAAsxOityCLv0zm5Vf3+My/YaBvZcB5mGUsPbx8fAgEAAoGAAy0+WanRqwRHXUzt89OsupPXuNNqBlCEqgTqGAt4Nimq6Ur9u2R1KXKXUotxjp71Ubw6JbuUWvJg+5Rmd9RjT0HOUEQF3rvzEepKtaraPhV5ejEIrB+nJWNfGye4yzLdfEXJBGUQzrG+wNe13izfRNXI4dN/6Q5npzqaqv0E1CkCAQACAQACAQACAQACAQA=
 ##
-public_key = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCghPCWCobG8nTD24juwSVataW7iViRxcTkey/B792VZEhuHjQvA3cAJgx2Lv8GnX8NIoShZtoCg3Cx6ecs+VEPD2fBcg2L4JK7xldGpOJ3ONEAyVsLOttXZtNXvyDZRijiErQALMTorcgi79M5uVX9/jMv2Ggb2XAeZhlLD28fHwIDAQAB
+public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCghPCWCobG8nTD24juwSVataW7iViRxcTkey/B792VZEhuHjQvA3cAJgx2Lv8GnX8NIoShZtoCg3Cx6ecs+VEPD2fBcg2L4JK7xldGpOJ3ONEAyVsLOttXZtNXvyDZRijiErQALMTorcgi79M5uVX9/jMv6Ggb2XAeZhlLD28fHwIDAQAB
 ##
-gateway_server_port = 20882
+gateway_server_port=20882
 ##
-connection_server_port = 3000
+connection_server_port=3000
 ##
-aes_key_length = 16
+aes_key_length=16
 ##
-ras_key_length = 1024
+ras_key_length=1024
 ##
-session_expired_time = 86400
-
+session_expired_time=86400
 #zk_ip = 115.29.169.109:5666
-zk_ip = 127.0.0.1:2181
-zk_namespace = mpush-daily
-zk_digest = shinemoIpo
-
+zk_ip=127.0.0.1:2181
+zk_namespace=mpush-daily
+zk_digest=shinemoIpo
 ##redis_group = 127.0.0.1:6379:shinemoIpo,127.0.0.1:6380:shinemoIpo;127.0.0.1:6381:shinemoIpo
 #redis_group = 111.1.57.148:6379:ShineMoIpo
-redis_group = 127.0.0.1:6379:shinemoIpo
-force_write_redis_group_info = false
+redis_group=111.1.57.148:6379:ShineMoIpo
+force_write_redis_group_info=false
 dns_mapping=api.server.mangguoyisheng.com=10.161.215.146:81,10.161.158.135:81;h5.server.mangguoyisheng.com=10.162.19.217,10.162.93.125
-
+#±¾»úIpºÍÍâÍøIpµÄÓ³Éä
+remote_ip_mapping=127.0.0.1:111.1.57.148