代码重构增加网关server push client

mpush-api/pom.xml

@@ -43,5 +43,36 @@
             <artifactId>mpush-tools</artifactId>
         </dependency>
     </dependencies>
+    <!-- 编译配置 -->
+    <build>
+        <!-- 指定编译时的Resource目录 -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
 
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+        </plugins>
+
+    </build>
 </project>

mpush-api/src/main/java/com/shinemo/mpush/api/Client.java

@@ -1,5 +1,7 @@
 package com.shinemo.mpush.api;
 
+import io.netty.channel.ChannelHandler;
+
 public interface Client {
 
     void init();
@@ -12,4 +14,6 @@ public interface Client {
 
     String getUri();
 
+    ChannelHandler getHandler();
+
 }

mpush-api/src/main/java/com/shinemo/mpush/api/Message.java

@@ -1,6 +1,8 @@
 package com.shinemo.mpush.api;
 
+import com.shinemo.mpush.api.connection.Connection;
 import com.shinemo.mpush.api.protocol.Packet;
+import io.netty.channel.ChannelFutureListener;
 
 /**
  * Created by ohun on 2015/12/22.
@@ -9,9 +11,9 @@ public interface Message {
 
     Connection getConnection();
 
-    void send();
+    void send(ChannelFutureListener listener);
 
-    void sendRaw();
+    void sendRaw(ChannelFutureListener listener);
 
     Packet getPacket();
 }

mpush-api/src/main/java/com/shinemo/mpush/api/MessageHandler.java

@@ -1,8 +1,11 @@
 package com.shinemo.mpush.api;
 
+import com.shinemo.mpush.api.connection.Connection;
+import com.shinemo.mpush.api.protocol.Packet;
+
 /**
  * Created by ohun on 2015/12/22.
  */
-public interface MessageHandler<T extends Message> {
-    void handle(T message);
+public interface MessageHandler {
+    void handle(Packet packet, Connection connection);
 }

mpush-api/src/main/java/com/shinemo/mpush/api/PacketReceiver.java

@@ -1,5 +1,6 @@
 package com.shinemo.mpush.api;
 
+import com.shinemo.mpush.api.connection.Connection;
 import com.shinemo.mpush.api.protocol.Packet;
 
 /**

mpush-api/src/main/java/com/shinemo/mpush/api/PushSender.java

@@ -0,0 +1,18 @@
+package com.shinemo.mpush.api;
+
+import java.util.Collection;
+
+/**
+ * Created by ohun on 2015/12/30.
+ */
+public interface PushSender {
+    void send(String content, Collection<String> userIds, Callback callback);
+
+    interface Callback {
+        void onSuccess(String userId);
+
+        void onFailure(String userId);
+
+        void onLose(String userId);
+    }
+}

mpush-api/src/main/java/com/shinemo/mpush/api/Server.java

@@ -4,8 +4,6 @@
  * Created by ohun on 2015/12/24.
  */
 public interface Server {
-    void init();
-
     void start();
 
     void stop();

mpush-api/src/main/java/com/shinemo/mpush/api/Cipher.java → mpush-api/src/main/java/com/shinemo/mpush/api/connection/Cipher.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.api;
+package com.shinemo.mpush.api.connection;
 
 /**
  * Created by ohun on 2015/12/28.

mpush-api/src/main/java/com/shinemo/mpush/api/Connection.java → mpush-api/src/main/java/com/shinemo/mpush/api/connection/Connection.java

@@ -1,39 +1,31 @@
-package com.shinemo.mpush.api;
+package com.shinemo.mpush.api.connection;
 
 import io.netty.channel.Channel;
 
 import com.shinemo.mpush.api.protocol.Packet;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
 
 /**
  * Created by ohun on 2015/12/22.
  */
 public interface Connection {
 
-    void init(Channel channel);
+    void init(Channel channel, boolean security);
 
     SessionContext getSessionContext();
 
     void setSessionContext(SessionContext context);
 
-    void send(Packet packet);
+    ChannelFuture send(Packet packet);
+
+    void send(Packet packet, ChannelFutureListener listener);
 
     Channel channel();
 
     String getId();
 
-    boolean isClosed();
-
-    boolean isOpen();
-
-    int getHbTimes();
-
     void close();
 
     boolean isConnected();
-
-    boolean isEnable();
-
-    String remoteIp();
-
-
 }

mpush-api/src/main/java/com/shinemo/mpush/api/connection/ConnectionManager.java

@@ -0,0 +1,14 @@
+package com.shinemo.mpush.api.connection;
+
+import io.netty.channel.Channel;
+
+/**
+ * Created by ohun on 2015/12/30.
+ */
+public interface ConnectionManager {
+    Connection get(Channel channel);
+
+    void remove(Channel channel);
+
+    void add(Connection connection);
+}

mpush-api/src/main/java/com/shinemo/mpush/api/SessionContext.java → mpush-api/src/main/java/com/shinemo/mpush/api/connection/SessionContext.java

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

mpush-api/src/main/java/com/shinemo/mpush/api/event/HandshakeEvent.java

@@ -1,6 +1,6 @@
 package com.shinemo.mpush.api.event;
 
-import com.shinemo.mpush.api.Connection;
+import com.shinemo.mpush.api.connection.Connection;
 
 /**
  * Created by ohun on 2015/12/29.

mpush-api/src/main/java/com/shinemo/mpush/api/exception/SendMessageException.java

@@ -0,0 +1,7 @@
+package com.shinemo.mpush.api.exception;
+
+/**
+ * Created by ohun on 2015/12/30.
+ */
+public class SendMessageException extends RuntimeException {
+}

mpush-api/src/main/java/com/shinemo/mpush/api/protocol/Command.java

@@ -13,8 +13,10 @@ public enum Command {
     KICK(7),
     FAST_CONNECT(8),
     ERROR(9),
-    PUSH(10),
-    API(11),
+    OK(10),
+    PUSH(11),
+    API(12),
+    GATEWAY_PUSH(13),
     UNKNOWN(-1);
 
     Command(int cmd) {