初步调整完毕

mpush-ps/pom.xml

@@ -11,7 +11,6 @@
     <packaging>jar</packaging>
 
     <name>mpush-ps</name>
-    <url>http://maven.apache.org</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -20,7 +19,15 @@
     <dependencies>
       <dependency>
           <groupId>com.shinemo.mpush</groupId>
-          <artifactId>mpush-core</artifactId>
+          <artifactId>mpush-api</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>com.shinemo.mpush</groupId>
+          <artifactId>mpush-netty</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>com.shinemo.mpush</groupId>
+          <artifactId>mpush-tools</artifactId>
       </dependency>
     </dependencies>
 </project>

mpush-client/src/main/java/com/shinemo/mpush/client/GatewayClientChannelHandler.java → mpush-ps/src/main/java/com/shinemo/mpush/ps/GatewayClientChannelHandler.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.client;
+package com.shinemo.mpush.ps;
 
 import com.shinemo.mpush.api.connection.Connection;
 import com.shinemo.mpush.api.protocol.Command;

mpush-client/src/main/java/com/shinemo/mpush/client/PushClient.java → mpush-ps/src/main/java/com/shinemo/mpush/ps/PushClient.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.client;
+package com.shinemo.mpush.ps;
 
 import com.google.common.base.Strings;
 import com.shinemo.mpush.api.Client;

mpush-client/src/main/java/com/shinemo/mpush/client/PushRequest.java → mpush-ps/src/main/java/com/shinemo/mpush/ps/PushRequest.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.client;
+package com.shinemo.mpush.ps;
 
 import com.shinemo.mpush.api.PushSender;
 import com.shinemo.mpush.api.connection.Connection;

mpush-client/src/main/java/com/shinemo/mpush/client/PushRequestBus.java → mpush-ps/src/main/java/com/shinemo/mpush/ps/PushRequestBus.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.client;
+package com.shinemo.mpush.ps;
 
 import java.util.Iterator;
 import java.util.Map;

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

@@ -0,0 +1,43 @@
+##
+max_packet_size = 10240
+##
+compress_limit = 10240
+##
+min_heartbeat = 10000
+##
+max_heartbeat = 1800000
+##
+max_hb_timeout_times = 2
+##
+private_key = MIIBNgIBADANBgkqhkiG9w0BAQEFAASCASAwggEcAgEAAoGBAKCE8JYKhsbydMPbiO7BJVq1pbuJWJHFxOR7L8Hv3ZVkSG4eNC8DdwAmDHYu/wadfw0ihKFm2gKDcLHp5yz5UQ8PZ8FyDYvgkrvGV0ak4nc40QDJWws621dm01e/INlGKOIStAAsxOityCLv0zm5Vf3+My/YaBvZcB5mGUsPbx8fAgEAAoGAAy0+WanRqwRHXUzt89OsupPXuNNqBlCEqgTqGAt4Nimq6Ur9u2R1KXKXUotxjp71Ubw6JbuUWvJg+5Rmd9RjT0HOUEQF3rvzEepKtaraPhV5ejEIrB+nJWNfGye4yzLdfEXJBGUQzrG+wNe13izfRNXI4dN/6Q5npzqaqv0E1CkCAQACAQACAQACAQACAQA=
+##
+public_key = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCghPCWCobG8nTD24juwSVataW7iViRxcTkey/B792VZEhuHjQvA3cAJgx2Lv8GnX8NIoShZtoCg3Cx6ecs+VEPD2fBcg2L4JK7xldGpOJ3ONEAyVsLOttXZtNXvyDZRijiErQALMTorcgi79M5uVX9/jMv2Ggb2XAeZhlLD28fHwIDAQAB
+##
+gateway_server_port = 4000
+##
+connection_server_port = 3000
+##
+aes_key_length = 16
+##
+ras_key_length = 1024
+##
+session_expired_time = 86400
+##
+max_hb_timeout_times = 2
+##
+max_heartbeat = 1800000
+##
+min_heartbeat = 10000
+##
+compress_limit = 10240
+##
+max_packet_size = 10240
+
+## zk 配置项
+zk_ip = 10.1.10.41:2181
+zk_namespace = mpush
+zk_digest = shinemoIpo
+
+## redis 配置项 redis组以分号分割，每组内的redis以逗号分割
+##redis_group = 127.0.0.1:6379:shinemoIpo,127.0.0.1:6380:shinemoIpo;127.0.0.1:6381:shinemoIpo
+redis_group = 127.0.0.1:6379:shinemoIpo

mpush-ps/src/main/resources/logback.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<target>System.out</target>
+		<encoding>UTF-8</encoding>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">  
+            <level>DEBUG</level>
+        </filter> 
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - [%thread] %-5level - %logger{35} - %msg%n</pattern>
+		</layout>
+	</appender>
+
+	<appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
+		<target>System.err</target>
+		<encoding>UTF-8</encoding>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">  
+            <level>WARN</level>  
+        </filter>
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - [%thread] %-5level - %logger{35}  - %msg%n</pattern>
+		</layout>
+	</appender>
+
+
+	<root>
+		<level value="INFO" />
+		<appender-ref ref="STDOUT" />
+	</root>
+</configuration>

mpush-ps/src/test/java/com/shinemo/mpush/ps/ConfigCenterTest.java

@@ -0,0 +1,16 @@
+package com.shinemo.mpush.ps;
+
+import org.junit.Test;
+
+import com.shinemo.mpush.tools.config.ConfigCenter;
+
+public class ConfigCenterTest {
+
+	@Test
+	public void test(){
+
+		System.out.println(ConfigCenter.holder.zkIp());
+
+	}
+
+}

mpush-ps/src/test/java/com/shinemo/mpush/ps/PushClientTest.java

@@ -0,0 +1,49 @@
+package com.shinemo.mpush.ps;
+
+import com.shinemo.mpush.api.PushSender;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.concurrent.locks.LockSupport;
+
+
+/**
+ * Created by ohun on 2016/1/7.
+ */
+public class PushClientTest {
+
+    @Test
+    public void testSend() throws Exception {
+
+    }
+
+    public static void main(String[] args) throws Exception {
+        PushClient client = new PushClient();
+        client.init();
+        Thread.sleep(1000);
+        client.send("this a first push", Arrays.asList("user-0", "user-1", "user-2", "user-3", "user-4"),
+                new PushSender.Callback() {
+                    @Override
+                    public void onSuccess(String userId) {
+                        System.err.println("push onSuccess userId=" + userId);
+                    }
+
+                    @Override
+                    public void onFailure(String userId) {
+                        System.err.println("push onFailure userId=" + userId);
+                    }
+
+                    @Override
+                    public void onOffline(String userId) {
+                        System.err.println("push onOffline userId=" + userId);
+                    }
+
+                    @Override
+                    public void onTimeout(String userId) {
+                        System.err.println("push onTimeout userId=" + userId);
+                    }
+                }
+        );
+        LockSupport.park();
+    }
+}