update to version 0.21

* refactor_server_api:
  update
  update
  update
  update
  update
  update

README.md

@@ -4,8 +4,8 @@
 
 | 仓库                                                         | 说明                                                    | 备注                                           |
 | ------------------------------------------------------------ | ------------------------------------------------------- | ---------------------------------------------- |
-| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android App                                      | 可以很方便地进行二次开发，或集成到现有应用当中 |
-| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS App                                          | 可以很方便地进行二次开发，或集成到现有应用当中 |
+| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android SDK源码和App源码                                      | 可以很方便地进行二次开发，或集成到现有应用当中 |
+| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS SDK源码和App源码                                          | 可以很方便地进行二次开发，或集成到现有应用当中 |
 | [pc-chat](https://github.com/wildfirechat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用 |                                                |
 | [proto](https://github.com/wildfirechat/proto)               | 野火IM的协议栈实现                                      |                                                |
 | [server](https://github.com/wildfirechat/server)             | IM server                                               |                                                |
@@ -24,7 +24,9 @@
 ### 联系我们
 问题讨论请加群：822762829
 
-<img src="http://static.wildfirechat.cn/qr_qqgroup.jpeg" width = 50% height = 50% />
+微信公众号：
+
+<img src="http://static.wildfirechat.cn/wx_wfc_qrcode.jpg" width = 50% height = 50% />
 
 #### 体验Demo
 我们提供了体验demo，请使用微信扫码下载安装体验
@@ -54,9 +56,16 @@
 
 <img src="http://static.wildfirechat.cn/ios-voip-view.png" width = 50% height = 50% />
 
+## 编译
+在安装JDK1.8以上及maven的前提下，在命令行中执行```mvn clean compile package```，生成的目标文件在```./distribution/target/distribution-xxxx-bundle-tar.tar.gz```
 
+## 特别感谢
+1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来，处理MQTT相关业务。
+2. [loServer](https://github.com/looly/loServer) 本项目使用loServer处理HTTP相关业务。
+
+*** 对他们表示诚挚的感谢🙏 ***
 
 ## License
 
 1. Under the Creative Commons Attribution-NoDerivs 3.0 Unported license. See the [LICENSE](https://github.com/wildfirechat/server/blob/wildfirechat/LICENSE) file for details.
-2. Under the Anti 996 License. See the [Anti 996 LICENSE](https://github.com/wildfirechat/server/blob/wildfirechat/LICENSE_996) file for details.
+2. Under the Anti 996 License. See the [Anti 996 LICENSE](https://github.com/wildfirechat/server/blob/wildfirechat/LICENSE_996) file for details.

broker/config/hazelcast.xml

@@ -3,15 +3,9 @@
     xsi:schemaLocation="http://www.hazelcast.com/schema/config
   http://www.hazelcast.com/schema/config/hazelcast-config-3.5.xsd"
     xmlns="http://www.hazelcast.com/schema/config">
-
-    <group>
-        <!--<name>wfc-dev</name>-->
-        <name>wfc-pro</name>
-    </group>
-
     <network>
         <join>
-            <multicast enabled="true"/>
+            <multicast enabled="false"/>
         </join>
     </network>
 

broker/config/wildfirechat.conf

@@ -32,6 +32,10 @@ embed.db 1
 ##服务器管理接口密钥
 http.admin.secret_key 123456
 
+##服务器API接口参数是否检查时间。当设置为false时，所有的请求会检查时间的有效性；当设置为true时，可以在http.admin.secret_key保持不变的情况下，使用固定的服务API签名
+##nonce = "76616", timestamp = "1558350862502", sign = "b98f9b0717f59febccf1440067a7f50d9b31bdde"
+http.admin.no_check_time true
+
 ##客户端协议栈密钥，需要与客户端协议栈文件libemqq.cc文件中的aes_key值保持一致，16进制byte用逗号分割。这个密钥对安全性帮助不大，客户不要修改
 client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F
 

broker/migrate/h2/V2__create_table.sql

@@ -1,26 +1,4 @@
-DROP TABLE IF EXISTS `t_messages`;
-CREATE TABLE `t_messages` (
-  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
-  `_mid` bigint(20) NOT NULL,
-  `_from` varchar(64) NOT NULL,
-  `_type` tinyint NOT NULL DEFAULT 0,
-  `_target` varchar(64) NOT NULL,
-  `_line` int(11) NOT NULL DEFAULT 0,
-  `_data` BLOB NOT NULL,
-  `_searchable_key` TEXT DEFAULT NULL,
-  `_dt` DATETIME NOT NULL DEFAULT NOW(),
-  UNIQUE INDEX `message_uid_index` (`_mid` ASC)
-);
 
-DROP TABLE IF EXISTS `t_user_messages`;
-CREATE TABLE `t_user_messages` (
-    `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    `_mid` bigint(20) NOT NULL,
-    `_uid` varchar(64) NOT NULL,
-    `_seq` bigint(20) NOT NULL,
-    `_dt` DATETIME NOT NULL DEFAULT NOW(),
-    UNIQUE INDEX `message_seq_uid_index` (`_uid` DESC, `_seq` DESC)
-);
 
 DROP TABLE IF EXISTS `t_group`;
 CREATE TABLE `t_group` (
@@ -181,6 +159,7 @@ CREATE TABLE `t_robot` (
   `_owner` varchar(64) DEFAULT '',
   `_secret` varchar(64) DEFAULT '',
   `_callback` varchar(1024) DEFAULT '',
+  `_state` tinyint DEFAULT 0,
   `_extra` TEXT DEFAULT NULL,
   `_dt` bigint(20) NOT NULL,
   UNIQUE INDEX `robot_uid_index` (`_uid` ASC),
@@ -219,11 +198,3 @@ CREATE TABLE `t_sensitiveword` (
   `_word` TEXT DEFAULT NULL
 );
 
-
-
-insert into t_chatroom (`_cid`, `_title`, `_desc`,`_dt`) values ('chatroom1','火信聊天室1','火信测试聊天室1，用来演示聊天室功能', 1);
-
-insert into t_chatroom (`_cid`, `_title`, `_desc`,`_dt`) values ('chatroom2','火信聊天室2','火信测试聊天室2，用来演示聊天室功能', 1);
-
-insert into t_chatroom (`_cid`, `_title`, `_desc`,`_dt`) values ('chatroom3','火信聊天室3','火信测试聊天室3，用来演示聊天室功能', 1);
-

broker/migrate/h2/V3__create_sharding_table.sql

@@ -0,0 +1,24 @@
+
+DROP TABLE IF EXISTS `t_messages`;
+CREATE TABLE `t_messages` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_mid` bigint(20) NOT NULL,
+  `_from` varchar(64) NOT NULL,
+  `_type` tinyint NOT NULL DEFAULT 0,
+  `_target` varchar(64) NOT NULL,
+  `_line` int(11) NOT NULL DEFAULT 0,
+  `_data` BLOB NOT NULL,
+  `_searchable_key` TEXT DEFAULT NULL,
+  `_dt` DATETIME NOT NULL DEFAULT NOW(),
+  UNIQUE INDEX `message_uid_index` (`_mid` ASC)
+);
+
+DROP TABLE IF EXISTS `t_user_messages`;
+CREATE TABLE `t_user_messages` (
+    `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `_mid` bigint(20) NOT NULL,
+    `_uid` varchar(64) NOT NULL,
+    `_seq` bigint(20) NOT NULL,
+    `_dt` DATETIME NOT NULL DEFAULT NOW(),
+    UNIQUE INDEX `message_seq_uid_index` (`_uid` DESC, `_seq` DESC)
+);

broker/migrate/h2/V4__create_default_chatroom.sql

@@ -0,0 +1,6 @@
+
+insert into t_chatroom (`_cid`, `_title`, `_desc`,`_dt`) values ('chatroom1','火信聊天室1','火信测试聊天室1，用来演示聊天室功能', 1);
+
+insert into t_chatroom (`_cid`, `_title`, `_desc`,`_dt`) values ('chatroom2','火信聊天室2','火信测试聊天室2，用来演示聊天室功能', 1);
+
+insert into t_chatroom (`_cid`, `_title`, `_desc`,`_dt`) values ('chatroom3','火信聊天室3','火信测试聊天室3，用来演示聊天室功能', 1);

broker/migrate/h2/V5__create_default_robot.sql

@@ -0,0 +1,4 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_portrait`,`_type`,`_dt`) values ('FireRobot','FireRobot','小火','http://cdn2.wildfirechat.cn/robot.png',1,1);
+
+insert into t_robot (`_uid`,`_owner`,`_secret`,`_callback`,`_state`,`_dt`) values ('FireRobot', 'FireRobot', '123456', 'http://127.0.0.1:8883/robot/recvmsg', 0, 1);

broker/migrate/h2/V6__add_friend_alias.sql

@@ -0,0 +1,2 @@
+
+alter table t_friend add column `_alias` varchar(64) DEFAULT NULL;

broker/migrate/mysql/V2__create_table.sql

@@ -1,3 +1,4 @@
+
 DROP TABLE IF EXISTS `t_messages`;
 CREATE TABLE `t_messages` (
   `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,

broker/migrate/mysql/V5__create_default_robot.sql

@@ -0,0 +1,3 @@
+insert into t_user (`_uid`,`_name`,`_display_name`,`_portrait`,`_type`,`_dt`) values ('FireRobot','FireRobot','小火','http://cdn2.wildfirechat.cn/robot.png',1,1);
+
+insert into t_robot (`_uid`,`_owner`,`_secret`,`_callback`,`_state`,`_dt`) values ('FireRobot', 'FireRobot', '123456', 'http://127.0.0.1:8883/robot/recvmsg', 0, 1);

broker/migrate/mysql/V6__add_friend_alias.sql

@@ -0,0 +1 @@
+alter table t_friend add column `_alias` varchar(64) DEFAULT NULL;

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.12</version>
+        <version>0.21</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -37,6 +37,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.wildfirechat</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!-- https://mvnrepository.com/artifact/log4j/log4j -->
         <dependency>
             <groupId>log4j</groupId>
@@ -44,13 +50,6 @@
             <version>1.2.14</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.2</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
         <dependency>
             <groupId>mysql</groupId>
@@ -127,13 +126,6 @@
             <version>3.2.2</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>2.5.0</version>
-        </dependency>
-
         <dependency>
             <groupId>com.librato.metrics</groupId>
             <artifactId>metrics-librato</artifactId>
@@ -249,6 +241,22 @@
             <version>1.4.197</version>
             <scope>runtime</scope>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.13.1</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.flywaydb/flyway-core -->
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+            <version>5.2.4</version>
+        </dependency>
+
+
     </dependencies>
 
 
@@ -333,7 +341,7 @@
                     <!--指定"git.properties"文件的存放路径(相对于${project.basedir}的一个路径);-->
                     <generateGitPropertiesFilename>config/git.properties</generateGitPropertiesFilename>
                     <!--".git"文件夹未找到时,构建是否失败;若设置true,则构建失败;若设置false,则跳过执行该目标;默认值:true;-->
-                    <failOnNoGitDirectory>true</failOnNoGitDirectory>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
 
                     <!--git描述配置,可选;由JGit提供实现;-->
                     <gitDescribe>

broker/sql/1_create_database.sql

@@ -1 +0,0 @@
-CREATE DATABASE IF NOT EXISTS wfchat CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

broker/sql/initialize_db.sh

@@ -1,83 +0,0 @@
-#!/bin/bash
-
-show_help_info(){
-  echo "###  Usage: ./initial_db.sh -u{user} -p{password}"
-  echo "###  初始化数据库。"
-  echo "###"
-
-}
-
-for i in "$@"
-do
-  PFLAG=`echo $i|cut -b1-2`
-  PPARAM=`echo $i|cut -b3-`
-  if [ $PFLAG = "-u" ]; then
-    USER=${PPARAM}
-  elif [ $PFLAG = "-p" ]; then
-    PASSWORD=${PPARAM}
-  elif [ $PFLAG = "-h" ]; then
-    show_help_info
-    exit 1
-  fi
-done
-
-echo
-
-if [ "${USER}" = "" ]; then
-  show_help_info
-  exit 1
-elif [ "${PASSWORD}" = "" ]; then
-  show_help_info
-  exit 1
-fi
-
-
-mysql -u${USER} -p${PASSWORD} -e"source 1_create_database.sql;"
-mysql -u${USER} -p${PASSWORD} -e"use wfchat; source 2_create_table.sql; source 3_create_default_chatroom.sql;"
-
-for((i=0;i<36;i++));
-do
-  create_message_tbl_sql="USE wfchat;
-  DROP TABLE IF EXISTS \`t_messages_${i}\`;
-  CREATE TABLE \`t_messages_${i}\` (
-    \`id\` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    \`_mid\` bigint(20) NOT NULL,
-    \`_from\` varchar(64) NOT NULL,
-    \`_type\` tinyint NOT NULL DEFAULT 0,
-    \`_target\` varchar(64) NOT NULL,
-    \`_line\` int(11) NOT NULL DEFAULT 0,
-    \`_data\` BLOB NOT NULL,
-    \`_searchable_key\` TEXT DEFAULT NULL,
-    \`_dt\` DATETIME NOT NULL,
-    INDEX \`message_uid_index\` (\`_mid\` DESC)
-  )
-  ENGINE = InnoDB
-  DEFAULT CHARACTER SET = utf8mb4
-  COLLATE = utf8mb4_unicode_ci;
-  "
-
-  echo "create table t_messages_$i"
-  mysql -u${USER} -p${PASSWORD} -e"${create_message_tbl_sql}"
-done
-
-
-for((i=0;i<128;i++));
-do
-  create_user_message_tbl_sql="USE wfchat;
-  DROP TABLE IF EXISTS \`t_user_messages_${i}\`;
-  CREATE TABLE \`t_user_messages_${i}\` (
-    \`id\` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    \`_mid\` bigint(20) NOT NULL,
-    \`_uid\` varchar(64) NOT NULL,
-    \`_seq\` bigint(20) NOT NULL,
-    \`_dt\` DATETIME NOT NULL DEFAULT NOW(),
-    INDEX \`message_seq_uid_index\` (\`_uid\` DESC, \`_seq\` DESC)
-  )
-  ENGINE = InnoDB
-  DEFAULT CHARACTER SET = utf8mb4
-  COLLATE = utf8mb4_unicode_ci;
-  "
-
-  echo "create table t_user_messages_$i"
-  mysql -u${USER} -p${PASSWORD} -e"${create_user_message_tbl_sql}"
-done

broker/src/main/java/cn/wildfirechat/server/ThreadPoolExecutorWrapper.java

@@ -30,14 +30,14 @@ public class ThreadPoolExecutorWrapper {
 
     public void execute(Runnable task) {
         int startCount = runCounter.incrementAndGet();
-        LOG.info("Submit task and current taskcount {}", startCount);
+        LOG.debug("Submit task and current task count {}", startCount);
         final long startTime = System.currentTimeMillis();
         executor.execute(() -> {
             try {
                 task.run();
             } finally {
                 int endCount = runCounter.decrementAndGet();
-                LOG.info("Finish task and current taskcount {} use time {}", endCount, System.currentTimeMillis()-startTime);
+                LOG.debug("Finish task and current task count {} use time {}", endCount, System.currentTimeMillis()-startTime);
             }
         });
     }

broker/src/main/java/com/xiaoleilu/loServer/RestResult.java

@@ -8,7 +8,7 @@
 
 package com.xiaoleilu.loServer;
 
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
 public class RestResult {
 

broker/src/main/java/com/xiaoleilu/loServer/action/Action.java

@@ -10,7 +10,6 @@ package com.xiaoleilu.loServer.action;
 
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
-import com.xiaoleilu.loServer.action.admin.GetIMTokenAction;
 import com.xiaoleilu.loServer.annotation.RequireAuthentication;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
@@ -21,10 +20,9 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.DBUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 /**
  * 请求处理接口<br>
@@ -39,8 +37,6 @@ abstract public class Action {
 
     public ChannelHandlerContext ctx;
 
-    protected boolean isSync = true;
-
     public ErrorCode preAction(Request request, Response response) {
         if (getClass().getAnnotation(RequireAuthentication.class) != null) {
             //do authentication
@@ -50,6 +46,7 @@ abstract public class Action {
     }
 	public boolean doAction(Request request, Response response) {
         ErrorCode errorCode = preAction(request, response);
+        boolean isSync = true;
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             //事务逻辑有缺陷，先注释掉
 //            if (isTransactionAction() && !(this instanceof IMAction)) {
@@ -63,9 +60,8 @@ abstract public class Action {
 //                    throw e;
 //                }
 //            } else {
-                action(request, response);
+            isSync = action(request, response);
 //            }
-            afterAction(request, response);
         } else {
             response.setStatus(HttpResponseStatus.OK);
             if (errorCode == null) {
@@ -77,19 +73,12 @@ abstract public class Action {
             response.send();
         }
 
-        if(this instanceof IMAction || this instanceof RouteAction || this instanceof GetIMTokenAction) {
-            isSync = false;
-        }
         return isSync;
     }
     public boolean isTransactionAction() {
         return false;
     }
-    abstract public void action(Request request, Response response);
-    public void afterAction(Request request, Response response) {
-
-    }
-
+    abstract public boolean action(Request request, Response response);
 
     protected <T> T getRequestBody(HttpRequest request, Class<T> cls) {
         if (request instanceof FullHttpRequest) {

broker/src/main/java/com/xiaoleilu/loServer/action/DefaultIndexAction.java

@@ -12,7 +12,8 @@ import io.moquette.spi.IMessagesStore;
  */
 public class DefaultIndexAction extends Action{
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         response.setContent("Welcome to LoServer.");
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java

@@ -34,15 +34,15 @@ public class FileAction extends Action {
     private static final org.slf4j.Logger Logger = LoggerFactory.getLogger(FileAction.class);
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (false == Request.METHOD_GET.equalsIgnoreCase(request.getMethod())) {
             response.sendError(HttpResponseStatus.METHOD_NOT_ALLOWED, "Please use GET method to request file!");
-            return;
+            return true;
         }
 
         if(ServerSetting.isRootAvailable() == false){
             response.sendError(HttpResponseStatus.NOT_FOUND, "404 Root dir not avaliable!");
-            return;
+            return true;
         }
 
         final File file = getFileByPath(request.getPath());
@@ -51,13 +51,13 @@ public class FileAction extends Action {
         // 隐藏文件，跳过
         if (file.isHidden() || !file.exists()) {
             response.sendError(HttpResponseStatus.NOT_FOUND, "404 File not found!");
-            return;
+            return true;
         }
 
         // 非文件，跳过
         if (false == file.isFile()) {
             response.sendError(HttpResponseStatus.FORBIDDEN, "403 Forbidden!");
-            return;
+            return true;
         }
 
         // Cache Validation
@@ -76,12 +76,13 @@ public class FileAction extends Action {
                 if (ifModifiedSinceDateSeconds == fileLastModifiedSeconds) {
                     Logger.debug("File {} not modified.", file.getPath());
                     response.sendNotModified();
-                    return;
+                    return true;
                 }
             }
         }
 
         response.setContent(file);
+        return true;
     }
 
     private static final Pattern INSECURE_URI = Pattern.compile(".*[<>&\"].*");

broker/src/main/java/com/xiaoleilu/loServer/action/IMAction.java

@@ -25,7 +25,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
 import java.util.Base64;
 import java.util.concurrent.Executor;
@@ -35,7 +35,7 @@ import java.util.concurrent.Executor;
 public class IMAction extends Action {
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
 
             FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
@@ -46,15 +46,15 @@ public class IMAction extends Action {
                 bytes = Base64.getDecoder().decode(str);
             } catch (IllegalArgumentException e) {
                 sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null);
-                return;
+                return true;
             }
 
             String cid = fullHttpRequest.headers().get("cid");
             byte[] cbytes = Base64.getDecoder().decode(cid);
-            cbytes = AES.AESDecrypt(cbytes, null, true);
+            cbytes = AES.AESDecrypt(cbytes, "", true);
             if (cbytes == null) {
                 sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null);
-                return;
+                return true;
             }
             cid = new String(cbytes);
 
@@ -64,13 +64,13 @@ public class IMAction extends Action {
                 bytes = AES.AESDecrypt(bytes, session.getSecret(), true);
             } else {
                 sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null);
-                return;
+                return true;
             }
 
 
             if (bytes == null) {
                 sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null);
-                return;
+                return true;
             }
 
             try {
@@ -102,12 +102,14 @@ public class IMAction extends Action {
                                 ctx.executor().execute(command);
                             };
                         }
-                    });
+                    }, false);
+                    return false;
                 }
             } catch (InvalidProtocolBufferException e) {
                 sendResponse(response, ErrorCode.ERROR_CODE_INVALID_DATA, null);
             }
         }
+        return true;
     }
 
     private void sendResponse(Response response, ErrorCode errorCode, byte[] contents) {

broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java

@@ -27,7 +27,8 @@ public class NotFoundAction extends Action{
 	private final static String TEMPLATE_ERROR = "<!DOCTYPE html><html><head><title>LoServer - Error report</title><style>h1,h3 {color:white; background-color: gray;}</style></head><body><h1>HTTP Status {} - {}</h1><hr size=\"1\" noshade=\"noshade\" /><p>{}</p><hr size=\"1\" noshade=\"noshade\" /><h3>LoServer</h3></body></html>";
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         response.sendError(HttpResponseStatus.NOT_FOUND, "404 Not found!");
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java

@@ -26,7 +26,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
 import java.util.Base64;
 import java.util.concurrent.Executor;
@@ -36,7 +36,7 @@ import java.util.concurrent.Executor;
 public class RouteAction extends Action {
     private static final Logger LOG = LoggerFactory.getLogger(RouteAction.class);
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
 
             response.setContentType("application/octet-stream");
@@ -55,34 +55,34 @@ public class RouteAction extends Action {
                 bytes = Base64.getDecoder().decode(str);
             } catch (IllegalArgumentException e) {
                 sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null, base64Response);
-                return;
+                return true;
             }
 
             String cid = fullHttpRequest.headers().get("cid");
             byte[] cbytes = Base64.getDecoder().decode(cid);
-            cbytes = AES.AESDecrypt(cbytes, null, true);
+            cbytes = AES.AESDecrypt(cbytes, "", true);
             if (cbytes == null) {
                 sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null, base64Response);
-                return;
+                return true;
             }
             cid = new String(cbytes);
 
             String uid = fullHttpRequest.headers().get("uid");
             byte[] ubytes = Base64.getDecoder().decode(uid);
-            ubytes = AES.AESDecrypt(ubytes, null, true);
+            ubytes = AES.AESDecrypt(ubytes, "", true);
             if (ubytes == null) {
                 sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null, base64Response);
-                return;
+                return true;
             }
             uid = new String(ubytes);
 
 
             MemorySessionStore.Session session = sessionsStore.sessionForClientAndUser(uid, cid);
             if (session == null) {
-                ErrorCode errorCode = sessionsStore.createNewSession(uid, cid, true);
+                ErrorCode errorCode = sessionsStore.createNewSession(uid, cid, true, true);
                 if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
                     sendResponse(response, errorCode, null, base64Response);
-                    return;
+                    return true;
                 }
                 session = sessionsStore.sessionForClientAndUser(uid, cid);
             }
@@ -92,13 +92,13 @@ public class RouteAction extends Action {
                 bytes = AES.AESDecrypt(bytes, session.getSecret(), true);
             } else {
                 sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null, base64Response);
-                return;
+                return true;
             }
 
 
             if (bytes == null) {
                 sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null, base64Response);
-                return;
+                return true;
             }
 
 
@@ -132,12 +132,14 @@ public class RouteAction extends Action {
                                 ctx.executor().execute(command);
                             };
                         }
-                    });
+                    }, false);
+                    return false;
                 }
             } catch (InvalidProtocolBufferException e) {
                 sendResponse(response, ErrorCode.ERROR_CODE_INVALID_DATA, null, false);
             }
         }
+        return true;
     }
 
     private void sendResponse(Response response, ErrorCode errorCode, byte[] contents, boolean base64Response) {

broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java

@@ -27,7 +27,8 @@ public class UnknownErrorAction extends Action{
 	private final static String TEMPLATE_ERROR = "<!DOCTYPE html><html><head><title>LoServer - Error report</title><style>h1,h3 {color:white; background-color: gray;}</style></head><body><h1>HTTP Status {} - {}</h1><hr size=\"1\" noshade=\"noshade\" /><p>{}</p><hr size=\"1\" noshade=\"noshade\" /><h3>LoServer</h3></body></html>";
 
     @Override
-    public void action(Request request, Response response) {
-        response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
+    public boolean action(Request request, Response response) {
+        response.setStatus(HttpResponseStatus.NOT_FOUND);
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java

@@ -73,7 +73,7 @@ public class UploadFileAction extends Action {
     }
 
     @Override
-    public void action(Request r, Response response) {
+    public boolean action(Request r, Response response) {
         if (r.getNettyRequest() instanceof FullHttpRequest) {
 
             FullHttpRequest request = (FullHttpRequest) r.getNettyRequest();
@@ -84,12 +84,13 @@ public class UploadFileAction extends Action {
                 logger.warn("http decode failed!");
                 response.setStatus(HttpResponseStatus.BAD_REQUEST);
                 response.setContent("http decode failed");
-                return;
+                return true;
             }
 
             multipartUpload(request, requestId, response);
 
         }
+        return true;
     }
 
 

broker/src/main/java/com/xiaoleilu/loServer/action/VersionAction.java

@@ -9,23 +9,17 @@
 package com.xiaoleilu.loServer.action;
 
 import com.google.gson.Gson;
-import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputUserLogin;
-import com.xiaoleilu.loServer.pojos.OutputLoginData;
-import io.moquette.spi.impl.Utils;
-import io.moquette.spi.impl.security.TokenAuthenticator;
+import cn.wildfirechat.pojos.InputUserLogin;
+import cn.wildfirechat.pojos.OutputLoginData;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
 import win.liyufan.im.GitRepositoryState;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 @Route("/api/version")
 @HttpMethod("GET")
@@ -33,7 +27,7 @@ public class VersionAction extends Action {
 
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             response.setStatus(HttpResponseStatus.OK);
 
@@ -44,5 +38,6 @@ public class VersionAction extends Action {
                 response.setContent("{\"version\":\"unknown\"}");
             }
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddGroupMemberAction.java

@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputAddGroupMember;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Member_Add)
+@HttpMethod("POST")
+public class AddGroupMemberAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputAddGroupMember inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputAddGroupMember.class);
+            if (inputAddGroupMember.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.AddGroupMemberTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), inputAddGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java

@@ -13,24 +13,28 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.spi.impl.Utils;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.RateLimiter;
 
 abstract public class AdminAction extends Action {
     private static String SECRET_KEY = "123456";
+    private static boolean NO_CHECK_TIME = false;
     private final RateLimiter mLimitCounter = new RateLimiter(10, 500);
     public static void setSecretKey(String secretKey) {
         SECRET_KEY = secretKey;
     }
 
+    public static void setNoCheckTime(String noCheckTime) {
+        try {
+            NO_CHECK_TIME = Boolean.parseBoolean(noCheckTime);
+        } catch (Exception e) {
+
+        }
+    }
+
     @Override
     public ErrorCode preAction(Request request, Response response) {
         if (!mLimitCounter.isGranted("admin")) {
@@ -51,8 +55,8 @@ abstract public class AdminAction extends Action {
             return ErrorCode.INVALID_PARAMETER;
         }
 
-        if (System.currentTimeMillis() - ts > 2 * 60 * 60 * 1000) {
-//            return ErrorCode.ERROR_CODE_SIGN_EXPIRED;
+        if (!NO_CHECK_TIME && System.currentTimeMillis() - ts > 2 * 60 * 60 * 1000) {
+            return ErrorCode.ERROR_CODE_SIGN_EXPIRED;
         }
 
         String str = nonce + "|" + SECRET_KEY + "|" + timestamp;

broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlockUserAction.java

@@ -8,21 +8,22 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("admin/user/status")
+@Route(APIPath.User_Update_Block_Status)
 @HttpMethod("POST")
 public class BlockUserAction extends AdminAction {
 
@@ -32,7 +33,7 @@ public class BlockUserAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputOutputUserBlockStatus inputUserBlock = getRequestBody(request.getNettyRequest(), InputOutputUserBlockStatus.class);
             if (inputUserBlock != null
@@ -44,7 +45,9 @@ public class BlockUserAction extends AdminAction {
                 result = RestResult.resultOf(errorCode);
                 response.setContent(new Gson().toJson(result));
 
-                RPCCenter.getInstance().sendRequest(null, null, RPCCenter.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), inputUserBlock.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null);
+                if (inputUserBlock.getStatus() != 0) {
+                    RPCCenter.getInstance().sendRequest(null, null, RPCCenter.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), inputUserBlock.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null, true);
+                }
 
                 sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, null);
             } else {
@@ -54,5 +57,6 @@ public class BlockUserAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CheckUserOnlineAction.java

@@ -8,19 +8,19 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.InputGetUserInfo;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("/admin/user/onlinestatus")
+@Route(APIPath.User_Get_Online_Status)
 @HttpMethod("POST")
 public class CheckUserOnlineAction extends AdminAction {
 
@@ -30,16 +30,17 @@ public class CheckUserOnlineAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId == null || !StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
-                RPCCenter.getInstance().sendRequest(null, null, RPCCenter.CHECK_USER_ONLINE_REQUEST, inputUserId.getUserId().getBytes(), inputUserId.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null);
-                return;
+                RPCCenter.getInstance().sendRequest(null, null, RPCCenter.CHECK_USER_ONLINE_REQUEST, inputUserId.getUserId().getBytes(), inputUserId.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null, true);
+                return true;
             } else {
                 sendResponse(response, ErrorCode.INVALID_PARAMETER, null);
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChatroomAction.java

@@ -8,6 +8,7 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,17 +16,16 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateChatroom;
-import com.xiaoleilu.loServer.pojos.OutputCreateChatroom;
+import cn.wildfirechat.pojos.InputCreateChatroom;
+import cn.wildfirechat.pojos.OutputCreateChatroom;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
-import win.liyufan.im.UUIDGenerator;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("/admin/chatroom")
-@HttpMethod("PUT")
+@Route(APIPath.Create_Chatroom)
+@HttpMethod("POST")
 public class CreateChatroomAction extends AdminAction {
 
     @Override
@@ -34,7 +34,7 @@ public class CreateChatroomAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
             byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
@@ -67,5 +67,6 @@ public class CreateChatroomAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateGroupAction.java

@@ -9,27 +9,28 @@
 package com.xiaoleilu.loServer.action.admin;
 
 
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateGroup;
-import com.xiaoleilu.loServer.pojos.OutputCreateGroupResult;
+import cn.wildfirechat.pojos.InputCreateGroup;
+import cn.wildfirechat.pojos.OutputCreateGroupResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.concurrent.Executor;
 
-@Route("admin/group")
-@HttpMethod("PUT")
+@Route(APIPath.Create_Group)
+@HttpMethod("POST")
 public class CreateGroupAction extends AdminAction {
 
     @Override
@@ -38,7 +39,7 @@ public class CreateGroupAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputCreateGroup inputCreateGroup = getRequestBody(request.getNettyRequest(), InputCreateGroup.class);
             if (inputCreateGroup.isValide()) {
@@ -74,12 +75,14 @@ public class CreateGroupAction extends AdminAction {
                             ctx.executor().execute(command);
                         };
                     }
-                });
+                }, true);
+                return false;
             } else {
                 response.setStatus(HttpResponseStatus.OK);
                 RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
                 response.setContent(new Gson().toJson(result));
             }
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java

@@ -8,6 +8,7 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,15 +16,15 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateRobot;
-import com.xiaoleilu.loServer.pojos.OutputCreateRobot;
+import cn.wildfirechat.pojos.InputCreateRobot;
+import cn.wildfirechat.pojos.OutputCreateRobot;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.UUIDGenerator;
 
-@Route("admin/robot/create")
+@Route(APIPath.Create_Robot)
 @HttpMethod("POST")
 public class CreateRobotAction extends AdminAction {
 
@@ -33,7 +34,7 @@ public class CreateRobotAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputCreateRobot inputCreateRobot = getRequestBody(request.getNettyRequest(), InputCreateRobot.class);
             if (inputCreateRobot != null
@@ -76,5 +77,6 @@ public class CreateRobotAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java

@@ -8,6 +8,7 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,15 +16,15 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputCreateUser;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.UUIDGenerator;
 
-@Route("admin/user/create")
+@Route(APIPath.Create_User)
 @HttpMethod("POST")
 public class CreateUserAction extends AdminAction {
 
@@ -33,9 +34,9 @@ public class CreateUserAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-            InputCreateUser inputCreateUser = getRequestBody(request.getNettyRequest(), InputCreateUser.class);
+            InputOutputUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputOutputUserInfo.class);
             if (inputCreateUser != null
                 && !StringUtil.isNullOrEmpty(inputCreateUser.getName())) {
 
@@ -90,5 +91,6 @@ public class CreateUserAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestoryChatroomAction.java

@@ -8,21 +8,22 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputDestoryChatroom;
+import cn.wildfirechat.pojos.InputDestoryChatroom;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("/admin/chatroom")
-@HttpMethod("DELETE")
+@Route(APIPath.Chatroom_Destroy)
+@HttpMethod("POST")
 public class DestoryChatroomAction extends AdminAction {
 
     @Override
@@ -31,7 +32,7 @@ public class DestoryChatroomAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
             byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
@@ -54,5 +55,6 @@ public class DestoryChatroomAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/DismissGroupAction.java

@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputDismissGroup;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Dismiss)
+@HttpMethod("POST")
+public class DismissGroupAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputDismissGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputDismissGroup.class);
+            if (inputDismissGroup.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputDismissGroup.getOperator(), null, IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), inputDismissGroup.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java

@@ -0,0 +1,88 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputFriendRequest;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Friend_Update_Status)
+@HttpMethod("POST")
+public class FriendRelationAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputFriendRequest friendAdd = getRequestBody(request.getNettyRequest(), InputFriendRequest.class);
+            if (friendAdd != null
+                && !StringUtil.isNullOrEmpty(friendAdd.getUserId())
+                && !StringUtil.isNullOrEmpty(friendAdd.getFriendUid())
+            ) {
+                WFCMessage.HandleFriendRequest friendRequest = WFCMessage.HandleFriendRequest.newBuilder().setTargetUid(friendAdd.getFriendUid()).setStatus(friendAdd.getStatus()).build();
+                RPCCenter.getInstance().sendRequest(friendAdd.getUserId(), null, IMTopic.HandleFriendRequestTopic, friendRequest.toByteArray(), friendAdd.getFriendUid(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> ctx.executor().execute(command);
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationGetAction.java

@@ -0,0 +1,52 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import com.xiaoleilu.loServer.model.FriendData;
+import cn.wildfirechat.pojos.InputGetFriendList;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Friend_Get_List)
+@HttpMethod("POST")
+public class FriendRelationGetAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetFriendList inputGetFriendList = getRequestBody(request.getNettyRequest(), InputGetFriendList.class);
+            List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), 0);
+            List<String> list = new ArrayList<>();
+            for (FriendData data : dataList) {
+                if (data.getState() == inputGetFriendList.getStatus()) {
+                    list.add(data.getFriendUid());
+                }
+            }
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok(list);
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomInfoAction.java

@@ -8,6 +8,8 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,14 +17,13 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.OutputGetChatroomInfo;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("/admin/chatroom")
-@HttpMethod("GET")
+@Route(APIPath.Chatroom_Info)
+@HttpMethod("POST")
 public class GetChatroomInfoAction extends AdminAction {
 
     @Override
@@ -31,19 +32,19 @@ public class GetChatroomInfoAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-
-            String chatroomid = request.getParam("id");
+            InputGetChatroomInfo getChatroomInfo = getRequestBody(request.getNettyRequest(), InputGetChatroomInfo.class);
+            String chatroomid = getChatroomInfo.getChatroomId();
             if (!StringUtil.isNullOrEmpty(chatroomid)) {
 
                 WFCMessage.ChatroomInfo info = messagesStore.getChatroomInfo(chatroomid);
 
                 RestResult result;
-                if (info == null) {
+                if (info != null) {
                     result = RestResult.ok(new OutputGetChatroomInfo(chatroomid, messagesStore.getChatroomMemberCount(chatroomid), info));
                 } else {
-                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_SUCCESS);
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                 }
                 response.setStatus(HttpResponseStatus.OK);
 
@@ -56,5 +57,6 @@ public class GetChatroomInfoAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupInfoAction.java

@@ -0,0 +1,71 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.PojoGroupInfo;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Group_Get_Info)
+@HttpMethod("POST")
+public class GetGroupInfoAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
+            if (inputGetGroup != null
+                && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) {
+
+                WFCMessage.GroupInfo groupInfo = messagesStore.getGroupInfo(inputGetGroup.getGroupId());
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (groupInfo == null) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    PojoGroupInfo pojoGroupInfo = new PojoGroupInfo();
+                    pojoGroupInfo.setExtra(groupInfo.getExtra());
+                    pojoGroupInfo.setName(groupInfo.getName());
+                    pojoGroupInfo.setOwner(groupInfo.getOwner());
+                    pojoGroupInfo.setPortrait(groupInfo.getPortrait());
+                    pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
+                    pojoGroupInfo.setType(groupInfo.getType());
+                    result = RestResult.ok(pojoGroupInfo);
+                }
+
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupMembersAction.java

@@ -0,0 +1,78 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.OutputGroupMemberList;
+import cn.wildfirechat.pojos.PojoGroupInfo;
+import cn.wildfirechat.pojos.PojoGroupMember;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Group_Member_List)
+@HttpMethod("POST")
+public class GetGroupMembersAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
+            if (inputGetGroup != null
+                && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) {
+
+                List<WFCMessage.GroupMember> members = new ArrayList<>();
+                ErrorCode errorCode = messagesStore.getGroupMembers(inputGetGroup.getGroupId(), 0, members);
+
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                    result = RestResult.resultOf(errorCode);
+                } else {
+                    OutputGroupMemberList out = new OutputGroupMemberList();
+                    out.setMembers(new ArrayList<>());
+                    for (WFCMessage.GroupMember member : members) {
+                        PojoGroupMember pm = new PojoGroupMember();
+                        pm.setMember_id(member.getMemberId());
+                        pm.setAlias(member.getAlias());
+                        pm.setType(member.getType());
+                        out.getMembers().add(pm);
+                    }
+                    result = RestResult.ok(out);
+                }
+
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetIMTokenAction.java

@@ -8,23 +8,24 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputGetToken;
-import com.xiaoleilu.loServer.pojos.OutputGetIMTokenData;
+import cn.wildfirechat.pojos.InputGetToken;
+import cn.wildfirechat.pojos.OutputGetIMTokenData;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.handler.codec.http.FullHttpRequest;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.Base64;
 import java.util.concurrent.Executor;
 
-@Route("/admin/user/token")
+@Route(APIPath.User_Get_Token)
 @HttpMethod("POST")
 public class GetIMTokenAction extends AdminAction {
 
@@ -34,7 +35,7 @@ public class GetIMTokenAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetToken input = getRequestBody(request.getNettyRequest(), InputGetToken.class);
             String userId = input.getUserId();
@@ -75,7 +76,9 @@ public class GetIMTokenAction extends AdminAction {
                         ctx.executor().execute(command);
                     };
                 }
-            });
+            }, true);
+            return false;
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java

@@ -8,6 +8,7 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,15 +16,14 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("admin/user/info")
+@Route(APIPath.User_Get_Info)
 @HttpMethod("POST")
 public class GetUserAction extends AdminAction {
 
@@ -33,11 +33,11 @@ public class GetUserAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId != null
-                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()))) {
+                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()) || !StringUtil.isNullOrEmpty(inputUserId.getMobile()))) {
 
                 WFCMessage.User user = null;
                 if(!StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
@@ -53,7 +53,7 @@ public class GetUserAction extends AdminAction {
                 if (user == null) {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                 } else {
-                    result = RestResult.ok(InputCreateUser.fromPbUser(user));
+                    result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
                 }
 
                 response.setContent(new Gson().toJson(result));
@@ -64,5 +64,6 @@ public class GetUserAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockListAction.java

@@ -8,6 +8,8 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.OutputUserBlockStatusList;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -17,7 +19,7 @@ import com.xiaoleilu.loServer.handler.Response;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
-@Route("admin/user/statuslist")
+@Route(APIPath.User_Get_Blocked_List)
 @HttpMethod("POST")
 public class GetUserBlockListAction extends AdminAction {
 
@@ -27,11 +29,14 @@ public class GetUserBlockListAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(messagesStore.getUserStatusList());
+            OutputUserBlockStatusList list = new OutputUserBlockStatusList();
+            list.setStatusList(messagesStore.getUserStatusList());
+            RestResult result = RestResult.ok(list);
             response.setContent(new Gson().toJson(result));
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockStatusAction.java

@@ -8,21 +8,21 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
-import com.xiaoleilu.loServer.pojos.OutputUserStatus;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.OutputUserStatus;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("admin/user/checkstatus")
+@Route(APIPath.User_Check_Block_Status)
 @HttpMethod("POST")
 public class GetUserBlockStatusAction extends AdminAction {
 
@@ -32,7 +32,7 @@ public class GetUserBlockStatusAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId != null
@@ -49,5 +49,6 @@ public class GetUserBlockStatusAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffGroupMemberAction.java

@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputKickoffGroupMember;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Member_Kickoff)
+@HttpMethod("POST")
+public class KickoffGroupMemberAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
+            if (inputKickoffGroupMember.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.AddGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), inputKickoffGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMessageAction.java

@@ -8,6 +8,7 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,7 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.RecallMessageData;
+import cn.wildfirechat.pojos.RecallMessageData;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
@@ -23,12 +24,12 @@ import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.concurrent.Executor;
 
-@Route("admin/message/recall")
+@Route(APIPath.Msg_Recall)
 @HttpMethod("POST")
 public class RecallMessageAction extends AdminAction {
 
@@ -38,7 +39,7 @@ public class RecallMessageAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             RecallMessageData recallMessageData = getRequestBody(request.getNettyRequest(), RecallMessageData.class);
             if (recallMessageData != null && !StringUtil.isNullOrEmpty(recallMessageData.getOperator())) {
@@ -69,12 +70,14 @@ public class RecallMessageAction extends AdminAction {
                             ctx.executor().execute(command);
                         };
                     }
-                });
+                }, true);
+                return false;
             } else {
                 response.setStatus(HttpResponseStatus.OK);
                 RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
                 response.setContent(new Gson().toJson(result));
             }
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/SendMessageAction.java

@@ -9,26 +9,28 @@
 package com.xiaoleilu.loServer.action.admin;
 
 
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
+import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+import cn.wildfirechat.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.concurrent.Executor;
 
-@Route("admin/message/send")
+@Route(APIPath.Msg_Send)
 @HttpMethod("POST")
 public class SendMessageAction extends AdminAction {
 
@@ -38,10 +40,10 @@ public class SendMessageAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
-            if (SendMessageData.isValide(sendMessageData)) {
+            if (SendMessageData.isValide(sendMessageData) && !StringUtil.isNullOrEmpty(sendMessageData.getSender())) {
                 RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
                     @Override
                     public void onSuccess(byte[] result) {
@@ -73,12 +75,14 @@ public class SendMessageAction extends AdminAction {
                             ctx.executor().execute(command);
                         };
                     }
-                });
+                }, true);
+                return false;
             } else {
                 response.setStatus(HttpResponseStatus.OK);
                 RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
                 response.setContent(new Gson().toJson(result));
             }
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordAddAction.java

@@ -8,22 +8,19 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputSensitiveWords;
-import com.xiaoleilu.loServer.pojos.InputOutputUserBlockStatus;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
+import cn.wildfirechat.pojos.InputOutputSensitiveWords;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("admin/sensitive/add")
+@Route(APIPath.Sensitive_Add)
 @HttpMethod("POST")
 public class SensitiveWordAddAction extends AdminAction {
 
@@ -33,7 +30,7 @@ public class SensitiveWordAddAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputOutputSensitiveWords input = getRequestBody(request.getNettyRequest(), InputOutputSensitiveWords.class);
             if (input != null && input.getWords() != null && !input.getWords().isEmpty()) {
@@ -47,5 +44,6 @@ public class SensitiveWordAddAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordDeleteAction.java

@@ -8,18 +8,19 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputSensitiveWords;
+import cn.wildfirechat.pojos.InputOutputSensitiveWords;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("admin/sensitive/del")
+@Route(APIPath.Sensitive_Del)
 @HttpMethod("POST")
 public class SensitiveWordDeleteAction extends AdminAction {
 
@@ -29,7 +30,7 @@ public class SensitiveWordDeleteAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputOutputSensitiveWords input = getRequestBody(request.getNettyRequest(), InputOutputSensitiveWords.class);
             if (input != null && input.getWords() != null && !input.getWords().isEmpty()) {
@@ -44,5 +45,6 @@ public class SensitiveWordDeleteAction extends AdminAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordQueryAction.java

@@ -8,20 +8,18 @@
 
 package com.xiaoleilu.loServer.action.admin;
 
-import com.google.gson.Gson;
-import com.xiaoleilu.loServer.RestResult;
+import cn.wildfirechat.common.APIPath;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputOutputSensitiveWords;
+import cn.wildfirechat.pojos.InputOutputSensitiveWords;
 import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
 import java.util.List;
 
-@Route("admin/sensitive/query")
+@Route(APIPath.Sensitive_Query)
 @HttpMethod("POST")
 public class SensitiveWordQueryAction extends AdminAction {
 
@@ -31,12 +29,13 @@ public class SensitiveWordQueryAction extends AdminAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
                 List<String> words = messagesStore.getAllSensitiveWords();
                 InputOutputSensitiveWords out = new InputOutputSensitiveWords();
                 out.setWords(words);
                 sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, out);
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/admin/TransferGroupAction.java

@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+
+import cn.wildfirechat.common.APIPath;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import cn.wildfirechat.pojos.InputTransferGroup;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Transfer)
+@HttpMethod("POST")
+public class TransferGroupAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputTransferGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputTransferGroup.class);
+            if (inputDismissGroup.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputDismissGroup.getOperator(), null, IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), inputDismissGroup.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java

@@ -14,14 +14,13 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import io.moquette.persistence.RPCCenter;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.RateLimiter;
 
 abstract public class ChannelAction extends Action {

broker/src/main/java/com/xiaoleilu/loServer/action/channel/SendMessageAction.java

@@ -9,30 +9,30 @@
 package com.xiaoleilu.loServer.action.channel;
 
 
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
-import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.Conversation;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+import cn.wildfirechat.pojos.Conversation;
+import cn.wildfirechat.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.concurrent.Executor;
 
 import static cn.wildfirechat.proto.ProtoConstants.ConversationType.ConversationType_Channel;
 
-@Route("channel/message/send")
+@Route(APIPath.Channel_Message_Send)
 @HttpMethod("POST")
 public class SendMessageAction extends ChannelAction {
 
@@ -42,7 +42,7 @@ public class SendMessageAction extends ChannelAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
             sendMessageData.setConv(new Conversation());
@@ -81,12 +81,14 @@ public class SendMessageAction extends ChannelAction {
                             ctx.executor().execute(command);
                         };
                     }
-                });
+                }, false);
+                return false;
             } else {
                 response.setStatus(HttpResponseStatus.OK);
                 RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
                 response.setContent(new Gson().toJson(result));
             }
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java

@@ -8,6 +8,7 @@
 
 package com.xiaoleilu.loServer.action.robot;
 
+import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -15,24 +16,23 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.InputCreateUser;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-@Route("admin/robot/user_info")
+@Route(APIPath.Robot_User_Info)
 @HttpMethod("POST")
 public class GetUserAction extends RobotAction {
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId != null
-                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()))) {
+                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()) || !StringUtil.isNullOrEmpty(inputUserId.getMobile()))) {
 
                 WFCMessage.User user = null;
                 if(!StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
@@ -48,7 +48,7 @@ public class GetUserAction extends RobotAction {
                 if (user == null) {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                 } else {
-                    result = RestResult.ok(InputCreateUser.fromPbUser(user));
+                    result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
                 }
 
                 response.setContent(new Gson().toJson(result));
@@ -59,5 +59,6 @@ public class GetUserAction extends RobotAction {
             }
 
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java

@@ -14,16 +14,17 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import io.moquette.persistence.RPCCenter;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.RateLimiter;
 
+import java.io.UnsupportedEncodingException;
+
 abstract public class RobotAction extends Action {
     private final RateLimiter mLimitCounter = new RateLimiter(10, 1000);
 
@@ -80,10 +81,15 @@ abstract public class RobotAction extends Action {
         if (request instanceof FullHttpRequest) {
             FullHttpRequest fullHttpRequest = (FullHttpRequest) request;
             byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
-            String content = new String(bytes);
-            Gson gson = new Gson();
-            T t = gson.fromJson(content, cls);
-            return t;
+            String content = null;
+            try {
+                content = new String(bytes, "UTF-8");
+                Gson gson = new Gson();
+                T t = gson.fromJson(content, cls);
+                return t;
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
         }
         return null;
     }

broker/src/main/java/com/xiaoleilu/loServer/action/robot/SendMessageAction.java

@@ -9,28 +9,27 @@
 package com.xiaoleilu.loServer.action.robot;
 
 
-import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.common.APIPath;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
-import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+import cn.wildfirechat.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageResult;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.concurrent.Executor;
 
-@Route("admin/robot/send")
+@Route(APIPath.Robot_Message_Send)
 @HttpMethod("POST")
 public class SendMessageAction extends RobotAction {
 
@@ -40,7 +39,7 @@ public class SendMessageAction extends RobotAction {
     }
 
     @Override
-    public void action(Request request, Response response) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
             sendMessageData.setSender(robot.getUid());
@@ -76,12 +75,14 @@ public class SendMessageAction extends RobotAction {
                             ctx.executor().execute(command);
                         };
                     }
-                });
+                }, false);
+                return false;
             } else {
                 response.setStatus(HttpResponseStatus.OK);
                 RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
                 response.setContent(new Gson().toJson(result));
             }
         }
+        return true;
     }
 }

broker/src/main/java/com/xiaoleilu/loServer/model/FriendData.java

@@ -13,13 +13,15 @@ import java.io.Serializable;
 public class FriendData implements Serializable {
     private String userId;
     private String friendUid;
+    private String alias;
     private int state;
     private long timestamp;
 
 
-    public FriendData(String userId, String friendUid, int state, long timestamp) {
+    public FriendData(String userId, String friendUid, String alias, int state, long timestamp) {
         this.userId = userId;
         this.friendUid = friendUid;
+        this.alias = alias;
         this.state = state;
         this.timestamp = timestamp;
     }
@@ -43,6 +45,14 @@ public class FriendData implements Serializable {
         this.friendUid = friendUid;
     }
 
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
     public int getState() {
         return state;
     }

broker/src/main/java/io/moquette/BrokerConstants.java

@@ -100,6 +100,8 @@ public final class BrokerConstants {
     public static final String HZ_Cluster_Node_External_Short_Port = "node_external_short_port";
     public static final String HZ_Cluster_Node_ID = "node_id";
     public static final String HTTP_SERVER_SECRET_KEY = "http.admin.secret_key";
+    public static final String HTTP_SERVER_API_NO_CHECK_TIME = "http.admin.no_check_time";
+
     public static final String CLIENT_PROTO_SECRET_KEY = "client.proto.secret_key";
     public static final String TOKEN_SECRET_KEY = "token.key ";
 
@@ -113,17 +115,6 @@ public final class BrokerConstants {
 
 
 
-
-
-    public static final int MESSAGE_CONTENT_TYPE_CREATE_GROUP = 104;
-    public static final int MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER = 105;
-    public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER = 106;
-    public static final int MESSAGE_CONTENT_TYPE_QUIT_GROUP = 107;
-    public static final int MESSAGE_CONTENT_TYPE_DISMISS_GROUP = 108;
-    public static final int MESSAGE_CONTENT_TYPE_TRANSFER_GROUP_OWNER = 109;
-    public static final int MESSAGE_CONTENT_TYPE_CHANGE_GROUP_NAME = 110;
-    public static final int MESSAGE_CONTENT_TYPE_MODIFY_GROUP_ALIAS = 111;
-    public static final int MESSAGE_CONTENT_TYPE_CHANGE_GROUP_PORTRAIT = 112;
     private BrokerConstants() {
     }
 }

broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java

@@ -12,16 +12,16 @@ import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.HandleFriendRequestTopic;
 
 @Handler(IMTopic.AddFriendRequestTopic)
 public class AddFriendHandler extends GroupHandler<WFCMessage.AddFriendRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.AddFriendRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddFriendRequest request, Qos1PublishHandler.IMCallback callback) {
             long[] head = new long[1];
             ErrorCode errorCode = m_messagesStore.saveAddFriendRequest(fromUser, request, head);
             if (errorCode == ERROR_CODE_SUCCESS) {
@@ -30,7 +30,7 @@ public class AddFriendHandler extends GroupHandler<WFCMessage.AddFriendRequest>
                     publisher.publishNotification(IMTopic.NotifyFriendRequestTopic, request.getTargetUid(), head[0]);
                 } else if(user != null && user.getType() == ProtoConstants.UserType.UserType_Robot) {
                     WFCMessage.HandleFriendRequest handleFriendRequest = WFCMessage.HandleFriendRequest.newBuilder().setTargetUid(fromUser).setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Accepted).build();
-                    mServer.internalRpcMsg(request.getTargetUid(), null, handleFriendRequest.toByteArray(), 0, fromUser, HandleFriendRequestTopic);
+                    mServer.internalRpcMsg(request.getTargetUid(), null, handleFriendRequest.toByteArray(), 0, fromUser, HandleFriendRequestTopic, false);
                 }
             }
             return errorCode;

broker/src/main/java/io/moquette/imhandler/AddGroupMember.java

@@ -9,26 +9,25 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 @Handler(value = IMTopic.AddGroupMemberTopic)
 public class AddGroupMember extends GroupHandler<WFCMessage.AddGroupMemberRequest> {
 
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.AddGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, request.getGroupId(), request.getAddedMemberList());
         if (errorCode == ERROR_CODE_SUCCESS) {
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, null, getMemberIdList(request.getAddedMemberList())).getAddGroupNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, getMemberIdList(request.getAddedMemberList())).getAddGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
         }

broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java

@@ -11,15 +11,15 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 @Handler(IMTopic.BlackListUserTopic)
 public class BlackListRequestHandler extends GroupHandler<WFCMessage.BlackUserRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.BlackUserRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.BlackUserRequest request, Qos1PublishHandler.IMCallback callback) {
         long[] head = new long[1];
         ErrorCode errorCode = m_messagesStore.blackUserRequest(fromUser, request.getUid(), request.getStatus(), head);
         if (errorCode == ERROR_CODE_SUCCESS) {

broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java

@@ -9,13 +9,11 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.PutUserSettingTopic;
 import static win.liyufan.im.UserSettingScope.kUserSettingListenedChannels;
 
@@ -23,11 +21,11 @@ import static win.liyufan.im.UserSettingScope.kUserSettingListenedChannels;
 public class ChannelListenMember extends IMHandler<WFCMessage.ListenChannel> {
 
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ListenChannel request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ListenChannel request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = m_messagesStore.listenChannel(fromUser, request.getChannelId(), request.getListen()>0);
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingListenedChannels).setKey(request.getChannelId()).setValue(request.getListen() > 0 ? "1" : "0").build();
-            mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic);
+            mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false);
 
             publisher.notifyChannelListenStatusChanged(m_messagesStore.getChannelInfo(request.getChannelId()), fromUser, request.getListen() > 0);
         }

broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java

@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.List;
@@ -19,7 +19,7 @@ import java.util.List;
 @Handler(IMTopic.ChannelSearchTopic)
 public class ChannelSearchHandler extends IMHandler<WFCMessage.SearchUserRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.SearchUserRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.SearchUserRequest request, Qos1PublishHandler.IMCallback callback) {
         List<WFCMessage.ChannelInfo> users = m_messagesStore.searchChannel(request.getKeyword(), request.getFuzzy() > 0, request.getPage());
         WFCMessage.SearchChannelResult.Builder builder = WFCMessage.SearchChannelResult.newBuilder();
         builder.addAllChannel(users);

broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java

@@ -10,22 +10,18 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
 import com.hazelcast.util.StringUtil;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
-import win.liyufan.im.IDUtils;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
-import win.liyufan.im.UUIDGenerator;
 
 import static win.liyufan.im.IMTopic.PutUserSettingTopic;
-import static win.liyufan.im.UserSettingScope.kUserSettingListenedChannels;
 import static win.liyufan.im.UserSettingScope.kUserSettingMyChannels;
 
 @Handler(value = IMTopic.CreateChannelTopic)
 public class CreateChannelHandler extends GroupHandler<WFCMessage.ChannelInfo> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ChannelInfo request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ChannelInfo request, Qos1PublishHandler.IMCallback callback) {
         WFCMessage.ChannelInfo.Builder builder = request.toBuilder();
         if (StringUtil.isNullOrEmpty(request.getTargetId())) {
             builder.setTargetId(m_messagesStore.getShortUUID());
@@ -44,7 +40,7 @@ public class CreateChannelHandler extends GroupHandler<WFCMessage.ChannelInfo> {
 
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingMyChannels).setKey(request.getTargetId()).setValue("1").build();
-            mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic);
+            mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false);
             byte[] data = request.getTargetId().getBytes();
             ackPayload.ensureWritable(data.length).writeBytes(data);
             return ErrorCode.ERROR_CODE_SUCCESS;

broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java

@@ -9,25 +9,30 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
+import com.hazelcast.util.StringUtil;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static io.moquette.BrokerConstants.MESSAGE_CONTENT_TYPE_CREATE_GROUP;
-
 @Handler(value = IMTopic.CreateGroupTopic)
 public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.CreateGroupRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.CreateGroupRequest request, Qos1PublishHandler.IMCallback callback) {
+
+        if (!StringUtil.isNullOrEmpty(request.getGroup().getGroupInfo().getTargetId())) {
+            WFCMessage.GroupInfo existGroupInfo = m_messagesStore.getGroupInfo(request.getGroup().getGroupInfo().getTargetId());
+            if (existGroupInfo != null) {
+                return ErrorCode.ERROR_CODE_GROUP_ALREADY_EXIST;
+            }
+        }
         WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList());
         if (groupInfo != null) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
             } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, groupInfo.getName(), "").getCreateGroupNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(groupInfo.getTargetId(), fromUser, groupInfo.getName(), "").getCreateGroupNotifyContent();
                 sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), content);
             }
         }

broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java

@@ -11,13 +11,13 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(IMTopic.DeleteFriendTopic)
 public class DeleteFriendHandler extends IMHandler<WFCMessage.IDBuf> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
         return m_messagesStore.deleteFriend(fromUser, request.getId());
     }
 }

broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java

@@ -10,33 +10,33 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
 import static win.liyufan.im.IMTopic.DismissGroupTopic;
 
 @Handler(value = DismissGroupTopic)
 public class DismissGroupHandler extends GroupHandler<WFCMessage.DismissGroupRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.DismissGroupRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.DismissGroupRequest request, Qos1PublishHandler.IMCallback callback) {
             WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
             ErrorCode errorCode;
             if (groupInfo == null) {
-                errorCode = m_messagesStore.dismissGroup(fromUser, request.getGroupId());
+                errorCode = m_messagesStore.dismissGroup(fromUser, request.getGroupId(), isAdmin);
 
-            } else if ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
+            } else if (isAdmin || (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
                 && groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {
 
                 //send notify message first, then dismiss group
                 if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                     sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
                 } else {
-                    WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, null, "").getDismissGroupNotifyContent();
+                    WFCMessage.MessageContent content = new GroupNotificationBinaryContent(groupInfo.getTargetId(), fromUser, null, "").getDismissGroupNotifyContent();
                     sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
                 }
-                errorCode = m_messagesStore.dismissGroup(fromUser, request.getGroupId());
+                errorCode = m_messagesStore.dismissGroup(fromUser, request.getGroupId(), isAdmin);
             } else {
                 errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
             }

broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java

@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import static win.liyufan.im.IMTopic.PutUserSettingTopic;
@@ -20,11 +20,11 @@ import static win.liyufan.im.UserSettingScope.kUserSettingMyChannels;
 @Handler(value = IMTopic.DestoryChannelInfoTopic)
 public class DistoryChannelHandler extends GroupHandler<WFCMessage.IDBuf> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = m_messagesStore.distoryChannel(fromUser, request.getId());
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingMyChannels).setKey(request.getId()).setValue("0").build();
-            mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic);
+            mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false);
         }
         return errorCode;
     }

broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java

@@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage;
 import com.xiaoleilu.loServer.model.FriendData;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.List;
@@ -20,12 +20,12 @@ import java.util.List;
 @Handler(IMTopic.FriendPullTopic)
 public class FriendPullHandler extends IMHandler<WFCMessage.Version> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) {
         List<FriendData> friendDatas = m_messagesStore.getFriendList(fromUser, request.getVersion());
         WFCMessage.GetFriendsResult.Builder builder = WFCMessage.GetFriendsResult.newBuilder();
         for (FriendData data : friendDatas
             ) {
-            builder.addEntry(WFCMessage.Friend.newBuilder().setState(data.getState()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp()).build());
+            builder.addEntry(WFCMessage.Friend.newBuilder().setState(data.getState()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp()).setAlias(data.getAlias()).build());
         }
         byte[] data = builder.build().toByteArray();
         ackPayload.ensureWritable(data.length).writeBytes(data);

broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java

@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.List;
@@ -19,7 +19,7 @@ import java.util.List;
 @Handler(IMTopic.FriendRequestPullTopic)
 public class FriendRequestPullHandler extends IMHandler<WFCMessage.Version> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) {
             List<WFCMessage.FriendRequest> friendDatas = m_messagesStore.getFriendRequestList(fromUser, request.getVersion());
             WFCMessage.GetFriendRequestResult.Builder builder = WFCMessage.GetFriendRequestResult.newBuilder();
             builder.addAllEntry(friendDatas);

broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java

@@ -11,13 +11,13 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(IMTopic.ChannelPullTopic)
 public class GetChannelInfoHandler extends IMHandler<WFCMessage.PullChannelInfo> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullChannelInfo request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullChannelInfo request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
         WFCMessage.ChannelInfo info = m_messagesStore.getChannelInfo(request.getChannelId());
         if (info == null) {

broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java

@@ -11,13 +11,13 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(IMTopic.GetChatroomInfoTopic)
 public class GetChatroomInfoHandler extends IMHandler<WFCMessage.GetChatroomInfoRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.GetChatroomInfoRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetChatroomInfoRequest request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
         WFCMessage.ChatroomInfo info = m_messagesStore.getChatroomInfo(request.getChatroomId());
         if (info == null) {

broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java

@@ -11,13 +11,13 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(IMTopic.GetChatroomMemberTopic)
 public class GetChatroomMemberHandler extends IMHandler<WFCMessage.GetChatroomMemberInfoRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.GetChatroomMemberInfoRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetChatroomMemberInfoRequest request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
             WFCMessage.ChatroomMemberInfo info = m_messagesStore.getChatroomMemberInfo(request.getChatroomId(), request.getMaxCount());
             if (info != null) {

broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java

@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.List;
@@ -19,7 +19,7 @@ import java.util.List;
 @Handler(IMTopic.GetGroupInfoTopic)
 public class GetGroupInfoHandler extends IMHandler<WFCMessage.PullUserRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) {
             List<WFCMessage.GroupInfo> infos = m_messagesStore.getGroupInfos(request.getRequestList());
 
             WFCMessage.PullGroupInfoResult result = WFCMessage.PullGroupInfoResult.newBuilder().addAllInfo(infos).build();

broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java

@@ -11,18 +11,18 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 @Handler(IMTopic.GetGroupMemberTopic)
 public class GetGroupMemberHandler extends IMHandler<WFCMessage.PullGroupMemberRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
         List<WFCMessage.GroupMember> members = new ArrayList<>();
         ErrorCode errorCode = m_messagesStore.getGroupMembers(request.getTarget(), request.getHead(), members);
 

broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java

@@ -14,13 +14,13 @@ import com.xiaoleilu.loServer.action.UploadFileAction;
 import io.moquette.server.config.MediaServerConfig;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(IMTopic.GetQiniuUploadTokenTopic)
 public class GetQiniuUploadTokenHandler extends IMHandler<Byte> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, Byte request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, Byte request, Qos1PublishHandler.IMCallback callback) {
         int type = request;
         String token;
 

broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java

@@ -13,13 +13,13 @@ import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.moquette.spi.impl.security.TokenAuthenticator;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(IMTopic.GetTokenTopic)
 public class GetTokenHandler extends IMHandler<WFCMessage.GetTokenRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.GetTokenRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetTokenRequest request, Qos1PublishHandler.IMCallback callback) {
         MemorySessionStore.Session session = m_sessionsStore.createUserSession(fromUser, clientID);
         TokenAuthenticator authenticator = new TokenAuthenticator();
         String strToken = authenticator.generateToken(fromUser);

broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java

@@ -11,15 +11,15 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 @Handler(IMTopic.GetUserInfoTopic)
 public class GetUserInfoHandler extends IMHandler<WFCMessage.PullUserRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) {
         WFCMessage.PullUserResult.Builder resultBuilder = WFCMessage.PullUserResult.newBuilder();
 
         ErrorCode errorCode = m_messagesStore.getUserInfo(request.getRequestList(), resultBuilder);

broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java

@@ -11,15 +11,15 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 @Handler(IMTopic.GetUserSettingTopic)
 public class GetUserSettingHandler extends IMHandler<WFCMessage.Version> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) {
             WFCMessage.GetUserSettingResult.Builder builder = WFCMessage.GetUserSettingResult.newBuilder();
             ErrorCode errorCode = m_messagesStore.getUserSettings(fromUser, request.getVersion(), builder);
             if (errorCode == ERROR_CODE_SUCCESS) {

broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java

@@ -12,22 +12,22 @@ import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 import win.liyufan.im.MessageShardingUtil;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 @Handler(IMTopic.HandleFriendRequestTopic)
 public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFriendRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.HandleFriendRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.HandleFriendRequest request, Qos1PublishHandler.IMCallback callback) {
             WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder();
             builder.setFromUser(request.getTargetUid());
             long[] heads = new long[2];
-            ErrorCode errorCode = m_messagesStore.handleFriendRequest(fromUser, request, builder, heads);
+            ErrorCode errorCode = m_messagesStore.handleFriendRequest(fromUser, request, builder, heads, isAdmin);
 
-            if (errorCode == ERROR_CODE_SUCCESS) {
+            if (errorCode == ERROR_CODE_SUCCESS && !isAdmin) {
                 long messageId = MessageShardingUtil.generateId();
                 long timestamp = System.currentTimeMillis();
                 builder.setMessageId(messageId);

broker/src/main/java/io/moquette/imhandler/IMHandler.java

@@ -23,24 +23,19 @@ import io.netty.buffer.Unpooled;
 import io.netty.util.internal.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.RateLimiter;
 import win.liyufan.im.Utility;
 
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import java.util.Spliterator;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Consumer;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 /**
  * 请求处理接口<br>
@@ -89,8 +84,8 @@ abstract public class IMHandler<T> {
             for (Method method : getClass().getDeclaredMethods()
                  ) {
 
-                if (method.getName() == actionName && method.getParameterCount() == 5) {
-                    dataCls = method.getParameterTypes()[3];
+                if (method.getName() == actionName && method.getParameterCount() == 6) {
+                    dataCls = method.getParameterTypes()[4];
                     break;
                 }
             }
@@ -171,7 +166,7 @@ abstract public class IMHandler<T> {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
-	public void doHandler(String clientID, String fromUser, String topic, byte[] payloadContent, Qos1PublishHandler.IMCallback callback) {
+	public void doHandler(String clientID, String fromUser, String topic, byte[] payloadContent, Qos1PublishHandler.IMCallback callback, boolean isAdmin) {
         m_imBusinessExecutor.execute(() -> {
             Qos1PublishHandler.IMCallback callbackWrapper = new Qos1PublishHandler.IMCallback() {
                 @Override
@@ -191,7 +186,7 @@ abstract public class IMHandler<T> {
 
                 try {
                     LOG.debug("execute handler for topic {}", topic);
-                    errorCode = action(ackPayload, clientID, fromUser, getDataObject(payloadContent), callbackWrapper);
+                    errorCode = action(ackPayload, clientID, fromUser, isAdmin, getDataObject(payloadContent), callbackWrapper);
                 } catch (IllegalAccessException e) {
                     e.printStackTrace();
                     Utility.printExecption(LOG, e);
@@ -234,7 +229,7 @@ abstract public class IMHandler<T> {
 
 
     @ActionMethod
-    abstract public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, T request, Qos1PublishHandler.IMCallback callback)   ;
+    abstract public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, T request, Qos1PublishHandler.IMCallback callback)   ;
 
     public void afterAction(String clientID, String fromUser, String topic, Qos1PublishHandler.IMCallback callback) {
 

broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java

@@ -11,14 +11,14 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 
 @Handler(IMTopic.JoinChatroomTopic)
 public class JoinChatroomHandler extends IMHandler<WFCMessage.IDBuf> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
         return m_messagesStore.handleJoinChatroom(fromUser, clientID, request.getId());
     }
 }

broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java

@@ -10,16 +10,16 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import static win.liyufan.im.IMTopic.KickoffGroupMemberTopic;
 
 @Handler(value = KickoffGroupMemberTopic)
 public class KickoffGroupMember extends GroupHandler<WFCMessage.RemoveGroupMemberRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.RemoveGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.RemoveGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode;
         WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
         if (groupInfo == null) {
@@ -32,7 +32,7 @@ public class KickoffGroupMember extends GroupHandler<WFCMessage.RemoveGroupMembe
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
             } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
             errorCode = m_messagesStore.kickoffGroupMembers(fromUser, request.getGroupId(), request.getRemovedMemberList());

broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java

@@ -8,20 +8,23 @@
 
 package io.moquette.imhandler;
 
-import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(value = IMTopic.LoadRemoteMessagesTopic)
 public class LoadRemoteMessagesHandler extends IMHandler<WFCMessage.LoadRemoteMessages> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.LoadRemoteMessages request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.LoadRemoteMessages request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
 
-        WFCMessage.PullMessageResult result = m_messagesStore.loadRemoteMessages(fromUser, request.getConversation(), request.getBeforeUid(), request.getCount());
+        long beforeUid = request.getBeforeUid();
+        if (beforeUid == 0) {
+            beforeUid = Long.MAX_VALUE;
+        }
+        WFCMessage.PullMessageResult result = m_messagesStore.loadRemoteMessages(fromUser, request.getConversation(), beforeUid, request.getCount());
         byte[] data = result.toByteArray();
         LOG.info("User {} load message with count({}), payload size({})", fromUser, result.getMessageCount(), data.length);
         ackPayload.ensureWritable(data.length).writeBytes(data);

broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java

@@ -9,21 +9,16 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Name;
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.ModifyChannelInfoTopic;
-import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
 
 @Handler(value = ModifyChannelInfoTopic)
 public class ModifyChannelInfoHandler extends GroupHandler<WFCMessage.ModifyChannelInfo> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyChannelInfo request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyChannelInfo request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode= m_messagesStore.modifyChannelInfo(fromUser, request.getChannelId(), request.getType(), request.getValue());
         return errorCode;
     }

broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java

@@ -9,24 +9,24 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 @Handler(IMTopic.ModifyGroupAliasTopic)
 public class ModifyGroupAliasHandler extends GroupHandler<WFCMessage.ModifyGroupMemberAlias> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias());
         if (errorCode == ERROR_CODE_SUCCESS && request.hasNotifyContent()) {
             if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, request.getAlias(), "").getModifyGroupMemberAliasNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getAlias(), "").getModifyGroupMemberAliasNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
         }

broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java

@@ -9,20 +9,20 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
 import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Name;
 import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
 
 @Handler(value = ModifyGroupInfoTopic)
 public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupInfoRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyGroupInfoRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupInfoRequest request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue());
         if (errorCode == ERROR_CODE_SUCCESS) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
@@ -30,9 +30,9 @@ public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupI
             } else {
                 WFCMessage.MessageContent content = null;
                 if (request.getType() == Modify_Group_Name) {
-                    content = new GroupNotificationBinaryContent(fromUser, request.getValue(), "").getChangeGroupNameNotifyContent();
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupNameNotifyContent();
                 } else if(request.getType() == Modify_Group_Portrait) {
-                    content = new GroupNotificationBinaryContent(fromUser, null, "").getChangeGroupPortraitNotifyContent();
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getChangeGroupPortraitNotifyContent();
                 }
 
                 if (content != null) {

broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java

@@ -11,13 +11,13 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(IMTopic.ModifyMyInfoTopic)
 public class ModifyMyInfoHandler extends IMHandler<WFCMessage.ModifyMyInfoRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyMyInfoRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyMyInfoRequest request, Qos1PublishHandler.IMCallback callback) {
             return m_messagesStore.modifyUserInfo(fromUser, request);
     }
 }

broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java

@@ -10,16 +10,15 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(value = IMTopic.PullMessageTopic)
 public class PullMessageHandler extends IMHandler<WFCMessage.PullMessageRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullMessageRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullMessageRequest request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
 
         if (request.getType() == ProtoConstants.PullType.Pull_ChatRoom && !m_messagesStore.checkUserClientInChatroom(fromUser, clientID, null)) {

broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java

@@ -11,13 +11,13 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(IMTopic.PutUserSettingTopic)
 public class PutUserSettingHandler extends IMHandler<WFCMessage.ModifyUserSettingReq> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyUserSettingReq request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyUserSettingReq request, Qos1PublishHandler.IMCallback callback) {
             long timestamp = m_messagesStore.updateUserSettings(fromUser, request);
             publisher.publishNotification(IMTopic.NotifyUserSettingTopic, fromUser, timestamp);
             return ErrorCode.ERROR_CODE_SUCCESS;

broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java

@@ -11,13 +11,13 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 @Handler(IMTopic.QuitChatroomTopic)
 public class QuitChatroomHandler extends IMHandler<WFCMessage.IDBuf> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
         m_messagesStore.handleQuitChatroom(fromUser, clientID, request.getId());
         return ErrorCode.ERROR_CODE_SUCCESS;
     }

broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java

@@ -9,17 +9,17 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.loServer.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 
 import static win.liyufan.im.IMTopic.QuitGroupTopic;
 
 @Handler(value = QuitGroupTopic)
 public class QuitGroupHandler extends GroupHandler<WFCMessage.QuitGroupRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.QuitGroupRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.QuitGroupRequest request, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
         WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
         if (groupInfo == null) {
@@ -29,7 +29,7 @@ public class QuitGroupHandler extends GroupHandler<WFCMessage.QuitGroupRequest>
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
             } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(fromUser, null, "").getQuitGroupNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
             errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());

broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java

@@ -11,7 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.LinkedHashSet;
@@ -20,7 +20,7 @@ import java.util.Set;
 @Handler(value = IMTopic.RecallMessageTopic)
 public class RecallMessageHandler extends IMHandler<WFCMessage.INT64Buf> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.INT64Buf int64Buf, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.INT64Buf int64Buf, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = m_messagesStore.recallMessage(int64Buf.getId(), fromUser);
 
         if(errorCode != ErrorCode.ERROR_CODE_SUCCESS) {

broker/src/main/java/io/moquette/imhandler/RouteHandler.java

@@ -13,7 +13,7 @@ import com.hazelcast.core.Member;
 import io.moquette.spi.ClientSession;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_IP;
@@ -23,7 +23,7 @@ import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_Short_Port;
 @Handler(IMTopic.RouteTopic)
 public class RouteHandler extends IMHandler<WFCMessage.RouteRequest> {
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.RouteRequest request, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.RouteRequest request, Qos1PublishHandler.IMCallback callback) {
         Member member = mServer.getHazelcastInstance().getCluster().getLocalMember();
         String serverIp = member.getStringAttribute(HZ_Cluster_Node_External_IP);
         String longPort = member.getStringAttribute(HZ_Cluster_Node_External_Long_Port);
@@ -32,7 +32,7 @@ public class RouteHandler extends IMHandler<WFCMessage.RouteRequest> {
         ClientSession clientSession = m_sessionsStore.sessionForClient(clientID);
         boolean isSessionAlreadyStored = clientSession != null;
         if (!isSessionAlreadyStored) {
-            m_sessionsStore.createNewSession(fromUser, clientID, true);
+            m_sessionsStore.createNewSession(fromUser, clientID, true, true);
         } else {
             m_sessionsStore.updateExistSession(fromUser, clientID, request, true);
         }

broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java

@@ -14,10 +14,9 @@ import com.hazelcast.util.StringUtil;
 import io.moquette.BrokerConstants;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
-import win.liyufan.im.ErrorCode;
+import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 import win.liyufan.im.MessageShardingUtil;
-import win.liyufan.im.SensitiveFilter;
 
 import java.util.Set;
 
@@ -43,69 +42,68 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
     }
 
     @Override
-    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.Message message, Qos1PublishHandler.IMCallback callback) {
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Message message, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
         if (message != null) {
-            int userStatus = m_messagesStore.getUserStatus(fromUser);
-            if (userStatus == 1 || userStatus == 2) {
-                return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
-            }
+            if (!isAdmin) {  //admin do not check the right
+                int userStatus = m_messagesStore.getUserStatus(fromUser);
+                if (userStatus == 1 || userStatus == 2) {
+                    return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
+                }
 
-            if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private) {
-                if (m_messagesStore.isBlacked(message.getConversation().getTarget(), fromUser)) {
-                    return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
+                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private) {
+                    if (m_messagesStore.isBlacked(message.getConversation().getTarget(), fromUser)) {
+                        return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
+                    }
+                }
+
+
+                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && !m_messagesStore.isMemberInGroup(fromUser, message.getConversation().getTarget())) {
+                    return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && m_messagesStore.isForbiddenInGroup(fromUser, message.getConversation().getTarget())) {
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom && !m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
+                    return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel && !m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
+                    return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
                 }
             }
 
             long timestamp = System.currentTimeMillis();
-            if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group &&
-                !m_messagesStore.isMemberInGroup(fromUser, message.getConversation().getTarget())) {
-                errorCode = ErrorCode.ERROR_CODE_NOT_IN_GROUP;
-            } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group &&
-                m_messagesStore.isForbiddenInGroup(fromUser, message.getConversation().getTarget())) {
-                errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
-            } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom &&
-                !m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
-                errorCode = ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
-            } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel &&
-                !m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
-                errorCode = ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
-            } else {
-                long messageId = MessageShardingUtil.generateId();
-                message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).build();
+            long messageId = MessageShardingUtil.generateId();
+            message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).build();
 
-                if (mForwardUrl != null) {
-                    publisher.forwardMessage(message, mForwardUrl);
-                }
+            if (mForwardUrl != null) {
+                publisher.forwardMessage(message, mForwardUrl);
+            }
 
-                boolean ignoreMsg = false;
-                if (message.getContent().getType() == Text) {
-                    Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent());
-                    if (matched != null && !matched.isEmpty()) {
-                        if (mSensitiveType == 0) {
-                            errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED;
-                        } else if(mSensitiveType == 1) {
-                            ignoreMsg = true;
-                        } else {
-                            String text = message.getContent().getSearchableContent();
-                            for (String word : matched) {
-                                text = text.replace(word, "***");
-                            }
-
-                            message = message.toBuilder().setContent(message.getContent().toBuilder().setSearchableContent(text).build()).build();
+            boolean ignoreMsg = false;
+            if (!isAdmin && message.getContent().getType() == Text) {
+                Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent());
+                if (matched != null && !matched.isEmpty()) {
+                    if (mSensitiveType == 0) {
+                        errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED;
+                    } else if(mSensitiveType == 1) {
+                        ignoreMsg = true;
+                    } else {
+                        String text = message.getContent().getSearchableContent();
+                        for (String word : matched) {
+                            text = text.replace(word, "***");
                         }
-                    }
-                }
 
-                if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
-                    if (!ignoreMsg) {
-                        saveAndPublish(fromUser, clientID, message);
+                        message = message.toBuilder().setContent(message.getContent().toBuilder().setSearchableContent(text).build()).build();
                     }
-                    ackPayload = ackPayload.capacity(20);
-                    ackPayload.writeLong(messageId);
-                    ackPayload.writeLong(timestamp);
                 }
             }
+
+            if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                if (!ignoreMsg) {
+                    saveAndPublish(fromUser, clientID, message);
+                }
+                ackPayload = ackPayload.capacity(20);
+                ackPayload.writeLong(messageId);
+                ackPayload.writeLong(timestamp);
+            }
         } else {
             errorCode = ErrorCode.ERROR_CODE_INVALID_MESSAGE;
         }

broker/src/main/java/io/moquette/imhandler/SetFriendAliasRequestHandler.java

@@ -0,0 +1,30 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.IMTopic;
+
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
+@Handler(IMTopic.SetFriendAliasTopic)
+public class SetFriendAliasRequestHandler extends GroupHandler<WFCMessage.AddFriendRequest> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddFriendRequest request, Qos1PublishHandler.IMCallback callback) {
+        long[] head = new long[1];
+        ErrorCode errorCode = m_messagesStore.setFriendAliasRequest(fromUser, request.getTargetUid(), request.getReason(), head);
+        if (errorCode == ERROR_CODE_SUCCESS) {
+            publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, head[0]);
+        }
+        return errorCode;
+    }
+}