Update to version 0.23

* refactor_server_api:
  update
  update
  update
  update
  update
  update

.gitignore

@@ -51,3 +51,6 @@ broker/config/git.properties
 distribution/src/main/resources/git.properties
 broker/h2db
 broker/media
+common/target
+server/target
+sdk/target

README.md

@@ -4,8 +4,8 @@
 
 | 仓库                                                         | 说明                                                    | 备注                                           |
 | ------------------------------------------------------------ | ------------------------------------------------------- | ---------------------------------------------- |
-| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android App                                      | 可以很方便地进行二次开发，或集成到现有应用当中 |
+| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android SDK源码和App源码                                      | 可以很方便地进行二次开发，或集成到现有应用当中 |
-| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS 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,11 @@
 ### 联系我们
 问题讨论请加群：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% />
+
+> 强烈建议关注我们的公众号。我们有新版本发布或者有重大更新会通过公众号通知大家，另外我们也会不定期的发布一些关于野火IM的技术介绍。
 
 #### 体验Demo
 我们提供了体验demo，请使用微信扫码下载安装体验
@@ -57,6 +61,12 @@
 ## 编译
 在安装JDK1.8以上及maven的前提下，在命令行中执行```mvn clean compile package```，生成的目标文件在```./distribution/target/distribution-xxxx-bundle-tar.tar.gz```
 
