From 50ad167e20f227edc209d60acea2f10377cf214e Mon Sep 17 00:00:00 2001
From: zhangshuzheng <469741414@qq.com>
Date: Wed, 4 Jul 2018 16:23:40 +0800
Subject: [PATCH] =?UTF-8?q?zheng-message=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                              | 10 +++++-----
 pom.xml                                                |  2 +-
 {zheng-notify => zheng-message}/pom.xml                |  8 ++++----
 .../zheng-message-client}/index.html                   |  2 +-
 .../zheng-message-sdk}/pom.xml                         |  8 ++++----
 .../main/java/com/zheng/message}/sdk/BaseResult.java   |  2 +-
 .../java/com/zheng/message/sdk/MessageConstants.java   |  4 ++--
 .../main/java/com/zheng/message/sdk/MessageHelper.java | 10 +++++-----
 .../main/java/com/zheng/message}/sdk/PublishDto.java   |  2 +-
 .../zheng-message-server}/pom.xml                      |  8 ++++----
 .../message}/server/controller/IndexController.java    |  2 +-
 .../src/main/resources/config.properties               |  0
 .../src/main/resources/i18n/messages_en_US.properties  |  0
 .../src/main/resources/i18n/messages_zh_CN.properties  |  0
 .../src/main/resources/log4j.properties                |  4 ++--
 .../src/main/resources/profiles/dev.properties         |  0
 .../src/main/resources/profiles/prod.properties        |  0
 .../src/main/resources/profiles/test.properties        |  0
 .../src/main/resources/springMVC-servlet.xml           |  0
 .../src/main/webapp/WEB-INF/web.xml                    |  0
 20 files changed, 31 insertions(+), 31 deletions(-)
 rename {zheng-notify => zheng-message}/pom.xml (81%)
 rename {zheng-notify/zheng-notify-client => zheng-message/zheng-message-client}/index.html (98%)
 rename {zheng-notify/zheng-notify-sdk => zheng-message/zheng-message-sdk}/pom.xml (90%)
 rename {zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify => zheng-message/zheng-message-sdk/src/main/java/com/zheng/message}/sdk/BaseResult.java (96%)
 rename zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/NotifyConstants.java => zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/MessageConstants.java (84%)
 rename zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/NotifyHelper.java => zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/MessageHelper.java (88%)
 rename {zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify => zheng-message/zheng-message-sdk/src/main/java/com/zheng/message}/sdk/PublishDto.java (97%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/pom.xml (94%)
 rename {zheng-notify/zheng-notify-server/src/main/java/com/zheng/notify => zheng-message/zheng-message-server/src/main/java/com/zheng/message}/server/controller/IndexController.java (93%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/src/main/resources/config.properties (100%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/src/main/resources/i18n/messages_en_US.properties (100%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/src/main/resources/i18n/messages_zh_CN.properties (100%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/src/main/resources/log4j.properties (86%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/src/main/resources/profiles/dev.properties (100%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/src/main/resources/profiles/prod.properties (100%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/src/main/resources/profiles/test.properties (100%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/src/main/resources/springMVC-servlet.xml (100%)
 rename {zheng-notify/zheng-notify-server => zheng-message/zheng-message-server}/src/main/webapp/WEB-INF/web.xml (100%)

diff --git a/README.md b/README.md
index 12543168..fb797e05 100644
--- a/README.md
+++ b/README.md
@@ -68,10 +68,10 @@ zheng
 |    ├── zheng-oss-sdk -- 开发工具包
 |    ├── zheng-oss-web -- 前台接口[端口:7771]
 |    └── zheng-oss-admin -- 后台管理[端口:7772]
-├── zheng-notify -- 实时推送系统
-|    ├── zheng-notify-sdk -- 开发工具包
-|    ├── zheng-notify-server -- 服务端[端口:8881,SocketIO端口:8882]
-|    └── zheng-notify-client -- 客户端
+├── zheng-message -- 实时推送系统
+|    ├── zheng-message-sdk -- 开发工具包
+|    ├── zheng-message-server -- 服务端[端口:8881,SocketIO端口:8882]
+|    └── zheng-message-client -- 客户端
 ├── zheng-shop -- 电子商务系统
 └── zheng-demo -- 示例模块(包含一些示例代码等)
      ├── zheng-demo-rpc-api -- rpc接口包
@@ -203,7 +203,7 @@ Spring+SpringMVC+Mybatis框架集成公共模块，包括公共配置、MybatisG
 
 微信小程序后台
 
-> zheng-notify
+> zheng-message
 
 基于Netty实现SocketIO的实时推送系统。支持命名空间、二进制数据、SSL、ACK等功能。
 
diff --git a/pom.xml b/pom.xml
index 10b8eebb..6d520e2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
         <module>zheng-wechat</module>
         <module>zheng-shop</module>
         <module>zheng-api</module>
-        <module>zheng-notify</module>
+        <module>zheng-message</module>
         <module>zheng-demo</module>
     </modules>
 </project>
diff --git a/zheng-notify/pom.xml b/zheng-message/pom.xml
similarity index 81%
rename from zheng-notify/pom.xml
rename to zheng-message/pom.xml
index 26c3ef70..7678da55 100644
--- a/zheng-notify/pom.xml
+++ b/zheng-message/pom.xml
@@ -3,11 +3,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.zheng</groupId>
-    <artifactId>zheng-notify</artifactId>
+    <artifactId>zheng-message</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
 
-    <name>zheng-notify</name>
+    <name>zheng-message</name>
     <url>http://www.zhangshuzheng.cn</url>
 
     <properties>
@@ -19,7 +19,7 @@
     </properties>
 
     <modules>
-        <module>zheng-notify-sdk</module>
-        <module>zheng-notify-server</module>
+        <module>zheng-message-sdk</module>
+        <module>zheng-message-server</module>
     </modules>
 </project>
diff --git a/zheng-notify/zheng-notify-client/index.html b/zheng-message/zheng-message-client/index.html
similarity index 98%
rename from zheng-notify/zheng-notify-client/index.html
rename to zheng-message/zheng-message-client/index.html
index ea70d7f5..c911dfe2 100644
--- a/zheng-notify/zheng-notify-client/index.html
+++ b/zheng-message/zheng-message-client/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <title>管理监控中心</title>
+    <title>实时推送系统前端示例</title>
     <style>
         #main{width:100%;height:400px;margin:0 auto;}
         .namespace{width:100%;height:400px;background:#000;}
diff --git a/zheng-notify/zheng-notify-sdk/pom.xml b/zheng-message/zheng-message-sdk/pom.xml
similarity index 90%
rename from zheng-notify/zheng-notify-sdk/pom.xml
rename to zheng-message/zheng-message-sdk/pom.xml
index b517216a..f89dfcd2 100644
--- a/zheng-notify/zheng-notify-sdk/pom.xml
+++ b/zheng-message/zheng-message-sdk/pom.xml
@@ -4,14 +4,14 @@
 
     <parent>
         <groupId>com.zheng</groupId>
-        <artifactId>zheng-notify</artifactId>
+        <artifactId>zheng-message</artifactId>
         <version>1.0.0</version>
     </parent>
 
-    <artifactId>zheng-notify-sdk</artifactId>
+    <artifactId>zheng-message-sdk</artifactId>
     <packaging>jar</packaging>
 
-    <name>zheng-notify-sdk</name>
+    <name>zheng-message-sdk</name>
     <url>http://www.zhangshuzheng.cn</url>
 
     <properties>
@@ -32,7 +32,7 @@
     </dependencies>
 
     <build>
-        <finalName>zheng-notify-sdk</finalName>
+        <finalName>zheng-message-sdk</finalName>
         <resources>
             <resource>
                 <directory>src/main/java</directory>
diff --git a/zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/BaseResult.java b/zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/BaseResult.java
similarity index 96%
rename from zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/BaseResult.java
rename to zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/BaseResult.java
index a18aadfa..81d7cd35 100644
--- a/zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/BaseResult.java
+++ b/zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/BaseResult.java
@@ -1,4 +1,4 @@
-package com.zheng.notify.sdk;
+package com.zheng.message.sdk;
 
 /**
  * 统一返回结果类
diff --git a/zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/NotifyConstants.java b/zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/MessageConstants.java
similarity index 84%
rename from zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/NotifyConstants.java
rename to zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/MessageConstants.java
index bf2330ac..056c1ce8 100644
--- a/zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/NotifyConstants.java
+++ b/zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/MessageConstants.java
@@ -1,10 +1,10 @@
-package com.zheng.notify.sdk;
+package com.zheng.message.sdk;
 
 /**
  * 全局常量
  * Created by shuzheng on 2018/6/28.
  */
-public class NotifyConstants {
+public class MessageConstants {
 
     // 通知类型：广播
     public static final String PUBLISH_TYPE_BROADCAST = "broadcast";
diff --git a/zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/NotifyHelper.java b/zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/MessageHelper.java
similarity index 88%
rename from zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/NotifyHelper.java
rename to zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/MessageHelper.java
index a6cb38ca..bf060ffe 100644
--- a/zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/NotifyHelper.java
+++ b/zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/MessageHelper.java
@@ -1,4 +1,4 @@
-package com.zheng.notify.sdk;
+package com.zheng.message.sdk;
 
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpEntity;
@@ -16,7 +16,7 @@ import java.nio.charset.Charset;
  * 推送工具类
  * Created by shuzheng on 2018/6/28.
  */
-public class NotifyHelper {
+public class MessageHelper {
 
     /**
      * 推送消息
@@ -55,13 +55,13 @@ public class NotifyHelper {
     }
 
     public static void main(String[] args) {
-        String url = "http://localhost:8881/notify/publish";
+        String url = "http://localhost:8881/message/publish";
         PublishDto publishDto = new PublishDto();
-        publishDto.setType(NotifyConstants.PUBLISH_TYPE_BROADCAST);
+        publishDto.setType(MessageConstants.PUBLISH_TYPE_BROADCAST);
         publishDto.setNamespace("/demo");
         publishDto.setAccessKey("1");
         publishDto.setPayload("hi");
-        BaseResult result = new NotifyHelper().publish(url, publishDto);
+        BaseResult result = new MessageHelper().publish(url, publishDto);
         System.out.println(result.message);
     }
 
diff --git a/zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/PublishDto.java b/zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/PublishDto.java
similarity index 97%
rename from zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/PublishDto.java
rename to zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/PublishDto.java
index 08e8a5da..18345ede 100644
--- a/zheng-notify/zheng-notify-sdk/src/main/java/com/zheng/notify/sdk/PublishDto.java
+++ b/zheng-message/zheng-message-sdk/src/main/java/com/zheng/message/sdk/PublishDto.java
@@ -1,4 +1,4 @@
-package com.zheng.notify.sdk;
+package com.zheng.message.sdk;
 
 
 /**
diff --git a/zheng-notify/zheng-notify-server/pom.xml b/zheng-message/zheng-message-server/pom.xml
similarity index 94%
rename from zheng-notify/zheng-notify-server/pom.xml
rename to zheng-message/zheng-message-server/pom.xml
index 3067fa65..b0ed9edf 100644
--- a/zheng-notify/zheng-notify-server/pom.xml
+++ b/zheng-message/zheng-message-server/pom.xml
@@ -4,14 +4,14 @@
 
     <parent>
         <groupId>com.zheng</groupId>
-        <artifactId>zheng-notify</artifactId>
+        <artifactId>zheng-message</artifactId>
         <version>1.0.0</version>
     </parent>
 
-    <artifactId>zheng-notify-server</artifactId>
+    <artifactId>zheng-message-server</artifactId>
     <packaging>jar</packaging>
 
-    <name>zheng-notify-server</name>
+    <name>zheng-message-server</name>
     <url>http://www.zhangshuzheng.cn</url>
 
     <properties>
@@ -69,7 +69,7 @@
     </profiles>
 
     <build>
-        <finalName>zheng-notify-server</finalName>
+        <finalName>zheng-message-server</finalName>
         <filters>
             <filter>src/main/resources/profiles/${env}.properties</filter>
         </filters>
diff --git a/zheng-notify/zheng-notify-server/src/main/java/com/zheng/notify/server/controller/IndexController.java b/zheng-message/zheng-message-server/src/main/java/com/zheng/message/server/controller/IndexController.java
similarity index 93%
rename from zheng-notify/zheng-notify-server/src/main/java/com/zheng/notify/server/controller/IndexController.java
rename to zheng-message/zheng-message-server/src/main/java/com/zheng/message/server/controller/IndexController.java
index 4c80e5b0..e5d7f1c1 100644
--- a/zheng-notify/zheng-notify-server/src/main/java/com/zheng/notify/server/controller/IndexController.java
+++ b/zheng-message/zheng-message-server/src/main/java/com/zheng/message/server/controller/IndexController.java
@@ -1,4 +1,4 @@
-package com.zheng.notify.server.controller;
+package com.zheng.message.server.controller;
 
 import com.zheng.common.base.BaseController;
 import org.slf4j.Logger;
diff --git a/zheng-notify/zheng-notify-server/src/main/resources/config.properties b/zheng-message/zheng-message-server/src/main/resources/config.properties
similarity index 100%
rename from zheng-notify/zheng-notify-server/src/main/resources/config.properties
rename to zheng-message/zheng-message-server/src/main/resources/config.properties
diff --git a/zheng-notify/zheng-notify-server/src/main/resources/i18n/messages_en_US.properties b/zheng-message/zheng-message-server/src/main/resources/i18n/messages_en_US.properties
similarity index 100%
rename from zheng-notify/zheng-notify-server/src/main/resources/i18n/messages_en_US.properties
rename to zheng-message/zheng-message-server/src/main/resources/i18n/messages_en_US.properties
diff --git a/zheng-notify/zheng-notify-server/src/main/resources/i18n/messages_zh_CN.properties b/zheng-message/zheng-message-server/src/main/resources/i18n/messages_zh_CN.properties
similarity index 100%
rename from zheng-notify/zheng-notify-server/src/main/resources/i18n/messages_zh_CN.properties
rename to zheng-message/zheng-message-server/src/main/resources/i18n/messages_zh_CN.properties
diff --git a/zheng-notify/zheng-notify-server/src/main/resources/log4j.properties b/zheng-message/zheng-message-server/src/main/resources/log4j.properties
similarity index 86%
rename from zheng-notify/zheng-notify-server/src/main/resources/log4j.properties
rename to zheng-message/zheng-message-server/src/main/resources/log4j.properties
index d199d8ce..a489ca1e 100644
--- a/zheng-notify/zheng-notify-server/src/main/resources/log4j.properties
+++ b/zheng-message/zheng-message-server/src/main/resources/log4j.properties
@@ -10,7 +10,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
 
 ### Log ###
 log4j.appender.log = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.log.File = ../logs/zheng-notify-server.log
+log4j.appender.log.File = ../logs/zheng-message-server.log
 log4j.appender.log.Append = true
 log4j.appender.log.Threshold = DEBUG
 log4j.appender.log.DatePattern='.'yyyy-MM-dd
@@ -19,7 +19,7 @@ log4j.appender.log.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [ %p ] [
 
 ### Error ###
 log4j.appender.errorlog = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.errorlog.File = ../logs/zheng-notify-server.error.log
+log4j.appender.errorlog.File = ../logs/zheng-message-server.error.log
 log4j.appender.errorlog.Append = true
 log4j.appender.errorlog.Threshold = ERROR
 log4j.appender.errorlog.DatePattern='.'yyyy-MM-dd
diff --git a/zheng-notify/zheng-notify-server/src/main/resources/profiles/dev.properties b/zheng-message/zheng-message-server/src/main/resources/profiles/dev.properties
similarity index 100%
rename from zheng-notify/zheng-notify-server/src/main/resources/profiles/dev.properties
rename to zheng-message/zheng-message-server/src/main/resources/profiles/dev.properties
diff --git a/zheng-notify/zheng-notify-server/src/main/resources/profiles/prod.properties b/zheng-message/zheng-message-server/src/main/resources/profiles/prod.properties
similarity index 100%
rename from zheng-notify/zheng-notify-server/src/main/resources/profiles/prod.properties
rename to zheng-message/zheng-message-server/src/main/resources/profiles/prod.properties
diff --git a/zheng-notify/zheng-notify-server/src/main/resources/profiles/test.properties b/zheng-message/zheng-message-server/src/main/resources/profiles/test.properties
similarity index 100%
rename from zheng-notify/zheng-notify-server/src/main/resources/profiles/test.properties
rename to zheng-message/zheng-message-server/src/main/resources/profiles/test.properties
diff --git a/zheng-notify/zheng-notify-server/src/main/resources/springMVC-servlet.xml b/zheng-message/zheng-message-server/src/main/resources/springMVC-servlet.xml
similarity index 100%
rename from zheng-notify/zheng-notify-server/src/main/resources/springMVC-servlet.xml
rename to zheng-message/zheng-message-server/src/main/resources/springMVC-servlet.xml
diff --git a/zheng-notify/zheng-notify-server/src/main/webapp/WEB-INF/web.xml b/zheng-message/zheng-message-server/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from zheng-notify/zheng-notify-server/src/main/webapp/WEB-INF/web.xml
rename to zheng-message/zheng-message-server/src/main/webapp/WEB-INF/web.xml