version 0.64 -> 0.65

Bumps httpclient from 4.4.1 to 4.5.13.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpclient
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

README.md

@@ -2,18 +2,19 @@
 
 野火IM是一套跨平台、核心功能开源的即时通讯解决方案，主要包含以下内容。
 
-| 仓库                                                         | 说明                                                    | 备注 |
-| ------------------------------------------------------------ | ------------------------------------------------------- | ---- |
-| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android SDK源码和App源码                       |可以很方便地进行二次开发，或集成到现有应用当中      |
-| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS SDK源码和App源码                            |可以很方便地进行二次开发，或集成到现有应用当中      |
-| [pc-chat](https://github.com/wildfirechat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用 |      |
-| [web-chat](https://github.com/wildfirechat/web-chat)          | Web平台的Demo, [体验地址](http://web.wildfirechat.net)   |      |
-| [wx-chat](https://github.com/wildfirechat/wx-chat)           | 微信小程序平台的Demo   |      |
-| [server](https://github.com/wildfirechat/server)             | IM server                                               |      |
-| [app server](https://github.com/wildfirechat/app_server)     | 应用服务端                                          |      |
-| [robot_server](https://github.com/wildfirechat/robot_server) | 机器人服务端                                        |      |
-| [push_server](https://github.com/wildfirechat/push_server)   | 推送服务器                                              |      |
-| [docs](https://github.com/wildfirechat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明          |      | |                                            |
+| [GitHub仓库地址(主站)](https://github.com/wildfirechat)      | [码云仓库地址(镜像)](https://gitee.com/wfchat)        | 说明                                                                                      | 备注                                           |
+| ------------------------------------------------------------ | ----------------------------------------------------- | ----------------------------------------------------------------------------------------- | ---------------------------------------------- |
+| [android-chat](https://github.com/wildfirechat/android-chat) | [android-chat](https://gitee.com/wfchat/android-chat) | 野火IM Android SDK源码和App源码                                                           | 可以很方便地进行二次开发，或集成到现有应用当中 |
+| [ios-chat](https://github.com/wildfirechat/ios-chat)         | [ios-chat](https://gitee.com/wfchat/ios-chat)         | 野火IM iOS SDK源码和App源码                                                               | 可以很方便地进行二次开发，或集成到现有应用当中 |
+| [pc-chat](https://github.com/wildfirechat/pc-chat)           | [pc-chat](https://gitee.com/wfchat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用                                   |                                                |
+| [web-chat](https://github.com/wildfirechat/web-chat)         | [web-chat](https://gitee.com/wfchat/web-chat)         | Web平台的Demo, [体验地址](http://web.wildfirechat.cn)                                     |                                                |
+| [wx-chat](https://github.com/wildfirechat/wx-chat)           | [wx-chat](https://gitee.com/wfchat/wx-chat)           | 微信小程序平台的Demo                                                                      |                                                |
+| [server](https://github.com/wildfirechat/server)             | [server](https://gitee.com/wfchat/server)             | IM server                                                                                 |                                                |
+| [app server](https://github.com/wildfirechat/app_server)     | [app server](https://gitee.com/wfchat/app_server)     | 应用服务端                                                                                |                                                |
+| [robot_server](https://github.com/wildfirechat/robot_server) | [robot_server](https://gitee.com/wfchat/robot_server) | 机器人服务端                                                                              |                                                |
+| [push_server](https://github.com/wildfirechat/push_server)   | [push_server](https://gitee.com/wfchat/push_server)   | 推送服务器                                                                                |                                                |
+| [docs](https://github.com/wildfirechat/docs)                 | [docs](https://gitee.com/wfchat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明，[在线查看](https://docs.wildfirechat.cn/) |                                                |  |
+
 
 # server
 本工程为野火IM 社区版IM服务软件。野火IM作为一个通用的即时通讯解决方案，可以集成到各种应用中。请阅读[docs](http://docs.wildfirechat.net)或下载服务器[发布版本](https://github.com/wildfirechat/server/releases)

broker/config/wildfirechat.conf

@@ -12,7 +12,7 @@
 #服务器的接入IP。给客户端提供是${server.ip}和${http_port}。
 #客户端会从${http_port}端口获取到长链接端口。这个地址一定要改成客户端可以访问到的IP地址
 # （如果您部署云服务器上或者具有独立公网出口的服务器上，请改为对应的公网IP；如果您部署在在内网环境下，在内网使用，这个地方改成内网地址）
-server.ip 0.0.0.0
+server.ip 192.168.3.124
 
 ##原生客户端长链接端口
 port 1883
@@ -74,12 +74,15 @@ message.blacklist.strategy 0
 ##是否禁止服务器端消息搜索，该功能暂未实现。目前的影响是如果打开，则存储消息时不单独保存_searchable_content字段
 message.disable_remote_search  false
 
-##允许客户端撤回消息时限，单位是秒。群组管理员或群主撤回群成员消息、server api不受此限制，可以撤回任意时限内的消息
+##允许客户端撤回用户自己发送的消息时限，单位是秒。群组管理员或群主撤回群成员消息、server api不受此限制，可以撤回任意时限内的消息
 message.recall_time_limit 120
 
+##禁止群主/群管理员撤回群内消息，关闭时群主/群管理员可以撤回任意时间段内群内成员的消息，群主/群管理员撤回自己发送的消息还是会受到message.recall_time_limit时间限制。
+message.disable_group_manager_recall false
+
 ## 禁止客户端发送消息类型，消息类型以逗号分开，下面3个值为示例，可以删除。
 ## 一般用于重要类型消息，比如交易、充值等，禁止客户端发送，仅限于服务器发送，提高安全性。
-message.forbidden_client_send_types 3999,4000,4001
+#message.forbidden_client_send_types 3999,4000,4001
 
 ## 当禁止发送消息时，允许例外发送的消息。这种一般用户需要被动回应的消息。比如群中被禁言的用户，他无法主动发起音视频，但可以接听未被禁言用户的音视频
 ## 因为音视频使用了消息作为信令，所以就需要允许发送音视频信令。如果开发了其它场景也需要被动回应消息，可以加在这里。
@@ -112,7 +115,7 @@ friend.request_expiration_duration 604800000
 ##旧的方式会发送notification消息（contenttype是80），内容会根据好友接收者的语言选择对应的语言，如果双方语言不一致会导致另外一方看到的不是本地语言。
 ##新的方式会发送添加好友消息（contenttype是93）和欢迎消息（contenttype是92），需要客户端实现这两种消息。
 ##如果客户端已经实现这两种消息可以打开这个开关
-friend.new_welcome_message false
+friend.new_welcome_message true
 
 ## 聊天室观众空闲退出时间，单位为毫秒，默认为15分钟，0为永远不退出
 chatroom.participant_idle_time 900000
@@ -132,6 +135,10 @@ group.visible_quit_or_kickoff_notification 0
 ## 注意，修改本配置不会对已经同步的信息产生影响。
 #user.hide_properties 3,4,5
 
+# 好友/好友请求/用户设置 这三类数据同步的最大条目数。之前是客户第一次登录时，会把所有的对应数据一次下载到客户端，但如果有特别多的信息，会导致无法同步到客户端，
+# 因此需要分段多次同步，此开关定义了每次同步的数据的条数。此需要客户端支持，客户端SDK在2021.5.25日后支持此功能。如果确认所有客户端都在这个日志之后才可以打开此设置。
+#sync.data_part_size 1000
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************
@@ -180,6 +187,11 @@ qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 # local media server configuration
 # 本地媒体服务器配置。
 local.media.storage.root media
+# 如果使用内置文件存储，文件上传后地址默认为 http://server.ip:http_port/fs/5/2021/03/27/08/filename。
+# 如果需要使用nginx添加https支持，请打开下面配置，这样客户端得到的文件地址为 https://example.com/media/fs/5/2021/03/27/08/filename。
+# 需要nginx把请求从https://example.com/media/fs 转到 http://server.ip:http_port/fs。注意需要带上所有header。
+# 尽管内置文件存储可以使用，但是我们还是建议使用专业级别的对象存储服务，社区版可以使用七牛，专业版另外支持阿里云和也是私有对象存储。详情请参考 https://docs.wildfirechat.cn/server/oss.html
+# local.media.storage.remote_server_url https://example.com/media
 
 # 是否支持多端登陆，为true时支持任意平台任意多个客户端同时登录；为false时每个平台只支持一个端登录，但不同平台可以同时登录。
 server.multi_endpoint false

broker/migrate/h2/V39__add_group_member_friend_request_extra.sql

@@ -0,0 +1,2 @@
+alter table `t_group_member` add column `_extra` TEXT DEFAULT NULL;
+alter table `t_friend_request` add column `_extra` TEXT DEFAULT NULL;

broker/migrate/mysql/V44__add_group_member_friend_request_extra.sql

@@ -0,0 +1,2 @@
+alter table `t_group_member` add column `_extra` TEXT DEFAULT NULL;
+alter table `t_friend_request` add column `_extra` TEXT DEFAULT NULL;

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.60</version>
+        <version>0.65</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.4.1</version>
+            <version>4.5.13</version>
         </dependency>
 
         <dependency>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>3.9.4</version>
+            <version>3.11.5</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.xiaoleilu/hutool -->
@@ -195,7 +195,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.5</version>
+            <version>2.7</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->

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

@@ -38,6 +38,31 @@ abstract public class Action {
     public static ISessionsStore sessionsStore = null;
 
     public ChannelHandlerContext ctx;
+    protected class Result {
+        Object data;
+        ErrorCode errorCode;
+
+        public Result(ErrorCode errorCode) {
+            this.errorCode = errorCode;
+        }
+
+        public Result(ErrorCode errorCode, Object data) {
+            this.data = data;
+            this.errorCode = errorCode;
+        }
+
+        public Object getData() {
+            return data;
+        }
+
+        public ErrorCode getErrorCode() {
+            return errorCode;
+        }
+    }
+
+    protected interface ApiCallback {
+        Result onResult(byte[] response);
+    }
 
     public ErrorCode preAction(Request request, Response response) {
         if (getClass().getAnnotation(RequireAuthentication.class) != null) {
@@ -93,4 +118,9 @@ abstract public class Action {
         }
         return null;
     }
+
+    protected void setResponseContent(RestResult result, Response response) {
+        response.setStatus(HttpResponseStatus.OK);
+        response.setContent(new Gson().toJson(result));
+    }
 }

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

@@ -15,9 +15,8 @@ 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.ServerAPIHelper;
 import io.moquette.persistence.MemorySessionStore;
-import io.moquette.persistence.TargetEntry;
 import io.moquette.spi.impl.Utils;
 import io.moquette.spi.impl.security.AES;
 import io.moquette.spi.security.Tokenor;
@@ -80,7 +79,7 @@ public class IMAction extends Action {
                 if (userId == null) {
                     sendResponse(response, ErrorCode.ERROR_CODE_TOKEN_ERROR, null);
                 } else {
-                    RPCCenter.getInstance().sendRequest(userId, wrapper.getClientId(), wrapper.getRequest(), wrapper.getData().toByteArray(), userId, TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    ServerAPIHelper.sendRequest(userId, wrapper.getClientId(), wrapper.getRequest(), wrapper.getData().toByteArray(), new ServerAPIHelper.Callback() {
                         @Override
                         public void onSuccess(byte[] result) {
                             sendResponse(response, null, result);

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

@@ -15,8 +15,7 @@ import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
 import io.moquette.persistence.MemorySessionStore;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
+import io.moquette.persistence.ServerAPIHelper;
 import io.moquette.spi.impl.Utils;
 import io.moquette.spi.impl.security.AES;
 import io.moquette.spi.security.Tokenor;
@@ -113,7 +112,7 @@ public class RouteAction extends Action {
                 if (userId == null) {
                     sendResponse(response, ErrorCode.ERROR_CODE_TOKEN_ERROR, null, base64Response);
                 } else {
-                    RPCCenter.getInstance().sendRequest(userId, wrapper.getClientId(), wrapper.getRequest(), wrapper.getData().toByteArray(), userId, TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    ServerAPIHelper.sendRequest(userId, wrapper.getClientId(), wrapper.getRequest(), wrapper.getData().toByteArray(), new ServerAPIHelper.Callback() {
                         @Override
                         public void onSuccess(byte[] result) {
                             sendResponse(response, null, result, base64Response);

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

@@ -11,25 +11,17 @@ package com.xiaoleilu.loServer.action.admin;
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputAddFriendRequest;
-import cn.wildfirechat.pojos.InputUpdateAlias;
 import cn.wildfirechat.proto.WFCMessage;
-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.Friend_Send_Request)
 @HttpMethod("POST")
 public class AddFriendRequestAction extends AdminAction {
@@ -50,35 +42,11 @@ public class AddFriendRequestAction extends AdminAction {
             }
 
             WFCMessage.AddFriendRequest addFriendRequest = WFCMessage.AddFriendRequest.newBuilder().setReason(input.getReason()).setTargetUid(input.getFriendUid()).build();
-            RPCCenter.getInstance().sendRequest(input.getUserId(), null, IMTopic.AddFriendRequestTopic, addFriendRequest.toByteArray(), input.getUserId(), 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);
-                    };
-                }
+            sendApiMessage(response, input.getUserId(), IMTopic.AddFriendRequestTopic, addFriendRequest.toByteArray(), result -> {
+                ByteBuf byteBuf = Unpooled.buffer();
+                byteBuf.writeBytes(result);
+                ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                return new Result(errorCode);
             }, input.isForce());
             return false;
         }

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

@@ -15,10 +15,8 @@ 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 com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -26,8 +24,6 @@ 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 {
@@ -42,41 +38,15 @@ public class AddGroupMemberAction extends AdminAction {
         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);
+                sendApiMessage(response, inputAddGroupMember.getOperator(), IMTopic.AddGroupMemberTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -9,11 +9,11 @@
 package com.xiaoleilu.loServer.action.admin;
 
 import com.google.gson.Gson;
-import com.xiaoleilu.loServer.LoServer;
 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.ServerAPIHelper;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -22,6 +22,8 @@ import org.slf4j.LoggerFactory;
 import win.liyufan.im.RateLimiter;
 import win.liyufan.im.Utility;
 
+import java.util.concurrent.Executor;
+
 abstract public class AdminAction extends Action {
     private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(AdminAction.class);
     private static String SECRET_KEY = "123456";
@@ -90,4 +92,40 @@ abstract public class AdminAction extends Action {
         response.setContent(new Gson().toJson(result));
         response.send();
     }
+    protected void sendApiMessage(Response response, String fromUser, String topic, byte[] message, ApiCallback callback) {
+        sendApiMessage(response, fromUser, null, topic, message, callback, false);
+    }
+
+    protected void sendApiMessage(Response response, String fromUser, String topic, byte[] message, ApiCallback callback, boolean noAdmin) {
+        sendApiMessage(response, fromUser, null, topic, message, callback, noAdmin);
+    }
+
+    protected void sendApiMessage(Response response, String fromUser, String clientId, String topic, byte[] message, ApiCallback callback, boolean noAdmin) {
+        ServerAPIHelper.sendRequest(fromUser, clientId, topic, message, new ServerAPIHelper.Callback() {
+            @Override
+            public void onSuccess(byte[] result) {
+                if(callback != null) {
+                    Result r = callback.onResult(result);
+                    sendResponse(response, r.getErrorCode(), r.getData());
+                }
+            }
+
+            @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);
+                };
+            }
+        }, !noAdmin);
+    }
 }

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

@@ -9,6 +9,7 @@
 package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputGetAlias;
 import cn.wildfirechat.pojos.InputGetFriendList;
 import cn.wildfirechat.pojos.OutputGetAlias;
@@ -49,9 +50,8 @@ public class AliasGetAction extends AdminAction {
                     break;
                 }
             }
-            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(out);
-            response.setContent(new Gson().toJson(result));
+
+            setResponseContent(RestResult.ok(out), response);
         }
         return true;
     }

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

@@ -40,9 +40,7 @@ public class AliasPutAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputUpdateAlias input = getRequestBody(request.getNettyRequest(), InputUpdateAlias.class);
             ErrorCode errorCode = messagesStore.setFriendAliasRequest(input.getOperator(), input.getTargetId(), input.getAlias(), new long[1]);
-            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.resultOf(errorCode);
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(RestResult.resultOf(errorCode), response);
         }
         return true;
     }

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

@@ -18,8 +18,6 @@ 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;
@@ -27,8 +25,6 @@ import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import win.liyufan.im.IMTopic;
 
-import java.util.concurrent.Executor;
-
 @Route(APIPath.Blacklist_Update_Status)
 @HttpMethod("POST")
 public class BlacklistAction extends AdminAction {
@@ -47,39 +43,15 @@ public class BlacklistAction extends AdminAction {
                 && !StringUtil.isNullOrEmpty(inputData.getTargetUid())
             ) {
                 WFCMessage.BlackUserRequest friendRequest = WFCMessage.BlackUserRequest.newBuilder().setUid(inputData.getTargetUid()).setStatus(inputData.getStatus()).build();
-                RPCCenter.getInstance().sendRequest(inputData.getUserId(), null, IMTopic.BlackListUserTopic, friendRequest.toByteArray(), inputData.getUserId(), 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);
+                sendApiMessage(response, inputData.getUserId(), IMTopic.BlackListUserTopic, friendRequest.toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -45,9 +45,7 @@ public class BlacklistGetAction extends AdminAction {
                     list.add(data.getFriendUid());
                 }
             }
-            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(new OutputStringList(list));
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(RestResult.ok(new OutputStringList(list)), response);
         }
         return true;
     }

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

@@ -14,10 +14,9 @@ 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.InputOutputUserBlockStatus;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.ServerAPIHelper;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
@@ -46,14 +45,12 @@ public class BlockUserAction extends AdminAction {
                 response.setContent(new Gson().toJson(result));
 
                 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);
+                    sendApiMessage(response, null, ServerAPIHelper.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), null);
                 }
 
                 sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, null);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -13,8 +13,6 @@ 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;
@@ -22,16 +20,12 @@ 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 {
@@ -46,43 +40,21 @@ public class BroadcastMessageAction extends AdminAction {
         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);
-                        }
+                sendApiMessage(response, sendMessageData.getSender(), IMTopic.BroadcastMessageTopic, sendMessageData.toProtoMessage().toByteArray(), 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();
+                        return new Result(errorCode, new BroadMessageResult(messageId, count));
+                    } else {
+                        return new Result(errorCode);
                     }
-
-                    @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));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -9,26 +9,18 @@
 package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
-import cn.wildfirechat.pojos.BroadMessageResult;
 import cn.wildfirechat.pojos.OutputCheckUserOnline;
 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.InputGetUserInfo;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.ServerAPIHelper;
 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 java.util.concurrent.Executor;
-
 @Route(APIPath.User_Get_Online_Status)
 @HttpMethod("POST")
 public class CheckUserOnlineAction extends AdminAction {
@@ -43,30 +35,10 @@ public class CheckUserOnlineAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId == null || !StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
-                RPCCenter.getInstance().sendRequest(null, null, RPCCenter.CHECK_USER_ONLINE_REQUEST, inputUserId.getUserId().getBytes(), inputUserId.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
-                    @Override
-                    public void onSuccess(byte[] res) {
-                        OutputCheckUserOnline out = new Gson().fromJson(new String(res), OutputCheckUserOnline.class);
-                        sendResponse(response, null, out);
-                    }
-
-                    @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);
+                sendApiMessage(response, inputUserId.getUserId(), ServerAPIHelper.CHECK_USER_ONLINE_REQUEST, inputUserId.getUserId().getBytes(), res -> {
+                    OutputCheckUserOnline out = new Gson().fromJson(new String(res), OutputCheckUserOnline.class);
+                    return new Result(ErrorCode.ERROR_CODE_SUCCESS, out);
+                });
                 return false;
             } else {
                 sendResponse(response, ErrorCode.INVALID_PARAMETER, null);

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

@@ -11,24 +11,18 @@ package com.xiaoleilu.loServer.action.admin;
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.*;
-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.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 win.liyufan.im.IMTopic;
-import win.liyufan.im.UUIDGenerator;
-
-import java.util.concurrent.Executor;
 
 @Route(APIPath.Create_Channel)
 @HttpMethod("POST")
@@ -52,44 +46,22 @@ public class CreateChannelAction extends AdminAction {
                     inputCreateChannel.setTargetId(messagesStore.getShortUUID());
                 }
 
-                RPCCenter.getInstance().sendRequest(inputCreateChannel.getOwner(), null, IMTopic.CreateChannelTopic, inputCreateChannel.toProtoChannelInfo().toByteArray(), inputCreateChannel.getOwner(), 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) {
-                            byte[] data = new byte[byteBuf.readableBytes()];
-                            byteBuf.readBytes(data);
-                            String channelId = new String(data);
-                            sendResponse(response, null, new OutputCreateChannel(channelId));
-                        } else {
-                            sendResponse(response, errorCode, null);
-                        }
+                sendApiMessage(response, inputCreateChannel.getOwner(), IMTopic.CreateChannelTopic, inputCreateChannel.toProtoChannelInfo().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                        byte[] data = new byte[byteBuf.readableBytes()];
+                        byteBuf.readBytes(data);
+                        String channelId = new String(data);
+                        return new Result(ErrorCode.ERROR_CODE_SUCCESS, new OutputCreateChannel(channelId));
+                    } else {
+                        return new Result(errorCode);
                     }
-
-                    @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));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -53,17 +53,10 @@ public class CreateChatroomAction extends AdminAction {
                 }
 
                 WFCMessage.ChatroomInfo info = inputCreateChatroom.toChatroomInfo();
-
                 messagesStore.createChatroom(inputCreateChatroom.getChatroomId(), info);
-
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.ok(new OutputCreateChatroom(inputCreateChatroom.getChatroomId()));
-                response.setContent(new Gson().toJson(result));
-
+                setResponseContent(RestResult.ok(new OutputCreateChatroom(inputCreateChatroom.getChatroomId())), response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -15,11 +15,9 @@ 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.InputCreateGroup;
 import cn.wildfirechat.pojos.OutputCreateGroupResult;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -27,8 +25,6 @@ import io.netty.handler.codec.http.HttpResponseStatus;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import java.util.concurrent.Executor;
-
 @Route(APIPath.Create_Group)
 @HttpMethod("POST")
 public class CreateGroupAction extends AdminAction {
@@ -43,44 +39,22 @@ public class CreateGroupAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputCreateGroup inputCreateGroup = getRequestBody(request.getNettyRequest(), InputCreateGroup.class);
             if (inputCreateGroup.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputCreateGroup.getOperator(), null, IMTopic.CreateGroupTopic, inputCreateGroup.toProtoGroupRequest().toByteArray(), inputCreateGroup.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) {
-                            byte[] data = new byte[byteBuf.readableBytes()];
-                            byteBuf.readBytes(data);
-                            String groupId = new String(data);
-                            sendResponse(response, null, new OutputCreateGroupResult(groupId));
-                        } else {
-                            sendResponse(response, errorCode, null);
-                        }
+                sendApiMessage(response, inputCreateGroup.getOperator(), IMTopic.CreateGroupTopic, inputCreateGroup.toProtoGroupRequest().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                        byte[] data = new byte[byteBuf.readableBytes()];
+                        byteBuf.readBytes(data);
+                        String groupId = new String(data);
+                        return new Result(ErrorCode.ERROR_CODE_SUCCESS, new OutputCreateGroupResult(groupId));
+                    } else {
+                        return new Result(errorCode);
                     }
-
-                    @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));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -78,16 +78,10 @@ public class CreateRobotAction extends AdminAction {
                 if (StringUtil.isNullOrEmpty(inputCreateRobot.getSecret())) {
                     inputCreateRobot.setSecret(UUIDGenerator.getUUID());
                 }
-
                 messagesStore.addRobot(inputCreateRobot.toRobot());
-
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.ok(new OutputCreateRobot(inputCreateRobot.getUserId(), inputCreateRobot.getSecret()));
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.ok(new OutputCreateRobot(inputCreateRobot.getUserId(), inputCreateRobot.getSecret())), response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -89,19 +89,13 @@ public class CreateUserAction extends AdminAction {
                 } catch (Exception e) {
                     e.printStackTrace();
                     Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ADMIN_API_Exception);
-                    response.setStatus(HttpResponseStatus.OK);
-                    RestResult result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage());
-                    response.setContent(new Gson().toJson(result));
+                    setResponseContent(RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage()), response);
                     return true;
                 }
 
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.ok(new OutputCreateUser(inputCreateUser.getUserId(), inputCreateUser.getName()));
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.ok(new OutputCreateUser(inputCreateUser.getUserId(), inputCreateUser.getName())), response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -41,17 +41,10 @@ public class DestoryChatroomAction extends AdminAction {
             InputDestoryChatroom inputDestoryChatroom = gson.fromJson(content, InputDestoryChatroom.class);
             if (inputDestoryChatroom != null
                 && !StringUtil.isNullOrEmpty(inputDestoryChatroom.getChatroomId())) {
-
                 messagesStore.destoryChatroom(inputDestoryChatroom.getChatroomId());
-
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.ok();
-                response.setContent(new Gson().toJson(result));
-
+                setResponseContent(RestResult.ok(), response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -11,9 +11,6 @@ package com.xiaoleilu.loServer.action.admin;
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputDestroyUser;
-import cn.wildfirechat.pojos.InputOutputUserInfo;
-import cn.wildfirechat.pojos.OutputCreateUser;
-import cn.wildfirechat.pojos.OutputGetIMTokenData;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -21,16 +18,12 @@ 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.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import win.liyufan.im.IMTopic;
-import win.liyufan.im.UUIDGenerator;
 
 import java.util.Base64;
-import java.util.concurrent.Executor;
 
 @Route(APIPath.Destroy_User)
 @HttpMethod("POST")
@@ -49,46 +42,13 @@ public class DestroyUserAction extends AdminAction {
                 && !StringUtil.isNullOrEmpty(inputDestroyUser.getUserId())) {
 
                 WFCMessage.IDBuf idBuf = WFCMessage.IDBuf.newBuilder().setId(inputDestroyUser.getUserId()).build();
-                RPCCenter.getInstance().sendRequest(inputDestroyUser.getUserId(), null, IMTopic.DestroyUserTopic, idBuf.toByteArray(), inputDestroyUser.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
-                    @Override
-                    public void onSuccess(byte[] result) {
-                        ErrorCode errorCode1 = ErrorCode.fromCode(result[0]);
-                        if (errorCode1 == ErrorCode.ERROR_CODE_SUCCESS) {
-                            //ba errorcode qudiao
-                            byte[] data = new byte[result.length -1];
-                            for (int i = 0; i < data.length; i++) {
-                                data[i] = result[i+1];
-                            }
-                            String token = Base64.getEncoder().encodeToString(data);
-
-                            sendResponse(response, null, null);
-                        } else {
-                            sendResponse(response, errorCode1, 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);
+                sendApiMessage(response, inputDestroyUser.getUserId(), IMTopic.DestroyUserTopic, idBuf.toByteArray(), result -> {
+                    ErrorCode errorCode1 = ErrorCode.fromCode(result[0]);
+                    return new Result(errorCode1);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -15,10 +15,8 @@ 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 com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -26,8 +24,6 @@ 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 {
@@ -42,41 +38,15 @@ public class DismissGroupAction extends AdminAction {
         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);
+                sendApiMessage(response, inputDismissGroup.getOperator(), IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -15,10 +15,8 @@ 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.InputUpdateFriendStatusRequest;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -27,8 +25,6 @@ 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 {
@@ -50,39 +46,15 @@ public class FriendRelationAction extends AdminAction {
                 if (!StringUtil.isNullOrEmpty(friendAdd.getExtra())) {
                     friendRequestBuilder = friendRequestBuilder.setExtra(friendAdd.getExtra());
                 }
-                RPCCenter.getInstance().sendRequest(friendAdd.getUserId(), null, IMTopic.HandleFriendRequestTopic, friendRequestBuilder.build().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);
+                sendApiMessage(response, friendAdd.getUserId(), IMTopic.HandleFriendRequestTopic, friendRequestBuilder.build().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -47,9 +47,7 @@ public class FriendRelationGetAction extends AdminAction {
                     list.add(data.getFriendUid());
                 }
             }
-            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(new OutputStringList(list));
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(RestResult.ok(new OutputStringList(list)), response);
         }
         return true;
     }

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

@@ -46,14 +46,9 @@ public class GetChatroomInfoAction extends AdminAction {
                 } else {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                 }
-                response.setStatus(HttpResponseStatus.OK);
-
-                response.setContent(new Gson().toJson(result));
-
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -58,14 +58,9 @@ public class GetChatroomMembersAction extends AdminAction {
                 } else {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                 }
-                response.setStatus(HttpResponseStatus.OK);
-
-                response.setContent(new Gson().toJson(result));
-
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -42,8 +42,6 @@ public class GetGroupInfoAction extends AdminAction {
                 && (!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);
@@ -55,14 +53,15 @@ public class GetGroupInfoAction extends AdminAction {
                     pojoGroupInfo.setPortrait(groupInfo.getPortrait());
                     pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
                     pojoGroupInfo.setType(groupInfo.getType());
+                    pojoGroupInfo.setMute(groupInfo.getMute());
+                    pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
+                    pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
+                    pojoGroupInfo.setSearchable(groupInfo.getSearchable());
                     result = RestResult.ok(pojoGroupInfo);
                 }
-
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -48,8 +48,6 @@ public class GetGroupMembersAction extends AdminAction {
                 List<WFCMessage.GroupMember> members = new ArrayList<>();
                 ErrorCode errorCode = messagesStore.getGroupMembers(null, inputGetGroup.getGroupId(), 0, members);
 
-
-                response.setStatus(HttpResponseStatus.OK);
                 RestResult result;
                 if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
                     result = RestResult.resultOf(errorCode);
@@ -64,16 +62,15 @@ public class GetGroupMembersAction extends AdminAction {
                         pm.setMember_id(member.getMemberId());
                         pm.setAlias(member.getAlias());
                         pm.setType(member.getType());
+                        pm.setExtra(member.getExtra());
                         out.getMembers().add(pm);
                     }
                     result = RestResult.ok(out);
                 }
 
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -13,17 +13,14 @@ 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 cn.wildfirechat.pojos.InputGetToken;
 import cn.wildfirechat.pojos.OutputGetIMTokenData;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.handler.codec.http.FullHttpRequest;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
 import java.util.Base64;
-import java.util.concurrent.Executor;
 
 @Route(APIPath.User_Get_Token)
 @HttpMethod("POST")
@@ -42,41 +39,21 @@ public class GetIMTokenAction extends AdminAction {
 
 
             WFCMessage.GetTokenRequest getTokenRequest = WFCMessage.GetTokenRequest.newBuilder().setUserId(userId).setClientId(input.getClientId()).setPlatform(input.getPlatform() == null ? 0 : input.getPlatform()).build();
-            RPCCenter.getInstance().sendRequest(userId, input.getClientId(), IMTopic.GetTokenTopic, getTokenRequest.toByteArray(), userId, TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
-                @Override
-                public void onSuccess(byte[] result) {
-                    ErrorCode errorCode1 = ErrorCode.fromCode(result[0]);
-                    if (errorCode1 == ErrorCode.ERROR_CODE_SUCCESS) {
-                        //ba errorcode qudiao
-                        byte[] data = new byte[result.length -1];
-                        for (int i = 0; i < data.length; i++) {
-                            data[i] = result[i+1];
-                        }
-                        String token = Base64.getEncoder().encodeToString(data);
-
-                        sendResponse(response, null, new OutputGetIMTokenData(userId, token));
-                    } else {
-                        sendResponse(response, errorCode1, null);
+            sendApiMessage(response, userId, input.getClientId(), IMTopic.GetTokenTopic, getTokenRequest.toByteArray(), result -> {
+                ErrorCode errorCode1 = ErrorCode.fromCode(result[0]);
+                if (errorCode1 == ErrorCode.ERROR_CODE_SUCCESS) {
+                    //ba errorcode qudiao
+                    byte[] data = new byte[result.length -1];
+                    for (int i = 0; i < data.length; i++) {
+                        data[i] = result[i+1];
                     }
-                }
+                    String token = Base64.getEncoder().encodeToString(data);
 
-                @Override
-                public void onError(ErrorCode errorCode) {
-                    sendResponse(response, errorCode, null);
+                    return new Result(errorCode1, new OutputGetIMTokenData(userId, token));
+                } else {
+                    return new Result(errorCode1);
                 }
-
-                @Override
-                public void onTimeout() {
-                    sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
-                }
-
-                @Override
-                public Executor getResponseExecutor() {
-                    return command -> {
-                        ctx.executor().execute(command);
-                    };
-                }
-            }, true);
+            }, false);
             return false;
         }
         return true;

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

@@ -40,7 +40,6 @@ public class GetSystemSettingAction extends AdminAction {
             if (inputUserId != null) {
                 SystemSettingPojo output = messagesStore.getSystemSetting(inputUserId.id);
 
-                response.setStatus(HttpResponseStatus.OK);
                 RestResult result;
                 if (output == null) {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
@@ -48,11 +47,9 @@ public class GetSystemSettingAction extends AdminAction {
                     result = RestResult.ok(output);
                 }
 
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -48,7 +48,6 @@ public class GetUserAction extends AdminAction {
                     user = messagesStore.getUserInfoByMobile(inputUserId.getMobile());
                 }
 
-                response.setStatus(HttpResponseStatus.OK);
                 RestResult result;
                 if (user == null) {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
@@ -56,11 +55,9 @@ public class GetUserAction extends AdminAction {
                     result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
                 }
 
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -31,11 +31,10 @@ public class GetUserBlockListAction extends AdminAction {
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-            response.setStatus(HttpResponseStatus.OK);
             OutputUserBlockStatusList list = new OutputUserBlockStatusList();
             list.setStatusList(messagesStore.getUserStatusList());
             RestResult result = RestResult.ok(list);
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(result, response);
         }
         return true;
     }

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

@@ -39,13 +39,9 @@ public class GetUserBlockStatusAction extends AdminAction {
                 && !StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
 
                 int status = messagesStore.getUserStatus(inputUserId.getUserId());
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.ok(new OutputUserStatus(status));
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.ok(new OutputUserStatus(status)), response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -45,16 +45,12 @@ public class GetUserGroupsAction extends AdminAction {
                 && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()))) {
 
                 Set<String> groupIds = messagesStore.getUserGroupIds(inputUserId.getUserId());
-                response.setStatus(HttpResponseStatus.OK);
                 OutputGroupIds outputGroupIds = new OutputGroupIds();
                 outputGroupIds.setGroupIds(new ArrayList<>(groupIds));
                 RestResult result = RestResult.ok(outputGroupIds);
-
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -15,10 +15,8 @@ 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 com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -26,8 +24,6 @@ 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 {
@@ -42,41 +38,15 @@ public class KickoffGroupMemberAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
             if (inputKickoffGroupMember.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.KickoffGroupMemberTopic, 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);
+                sendApiMessage(response, inputKickoffGroupMember.getOperator(), IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -10,7 +10,6 @@ package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
-import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import cn.wildfirechat.pojos.StringPairPojo;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -18,8 +17,6 @@ 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.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
@@ -41,9 +38,7 @@ public class KickoffUserClientAction extends AdminAction {
                 sessionsStore.kickoffUserClient(pojo.getFirst(), pojo.getSecond());
                 sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, null);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -11,7 +11,6 @@ package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
-import cn.wildfirechat.pojos.InputAddGroupMember;
 import cn.wildfirechat.pojos.InputModifyGroupInfo;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -19,16 +18,12 @@ 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.Group_Modify_Info)
 @HttpMethod("POST")
 public class ModifyGroupInfoAction extends AdminAction {
@@ -43,41 +38,15 @@ public class ModifyGroupInfoAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class);
             if (inputAddGroupMember.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.ModifyGroupInfoTopic, 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);
+                sendApiMessage(response, inputAddGroupMember.getOperator(), IMTopic.ModifyGroupInfoTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -11,7 +11,6 @@ package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
-import cn.wildfirechat.pojos.InputKickoffGroupMember;
 import cn.wildfirechat.pojos.InputSetGroupMemberAlias;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -19,16 +18,12 @@ 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.Group_Set_Member_Alias)
 @HttpMethod("POST")
 public class ModifyGroupMemberAliasAction extends AdminAction {
@@ -43,41 +38,15 @@ public class ModifyGroupMemberAliasAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputSetGroupMemberAlias inputSetGroupMemberAlias = getRequestBody(request.getNettyRequest(), InputSetGroupMemberAlias.class);
             if (inputSetGroupMemberAlias.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputSetGroupMemberAlias.getOperator(), null, IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), inputSetGroupMemberAlias.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);
+                sendApiMessage(response, inputSetGroupMemberAlias.getOperator(), IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -11,27 +11,20 @@ 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.MultiMessageResult;
 import cn.wildfirechat.pojos.MulticastMessageData;
 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_Multicast)
 @HttpMethod("POST")
 public class MulticastMessageAction extends AdminAction {
@@ -46,43 +39,21 @@ public class MulticastMessageAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             MulticastMessageData sendMessageData = getRequestBody(request.getNettyRequest(), MulticastMessageData.class);
             if (MulticastMessageData.isValide(sendMessageData)) {
-                RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.MultiCastMessageTopic, 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 timestamp = byteBuf.readLong();
-                            sendResponse(response, null, new MultiMessageResult(messageId, timestamp));
-                        } else {
-                            sendResponse(response, errorCode, null);
-                        }
+                sendApiMessage(response, sendMessageData.getSender(), IMTopic.MultiCastMessageTopic, sendMessageData.toProtoMessage().toByteArray(), 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 timestamp = byteBuf.readLong();
+                        return new Result(errorCode, new MultiMessageResult(messageId, timestamp));
+                    } else {
+                        return new Result(errorCode);
                     }
-
-                    @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));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -40,22 +40,16 @@ public class PutSystemSettingAction extends AdminAction {
             if (inputUserId != null
                 && (!StringUtil.isNullOrEmpty(inputUserId.value) || !StringUtil.isNullOrEmpty(inputUserId.desc))) {
 
-
                 boolean success = messagesStore.updateSystemSetting(inputUserId.id, inputUserId.value, inputUserId.desc);
-
-                response.setStatus(HttpResponseStatus.OK);
                 RestResult result;
                 if (!success) {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR);
                 } else {
                     result = RestResult.ok();
                 }
-
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -11,7 +11,6 @@ package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
-import cn.wildfirechat.pojos.InputKickoffGroupMember;
 import cn.wildfirechat.pojos.InputQuitGroup;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -19,16 +18,12 @@ 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.Group_Member_Quit)
 @HttpMethod("POST")
 public class QuitGroupMemberAction extends AdminAction {
@@ -43,41 +38,15 @@ public class QuitGroupMemberAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputQuitGroup inputQuitGroup = getRequestBody(request.getNettyRequest(), InputQuitGroup.class);
             if (inputQuitGroup.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputQuitGroup.getOperator(), null, IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), inputQuitGroup.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);
+                sendApiMessage(response, inputQuitGroup.getOperator(), IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -15,10 +15,8 @@ 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.RecallMessageData;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -27,8 +25,6 @@ import io.netty.util.internal.StringUtil;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import java.util.concurrent.Executor;
-
 @Route(APIPath.Msg_Recall)
 @HttpMethod("POST")
 public class RecallMessageAction extends AdminAction {
@@ -45,37 +41,15 @@ public class RecallMessageAction extends AdminAction {
             if (recallMessageData != null && !StringUtil.isNullOrEmpty(recallMessageData.getOperator())) {
 
                 WFCMessage.INT64Buf idBuf = WFCMessage.INT64Buf.newBuilder().setId(recallMessageData.getMessageUid()).build();
-                RPCCenter.getInstance().sendRequest(recallMessageData.getOperator(), null, IMTopic.RecallMessageTopic, idBuf.toByteArray(), recallMessageData.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());
-                        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);
+                sendApiMessage(response, recallMessageData.getOperator(), IMTopic.RecallMessageTopic, idBuf.toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -10,7 +10,6 @@ package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
-import cn.wildfirechat.pojos.RecallMessageData;
 import cn.wildfirechat.pojos.RecallMultiCastMessageData;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
@@ -19,8 +18,6 @@ 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;
@@ -28,8 +25,6 @@ import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import win.liyufan.im.IMTopic;
 
-import java.util.concurrent.Executor;
-
 @Route(APIPath.Msg_RecallMultiCast)
 @HttpMethod("POST")
 public class RecallMultiCastMessageAction extends AdminAction {
@@ -46,37 +41,15 @@ public class RecallMultiCastMessageAction extends AdminAction {
             if (recallMessageData != null && !StringUtil.isNullOrEmpty(recallMessageData.operator)) {
 
                 WFCMessage.RecallMultiCastMessageRequest recallRequest = WFCMessage.RecallMultiCastMessageRequest.newBuilder().setMessageId(recallMessageData.messageUid).addAllReceiver(recallMessageData.receivers).build();
-                RPCCenter.getInstance().sendRequest(recallMessageData.operator, null, IMTopic.RecallMultiCastMessageTopic, recallRequest.toByteArray(), recallMessageData.operator, 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());
-                        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);
+                sendApiMessage(response, recallMessageData.operator, IMTopic.RecallMultiCastMessageTopic, recallRequest.toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -51,10 +51,7 @@ public class RelationGetAction extends AdminAction {
                 out.alias = data.getAlias();
                 out.extra = data.getExtra();
             }
-
-            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(out);
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(RestResult.ok(out), response);
         }
         return true;
     }

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

@@ -16,11 +16,9 @@ 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.SendMessageData;
 import cn.wildfirechat.pojos.SendMessageResult;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -28,8 +26,6 @@ import io.netty.handler.codec.http.HttpResponseStatus;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import java.util.concurrent.Executor;
-
 @Route(APIPath.Msg_Send)
 @HttpMethod("POST")
 public class SendMessageAction extends AdminAction {
@@ -44,43 +40,21 @@ public class SendMessageAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
             if (SendMessageData.isValide(sendMessageData) && !StringUtil.isNullOrEmpty(sendMessageData.getSender())) {
-                RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
-                    @Override
-                    public void onSuccess(byte[] result) {
-                        ByteBuf byteBuf = Unpooled.buffer();
-                        byteBuf.writeBytes(result);
-                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
-                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
-                            long messageId = byteBuf.readLong();
-                            long timestamp = byteBuf.readLong();
-                            sendResponse(response, null, new SendMessageResult(messageId, timestamp));
-                        } else {
-                            sendResponse(response, errorCode, null);
-                        }
+                sendApiMessage(response, sendMessageData.getSender(), IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), 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 timestamp = byteBuf.readLong();
+                        return new Result(errorCode, new SendMessageResult(messageId, timestamp));
+                    } else {
+                        return new Result(errorCode);
                     }
-
-                    @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));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -38,9 +38,7 @@ public class SensitiveWordAddAction extends AdminAction {
                 response.setStatus(HttpResponseStatus.OK);
                 sendResponse(response, errorCode, null);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -39,9 +39,7 @@ public class SensitiveWordDeleteAction extends AdminAction {
 
                 sendResponse(response, errorCode, null);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -11,7 +11,6 @@ package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
-import cn.wildfirechat.pojos.InputAddGroupMember;
 import cn.wildfirechat.pojos.InputSetGroupManager;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -19,16 +18,12 @@ 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.Group_Set_Manager)
 @HttpMethod("POST")
 public class SetGroupManagerAction extends AdminAction {
@@ -43,41 +38,15 @@ public class SetGroupManagerAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputSetGroupManager inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputSetGroupManager.class);
             if (inputAddGroupMember.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.SetGroupManagerTopic, 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);
+                sendApiMessage(response, inputAddGroupMember.getOperator(), IMTopic.SetGroupManagerTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -15,10 +15,8 @@ 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 com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -26,8 +24,6 @@ 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 {
@@ -42,41 +38,15 @@ public class TransferGroupAction extends AdminAction {
         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);
+                sendApiMessage(response, inputDismissGroup.getOperator(), IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -50,13 +50,9 @@ public class UpdateUserAction extends AdminAction {
                 && inputCreateUser.flag > 0) {
 
                 ErrorCode errorCode = messagesStore.updateUserInfo(inputCreateUser.userInfo, inputCreateUser.flag);
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(errorCode);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(errorCode), response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -15,6 +15,7 @@ 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.ServerAPIHelper;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
@@ -26,11 +27,17 @@ import org.slf4j.LoggerFactory;
 import win.liyufan.im.RateLimiter;
 import win.liyufan.im.Utility;
 
+import java.util.concurrent.Executor;
+
 abstract public class ChannelAction extends Action {
     private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(ChannelAction.class);
     private final RateLimiter mLimitCounter = new RateLimiter(10, 200);
     protected WFCMessage.ChannelInfo channelInfo;
 
+    protected interface Callback {
+        void onSuccess(byte[] response);
+    }
+
     @Override
     public ErrorCode preAction(Request request, Response response) {
         String nonce = request.getHeader("nonce");
@@ -107,4 +114,32 @@ abstract public class ChannelAction extends Action {
         }
         return null;
     }
+
+    protected void sendApiMessage(Response response, String topic, byte[] message, Callback callback) {
+        sendApiMessage(response, channelInfo.getOwner(), topic, message, callback);
+    }
+    protected void sendApiMessage(Response response, String user, String topic, byte[] message, Callback callback) {
+        ServerAPIHelper.sendRequest(user, null, topic, message, new ServerAPIHelper.Callback() {
+            @Override
+            public void onSuccess(byte[] response) {
+                callback.onSuccess(response);
+            }
+            @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);
+                };
+            }
+        }, false, true);
+    }
 }

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

@@ -31,10 +31,7 @@ public class GetChannelAction extends ChannelAction {
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(OutputGetChannelInfo.fromPbInfo(channelInfo));
-
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(RestResult.ok(OutputGetChannelInfo.fromPbInfo(channelInfo)), response);
         }
         return true;
     }

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

@@ -36,10 +36,7 @@ public class GetChannelSubscribersAction extends ChannelAction {
             OutputStringList outputStringList = new OutputStringList();
             outputStringList.setList(new ArrayList<>());
             outputStringList.getList().addAll(messagesStore.getChannelSubscriber(channelInfo.getTargetId()));
-
-            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(outputStringList);
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(RestResult.ok(outputStringList), response);
         }
         return true;
     }

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

@@ -46,7 +46,6 @@ public class GetUserAction extends ChannelAction {
                     user = messagesStore.getUserInfoByMobile(inputUserId.getMobile());
                 }
 
-                response.setStatus(HttpResponseStatus.OK);
                 RestResult result;
 
                 if (user == null || StringUtil.isNullOrEmpty(user.getName())) {
@@ -70,11 +69,9 @@ public class GetUserAction extends ChannelAction {
                     }
                 }
 
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -10,10 +10,7 @@ package com.xiaoleilu.loServer.action.channel;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
-import cn.wildfirechat.pojos.InputGetUserInfo;
 import cn.wildfirechat.pojos.InputModifyChannelInfo;
-import cn.wildfirechat.pojos.InputOutputUserInfo;
-import cn.wildfirechat.pojos.SendMessageResult;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -21,17 +18,12 @@ 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 io.netty.util.internal.StringUtil;
 import win.liyufan.im.IMTopic;
 
-import java.util.concurrent.Executor;
-
 @Route(APIPath.Channel_Update_Profile)
 @HttpMethod("POST")
 public class ModifyChannelProfileAction extends ChannelAction {
@@ -41,41 +33,19 @@ public class ModifyChannelProfileAction extends ChannelAction {
             InputModifyChannelInfo input = getRequestBody(request.getNettyRequest(), InputModifyChannelInfo.class);
             if (input != null) {
                 WFCMessage.ModifyChannelInfo modifyChannelInfo = WFCMessage.ModifyChannelInfo.newBuilder().setChannelId(channelInfo.getTargetId()).setType(input.getType()).setValue(input.getValue()).build();
-                RPCCenter.getInstance().sendRequest(channelInfo.getOwner(), null, IMTopic.ModifyChannelInfoTopic, modifyChannelInfo.toByteArray(), channelInfo.getOwner(), 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) {
+                sendApiMessage(response, IMTopic.ModifyChannelInfoTopic, modifyChannelInfo.toByteArray(), 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 onTimeout() {
-                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
-                    }
-
-                    @Override
-                    public Executor getResponseExecutor() {
-                        return command -> {
-                            ctx.executor().execute(command);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -11,6 +11,7 @@ package com.xiaoleilu.loServer.action.channel;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.pojos.SendChannelMessageData;
+import cn.wildfirechat.proto.ProtoConstants;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -20,8 +21,6 @@ import com.xiaoleilu.loServer.handler.Response;
 import cn.wildfirechat.pojos.Conversation;
 import cn.wildfirechat.pojos.SendMessageData;
 import cn.wildfirechat.pojos.SendMessageResult;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -29,8 +28,6 @@ import io.netty.handler.codec.http.HttpResponseStatus;
 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(APIPath.Channel_Message_Send)
@@ -46,6 +43,17 @@ public class SendMessageAction extends ChannelAction {
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             SendChannelMessageData sendChannelMessageData = getRequestBody(request.getNettyRequest(), SendChannelMessageData.class);
+            if(sendChannelMessageData.getTargets() != null && !sendChannelMessageData.getTargets().isEmpty()) {
+                if((channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Message_Unsubscribed) == 0 && (channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Global) == 0) {
+                    for (String target:sendChannelMessageData.getTargets()) {
+                        if(!messagesStore.checkUserInChannel(target, channelInfo.getTargetId())) {
+                            setResponseContent(RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_RIGHT, "User " + target + " not in channel"), response);
+                            return true;
+                        }
+                    }
+                }
+            }
+
             SendMessageData sendMessageData = new SendMessageData();
             sendMessageData.setConv(new Conversation());
             sendMessageData.getConv().setType(ConversationType_Channel);
@@ -55,43 +63,21 @@ public class SendMessageAction extends ChannelAction {
             sendMessageData.setPayload(sendChannelMessageData.getPayload());
             sendMessageData.setToUsers(sendChannelMessageData.getTargets());
             if (SendMessageData.isValide(sendMessageData)) {
-                RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
-                    @Override
-                    public void onSuccess(byte[] result) {
-                        ByteBuf byteBuf = Unpooled.buffer();
-                        byteBuf.writeBytes(result);
-                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
-                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
-                            long messageId = byteBuf.readLong();
-                            long timestamp = byteBuf.readLong();
-                            sendResponse(response, null, new SendMessageResult(messageId, timestamp));
-                        } else {
-                            sendResponse(response, errorCode, null);
-                        }
-                    }
-
-                    @Override
-                    public void onError(ErrorCode errorCode) {
+                sendApiMessage(response, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), 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 timestamp = byteBuf.readLong();
+                        sendResponse(response, null, new SendMessageResult(messageId, timestamp));
+                    } else {
                         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);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -11,7 +11,6 @@ package com.xiaoleilu.loServer.action.channel;
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputChannelSubscribe;
-import cn.wildfirechat.pojos.InputModifyChannelInfo;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
@@ -21,16 +20,12 @@ 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.Channel_Subscribe)
 @HttpMethod("POST")
 public class SubscriberChannelAction extends ChannelAction {
@@ -47,41 +42,19 @@ public class SubscriberChannelAction extends ChannelAction {
                     return true;
                 }
                 WFCMessage.ListenChannel listenChannel = WFCMessage.ListenChannel.newBuilder().setChannelId(channelInfo.getTargetId()).setListen(input.getSubscribe()).build();
-                RPCCenter.getInstance().sendRequest(input.getTarget(), null, IMTopic.ChannelListenTopic, listenChannel.toByteArray(), input.getTarget(), 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) {
+                sendApiMessage(response, input.getTarget(), IMTopic.ChannelListenTopic, listenChannel.toByteArray(), 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 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));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -14,21 +14,16 @@ import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputAddGroupMember;
 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 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.Robot_Group_Member_Add)
 @HttpMethod("POST")
 public class AddGroupMemberAction extends RobotAction {
@@ -44,41 +39,19 @@ public class AddGroupMemberAction extends RobotAction {
             InputAddGroupMember inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputAddGroupMember.class);
             inputAddGroupMember.setOperator(robot.getUid());
             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) {
+                sendApiRequest(response, IMTopic.AddGroupMemberTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), 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 onTimeout() {
-                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
-                    }
-
-                    @Override
-                    public Executor getResponseExecutor() {
-                        return command -> {
-                            ctx.executor().execute(command);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -17,21 +17,16 @@ import cn.wildfirechat.pojos.PojoGroupInfo;
 import cn.wildfirechat.proto.WFCMessage;
 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 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.Robot_Create_Group)
 @HttpMethod("POST")
 public class CreateGroupAction extends RobotAction {
@@ -50,44 +45,22 @@ public class CreateGroupAction extends RobotAction {
             if (inputCreateGroup.isValide()) {
                 PojoGroupInfo group_info = inputCreateGroup.getGroup().getGroup_info();
                 WFCMessage.CreateGroupRequest createGroupRequest = inputCreateGroup.toProtoGroupRequest();
-                RPCCenter.getInstance().sendRequest(inputCreateGroup.getOperator(), null, IMTopic.CreateGroupTopic, createGroupRequest.toByteArray(), inputCreateGroup.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) {
-                            byte[] data = new byte[byteBuf.readableBytes()];
-                            byteBuf.readBytes(data);
-                            String groupId = new String(data);
-                            sendResponse(response, null, new OutputCreateGroupResult(groupId));
-                        } else {
-                            sendResponse(response, errorCode, null);
-                        }
-                    }
-
-                    @Override
-                    public void onError(ErrorCode errorCode) {
+                sendApiRequest(response, IMTopic.CreateGroupTopic, createGroupRequest.toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                        byte[] data = new byte[byteBuf.readableBytes()];
+                        byteBuf.readBytes(data);
+                        String groupId = new String(data);
+                        sendResponse(response, null, new OutputCreateGroupResult(groupId));
+                    } else {
                         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);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -32,9 +32,7 @@ public class DeleteCallbackAction extends RobotAction {
                 robot = robot.toBuilder().clearCallback().setState(0).build();
                 messagesStore.addRobot(robot);
             }
-            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok();
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(RestResult.ok(), response);
         }
         return true;
     }

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

@@ -14,21 +14,16 @@ import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputDismissGroup;
 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 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.Robot_Group_Dismiss)
 @HttpMethod("POST")
 public class DismissGroupAction extends RobotAction {
@@ -44,41 +39,19 @@ public class DismissGroupAction extends RobotAction {
             InputDismissGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputDismissGroup.class);
             inputDismissGroup.setOperator(robot.getUid());
             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) {
+                sendApiRequest(response, IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), 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 onTimeout() {
-                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
-                    }
-
-                    @Override
-                    public Executor getResponseExecutor() {
-                        return command -> {
-                            ctx.executor().execute(command);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -33,9 +33,7 @@ public class GetCallbackAction extends RobotAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             RobotCallbackPojo out = new RobotCallbackPojo();
             out.setUrl(robot.getCallback());
-            response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(out);
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(RestResult.ok(out), response);
         }
         return true;
     }

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

@@ -41,8 +41,6 @@ public class GetGroupInfoAction extends RobotAction {
                 && (!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);
@@ -54,14 +52,15 @@ public class GetGroupInfoAction extends RobotAction {
                     pojoGroupInfo.setPortrait(groupInfo.getPortrait());
                     pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
                     pojoGroupInfo.setType(groupInfo.getType());
+                    pojoGroupInfo.setMute(groupInfo.getMute());
+                    pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
+                    pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
+                    pojoGroupInfo.setSearchable(groupInfo.getSearchable());
                     result = RestResult.ok(pojoGroupInfo);
                 }
-
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -48,9 +48,6 @@ public class GetGroupMembersAction extends RobotAction {
 
                 List<WFCMessage.GroupMember> members = new ArrayList<>();
                 ErrorCode errorCode = messagesStore.getGroupMembers(null, inputGetGroup.getGroupId(), 0, members);
-
-
-                response.setStatus(HttpResponseStatus.OK);
                 RestResult result;
                 if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
                     result = RestResult.resultOf(errorCode);
@@ -69,6 +66,7 @@ public class GetGroupMembersAction extends RobotAction {
                         pm.setMember_id(member.getMemberId());
                         pm.setAlias(member.getAlias());
                         pm.setType(member.getType());
+                        pm.setExtra(member.getExtra());
                         out.getMembers().add(pm);
                     }
                     if(!isInGroup) {
@@ -77,11 +75,9 @@ public class GetGroupMembersAction extends RobotAction {
                     result = RestResult.ok(out);
                 }
 
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -43,19 +43,15 @@ public class GetUserAction extends RobotAction {
                     user = messagesStore.getUserInfoByMobile(inputUserId.getMobile());
                 }
 
-                response.setStatus(HttpResponseStatus.OK);
                 RestResult result;
                 if (user == null) {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                 } else {
                     result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
                 }
-
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(result, response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -14,21 +14,16 @@ import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputKickoffGroupMember;
 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 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.Robot_Group_Member_Kickoff)
 @HttpMethod("POST")
 public class KickoffGroupMemberAction extends RobotAction {
@@ -44,41 +39,19 @@ public class KickoffGroupMemberAction extends RobotAction {
             InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
             inputKickoffGroupMember.setOperator(robot.getUid());
             if (inputKickoffGroupMember.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.KickoffGroupMemberTopic, 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) {
+                sendApiRequest(response, IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), 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 onTimeout() {
-                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
-                    }
-
-                    @Override
-                    public Executor getResponseExecutor() {
-                        return command -> {
-                            ctx.executor().execute(command);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -14,21 +14,16 @@ import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputModifyGroupInfo;
 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 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.Robot_Group_Modify_Info)
 @HttpMethod("POST")
 public class ModifyGroupInfoAction extends RobotAction {
@@ -44,41 +39,19 @@ public class ModifyGroupInfoAction extends RobotAction {
             InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class);
             inputAddGroupMember.setOperator(robot.getUid());
             if (inputAddGroupMember.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.ModifyGroupInfoTopic, 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) {
+                sendApiRequest(response, IMTopic.ModifyGroupInfoTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), 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 onTimeout() {
-                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
-                    }
-
-                    @Override
-                    public Executor getResponseExecutor() {
-                        return command -> {
-                            ctx.executor().execute(command);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -14,21 +14,16 @@ import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputSetGroupMemberAlias;
 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 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.Robot_Group_Set_Member_Alias)
 @HttpMethod("POST")
 public class ModifyGroupMemberAliasAction extends RobotAction {
@@ -44,41 +39,19 @@ public class ModifyGroupMemberAliasAction extends RobotAction {
             InputSetGroupMemberAlias inputSetGroupMemberAlias = getRequestBody(request.getNettyRequest(), InputSetGroupMemberAlias.class);
             inputSetGroupMemberAlias.setOperator(robot.getUid());
             if (inputSetGroupMemberAlias.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputSetGroupMemberAlias.getOperator(), null, IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), inputSetGroupMemberAlias.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) {
+                sendApiRequest(response, IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), 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 onTimeout() {
-                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
-                    }
-
-                    @Override
-                    public Executor getResponseExecutor() {
-                        return command -> {
-                            ctx.executor().execute(command);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -14,21 +14,16 @@ import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputQuitGroup;
 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 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.Robot_Group_Member_Quit)
 @HttpMethod("POST")
 public class QuitGroupMemberAction extends RobotAction {
@@ -44,41 +39,19 @@ public class QuitGroupMemberAction extends RobotAction {
             InputQuitGroup inputQuitGroup = getRequestBody(request.getNettyRequest(), InputQuitGroup.class);
             inputQuitGroup.setOperator(robot.getUid());
             if (inputQuitGroup.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputQuitGroup.getOperator(), null, IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), inputQuitGroup.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) {
+                sendApiRequest(response, IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), 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 onTimeout() {
-                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
-                    }
-
-                    @Override
-                    public Executor getResponseExecutor() {
-                        return command -> {
-                            ctx.executor().execute(command);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -15,6 +15,7 @@ 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.ServerAPIHelper;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
@@ -28,6 +29,7 @@ import win.liyufan.im.RateLimiter;
 import win.liyufan.im.Utility;
 
 import java.io.UnsupportedEncodingException;
+import java.util.concurrent.Executor;
 
 abstract public class RobotAction extends Action {
     protected static final Logger LOG = LoggerFactory.getLogger(RobotAction.class);
@@ -35,6 +37,10 @@ abstract public class RobotAction extends Action {
 
     protected WFCMessage.Robot robot;
 
+    protected interface Callback {
+        void onSuccess(byte[] response);
+    }
+
     @Override
     public ErrorCode preAction(Request request, Response response) {
         String nonce = request.getHeader("nonce");
@@ -117,4 +123,30 @@ abstract public class RobotAction extends Action {
         }
         return null;
     }
+
+    protected void sendApiRequest(Response response, String topic, byte[] message, Callback callback) {
+        ServerAPIHelper.sendRequest(robot.getUid(), null, topic, message, new ServerAPIHelper.Callback() {
+            @Override
+            public void onSuccess(byte[] response) {
+                callback.onSuccess(response);
+            }
+
+            @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);
+                };
+            }
+        }, false, true);
+    }
 }

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

@@ -18,8 +18,6 @@ import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
 import cn.wildfirechat.pojos.SendMessageData;
 import cn.wildfirechat.pojos.SendMessageResult;
-import io.moquette.persistence.RPCCenter;
-import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -27,8 +25,6 @@ import io.netty.handler.codec.http.HttpResponseStatus;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
-import java.util.concurrent.Executor;
-
 @Route(APIPath.Robot_Message_Send)
 @HttpMethod("POST")
 public class SendMessageAction extends RobotAction {
@@ -44,43 +40,21 @@ public class SendMessageAction extends RobotAction {
             SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
             sendMessageData.setSender(robot.getUid());
             if (SendMessageData.isValide(sendMessageData)) {
-                RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
-                    @Override
-                    public void onSuccess(byte[] result) {
-                        ByteBuf byteBuf = Unpooled.buffer();
-                        byteBuf.writeBytes(result);
-                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
-                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
-                            long messageId = byteBuf.readLong();
-                            long timestamp = byteBuf.readLong();
-                            sendResponse(response, null, new SendMessageResult(messageId, timestamp));
-                        } else {
-                            sendResponse(response, errorCode, null);
-                        }
-                    }
-
-                    @Override
-                    public void onError(ErrorCode errorCode) {
+                sendApiRequest(response, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), 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 timestamp = byteBuf.readLong();
+                        sendResponse(response, null, new SendMessageResult(messageId, timestamp));
+                    } else {
                         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);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -35,14 +35,9 @@ public class SetCallbackAction extends RobotAction {
                     robot = robot.toBuilder().setCallback(input.getUrl()).setState(1).build();
                     messagesStore.addRobot(robot);
                 }
-
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.ok();
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.ok(), response);
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -14,21 +14,16 @@ import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputTransferGroup;
 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 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.Robot_Group_Transfer)
 @HttpMethod("POST")
 public class TransferGroupAction extends RobotAction {
@@ -44,41 +39,19 @@ public class TransferGroupAction extends RobotAction {
             InputTransferGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputTransferGroup.class);
             inputDismissGroup.setOperator(robot.getUid());
             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) {
+                sendApiRequest(response, IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), 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 onTimeout() {
-                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
-                    }
-
-                    @Override
-                    public Executor getResponseExecutor() {
-                        return command -> {
-                            ctx.executor().execute(command);
-                        };
-                    }
-                }, false);
+                });
                 return false;
             } else {
-                response.setStatus(HttpResponseStatus.OK);
-                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
-                response.setContent(new Gson().toJson(result));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -76,7 +76,6 @@ public class UpdateProfileAction extends RobotAction {
                     break;
             }
 
-            response.setStatus(HttpResponseStatus.OK);
             RestResult result = RestResult.ok();
             if(modified) {
                 try {
@@ -86,8 +85,7 @@ public class UpdateProfileAction extends RobotAction {
                     result.setErrorCode(ErrorCode.ERROR_CODE_SERVER_ERROR);
                 }
             }
-
-            response.setContent(new Gson().toJson(result));
+            setResponseContent(result, response);
         }
         return true;
     }

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

@@ -85,6 +85,8 @@ public final class BrokerConstants {
     public static final String QINIU_BUCKET_FAVORITE_DOMAIN = "qiniu.bucket_favorite_domain";
 
     public static final String FILE_STORAGE_ROOT = "local.media.storage.root";
+    public static final String FILE_STORAGE_REMOTE_SERVER_URL = "local.media.storage.remote_server_url";
+
     public static final String USER_QINIU = "media.server.use_qiniu";
 
     public static final String PUSH_ANDROID_SERVER_ADDRESS = "push.android.server.address";
@@ -155,6 +157,7 @@ public final class BrokerConstants {
     public static final String GROUP_Visible_Quit_Kickoff_Notification = "group.visible_quit_or_kickoff_notification";
 
     public static final String USER_HIDE_PROPERTIES = "user.hide_properties";
+    public static final String SYNC_Data_Part_Size = "sync.data_part_size";
 
     public static final String MESSAGES_FORBIDDEN_CLIENT_SEND_TYPES = "message.forbidden_client_send_types";
     public static final String MESSAGES_BLACKLIST_EXCEPTION_TYPES = "message.blacklist_exception_types";
@@ -164,6 +167,8 @@ public final class BrokerConstants {
     public static final String MESSAGES_DISABLE_REMOTE_SEARCH = "message.disable_remote_search";
 
     public static final String MESSAGES_RECALL_TIME_LIMIT = "message.recall_time_limit";
+    public static final String MESSAGES_DISABLE_GROUP_MANAGER_RECALL = "message.disable_group_manager_recall";
+
 
     private BrokerConstants() {
     }

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

@@ -30,7 +30,7 @@ public class AddFriendHandler extends GroupHandler<WFCMessage.AddFriendRequest>
                     publisher.publishNotification(IMTopic.NotifyFriendRequestTopic, request.getTargetUid(), head[0], fromUser, request.getReason());
                 } else if(user != null && user.getType() == ProtoConstants.UserType.UserType_Robot) {
                     WFCMessage.HandleFriendRequest handleFriendRequest = WFCMessage.HandleFriendRequest.newBuilder().setTargetUid(fromUser).setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Accepted).build();
-                    mServer.internalRpcMsg(request.getTargetUid(), null, handleFriendRequest.toByteArray(), 0, fromUser, HandleFriendRequestTopic, false);
+                    mServer.onApiMessage(request.getTargetUid(), null, handleFriendRequest.toByteArray(), 0, fromUser, HandleFriendRequestTopic, false, false);
                 }
             }
             return errorCode;

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

@@ -22,7 +22,7 @@ public class AddGroupMember extends GroupHandler<WFCMessage.AddGroupMemberReques
 
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getAddedMemberList());
+        ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getAddedMemberList(), request.getExtra());
         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/ChannelListenMember.java

@@ -25,7 +25,7 @@ public class ChannelListenMember extends IMHandler<WFCMessage.ListenChannel> {
         ErrorCode errorCode = m_messagesStore.listenChannel(fromUser, request.getChannelId(), request.getListen()>0);
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingListenedChannels).setKey(request.getChannelId()).setValue(request.getListen() > 0 ? "1" : "0").build();
-            mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false);
+            mServer.onApiMessage(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false, false);
 
             publisher.notifyChannelListenStatusChanged(m_messagesStore.getChannelInfo(request.getChannelId()), fromUser, request.getListen() > 0);
         }

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

@@ -40,7 +40,7 @@ public class CreateChannelHandler extends GroupHandler<WFCMessage.ChannelInfo> {
 
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingMyChannels).setKey(request.getTargetId()).setValue("1").build();
-            mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false);
+            mServer.onApiMessage(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false, false);
             byte[] data = request.getTargetId().getBytes();
             ackPayload.ensureWritable(data.length).writeBytes(data);
             return ErrorCode.ERROR_CODE_SUCCESS;

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

@@ -32,7 +32,7 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
             return ErrorCode.ERROR_CODE_NOT_RIGHT;
         }
 
-        WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList(), isAdmin);
+        WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList(), request.getMemberExtra(), isAdmin);
 
         if (groupInfo != null) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0 && (isAdmin || m_messagesStore.isAllowClientCustomGroupNotification())) {

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

@@ -24,7 +24,7 @@ public class DistoryChannelHandler extends GroupHandler<WFCMessage.IDBuf> {
         ErrorCode errorCode = m_messagesStore.distoryChannel(fromUser, request.getId());
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingMyChannels).setKey(request.getId()).setValue("0").build();
-            mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false);
+            mServer.onApiMessage(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false, false);
         }
         return errorCode;
     }

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

@@ -10,12 +10,15 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
 import com.qiniu.util.Auth;
 import com.xiaoleilu.loServer.action.UploadFileAction;
 import io.moquette.server.config.MediaServerConfig;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 
+import static io.moquette.server.config.MediaServerConfig.FILE_STROAGE_REMOTE_SERVER_URL;
+
 @Handler("GMUT")
 public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTokenRequest> {
     @Override
@@ -80,8 +83,12 @@ public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTo
             resultBuilder.setPort(80);
         } else {
             token = UploadFileAction.getToken(type);
-            resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT)
-                .setServer(MediaServerConfig.SERVER_IP);
+            if(StringUtil.isNullOrEmpty(MediaServerConfig.FILE_STROAGE_REMOTE_SERVER_URL)) {
+                resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT);
+            } else {
+                resultBuilder.setDomain(MediaServerConfig.FILE_STROAGE_REMOTE_SERVER_URL);
+            }
+            resultBuilder.setServer(MediaServerConfig.SERVER_IP);
             resultBuilder.setPort(MediaServerConfig.HTTP_SERVER_PORT);
         }
 

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

@@ -18,7 +18,7 @@ import win.liyufan.im.IMTopic;
 public class PutUserSettingHandler extends IMHandler<WFCMessage.ModifyUserSettingReq> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyUserSettingReq request, Qos1PublishHandler.IMCallback callback) {
-            m_messagesStore.updateUserSettings(fromUser, request);
+            m_messagesStore.updateUserSettings(fromUser, request, clientID);
             return ErrorCode.ERROR_CODE_SUCCESS;
     }
 }

broker/src/main/java/io/moquette/persistence/DatabaseStore.java

@@ -332,7 +332,7 @@ public class DatabaseStore {
             String sql = "select `_mid`" +
                 ", `_alias`" +
                 ", `_type`" +
-                ", `_dt`, `_create_dt` from t_group_member where _gid = ?";
+                ", `_dt`, `_create_dt`, `_extra` from t_group_member where _gid = ?";
             statement = connection.prepareStatement(sql);
 
             statement.setString(1, groupId);
@@ -362,6 +362,10 @@ public class DatabaseStore {
                 longValue = rs.getLong(index++);
                 builder.setCreateDt(longValue);
 
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setExtra(value);
+
                 WFCMessage.GroupMember member = builder.build();
                 groupMembers.put(groupId, member);
             }
@@ -442,7 +446,7 @@ public class DatabaseStore {
 
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `_uid`, `_friend_uid`, `_reason`, `_status`, `_dt`, `_from_read_status`, `_to_read_status` from t_friend_request";
+            String sql = "select `_uid`, `_friend_uid`, `_reason`, `_status`, `_dt`, `_from_read_status`, `_to_read_status`, `_extra` from t_friend_request";
             statement = connection.prepareStatement(sql);
 
             int index;
@@ -476,6 +480,9 @@ public class DatabaseStore {
                 intvalue = rs.getInt(index++);
                 builder.setToReadStatus(intvalue > 0);
 
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setExtra(value);
 
                 WFCMessage.FriendRequest request = builder.build();
                 requestMap.put(request.getFromUid(), request);
@@ -696,7 +703,7 @@ public class DatabaseStore {
     }
 
     MessageBundle getMessage(long messageId) {
-        String sql = "select  `_from`, `_type`, `_target`, `_line`, `_data`, `_dt` from " + MessageShardingUtil.getMessageTable(messageId) +" where _mid = ? limit 1";
+        String sql = "select  `_from`, `_type`, `_target`, `_line`, `_data`, `_dt` from " + MessageShardingUtil.getMessageTable(messageId) +" where _mid = ? order by `_dt` DESC limit 1";
         Connection connection = null;
         PreparedStatement statement = null;
         ResultSet resultSet = null;
@@ -1713,11 +1720,12 @@ public class DatabaseStore {
                     ", `_mid`" +
                     ", `_alias`" +
                     ", `_type`" +
-                    ", `_dt`, `_create_dt`) values(?, ?, ?, ?, ?, ?)" +
+                    ", `_dt`, `_create_dt`, `_extra`) values(?, ?, ?, ?, ?, ?,?)" +
                     " ON DUPLICATE KEY UPDATE " +
                     "`_alias` = ?," +
                     "`_type` = ?," +
-                    "`_dt` = ?";
+                    "`_dt` = ?," +
+                    "`_extra` = ?";
                 if(updateCreateTime) {
                     sql += ", `_create_dt` = ?";
                 }
@@ -1738,9 +1746,11 @@ public class DatabaseStore {
                     statement.setInt(index++, member.getType());
                     statement.setLong(index++, dt);
                     statement.setLong(index++, member.getCreateDt());
+                    statement.setString(index++, member.getExtra());
                     statement.setString(index++, member.getAlias());
                     statement.setInt(index++, member.getType());
                     statement.setLong(index++, dt);
+                    statement.setString(index++, member.getExtra());
                     if(updateCreateTime) {
                         statement.setLong(index++, dt);
                     }
@@ -2680,14 +2690,14 @@ public class DatabaseStore {
                 ", `_status`" +
                 ", `_dt`" +
                 ", `_from_read_status`" +
-                ", `_to_read_status` from t_friend_request where `_uid` = ? UNION ALL " +
+                ", `_to_read_status`, `_extra` from t_friend_request where `_uid` = ? UNION ALL " +
                 "select   `_uid`" +
                 ", `_friend_uid`" +
                 ", `_reason`" +
                 ", `_status`" +
                 ", `_dt`" +
                 ", `_from_read_status`" +
-                ", `_to_read_status` from t_friend_request where `_friend_uid` = ?";
+                ", `_to_read_status`, `_extra` from t_friend_request where `_friend_uid` = ?";
             statement = connection.prepareStatement(sql);
 
             int index = 1;
@@ -2725,6 +2735,10 @@ public class DatabaseStore {
                 b = rs.getBoolean(index++);
                 builder.setToReadStatus(b);
 
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setExtra(value);
+
                 out.add(builder.build());
             }
             return out;
@@ -2772,13 +2786,14 @@ public class DatabaseStore {
             PreparedStatement statement = null;
             try {
                 connection = DBUtil.getConnection();
-                String sql = "insert into t_friend_request (`_uid`, `_friend_uid`, `_reason`, `_status`, `_dt`, `_from_read_status`, `_to_read_status`) values(?, ?, ?, ?, ?, ?, ?)" +
+                String sql = "insert into t_friend_request (`_uid`, `_friend_uid`, `_reason`, `_status`, `_dt`, `_from_read_status`, `_to_read_status`, `_extra`) values(?, ?, ?, ?, ?, ?, ?, ?)" +
                     " ON DUPLICATE KEY UPDATE " +
                     "`_reason` = ?," +
                     "`_status` = ?," +
                     "`_dt` = ?," +
                     "`_from_read_status` = ?," +
-                    "`_to_read_status` = ?";
+                    "`_to_read_status` = ?," +
+                    "`_extra` = ?";
 
                 statement = connection.prepareStatement(sql);
                 int index = 1;
@@ -2789,12 +2804,14 @@ public class DatabaseStore {
                 statement.setLong(index++, request.getUpdateDt());
                 statement.setInt(index++, request.getFromReadStatus() ? 1 : 0);
                 statement.setInt(index++, request.getToReadStatus() ? 1 : 0);
+                statement.setString(index++, request.getExtra());
 
                 statement.setString(index++, request.getReason());
                 statement.setInt(index++, request.getStatus());
                 statement.setLong(index++, request.getUpdateDt());
                 statement.setInt(index++, request.getFromReadStatus() ? 1 : 0);
                 statement.setInt(index++, request.getToReadStatus() ? 1 : 0);
+                statement.setString(index++, request.getExtra());
                 int count = statement.executeUpdate();
                 LOG.info("Update rows {}", count);
             } catch (SQLException e) {

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -130,7 +130,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     private long mFriendRequestDuration = 7 * 24 * 60 * 60 * 1000;
     private long mFriendRejectDuration = 30 * 24 * 60 * 60 * 1000;
     private long mFriendRequestExpiration = 7 * 24 * 60 * 60 * 1000;
-    private boolean mFriendNewWelcomeMessage = false;
+    private boolean mFriendNewWelcomeMessage = true;
 
     private boolean mMultiPlatformNotification = false;
     private boolean mDisableStrangerChat = false;
@@ -144,7 +144,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     private List<Integer> mGlobalMuteExceptionTypes = new ArrayList<>();
 
     private long mRecallTimeLimit = 300;
-
+    private boolean mDisableGroupManagerRecall = false;
     private String mGroupInfoUpdateCallback;
     private String mGroupMemberUpdateCallback;
     private String mRelationUpdateCallback;
@@ -154,6 +154,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     private String mChatroomMemberUpdateCallback;
     private boolean mGroupAllowClientCustomOperationNotification;
     private int mGroupVisibleQuitKickoffNotification;
+    private int mSyncDataPartSize = 0;
 
     private Set<Integer> mUserHideProperties = new HashSet<>();
 
@@ -178,7 +179,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         } catch (Exception e) {
             e.printStackTrace();
             Utility.printExecption(LOG, e);
-            printMissConfigLog(SERVER_MULTI_PLATFROM_NOTIFICATION, mDisableStrangerChat + "");
+            printMissConfigLog(SERVER_MULTI_PLATFROM_NOTIFICATION, mMultiPlatformNotification + "");
         }
 
         try {
@@ -263,6 +264,12 @@ public class MemoryMessagesStore implements IMessagesStore {
         } catch (Exception e) {
         }
 
+        try {
+            mDisableGroupManagerRecall = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_DISABLE_GROUP_MANAGER_RECALL, "false"));
+        } catch (Exception e) {
+
+        }
+
         try {
             String strTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_FORBIDDEN_CLIENT_SEND_TYPES);
             if(!StringUtil.isNullOrEmpty(strTypes)) {
@@ -375,6 +382,12 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         }
 
+        try {
+            mSyncDataPartSize = Integer.parseInt(server.getConfig().getProperty(SYNC_Data_Part_Size, "0"));
+        } catch (Exception e) {
+
+        }
+
 
         try {
             String userHideStr = server.getConfig().getProperty(USER_HIDE_PROPERTIES);
@@ -513,19 +526,27 @@ public class MemoryMessagesStore implements IMessagesStore {
             if (channelInfo != null) {
                 notifyReceivers.add(fromUser);
                 if (channelInfo.getOwner().equals(fromUser)) {
-                    Collection<String> listeners = getChannelListener(message.getConversation().getTarget());
-                    if (!StringUtil.isNullOrEmpty(message.getToUser())) {
-                        if (listeners.contains(message.getToUser())) {
-                            notifyReceivers.add(message.getToUser());
-                        }
-                    } else if(message.getToList() != null && !message.getToList().isEmpty()) {
-                        for (String to:message.getToList()) {
-                            if (listeners.contains(to)) {
-                                notifyReceivers.add(to);
-                            }
+                    if((channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Global) > 0) {
+                        if((message.getToList() != null && !message.getToList().isEmpty())) {
+                            notifyReceivers.addAll(message.getToList());
+                        } else {
+                            notifyReceivers.addAll(getAllEnds());
                         }
                     } else {
-                        notifyReceivers.addAll(listeners);
+                        Collection<String> listeners = getChannelListener(message.getConversation().getTarget());
+                        if (!StringUtil.isNullOrEmpty(message.getToUser())) {
+                            if (listeners.contains(message.getToUser()) || (channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Message_Unsubscribed) > 0) {
+                                notifyReceivers.add(message.getToUser());
+                            }
+                        } else if (message.getToList() != null && !message.getToList().isEmpty()) {
+                            for (String to : message.getToList()) {
+                                if (listeners.contains(to) || (channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Message_Unsubscribed) > 0) {
+                                    notifyReceivers.add(to);
+                                }
+                            }
+                        } else {
+                            notifyReceivers.addAll(listeners);
+                        }
                     }
                 } else {
                     if (StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) {
@@ -920,7 +941,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public WFCMessage.GroupInfo createGroup(String fromUser, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList, boolean isAdmin) {
+    public WFCMessage.GroupInfo createGroup(String fromUser, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList, String memberExtra, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
 
@@ -942,19 +963,39 @@ public class MemoryMessagesStore implements IMessagesStore {
         List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
         boolean hasOwnerMember = false;
         for (WFCMessage.GroupMember member : memberList) {
+            WFCMessage.GroupMember.Builder builder = member.toBuilder();
+            builder.setUpdateDt(dt).setCreateDt(dt);
             if (member.getMemberId().equals(owner)) {
-                member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
+                builder.setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner);
                 hasOwnerMember = true;
             } else {
-                member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).build();
+                if (isAdmin) {
+                    if (member.getType() == GroupMemberType_Owner) {
+                        builder.setType(GroupMemberType_Normal);
+                        LOG.error("group member conflicted, group info owner is {}, and group member {} type is owner, set the member to normal member", owner, member.getMemberId());
+                    }
+                } else {
+                    builder.setType(GroupMemberType_Normal);
+                }
             }
+
+            if(!StringUtil.isNullOrEmpty(memberExtra)) {
+                builder.setExtra(memberExtra);
+            }
+
+            member = builder.build();
             groupMembers.put(groupId, member);
             updatedMemberList.add(member);
             dt++;
         }
 
         if(!hasOwnerMember && !StringUtil.isNullOrEmpty(owner)) {
-            WFCMessage.GroupMember member = WFCMessage.GroupMember.newBuilder().setMemberId(owner).setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
+            WFCMessage.GroupMember member;
+            if(!StringUtil.isNullOrEmpty(memberExtra)) {
+                member = WFCMessage.GroupMember.newBuilder().setMemberId(owner).setExtra(memberExtra).setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
+            } else {
+                member = WFCMessage.GroupMember.newBuilder().setMemberId(owner).setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
+            }
             groupMembers.put(groupId, member);
             updatedMemberList.add(member);
         }
@@ -1098,7 +1139,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList) {
+    public ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList, String extra) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
 
@@ -1155,18 +1196,24 @@ public class MemoryMessagesStore implements IMessagesStore {
         List<WFCMessage.GroupMember> tmp = new ArrayList<>();
         ArrayList<String> newInviteUsers = new ArrayList<>();
         for (WFCMessage.GroupMember member : memberList) {
+            WFCMessage.GroupMember.Builder builder = member.toBuilder();
+            builder.setUpdateDt(updateDt).setCreateDt(updateDt);
             if (member.getMemberId().equals(groupInfo.getOwner())) {
-                member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).setCreateDt(updateDt).build();
+                builder.setType(GroupMemberType_Owner).build();
             } else {
                 if (isAdmin) {
-                    if (member.getType() != GroupMemberType_Owner)
-                        member = member.toBuilder().setUpdateDt(updateDt).setCreateDt(updateDt).build();
-                    else
-                        return ErrorCode.INVALID_PARAMETER;
+                    if (member.getType() == GroupMemberType_Owner) {
+                        builder.setType(GroupMemberType_Normal);
+                        LOG.error("group member conflicted, group info owner is {}, and group member {} type is owner, set the member to normal member", groupInfo.getOwner(), member.getMemberId());
+                    }
                 } else {
-                    member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).setCreateDt(updateDt).build();
+                    builder.setType(GroupMemberType_Normal);
                 }
             }
+            if(!StringUtil.isNullOrEmpty(extra)) {
+                builder.setExtra(extra);
+            }
+            member = builder.build();
             tmp.add(member);
             newInviteUsers.add(member.getMemberId());
             updateDt++;
@@ -1832,7 +1879,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 }
             }
 
-            if (!canRecall && message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group) {
+            if (!canRecall && !mDisableGroupManagerRecall && message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group) {
                 IMap<String, WFCMessage.GroupInfo> groupMap = hzInstance.getMap(GROUPS_MAP);
 
                 WFCMessage.GroupInfo groupInfo = groupMap.get(message.getConversation().getTarget());
@@ -2098,7 +2145,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         if (session.getPlatform() == Platform_LINUX || session.getPlatform() == Platform_Windows || session.getPlatform() == Platform_OSX) {
-            updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(online ? (System.currentTimeMillis()  + "|"  + session.getPlatform() + "|" + session.getClientID() + "|" + session.getPhoneName()) : "").build());
+            updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(online ? (System.currentTimeMillis()  + "|"  + session.getPlatform() + "|" + session.getClientID() + "|" + session.getPhoneName()) : "").build(), session.clientID);
         } else {
             String value = null;
             for (MemorySessionStore.Session s : m_Server.getStore().sessionsStore().sessionForUser(session.username)) {
@@ -2124,11 +2171,11 @@ public class MemoryMessagesStore implements IMessagesStore {
             WFCMessage.UserSettingEntry pcentry = getUserSetting(session.getUsername(), kUserSettingPCOnline, "PC");
             if (value != null) {
                 if (pcentry == null || StringUtil.isNullOrEmpty(pcentry.getValue())) {
-                    updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(value).build());
+                    updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(value).build(), session.clientID);
                 }
             } else {
                 if (pcentry != null && !StringUtil.isNullOrEmpty(pcentry.getValue())) {
-                    updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue("").build());
+                    updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue("").build(), session.clientID);
                 }
             }
         }
@@ -2452,6 +2499,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
+
         if (mDisableStrangerChat) {
             //在禁止私聊时，允许机器人，物联网设备及管理员进行私聊。
             IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
@@ -2532,6 +2580,11 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
+        if(mSyncDataPartSize > 0 && out.size() > mSyncDataPartSize) {
+            out.sort(Comparator.comparingLong(FriendData::getTimestamp));
+            out = out.subList(0, mSyncDataPartSize);
+        }
+
         return out;
     }
 
@@ -2577,12 +2630,16 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
+        if(mSyncDataPartSize > 0 && out.size() > mSyncDataPartSize) {
+            out.sort(Comparator.comparingLong(WFCMessage.FriendRequest::getUpdateDt));
+            out = out.subList(0, mSyncDataPartSize);
+        }
         return out;
     }
 
     @Override
     public ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head, boolean isAdmin) {
-        if (mDisableFriendRequest) {
+        if (!isAdmin && mDisableFriendRequest) {
             return ErrorCode.ERROR_CODE_NOT_RIGHT;
         }
 
@@ -2635,6 +2692,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             .setFromUid(userId)
             .setToUid(request.getTargetUid())
             .setReason(request.getReason())
+            .setExtra(request.getExtra())
             .setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Sent)
             .setToReadStatus(false)
             .setUpdateDt(System.currentTimeMillis())
@@ -3069,6 +3127,12 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
+        if(mSyncDataPartSize > 0 && ec == ErrorCode.ERROR_CODE_SUCCESS && builder.getEntryCount() > mSyncDataPartSize) {
+            List<WFCMessage.UserSettingEntry> list = new ArrayList<>(builder.getEntryList());
+            list.sort(Comparator.comparingLong(WFCMessage.UserSettingEntry::getUpdateDt));
+            list = list.subList(0, mSyncDataPartSize);
+            builder.clearEntry().addAllEntry(list);
+        }
         return ec;
     }
 
@@ -3128,7 +3192,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public long updateUserSettings(String userId, WFCMessage.ModifyUserSettingReq request) {
+    public long updateUserSettings(String userId, WFCMessage.ModifyUserSettingReq request, String clientId) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
 
@@ -3168,7 +3232,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         } else if(request.getScope() == UserSettingScope.kUserSettingHiddenNotificationDetail) {
             userPushHiddenDetail.remove(userId);
         }
-        IMHandler.getPublisher().publishNotification(IMTopic.NotifyUserSettingTopic, userId, updateDt);
+        IMHandler.getPublisher().publishNotification(IMTopic.NotifyUserSettingTopic, userId, updateDt, clientId);
         return updateDt;
     }
 
@@ -3400,6 +3464,11 @@ public class MemoryMessagesStore implements IMessagesStore {
     public ErrorCode listenChannel(String operator, String channelId, boolean listen) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
+        IMap<String, WFCMessage.ChannelInfo> mIMap = hzInstance.getMap(CHANNELS);
+        WFCMessage.ChannelInfo channelInfo = mIMap.get(channelId);
+        if(channelInfo != null && (channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Private) > 0) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
 
         getChannelListener(channelId);
 
@@ -3435,12 +3504,12 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public boolean checkUserInChannel(String user, String channelId) {
-        Collection<String> chatroomMembers = getChannelListener(channelId);
-        if (chatroomMembers == null) {
+        Collection<String> channelMembers = getChannelListener(channelId);
+        if (channelMembers == null) {
             return false;
         }
 
-        if(!chatroomMembers.contains(user)) {
+        if(!channelMembers.contains(user)) {
             IMap<String, WFCMessage.ChannelInfo> mIMap = m_Server.getHazelcastInstance().getMap(CHANNELS);
             WFCMessage.ChannelInfo info = mIMap.get(channelId);
             if (info == null || !info.getOwner().equals(user)) {

broker/src/main/java/io/moquette/persistence/ServerAPIHelper.java

@@ -16,18 +16,18 @@ import cn.wildfirechat.common.ErrorCode;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class RPCCenter {
-    private static final Logger LOG = LoggerFactory.getLogger(RPCCenter.class);
+public class ServerAPIHelper {
+    private static final Logger LOG = LoggerFactory.getLogger(ServerAPIHelper.class);
     public static final String CHECK_USER_ONLINE_REQUEST = "check_user_online";
     public static final String KICKOFF_USER_REQUEST = "kickoff_user";
 
-    private Server server;
-    public ConcurrentHashMap<Integer, RequestInfo> requestMap = new ConcurrentHashMap<>();
-    private AtomicInteger aiRequestId = new AtomicInteger(1);
-    public ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(2);
+    private static Server server;
+    public static ConcurrentHashMap<Integer, RequestInfo> requestMap = new ConcurrentHashMap<>();
+    private static AtomicInteger aiRequestId = new AtomicInteger(1);
+    public static ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(2);
 
-    public void init(Server server) {
-        this.server = server;
+    public static void init(Server s) {
+        server = s;
     }
 
     public interface Callback {
@@ -37,18 +37,11 @@ public class RPCCenter {
         Executor getResponseExecutor();
     }
 
-    private static RPCCenter instance;
-
-    public static RPCCenter getInstance() {
-        if (instance == null) {
-            instance = new RPCCenter();
-        }
-        return instance;
+    public static void sendRequest(String fromUser, String clientId, String request, byte[] message, Callback callback, boolean isAdmin) {
+        sendRequest(fromUser, clientId, request, message, callback, isAdmin, false);
     }
 
-    protected RPCCenter() {}
-
-    public void sendRequest(String fromUser, String clientId, String request, byte[] message, String target, TargetEntry.Type type, Callback callback, boolean isAdmin) {
+    public static void sendRequest(String fromUser, String clientId, String request, byte[] message, Callback callback, boolean isAdmin, boolean isRobotOrChannel) {
         int requestId = 0;
 
         if (callback != null) {
@@ -61,10 +54,10 @@ public class RPCCenter {
             requestMap.put(requestId, new RequestInfo(fromUser, clientId, callback, message, requestId, request));
         }
 
-        server.internalRpcMsg(fromUser, clientId, message, requestId, "", request, isAdmin);
+        server.onApiMessage(fromUser, clientId, message, requestId, "", request, isAdmin, isRobotOrChannel);
     }
 
-    public void sendResponse(int errorCode, byte[] message, String toUuid, int requestId) {
+    public static void sendResponse(int errorCode, byte[] message, String toUuid, int requestId) {
         LOG.debug("send async reponse to {} with requestId {}", toUuid, requestId);
         if (requestId > 0) {
             RequestInfo info = requestMap.remove(requestId);

broker/src/main/java/io/moquette/persistence/TargetEntry.java

@@ -1,24 +0,0 @@
-/*
- * 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.persistence;
-
-public class TargetEntry {
-    public TargetEntry(Type type, String target) {
-        this.type = type;
-        this.target = target;
-    }
-
-    public enum Type {
-        TARGET_TYPE_USER,
-        TARGET_TYPE_CHATROOM,
-        TARGET_TYPE_MASTER_NODE,
-    }
-    public Type type;
-    public String target;
-}

broker/src/main/java/io/moquette/persistence/remote/RequestInfo.java

@@ -8,7 +8,7 @@
 
 package io.moquette.persistence.remote;
 
-import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.ServerAPIHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit;
 
 public class RequestInfo {
     private static final Logger LOG = LoggerFactory.getLogger(RequestInfo.class);
-    public final RPCCenter.Callback callback;
+    public final ServerAPIHelper.Callback callback;
     final byte[] message;
     final int requestId;
     final String fromUser;
@@ -25,15 +25,15 @@ public class RequestInfo {
     final String clientId;
     public final ScheduledFuture future;
 
-    public RequestInfo(String fromUser, String clientId, RPCCenter.Callback callback, byte[] message, int requestId, String request) {
+    public RequestInfo(String fromUser, String clientId, ServerAPIHelper.Callback callback, byte[] message, int requestId, String request) {
         this.callback = callback;
         this.message = message;
         this.requestId = requestId;
         this.fromUser = fromUser;
         this.clientId = clientId;
         this.request = request;
-        this.future = RPCCenter.getInstance().scheduledExecutorService.schedule(() -> {
-            RequestInfo info = RPCCenter.getInstance().requestMap.remove(requestId);
+        this.future = ServerAPIHelper.scheduledExecutorService.schedule(() -> {
+            RequestInfo info = ServerAPIHelper.requestMap.remove(requestId);
             if (info != null) {
                 LOG.error("Request timeout. fromUser {}, cliendId {}, requestId {}, request {}", fromUser, clientId, requestId, request);
                 info.callback.getResponseExecutor().execute(() -> {

broker/src/main/java/io/moquette/server/Server.java

@@ -35,7 +35,6 @@ import io.moquette.spi.IStore;
 import io.moquette.spi.impl.ProtocolProcessor;
 import io.moquette.spi.impl.ProtocolProcessorBootstrapper;
 import io.moquette.spi.impl.security.AES;
-import io.moquette.spi.impl.subscriptions.Token;
 import io.moquette.spi.security.IAuthenticator;
 import io.moquette.spi.security.IAuthorizator;
 import io.moquette.spi.security.ISslContextCreator;
@@ -347,6 +346,7 @@ public class Server {
             file.mkdirs();
         }
         ServerSetting.setRoot(file);
+        MediaServerConfig.FILE_STROAGE_REMOTE_SERVER_URL = config.getProperty(FILE_STORAGE_REMOTE_SERVER_URL);
 
         MediaServerConfig.USER_QINIU = Integer.parseInt(config.getProperty(BrokerConstants.USER_QINIU)) > 0;
     }
@@ -410,7 +410,7 @@ public class Server {
                 e.printStackTrace();
             }
         }
-        RPCCenter.getInstance().init(this);
+        ServerAPIHelper.init(this);
         return true;
     }
 
@@ -418,14 +418,9 @@ public class Server {
         return hazelcastInstance;
     }
 
-    public void internalRpcMsg(String fromUser, String clientId, byte[] message, int messageId, String from, String request, boolean isAdmin) {
-
-        if (!m_initialized) {
-            LOG.error("Moquette is not started, internal message cannot be notify");
-            return;
-        }
-        LOG.debug("internalNotifyMsg");
-        m_processor.onRpcMsg(fromUser, clientId, message, messageId, from, request, isAdmin);
+    public void onApiMessage(String fromUser, String clientId, byte[] message, int messageId, String from, String request, boolean isAdmin, boolean isRobotOrChannel) {
+        LOG.debug("onApiMessage");
+        m_processor.onApiMessage(fromUser, clientId, message, messageId, from, request, isAdmin, isRobotOrChannel);
     }
 
     public boolean isShutdowning() {

broker/src/main/java/io/moquette/server/config/MediaServerConfig.java

@@ -27,6 +27,7 @@ public class MediaServerConfig {
     public static String SERVER_IP = "localhost";
     public static int HTTP_SERVER_PORT = 8080;
     public static String FILE_STROAGE_ROOT = "fs";
+    public static String FILE_STROAGE_REMOTE_SERVER_URL;
     public static boolean USER_QINIU = false;
 
 

broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java

@@ -150,8 +150,8 @@ public class NettyAcceptor implements ServerAcceptor {
             LOG.error("An interruptedException was caught while initializing server. Protocol={}", protocol, ex);
         } catch (Exception e) {
             e.printStackTrace();
-            LOG.error("端口 {} 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", port, port);
-            System.out.println("端口 " + port + " 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + port);
+            LOG.error("端口 {} 已经被占用或者无权限使用。如果无权限使用，请以root权限运行；如果被占用，请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", port, port);
+            System.out.println("端口 " + port + " 已经被占用或者无权限使用。如果无权限使用，请以root权限运行；如果被占用，请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + port);
             System.exit(-1);
         }
     }

broker/src/main/java/io/moquette/spi/IMessagesStore.java

@@ -106,8 +106,8 @@ public interface IMessagesStore {
     WFCMessage.PullMessageResult fetchMessage(String user, String exceptClientId, long fromMessageId, int pullType);
     WFCMessage.PullMessageResult loadRemoteMessages(String user, WFCMessage.Conversation conversation, long beforeUid, int count);
     long insertUserMessages(String sender, int conversationType, String target, int line, int messageContentType, String userId, long messageId);
-    WFCMessage.GroupInfo createGroup(String operator, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList, boolean isAdmin);
-    ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList);
+    WFCMessage.GroupInfo createGroup(String operator, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList, String memberExtra, boolean isAdmin);
+    ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList, String extra);
     ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList);
     ErrorCode quitGroup(String operator, String groupId);
     void clearUserGroups(String userId);
@@ -190,7 +190,7 @@ public interface IMessagesStore {
     ErrorCode getUserSettings(String userId, long version, WFCMessage.GetUserSettingResult.Builder builder);
     WFCMessage.UserSettingEntry getUserSetting(String userId, int scope, String key);
     List<WFCMessage.UserSettingEntry> getUserSetting(String userId, int scope);
-    long updateUserSettings(String userId, WFCMessage.ModifyUserSettingReq request);
+    long updateUserSettings(String userId, WFCMessage.ModifyUserSettingReq request, String clientId);
     void clearUserSettings(String userId);
     boolean getUserGlobalSilent(String userId);
 

broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java

@@ -465,14 +465,21 @@ public class MessagesPublisher {
         publishNotification(topic, receiver, head, null, null);
     }
 
-    public void publishNotification(String topic, String receiver, long head, String fromUser, String pushContent) {
-        publishNotificationLocal(topic, receiver, head, fromUser, pushContent);
+    public void publishNotification(String topic, String receiver, long head, String exceptClientId) {
+        publishNotification(topic, receiver, head, null, null, exceptClientId);
     }
 
-    void publishNotificationLocal(String topic, String receiver, long head, String fromUser, String pushContent) {
+    public void publishNotification(String topic, String receiver, long head, String fromUser, String pushContent) {
+        publishNotification(topic, receiver, head, fromUser, pushContent, null);
+    }
+    public void publishNotification(String topic, String receiver, long head, String fromUser, String pushContent, String exceptClientId) {
         Collection<Session> sessions = m_sessionsStore.sessionForUser(receiver);
         String fromUserName = null;
         for (Session targetSession : sessions) {
+            if(targetSession.getClientID().equals(exceptClientId)) {
+                continue;
+            }
+
             boolean needPush = !StringUtil.isNullOrEmpty(pushContent);
             boolean targetIsActive = this.connectionDescriptors.isConnected(targetSession.getClientSession().clientID);
             if (targetIsActive) {

broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java

@@ -21,14 +21,12 @@ import cn.wildfirechat.pojos.UserOnlineStatus;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
-import com.hazelcast.core.Member;
 import com.hazelcast.util.StringUtil;
 import io.moquette.BrokerConstants;
-import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.ServerAPIHelper;
 import io.moquette.interception.InterceptHandler;
 import io.moquette.interception.messages.InterceptAcknowledgedMessage;
 import io.moquette.persistence.MemorySessionStore;
-import io.moquette.persistence.TargetEntry;
 import io.moquette.server.ConnectionDescriptor;
 import io.moquette.server.ConnectionDescriptorStore;
 import io.moquette.server.Server;
@@ -99,10 +97,9 @@ public class ProtocolProcessor {
         });
     }
 
-    private void handleTargetRemovedFromCurrentNode(TargetEntry target) {
-        System.out.println("kickof user " + target);
-        if (target.type == TargetEntry.Type.TARGET_TYPE_USER) {
-            Collection<MemorySessionStore.Session> sessions = m_sessionsStore.sessionForUser(target.target);
+    private void kickoffUserOffline(String userId) {
+        System.out.println("kickoff user " + userId);
+            Collection<MemorySessionStore.Session> sessions = m_sessionsStore.sessionForUser(userId);
             for (MemorySessionStore.Session session : sessions) {
                 ConnectionDescriptor descriptor = connectionDescriptors.getConnection(session.getClientID());
                 try {
@@ -114,9 +111,6 @@ public class ProtocolProcessor {
                     Utility.printExecption(LOG, e);
                 }
             }
-        } else if(target.type == TargetEntry.Type.TARGET_TYPE_CHATROOM) {
-
-        }
     }
 
 
@@ -702,13 +696,13 @@ public class ProtocolProcessor {
         return m_sessionsStore;
     }
 
-    public void onRpcMsg(String fromUser, String clientId, byte[] message, int messageId, String from, String request, boolean isAdmin) {
-        if(request.equals(RPCCenter.KICKOFF_USER_REQUEST)) {
+    public void onApiMessage(String fromUser, String clientId, byte[] message, int messageId, String from, String request, boolean isAdmin, boolean isRobotOrChannel) {
+        if(request.equals(ServerAPIHelper.KICKOFF_USER_REQUEST)) {
             String userId = new String(message);
-            mServer.getImBusinessScheduler().execute(()->handleTargetRemovedFromCurrentNode(new TargetEntry(TargetEntry.Type.TARGET_TYPE_USER, userId)));
+            mServer.getImBusinessScheduler().execute(()-> kickoffUserOffline(userId));
             return;
         }
-        qos1PublishHandler.onRpcMsg(fromUser, clientId, message, messageId, from, request, isAdmin);
+        qos1PublishHandler.onApiMessage(fromUser, clientId, message, messageId, from, request, isAdmin, isRobotOrChannel);
     }
     public void shutdown() {
         messagesPublisher.stopChatroomScheduler();

broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java

@@ -28,16 +28,14 @@ import java.util.zip.GZIPOutputStream;
 
 import cn.wildfirechat.server.ThreadPoolExecutorWrapper;
 import com.google.gson.Gson;
-import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.ClassUtil;
 import cn.wildfirechat.pojos.OutputCheckUserOnline;
-import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.ServerAPIHelper;
 import io.moquette.imhandler.Handler;
 import io.moquette.imhandler.IMHandler;
 import io.moquette.persistence.MemorySessionStore;
 import io.moquette.server.ConnectionDescriptor;
 import io.moquette.server.Server;
-import io.moquette.spi.ClientSession;
 import io.moquette.spi.impl.security.AES;
 import io.netty.handler.codec.mqtt.MqttVersion;
 import io.netty.util.ReferenceCountUtil;
@@ -106,18 +104,18 @@ public class Qos1PublishHandler extends QosPublishHandler {
         }
     }
 
-    public void onRpcMsg(String fromUser, String clientId, byte[] message, int requestId, String from, String request, boolean isAdmin) {
-        if (request.equals(RPCCenter.CHECK_USER_ONLINE_REQUEST)) {
-            checkUserOnlineHandler(message, ackPayload -> RPCCenter.getInstance().sendResponse(ERROR_CODE_SUCCESS.getCode(), ackPayload, from, requestId));
+    public void onApiMessage(String fromUser, String clientId, byte[] message, int requestId, String from, String request, boolean isAdmin, boolean isRobotOrChannel) {
+        if (request.equals(ServerAPIHelper.CHECK_USER_ONLINE_REQUEST)) {
+            checkUserOnlineHandler(message, ackPayload -> ServerAPIHelper.sendResponse(ERROR_CODE_SUCCESS.getCode(), ackPayload, from, requestId));
         } else {
             imHandler(clientId, fromUser, request, message, (errorCode, ackPayload) -> {
                 if (requestId > 0) {
                     byte[] response = new byte[ackPayload.readableBytes()];
                     ackPayload.readBytes(response);
                     ReferenceCountUtil.release(ackPayload);
-                    RPCCenter.getInstance().sendResponse(errorCode.getCode(), response, from, requestId);
+                    ServerAPIHelper.sendResponse(errorCode.getCode(), response, from, requestId);
                 }
-            }, isAdmin);
+            }, isAdmin, isRobotOrChannel);
         }
     }
 
@@ -148,9 +146,9 @@ public class Qos1PublishHandler extends QosPublishHandler {
         });
     }
 
-	void imHandler(String clientID, String fromUser, String topic, byte[] payloadContent, IMCallback callback, boolean isAdmin) {
+	void imHandler(String clientID, String fromUser, String topic, byte[] payloadContent, IMCallback callback, boolean isAdmin, boolean isRobotOrChannel) {
         LOG.info("imHandler fromUser={}, topic={}", fromUser, topic);
-        if(!mLimitCounter.isGranted(clientID + fromUser + topic)) {
+        if(!isAdmin && !isRobotOrChannel && !mLimitCounter.isGranted(clientID + fromUser + topic)) {
             ByteBuf ackPayload = Unpooled.buffer();
             ackPayload.ensureWritable(1).writeByte(ERROR_CODE_OVER_FREQUENCY.getCode());
             try {
@@ -263,7 +261,7 @@ public class Qos1PublishHandler extends QosPublishHandler {
         
         MemorySessionStore.Session session = m_sessionStore.getSession(clientID);
         payloadContent = AES.AESDecrypt(payloadContent, session.getSecret(), true);
-        imHandler(clientID, username, imtopic, payloadContent, (errorCode, ackPayload) -> sendPubAck(clientID, messageID, ackPayload, errorCode), false);
+        imHandler(clientID, username, imtopic, payloadContent, (errorCode, ackPayload) -> sendPubAck(clientID, messageID, ackPayload, errorCode), false, false);
     }
 
     private void sendPubAck(String clientId, int messageID, ByteBuf payload, ErrorCode errorCode) {

broker/src/main/java/win/liyufan/im/SensitiveFilter.java

@@ -17,33 +17,6 @@ public class SensitiveFilter {
 
     private static final String END_FLAG="end";
 
-    public static void main(String[] args) {
-        Set<String> sensitiveWords=new HashSet<>();
-        sensitiveWords.add("你是傻逼");
-        sensitiveWords.add("你是傻逼啊");
-        sensitiveWords.add("你是坏蛋");
-        sensitiveWords.add("你个大笨蛋");
-        sensitiveWords.add("我去年买了个表");
-        sensitiveWords.add("shit");
-
-        SensitiveFilter textFilter=new SensitiveFilter(sensitiveWords);
-        String text="你你你你是傻逼啊你，说你呢，你个大笨蛋。";
-        System.out.println(textFilter.getSensitiveWords(text,MatchType.MAX_MATCH));
-        for (int i = 0; i < 100; i++) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    System.out.println(textFilter.getSensitiveWords(text,MatchType.MAX_MATCH));
-                }
-            }).start();
-        }
-        try {
-            Thread.sleep(1000 * 100);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
     public boolean isContainSensitiveWord(String text){
         Set<String> sensitiveWords = getSensitiveWords(text, MatchType.MIN_MATCH);
         if(sensitiveWords!=null&&sensitiveWords.size()>0){