重构

conf-dev.properties

@@ -7,14 +7,14 @@ zk_ip=127.0.0.1:2181
 zk_digest=shinemoIpo
 zk_namespace=mpush-daily
 #redis配置多个用，隔开
-redis_group=127.0.0.1:6379:shinemoIpo
+redis_group=111.1.57.148:6379:ShineMoIpo
 #私钥
 private_key=MIIBNgIBADANBgkqhkiG9w0BAQEFAASCASAwggEcAgEAAoGBAKCE8JYKhsbydMPbiO7BJVq1pbuJWJHFxOR7L8Hv3ZVkSG4eNC8DdwAmDHYu/wadfw0ihKFm2gKDcLHp5yz5UQ8PZ8FyDYvgkrvGV0ak4nc40QDJWws621dm01e/INlGKOIStAAsxOityCLv0zm5Vf3+My/YaBvZcB5mGUsPbx8fAgEAAoGAAy0+WanRqwRHXUzt89OsupPXuNNqBlCEqgTqGAt4Nimq6Ur9u2R1KXKXUotxjp71Ubw6JbuUWvJg+5Rmd9RjT0HOUEQF3rvzEepKtaraPhV5ejEIrB+nJWNfGye4yzLdfEXJBGUQzrG+wNe13izfRNXI4dN/6Q5npzqaqv0E1CkCAQACAQACAQACAQACAQA=
 #公钥
 public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCghPCWCobG8nTD24juwSVataW7iViRxcTkey/B792VZEhuHjQvA3cAJgx2Lv8GnX8NIoShZtoCg3Cx6ecs+VEPD2fBcg2L4JK7xldGpOJ3ONEAyVsLOttXZtNXvyDZRijiErQALMTorcgi79M5uVX9/jMv2Ggb2XAeZhlLD28fHwIDAQAB
 force_write_redis_group_info=true
 #长连服务端口
-connection_server_port=20882
+connection_server_port=3000
 #网关服务端口
 gateway_server_port=4000
 #控制台服务端口

daily-pub.py

@@ -22,11 +22,11 @@
 
 BASEPATH = '/root/mpush'
 
-MPUSH_TAR_NAME = 'mpush-jar-with-dependency.tar.gz'
+MPUSH_TAR_NAME = 'mpush-release.tar.gz'
 
-PROCESS_KEY_WORD = 'mpush-cs.jar'
+PROCESS_KEY_WORD = 'boot.jar'
 
-GITLABPATH = '/data/localgit/mpush/mpush/target/'+MPUSH_TAR_NAME
+GITLABPATH = '/data/localgit/mpush/mpush-boot/target/'+MPUSH_TAR_NAME
 
 JAVA_PATH = '/opt/shinemo/jdk1.7.0_40/bin/java'
 
@@ -158,8 +158,9 @@ def main():
     print showText('git pull master success','greenText')
 
     ##1 assembly