+## 捐赠者名单
+
+| 捐赠者 | 商标 | 金额 | 简介 |
+| ----- | ---- | -------- | --- |
+| [SAMOS](http://samos.io) | ![SAMOS](http://static.wildfirechat.cn/SAMOS.png) | 每月2000¥ | 一站式区块链解决方案服务商(http://samos.io) |
+
 ## 特别感谢
 1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来，处理MQTT相关业务。
 2. [loServer](https://github.com/looly/loServer) 本项目使用loServer处理HTTP相关业务。

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

@@ -3,7 +3,7 @@
 #*********************************************************************
 #服务器的接入IP。给客户端提供是${server.ip}和${http_port}。
 #客户端会从${http_port}端口获取到长链接端口。
-server.ip 0.0.0.0
+server.ip 192.168.1.100
 
 ##原生客户端长链接端口
 port 1883
@@ -27,11 +27,15 @@ host 0.0.0.0
 local_port 80
 
 ##是否使用内置DB。0使用mysql；1使用h2db
-embed.db 1
+embed.db 0
 
 ##服务器管理接口密钥
 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/V10__create_default_admin.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_type`,`_dt`) values ('admin','admin','系统管理员',3,1);
+

broker/migrate/h2/V11__alter_device_token.sql

@@ -0,0 +1 @@
+ALTER TABLE t_user_session MODIFY _token VARCHAR(240) DEFAULT NULL;

broker/migrate/h2/V12__add_group_control_columns.sql

@@ -0,0 +1,4 @@
+alter table `t_group` add column `_mute` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_join_type` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_private_chat` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_searchable` tinyint NOT NULL DEFAULT 0;

broker/migrate/h2/V7__add_createtime_user_group_table.sql

@@ -0,0 +1,2 @@
+alter table t_user add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;
+alter table t_group add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;

broker/migrate/h2/V8__add_content_type_in_messages.sql

@@ -0,0 +1 @@
+alter table `t_messages` add column `_content_type` int(11) NOT NULL DEFAULT '0';

broker/migrate/h2/V9__add_sensitive_messages.sql

@@ -0,0 +1,15 @@
+
+DROP TABLE IF EXISTS `t_sensitive_messages`;
+CREATE TABLE `t_sensitive_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(),
+  `_content_type` int(11) NOT NULL DEFAULT 0,
+  UNIQUE INDEX `sensitive_message_uid_index` (`_mid` ASC)
+);

broker/migrate/mysql/V10__create_default_admin.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_type`,`_dt`) values ('admin','admin','系统管理员',3,1);
+

broker/migrate/mysql/V11__alter_device_token.sql

@@ -0,0 +1 @@
+ALTER TABLE t_user_session MODIFY _token VARCHAR(240) DEFAULT NULL;

broker/migrate/mysql/V12__add_group_control_columns.sql

@@ -0,0 +1,4 @@
+alter table `t_group` add column `_mute` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_join_type` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_private_chat` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_searchable` tinyint NOT NULL DEFAULT 0;

broker/migrate/mysql/V7__add_createtime_user_group_table.sql

@@ -0,0 +1,2 @@
+alter table t_user add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;
+alter table t_group add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;

broker/migrate/mysql/V8__add_content_type_in_messages.sql

@@ -0,0 +1,36 @@
+alter table `t_messages_0` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_1` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_2` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_3` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_4` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_5` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_6` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_7` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_8` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_9` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_10` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_11` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_12` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_13` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_14` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_15` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_16` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_17` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_18` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_19` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_20` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_21` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_22` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_23` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_24` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_25` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_26` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_27` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_28` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_29` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_30` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_31` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_32` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_33` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_34` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_35` add column `_content_type` int(11) NOT NULL DEFAULT '0';

broker/migrate/mysql/V9__add_sensitive_messages.sql

@@ -0,0 +1,18 @@
+
+DROP TABLE IF EXISTS `t_sensitive_messages`;
+CREATE TABLE `t_sensitive_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,
+    `_content_type` int(11) NOT NULL DEFAULT '0',
+    INDEX `message_uid_index` (`_mid` DESC)
+  )
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.20</version>
+        <version>0.23</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>
@@ -349,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/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 cn.wildfirechat.common.ErrorCode;
-import win.liyufan.im.ErrorCode;
 
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 /**
  * 请求处理接口<br>

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;

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;
@@ -40,7 +40,7 @@ public class RouteAction extends Action {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
 
             response.setContentType("application/octet-stream");
-            FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
+            FullHttpRequest fullHttpRequest = (FullHttpRequest) request.getNettyRequest();
             boolean b = false;
             if ("web".equalsIgnoreCase(fullHttpRequest.headers().get("p"))) {
                 b = true;
@@ -79,7 +79,7 @@ public class RouteAction extends Action {
 
             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 true;
@@ -144,10 +144,14 @@ public class RouteAction extends Action {
 
     private void sendResponse(Response response, ErrorCode errorCode, byte[] contents, boolean base64Response) {
         response.setStatus(HttpResponseStatus.OK);
-        if(contents == null) {
+        if (contents == null) {
             ByteBuf ackPayload = Unpooled.buffer();
             ackPayload.ensureWritable(1).writeByte(errorCode.getCode());
-            response.setContent(ackPayload);
+            contents = ackPayload.array();
+        }
+        if (base64Response) {
+            byte[] base64Data = Base64.getEncoder().encode(contents);
+            response.setContent(base64Data);
         } else {
             response.setContent(contents);
         }

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

@@ -28,7 +28,7 @@ public class UnknownErrorAction extends Action{
 
     @Override
     public boolean action(Request request, Response response) {
-        response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
+        response.setStatus(HttpResponseStatus.NOT_FOUND);
         return true;
     }
 }

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

@@ -9,23 +9,18 @@
 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 cn.wildfirechat.pojos.InputUserLogin;
-import com.xiaoleilu.loServer.pojos.OutputLoginData;
+import cn.wildfirechat.pojos.OutputLoginData;
-import io.moquette.spi.impl.Utils;
-import io.moquette.spi.impl.security.TokenAuthenticator;
 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 win.liyufan.im.Utility;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 @Route("/api/version")
 @HttpMethod("GET")
@@ -38,7 +33,8 @@ public class VersionAction extends Action {
             response.setStatus(HttpResponseStatus.OK);
 
             try {
-                response.setContent(new Gson().toJson(GitRepositoryState.getGitRepositoryState()));
+
+                response.setContent(Utility.formatJson(new Gson().toJson(GitRepositoryState.getGitRepositoryState())));
             } catch (IOException e) {
                 e.printStackTrace();
                 response.setContent("{\"version\":\"unknown\"}");

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 <[email protected]>
+ *
+ * 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) {
+        if (!NO_CHECK_TIME && System.currentTimeMillis() - ts > 2 * 60 * 60 * 1000) {
-//            return ErrorCode.ERROR_CODE_SIGN_EXPIRED;
+            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 {
 
@@ -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, true);
+                if (inputUserBlock.getStatus() == 2) {
+                    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 {

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

@@ -0,0 +1,90 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * 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.BroadMessageData;
+import cn.wildfirechat.pojos.BroadMessageResult;
+import cn.wildfirechat.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageResult;
+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 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.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Msg_Broadcast)
+@HttpMethod("POST")
+public class BroadcastMessageAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            BroadMessageData sendMessageData = getRequestBody(request.getNettyRequest(), BroadMessageData.class);
+            if (BroadMessageData.isValide(sendMessageData) && !StringUtil.isNullOrEmpty(sendMessageData.getSender())) {
+                RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.BroadcastMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), 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) {
+                            long messageId = byteBuf.readLong();
+                            long count = byteBuf.readLong();
+                            sendResponse(response, null, new BroadMessageResult(messageId, count));
+                        } 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/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 cn.wildfirechat.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
 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 {
 

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 cn.wildfirechat.pojos.InputCreateChatroom;
-import com.xiaoleilu.loServer.pojos.OutputCreateChatroom;
+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 cn.wildfirechat.common.ErrorCode;
-import win.liyufan.im.UUIDGenerator;
 
-@Route("/admin/chatroom")
+@Route(APIPath.Create_Chatroom)
-@HttpMethod("PUT")
+@HttpMethod("POST")
 public class CreateChatroomAction extends AdminAction {
 
     @Override

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 cn.wildfirechat.pojos.InputCreateGroup;
-import com.xiaoleilu.loServer.pojos.OutputCreateGroupResult;
+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")
+@Route(APIPath.Create_Group)
-@HttpMethod("PUT")
+@HttpMethod("POST")
 public class CreateGroupAction extends AdminAction {
 
     @Override

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 cn.wildfirechat.pojos.InputCreateRobot;
-import com.xiaoleilu.loServer.pojos.OutputCreateRobot;
+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 {
 

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 cn.wildfirechat.pojos.InputOutputUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+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 {
 
@@ -35,7 +36,7 @@ public class CreateUserAction extends AdminAction {
     @Override
     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())) {
 
@@ -47,10 +48,6 @@ public class CreateUserAction extends AdminAction {
                     inputCreateUser.setUserId(messagesStore.getShortUUID());
                 }
 
-                if (inputCreateUser.getPortrait() == null || inputCreateUser.getPortrait().length() == 0) {
-                    inputCreateUser.setPortrait("https://avatars.io/gravatar/" + inputCreateUser.getUserId());
-                }
-
                 WFCMessage.User.Builder newUserBuilder = WFCMessage.User.newBuilder()
                     .setUid(StringUtil.isNullOrEmpty(inputCreateUser.getUserId()) ? "" : inputCreateUser.getUserId());
                 if (inputCreateUser.getName() != null)

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")
+@Route(APIPath.Chatroom_Destroy)
-@HttpMethod("DELETE")
+@HttpMethod("POST")
 public class DestoryChatroomAction extends AdminAction {
 
     @Override

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")
+@Route(APIPath.Chatroom_Info)
-@HttpMethod("GET")
+@HttpMethod("POST")
 public class GetChatroomInfoAction extends AdminAction {
 
     @Override
@@ -33,8 +34,8 @@ public class GetChatroomInfoAction extends AdminAction {
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-
+            InputGetChatroomInfo getChatroomInfo = getRequestBody(request.getNettyRequest(), InputGetChatroomInfo.class);
-            String chatroomid = request.getParam("id");
+            String chatroomid = getChatroomInfo.getChatroomId();
             if (!StringUtil.isNullOrEmpty(chatroomid)) {
 
                 WFCMessage.ChatroomInfo info = messagesStore.getChatroomInfo(chatroomid);

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 cn.wildfirechat.pojos.InputGetToken;
-import com.xiaoleilu.loServer.pojos.OutputGetIMTokenData;
+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 {
 

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 cn.wildfirechat.pojos.InputOutputUserInfo;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.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;
 
-@Route("admin/user/info")
+@Route(APIPath.User_Get_Info)
 @HttpMethod("POST")
 public class GetUserAction extends AdminAction {
 
@@ -37,7 +37,7 @@ public class GetUserAction extends AdminAction {
         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));

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 {
 
@@ -30,7 +32,9 @@ public class GetUserBlockListAction extends AdminAction {
     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 cn.wildfirechat.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.OutputUserStatus;
-import com.xiaoleilu.loServer.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 {
 

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 {
 

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

@@ -9,6 +9,7 @@
 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;
@@ -16,20 +17,20 @@ 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 cn.wildfirechat.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+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 {
 

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 cn.wildfirechat.pojos.InputOutputSensitiveWords;
-import com.xiaoleilu.loServer.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 cn.wildfirechat.common.ErrorCode;
-import win.liyufan.im.ErrorCode;
 
-@Route("admin/sensitive/add")
+@Route(APIPath.Sensitive_Add)
 @HttpMethod("POST")
 public class SensitiveWordAddAction extends AdminAction {
 

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 {
 

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 cn.wildfirechat.common.APIPath;
-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 cn.wildfirechat.common.ErrorCode;
-import win.liyufan.im.ErrorCode;
 
 import java.util.List;
 
-@Route("admin/sensitive/query")
+@Route(APIPath.Sensitive_Query)
 @HttpMethod("POST")
 public class SensitiveWordQueryAction extends AdminAction {
 

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 cn.wildfirechat.pojos.Conversation;
-import com.xiaoleilu.loServer.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+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 {
 

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,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 cn.wildfirechat.pojos.InputOutputUserInfo;
-import com.xiaoleilu.loServer.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputGetUserInfo;
-import com.xiaoleilu.loServer.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;
 
-@Route("admin/robot/user_info")
+@Route(APIPath.Robot_User_Info)
 @HttpMethod("POST")
 public class GetUserAction extends RobotAction {
 
@@ -32,7 +32,7 @@ public class GetUserAction extends RobotAction {
         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));

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);
+            String content = null;
-            Gson gson = new Gson();
+            try {
-            T t = gson.fromJson(content, cls);
+                content = new String(bytes, "UTF-8");
-            return t;
+                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 cn.wildfirechat.pojos.SendMessageData;
-import com.xiaoleilu.loServer.pojos.SendMessageResult;
+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 {
 

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,10 +12,10 @@ 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)

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

@@ -9,21 +9,20 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
-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 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, boolean isAdmin, WFCMessage.AddGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, request.getGroupId(), request.getAddedMemberList());
+        ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getAddedMemberList());
         if (errorCode == ERROR_CODE_SUCCESS) {
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());

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

@@ -11,10 +11,10 @@ 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> {

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

@@ -0,0 +1,49 @@
+/*
+ * 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.common.ErrorCode;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
+import io.moquette.BrokerConstants;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+import win.liyufan.im.MessageShardingUtil;
+
+import java.util.Set;
+
+import static cn.wildfirechat.proto.ProtoConstants.ContentType.Text;
+
+@Handler(value = IMTopic.BroadcastMessageTopic)
+public class BroadcastMessageHandler extends IMHandler<WFCMessage.Message> {
+    @Override
+    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) {
+            if (!isAdmin) {  //only admin can broadcast message
+                return ErrorCode.ERROR_CODE_NOT_RIGHT;
+            }
+
+            long timestamp = System.currentTimeMillis();
+            long messageId = MessageShardingUtil.generateId();
+            message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(message.getConversation().getLine()).setType(ProtoConstants.ConversationType.ConversationType_Private).build()).build();
+
+            long count = saveAndBroadcast(fromUser, clientID, message);
+            ackPayload = ackPayload.capacity(20);
+            ackPayload.writeLong(messageId);
+            ackPayload.writeLong(count);
+        } else {
+            errorCode = ErrorCode.ERROR_CODE_INVALID_MESSAGE;
+        }
+        return errorCode;
+    }
+
+}

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;
 

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;

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

@@ -10,16 +10,12 @@ 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 cn.wildfirechat.common.ErrorCode;
-import win.liyufan.im.IDUtils;
 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)

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

@@ -9,19 +9,24 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
-import com.xiaoleilu.loServer.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, 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) {

broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.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;
 
 @Handler(IMTopic.DeleteFriendTopic)

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

@@ -10,10 +10,10 @@ 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;
 
@@ -24,9 +24,9 @@ public class DismissGroupHandler extends GroupHandler<WFCMessage.DismissGroupReq
             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
@@ -36,7 +36,7 @@ public class DismissGroupHandler extends GroupHandler<WFCMessage.DismissGroupReq
                     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;

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;

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;

broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.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;
 
 @Handler(IMTopic.ChannelPullTopic)

broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.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;
 
 @Handler(IMTopic.GetChatroomInfoTopic)

broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.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;
 
 @Handler(IMTopic.GetChatroomMemberTopic)

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;

broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.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;
 
 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> {

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

@@ -14,7 +14,7 @@ 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)

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

@@ -13,7 +13,7 @@ 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)

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

@@ -11,10 +11,10 @@ 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> {

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

@@ -11,10 +11,10 @@ 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> {

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

@@ -12,11 +12,11 @@ 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> {
@@ -25,9 +25,9 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
             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

@@ -8,6 +8,7 @@
 
 package io.moquette.imhandler;
 
+import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import cn.wildfirechat.server.ThreadPoolExecutorWrapper;
 import com.google.gson.Gson;
@@ -23,24 +24,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 cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 /**
  * 请求处理接口<br>
@@ -210,9 +206,7 @@ abstract public class IMHandler<T> {
                     }
                 }
 
-                if(errorCode != ErrorCode.ERROR_CODE_ASYNC_HANDLER) {
+                response(ackPayload, errorCode, callback);
-                    response(ackPayload, errorCode, callback);
-                }
             } else {
                 LOG.error("Handler {} preAction failure", this.getClass().getName());
                 ByteBuf ackPayload = Unpooled.buffer(1);
@@ -244,8 +238,16 @@ abstract public class IMHandler<T> {
         Set<String> notifyReceivers = new LinkedHashSet<>();
 
         message = m_messagesStore.storeMessage(username, clientID, message);
-        int pullType = m_messagesStore.getNotifyReceivers(username, message, notifyReceivers);
+        WFCMessage.Message.Builder messageBuilder = message.toBuilder();
-        this.publisher.publish2Receivers(message, notifyReceivers, clientID, pullType);
+        int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers);
-        return message.getMessageId();
+        this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType);
+        return notifyReceivers.size();
+    }
+
+    protected long saveAndBroadcast(String username, String clientID, WFCMessage.Message message) {
+        Set<String> notifyReceivers = m_messagesStore.getAllEnds();
+        WFCMessage.Message updatedMessage = m_messagesStore.storeMessage(username, clientID, message);
+        mServer.getImBusinessScheduler().execute(() -> publisher.publish2Receivers(updatedMessage, notifyReceivers, clientID, ProtoConstants.PullType.Pull_Normal));
+        return notifyReceivers.size();
     }
 }

broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.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;
 
 

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

@@ -10,10 +10,10 @@ 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)

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

@@ -8,11 +8,10 @@
 
 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)

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

@@ -9,16 +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 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> {

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

@@ -9,13 +9,13 @@
 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> {

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

@@ -9,14 +9,13 @@
 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.common.ErrorCode.ERROR_CODE_SUCCESS;
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait;
+import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.*;
-import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS;
 import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
 
 @Handler(value = ModifyGroupInfoTopic)
@@ -33,6 +32,14 @@ public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupI
                     content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupNameNotifyContent();
                 } else if(request.getType() == Modify_Group_Portrait) {
                     content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getChangeGroupPortraitNotifyContent();
+                } else if(request.getType() == Modify_Group_Mute) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupMuteNotifyContent();
+                } else if(request.getType() == Modify_Group_JoinType) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupJointypeNotifyContent();
+                } else if(request.getType() == Modify_Group_PrivateChat) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupPrivatechatNotifyContent();
+                } else if(request.getType() == Modify_Group_Searchable) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupSearchableNotifyContent();
                 }
 
                 if (content != null) {

broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.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;
 
 @Handler(IMTopic.ModifyMyInfoTopic)

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

@@ -10,10 +10,9 @@ 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)

broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.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;
 
 @Handler(IMTopic.PutUserSettingTopic)

broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.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;
 
 @Handler(IMTopic.QuitChatroomTopic)

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

@@ -9,10 +9,10 @@
 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;
 

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;
@@ -33,7 +33,7 @@ public class RecallMessageHandler extends IMHandler<WFCMessage.INT64Buf> {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
-        m_messagesStore.getNotifyReceivers(fromUser, message, notifyReceivers);
+        m_messagesStore.getNotifyReceivers(fromUser, message.toBuilder(), notifyReceivers);
         this.publisher.publishRecall2Receivers(int64Buf.getId(), fromUser, notifyReceivers, clientID);
 
         return errorCode;

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;
@@ -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;
 
@@ -59,14 +58,19 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
                 }
 
 
-                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && !m_messagesStore.isMemberInGroup(fromUser, message.getConversation().getTarget())) {
+                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group ) {
-                    return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+                    errorCode = m_messagesStore.canSendMessageInGroup(fromUser, message.getConversation().getTarget());
-                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && m_messagesStore.isForbiddenInGroup(fromUser, message.getConversation().getTarget())) {
+                    if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
-                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                        return errorCode;
-                } 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_ChatRoom) {
-                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel && !m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
+                    if(!m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
-                    return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+                        return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
+                    }
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
+                    if(!m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
+                        return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+                    }
                 }
             }
 
@@ -82,6 +86,7 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             if (!isAdmin && message.getContent().getType() == Text) {
                 Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent());
                 if (matched != null && !matched.isEmpty()) {
+                    m_messagesStore.storeSensitiveMessage(message);
                     if (mSensitiveType == 0) {
                         errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED;
                     } else if(mSensitiveType == 1) {

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

@@ -11,10 +11,10 @@ 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.SetFriendAliasTopic)
 public class SetFriendAliasRequestHandler extends GroupHandler<WFCMessage.AddFriendRequest> {

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

@@ -0,0 +1,35 @@
+/*
+ * 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.common.ErrorCode;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
+@Handler(IMTopic.SetGroupManagerTopic)
+public class SetGroupManagerHandler extends GroupHandler<WFCMessage.SetGroupManagerRequest> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.SetGroupManagerRequest request, Qos1PublishHandler.IMCallback callback) {
+        ErrorCode errorCode = m_messagesStore.setGroupManager(fromUser, request.getGroupId(), request.getType(), request.getUserIdList(), isAdmin);
+        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(request.getGroupId(), fromUser, request.getType() + "", request.getUserIdList()).getSetGroupManagerNotifyContent();
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
+            }
+        }
+        return errorCode;
+    }
+}

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

@@ -11,10 +11,10 @@ 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.RriendRequestUnreadSyncTopic)
 public class SyncFriendRequestUnreadHandler extends GroupHandler<WFCMessage.Version> {

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

@@ -9,14 +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;
-
 @Handler(IMTopic.TransferChannelInfoTopic)
 public class TransferChannelHandler extends GroupHandler<WFCMessage.TransferChannel> {
     @Override

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

@@ -9,19 +9,19 @@
 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.TransferGroupTopic)
 public class TransferGroupHandler extends GroupHandler<WFCMessage.TransferGroupRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.TransferGroupRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.transferGroup(fromUser, request.getGroupId(), request.getNewOwner());
+        ErrorCode errorCode = m_messagesStore.transferGroup(fromUser, request.getGroupId(), request.getNewOwner(), isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS) {
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());

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

@@ -13,7 +13,7 @@ import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.persistence.MemorySessionStore;
 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;
 
 
@@ -26,7 +26,7 @@ public class UploadDeviceTokenHandler extends IMHandler<WFCMessage.UploadDeviceT
             session.setAppName(request.getAppName());
             if (request.getPlatform() == ProtoConstants.Platform.Platform_iOS && request.getPushType() == 2) {
                 session.setVoipDeviceToken(request.getDeviceToken());
-                session.setPushType(0);//如果有voip token，肯定是生产环境的推送
+//                session.setPushType(0);//如果有voip token，肯定是生产环境的推送
                 m_sessionsStore.updateSessionToken(session, true);
             } else {
                 session.setDeviceToken(request.getDeviceToken());