-    runShell('mvn clean install  assembly:assembly -P %s'%ENV)
-    print showText('assembly success','greenText')
+    runShell('mvn clean)
+    runShell('mvn package -P %s'%ENV)
+    print showText('package success','greenText')
 
     ##2 包创建时间
     runShell('stat -c "%%y" %s'%GITLABPATH)

debug.sh

@@ -1,22 +1,18 @@
 #!/bin/sh
 
 ENV=dev
-
 base_dir=`pwd`
 
-echo "start assembly lib..."
-
-rm -rf $base_dir/target
-
-mvn clean install  assembly:assembly -P $ENV
+echo "start package project..."
+mvn clean
+mvn package -P $ENV
 
 echo "start tar mpush..."
-cd $base_dir/target
-tar -xzvf ./mpush-jar-with-dependency.tar.gz
-echo "start start mpush..."
-
-cd mpush/lib
+cd $base_dir/mpush-boot/target
+tar -xzvf ./mpush-release.tar.gz
 
-java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7998 -Dio.netty.leakDetectionLevel=advanced   -jar $base_dir/target/mpush/mpush-cs.jar &
+echo "start start mpush..."
+cd mpush
+java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7998 -Dio.netty.leakDetectionLevel=advanced   -jar boot.jar &
 
 echo "end start mpush..."

mpush-api/pom.xml

@@ -4,13 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>mpush</artifactId>
-        <groupId>com.shinemo.mpush</groupId>
-        <version>0.0.0.2</version>
-        <relativePath>../pom.xml</relativePath>
+        <groupId>com.mpush</groupId>
+        <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>${mpush.groupId}</groupId>
     <artifactId>mpush-api</artifactId>
+    <version>${mpush-api-version}</version>
     <name>mpush-api</name>
     <packaging>jar</packaging>
 

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

@@ -1,9 +1,8 @@
-package com.shinemo.mpush.api;
+package com.mpush.api;
 
+import com.mpush.api.connection.Connection;
 import io.netty.channel.Channel;
 
-import com.shinemo.mpush.api.connection.Connection;
-
 
 public interface Client {
 

mpush-api/src/main/java/com/shinemo/mpush/api/Constants.java → mpush-api/src/main/java/com/mpush/api/Constants.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.api;
+package com.mpush.api;
 
 import java.nio.charset.Charset;
 

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

@@ -1,7 +1,7 @@
-package com.shinemo.mpush.api;
+package com.mpush.api;
 
-import com.shinemo.mpush.api.connection.Connection;
-import com.shinemo.mpush.api.protocol.Packet;
+import com.mpush.api.protocol.Packet;
+import com.mpush.api.connection.Connection;
 import io.netty.channel.ChannelFutureListener;
 
 /**

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

@@ -1,7 +1,7 @@
-package com.shinemo.mpush.api;
+package com.mpush.api;
 
-import com.shinemo.mpush.api.connection.Connection;
-import com.shinemo.mpush.api.protocol.Packet;
+import com.mpush.api.protocol.Packet;
+import com.mpush.api.connection.Connection;
 
 /**
  * Created by ohun on 2015/12/22.

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

@@ -1,7 +1,7 @@
-package com.shinemo.mpush.api;
+package com.mpush.api;
 
-import com.shinemo.mpush.api.connection.Connection;
-import com.shinemo.mpush.api.protocol.Packet;
+import com.mpush.api.protocol.Packet;
+import com.mpush.api.connection.Connection;
 
 /**
  * Created by ohun on 2015/12/22.

mpush-api/src/main/java/com/shinemo/mpush/api/PushContent.java → mpush-api/src/main/java/com/mpush/api/PushContent.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.api;
+package com.mpush.api;
 
 import java.io.Serializable;
 

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

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.api;
+package com.mpush.api;
 
 import java.util.Collection;
 

mpush-api/src/main/java/com/shinemo/mpush/api/RedisKey.java → mpush-api/src/main/java/com/mpush/api/RedisKey.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.api;
+package com.mpush.api;
 
 public final class RedisKey {
 

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

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

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

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

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

@@ -1,8 +1,8 @@
-package com.shinemo.mpush.api.connection;
+package com.mpush.api.connection;
 
+import com.mpush.api.protocol.Packet;
 import io.netty.channel.Channel;
 
-import com.shinemo.mpush.api.protocol.Packet;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 

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

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.api.connection;
+package com.mpush.api.connection;
 
 import java.util.List;
 

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

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

mpush-api/src/main/java/com/shinemo/mpush/api/event/ConnectionCloseEvent.java → mpush-api/src/main/java/com/mpush/api/event/ConnectionCloseEvent.java

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

mpush-api/src/main/java/com/shinemo/mpush/api/event/Event.java → mpush-api/src/main/java/com/mpush/api/event/Event.java

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

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

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

mpush-api/src/main/java/com/shinemo/mpush/api/event/KickUserEvent.java → mpush-api/src/main/java/com/mpush/api/event/KickUserEvent.java

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

mpush-api/src/main/java/com/shinemo/mpush/api/event/RouterChangeEvent.java → mpush-api/src/main/java/com/mpush/api/event/RouterChangeEvent.java

@@ -1,6 +1,6 @@
-package com.shinemo.mpush.api.event;
+package com.mpush.api.event;
 
-import com.shinemo.mpush.api.router.Router;
+import com.mpush.api.router.Router;
 
 /**
  * Created by ohun on 2016/1/4.

mpush-api/src/main/java/com/shinemo/mpush/api/event/UserOfflineEvent.java → mpush-api/src/main/java/com/mpush/api/event/UserOfflineEvent.java

@@ -1,6 +1,6 @@
-package com.shinemo.mpush.api.event;
+package com.mpush.api.event;
 
-import com.shinemo.mpush.api.connection.Connection;
+import com.mpush.api.connection.Connection;
 
 /**
  * 链接超时，用户解绑的时候,用户主动关闭链接，才会触发该事件

mpush-api/src/main/java/com/shinemo/mpush/api/event/UserOnlineEvent.java → mpush-api/src/main/java/com/mpush/api/event/UserOnlineEvent.java

@@ -1,6 +1,6 @@
-package com.shinemo.mpush.api.event;
+package com.mpush.api.event;
 
-import com.shinemo.mpush.api.connection.Connection;
+import com.mpush.api.connection.Connection;
 
 /**
  * 绑定用户的时候才会触发该事件

mpush-api/src/main/java/com/shinemo/mpush/api/exception/CryptoException.java → mpush-api/src/main/java/com/mpush/api/exception/CryptoException.java

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

mpush-api/src/main/java/com/shinemo/mpush/api/exception/DecodeException.java → mpush-api/src/main/java/com/mpush/api/exception/DecodeException.java

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

mpush-api/src/main/java/com/shinemo/mpush/api/exception/MessageException.java → mpush-api/src/main/java/com/mpush/api/exception/MessageException.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.api.exception;
+package com.mpush.api.exception;
 
 public class MessageException extends RuntimeException {
 

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

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

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

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

mpush-api/src/main/java/com/shinemo/mpush/api/protocol/Packet.java → mpush-api/src/main/java/com/mpush/api/protocol/Packet.java

@@ -1,4 +1,4 @@
-package com.shinemo.mpush.api.protocol;
+package com.mpush.api.protocol;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

mpush-api/src/main/java/com/shinemo/mpush/api/router/ClientLocation.java → mpush-api/src/main/java/com/mpush/api/router/ClientLocation.java

@@ -1,6 +1,6 @@
-package com.shinemo.mpush.api.router;
+package com.mpush.api.router;
 
-import com.shinemo.mpush.api.connection.SessionContext;
+import com.mpush.api.connection.SessionContext;
 
 /**
  * Created by ohun on 2015/12/23.

mpush-api/src/main/java/com/shinemo/mpush/api/router/Router.java → mpush-api/src/main/java/com/mpush/api/router/Router.java

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

mpush-api/src/main/java/com/shinemo/mpush/api/router/RouterManager.java → mpush-api/src/main/java/com/mpush/api/router/RouterManager.java

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

assembly.xml → mpush-boot/assembly.xml

@@ -3,32 +3,25 @@
         xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>jar-with-dependency</id>
+    <id>release</id>
     <baseDirectory>mpush</baseDirectory>
     <includeBaseDirectory>true</includeBaseDirectory>
     <formats>
         <format>tar.gz</format>
     </formats>
     <fileSets>
         <fileSet>
-            <directory>mpush-cs/target/classes/</directory>
+            <directory>target/classes/</directory>
             <outputDirectory/>
             <includes>
                 <include>config.properties</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>mpush-cs/target/</directory>
+            <directory>target/</directory>
             <outputDirectory/>
             <includes>
-                <include>lib/*.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>mpush-cs/target/</directory>
-            <outputDirectory/>
-            <includes>
-                <include>mpush-cs.jar</include>
+                <include>boot.jar</include>
             </includes>
         </fileSet>
     </fileSets>