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
@@ -115,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
@@ -135,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
 #*********************************************************************
@@ -183,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.62</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>

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

@@ -38,8 +38,6 @@ abstract public class Action {
     public static ISessionsStore sessionsStore = null;
 
     public ChannelHandlerContext ctx;
-    public Response response;
-
     protected class Result {
         Object data;
         ErrorCode errorCode;
@@ -73,7 +71,7 @@ abstract public class Action {
 
         return ERROR_CODE_SUCCESS;
     }
-	public boolean doAction(Request request) {
+	public boolean doAction(Request request, Response response) {
         ErrorCode errorCode = preAction(request, response);
         boolean isSync = true;
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
@@ -89,7 +87,7 @@ abstract public class Action {
 //                    throw e;
 //                }
 //            } else {
-            isSync = action(request);
+            isSync = action(request, response);
 //            }
         } else {
             response.setStatus(HttpResponseStatus.OK);
@@ -107,7 +105,7 @@ abstract public class Action {
     public boolean isTransactionAction() {
         return false;
     }
-    abstract public boolean action(Request request);
+    abstract public boolean action(Request request, Response response);
 
     protected <T> T getRequestBody(HttpRequest request, Class<T> cls) {
         if (request instanceof FullHttpRequest) {
@@ -121,7 +119,7 @@ abstract public class Action {
         return null;
     }
 
-    protected void setResponseContent(RestResult result) {
+    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/CheckTokenAction.java

@@ -29,7 +29,7 @@ import java.io.IOException;
 public class CheckTokenAction extends Action {
     private final RateLimiter mLimitCounter = new RateLimiter(10, 1);
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             response.setStatus(HttpResponseStatus.OK);
             String userId = request.getParam("userId");

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

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

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

@@ -34,7 +34,7 @@ public class FileAction extends Action {
     private static final org.slf4j.Logger Logger = LoggerFactory.getLogger(FileAction.class);
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         response.setHeader("Access-Control-Allow-Origin", "*");
         if (false == Request.METHOD_GET.equalsIgnoreCase(request.getMethod())) {
             response.sendError(HttpResponseStatus.METHOD_NOT_ALLOWED, "Please use GET method to request file!");

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

@@ -34,7 +34,7 @@ import java.util.concurrent.Executor;
 public class IMAction extends Action {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
 
             FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();

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

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

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

@@ -36,7 +36,7 @@ public class RouteAction extends Action {
     private static final Logger LOG = LoggerFactory.getLogger(RouteAction.class);
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
 
             response.setContentType("application/octet-stream");

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

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

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

@@ -73,7 +73,7 @@ public class UploadFileAction extends Action {
     }
 
     @Override
-    public boolean action(Request r) {
+    public boolean action(Request r, Response response) {
         if (r.getNettyRequest() instanceof FullHttpRequest) {
 
             FullHttpRequest request = (FullHttpRequest) r.getNettyRequest();

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

@@ -28,7 +28,7 @@ public class VersionAction extends Action {
 
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             response.setStatus(HttpResponseStatus.OK);
 

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

@@ -16,6 +16,7 @@ import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -31,7 +32,7 @@ public class AddFriendRequestAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputAddFriendRequest input = getRequestBody(request.getNettyRequest(), InputAddFriendRequest.class);
 
@@ -41,12 +42,12 @@ public class AddFriendRequestAction extends AdminAction {
             }
 
             WFCMessage.AddFriendRequest addFriendRequest = WFCMessage.AddFriendRequest.newBuilder().setReason(input.getReason()).setTargetUid(input.getFriendUid()).build();
-            sendApiMessage(input.getUserId(), IMTopic.AddFriendRequestTopic, addFriendRequest.toByteArray(), result -> {
+            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());
+            }, input.isForce());
             return false;
         }
         return true;

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

@@ -16,6 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.InputAddGroupMember;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -33,11 +34,11 @@ public class AddGroupMemberAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputAddGroupMember inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputAddGroupMember.class);
             if (inputAddGroupMember.isValide()) {
-                sendApiMessage(inputAddGroupMember.getOperator(), IMTopic.AddGroupMemberTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                sendApiMessage(response, inputAddGroupMember.getOperator(), IMTopic.AddGroupMemberTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -45,7 +46,7 @@ public class AddGroupMemberAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -92,15 +92,15 @@ abstract public class AdminAction extends Action {
         response.setContent(new Gson().toJson(result));
         response.send();
     }
-    protected void sendApiMessage(String fromUser, String topic, byte[] message, ApiCallback callback) {
-        sendApiMessage(fromUser, null, topic, message, callback, false);
+    protected void sendApiMessage(Response response, String fromUser, String topic, byte[] message, ApiCallback callback) {
+        sendApiMessage(response, fromUser, null, topic, message, callback, false);
     }
 
-    protected void sendApiMessage(String fromUser, String topic, byte[] message, ApiCallback callback, boolean noAdmin) {
-        sendApiMessage(fromUser, null, topic, message, callback, noAdmin);
+    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(String fromUser, String clientId, String topic, byte[] message, ApiCallback callback, boolean 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) {

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

@@ -37,7 +37,7 @@ public class AliasGetAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetAlias input = getRequestBody(request.getNettyRequest(), InputGetAlias.class);
             List<FriendData> dataList = messagesStore.getFriendList(input.getOperator(), null, 0);
@@ -51,7 +51,7 @@ public class AliasGetAction extends AdminAction {
                 }
             }
 
-            setResponseContent(RestResult.ok(out));
+            setResponseContent(RestResult.ok(out), response);
         }
         return true;
     }

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

@@ -36,11 +36,11 @@ public class AliasPutAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         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]);
-            setResponseContent(RestResult.resultOf(errorCode));
+            setResponseContent(RestResult.resultOf(errorCode), response);
         }
         return true;
     }

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

@@ -17,6 +17,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -34,7 +35,7 @@ public class BlacklistAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputBlacklistRequest inputData = getRequestBody(request.getNettyRequest(), InputBlacklistRequest.class);
             if (inputData != null
@@ -42,7 +43,7 @@ public class BlacklistAction extends AdminAction {
                 && !StringUtil.isNullOrEmpty(inputData.getTargetUid())
             ) {
                 WFCMessage.BlackUserRequest friendRequest = WFCMessage.BlackUserRequest.newBuilder().setUid(inputData.getTargetUid()).setStatus(inputData.getStatus()).build();
-                sendApiMessage(inputData.getUserId(), IMTopic.BlackListUserTopic, friendRequest.toByteArray(), result -> {
+                sendApiMessage(response, inputData.getUserId(), IMTopic.BlackListUserTopic, friendRequest.toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -50,7 +51,7 @@ public class BlacklistAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -35,7 +35,7 @@ public class BlacklistGetAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputUserId inputGetFriendList = getRequestBody(request.getNettyRequest(), InputUserId.class);
             List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
@@ -45,7 +45,7 @@ public class BlacklistGetAction extends AdminAction {
                     list.add(data.getFriendUid());
                 }
             }
-            setResponseContent(RestResult.ok(new OutputStringList(list)));
+            setResponseContent(RestResult.ok(new OutputStringList(list)), response);
         }
         return true;
     }

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

@@ -15,6 +15,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
+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;
@@ -31,7 +32,7 @@ public class BlockUserAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputOutputUserBlockStatus inputUserBlock = getRequestBody(request.getNettyRequest(), InputOutputUserBlockStatus.class);
             if (inputUserBlock != null
@@ -44,12 +45,12 @@ public class BlockUserAction extends AdminAction {
                 response.setContent(new Gson().toJson(result));
 
                 if (inputUserBlock.getStatus() == 2) {
-                    sendApiMessage(null, ServerAPIHelper.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), null);
+                    sendApiMessage(response, null, ServerAPIHelper.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), null);
                 }
 
                 sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, null);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -19,6 +19,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -35,11 +36,11 @@ public class BroadcastMessageAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             BroadMessageData sendMessageData = getRequestBody(request.getNettyRequest(), BroadMessageData.class);
             if (BroadMessageData.isValide(sendMessageData) && !StringUtil.isNullOrEmpty(sendMessageData.getSender())) {
-                sendApiMessage(sendMessageData.getSender(), IMTopic.BroadcastMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
+                sendApiMessage(response, sendMessageData.getSender(), IMTopic.BroadcastMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -53,7 +54,7 @@ public class BroadcastMessageAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -15,6 +15,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.InputGetUserInfo;
+import com.xiaoleilu.loServer.handler.Response;
 import io.moquette.persistence.ServerAPIHelper;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.util.internal.StringUtil;
@@ -30,11 +31,11 @@ public class CheckUserOnlineAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId == null || !StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
-                sendApiMessage(inputUserId.getUserId(), ServerAPIHelper.CHECK_USER_ONLINE_REQUEST, inputUserId.getUserId().getBytes(), res -> {
+                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);
                 });

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

@@ -16,6 +16,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -33,7 +34,7 @@ public class CreateChannelAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputCreateChannel inputCreateChannel = getRequestBody(request.getNettyRequest(), InputCreateChannel.class);
             if (inputCreateChannel != null
@@ -45,7 +46,7 @@ public class CreateChannelAction extends AdminAction {
                     inputCreateChannel.setTargetId(messagesStore.getShortUUID());
                 }
 
-                sendApiMessage(inputCreateChannel.getOwner(), IMTopic.CreateChannelTopic, inputCreateChannel.toProtoChannelInfo().toByteArray(), result -> {
+                sendApiMessage(response, inputCreateChannel.getOwner(), IMTopic.CreateChannelTopic, inputCreateChannel.toProtoChannelInfo().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -60,7 +61,7 @@ public class CreateChannelAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -34,7 +34,7 @@ public class CreateChatroomAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
             byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
@@ -54,9 +54,9 @@ public class CreateChatroomAction extends AdminAction {
 
                 WFCMessage.ChatroomInfo info = inputCreateChatroom.toChatroomInfo();
                 messagesStore.createChatroom(inputCreateChatroom.getChatroomId(), info);
-                setResponseContent(RestResult.ok(new OutputCreateChatroom(inputCreateChatroom.getChatroomId())));
+                setResponseContent(RestResult.ok(new OutputCreateChatroom(inputCreateChatroom.getChatroomId())), response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -17,6 +17,7 @@ import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.InputCreateGroup;
 import cn.wildfirechat.pojos.OutputCreateGroupResult;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -34,11 +35,11 @@ public class CreateGroupAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputCreateGroup inputCreateGroup = getRequestBody(request.getNettyRequest(), InputCreateGroup.class);
             if (inputCreateGroup.isValide()) {
-                sendApiMessage(inputCreateGroup.getOperator(), IMTopic.CreateGroupTopic, inputCreateGroup.toProtoGroupRequest().toByteArray(), result -> {
+                sendApiMessage(response, inputCreateGroup.getOperator(), IMTopic.CreateGroupTopic, inputCreateGroup.toProtoGroupRequest().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -53,7 +54,7 @@ public class CreateGroupAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -39,7 +39,7 @@ public class CreateRobotAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputCreateRobot inputCreateRobot = getRequestBody(request.getNettyRequest(), InputCreateRobot.class);
             if (inputCreateRobot != null
@@ -79,9 +79,9 @@ public class CreateRobotAction extends AdminAction {
                     inputCreateRobot.setSecret(UUIDGenerator.getUUID());
                 }
                 messagesStore.addRobot(inputCreateRobot.toRobot());
-                setResponseContent(RestResult.ok(new OutputCreateRobot(inputCreateRobot.getUserId(), inputCreateRobot.getSecret())));
+                setResponseContent(RestResult.ok(new OutputCreateRobot(inputCreateRobot.getUserId(), inputCreateRobot.getSecret())), response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -40,7 +40,7 @@ public class CreateUserAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputOutputUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputOutputUserInfo.class);
             if (inputCreateUser != null
@@ -89,13 +89,13 @@ public class CreateUserAction extends AdminAction {
                 } catch (Exception e) {
                     e.printStackTrace();
                     Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ADMIN_API_Exception);
-                    setResponseContent(RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage()));
+                    setResponseContent(RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage()), response);
                     return true;
                 }
 
-                setResponseContent(RestResult.ok(new OutputCreateUser(inputCreateUser.getUserId(), inputCreateUser.getName())));
+                setResponseContent(RestResult.ok(new OutputCreateUser(inputCreateUser.getUserId(), inputCreateUser.getName())), response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -32,7 +32,7 @@ public class DestoryChatroomAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
             byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
@@ -42,9 +42,9 @@ public class DestoryChatroomAction extends AdminAction {
             if (inputDestoryChatroom != null
                 && !StringUtil.isNullOrEmpty(inputDestoryChatroom.getChatroomId())) {
                 messagesStore.destoryChatroom(inputDestoryChatroom.getChatroomId());
-                setResponseContent(RestResult.ok());
+                setResponseContent(RestResult.ok(), response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -17,6 +17,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
@@ -34,20 +35,20 @@ public class DestroyUserAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputDestroyUser inputDestroyUser = getRequestBody(request.getNettyRequest(), InputDestroyUser.class);
             if (inputDestroyUser != null
                 && !StringUtil.isNullOrEmpty(inputDestroyUser.getUserId())) {
 
                 WFCMessage.IDBuf idBuf = WFCMessage.IDBuf.newBuilder().setId(inputDestroyUser.getUserId()).build();
-                sendApiMessage(inputDestroyUser.getUserId(), IMTopic.DestroyUserTopic, idBuf.toByteArray(), result -> {
+                sendApiMessage(response, inputDestroyUser.getUserId(), IMTopic.DestroyUserTopic, idBuf.toByteArray(), result -> {
                     ErrorCode errorCode1 = ErrorCode.fromCode(result[0]);
                     return new Result(errorCode1);
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -16,6 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.InputDismissGroup;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -33,11 +34,11 @@ public class DismissGroupAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputDismissGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputDismissGroup.class);
             if (inputDismissGroup.isValide()) {
-                sendApiMessage(inputDismissGroup.getOperator(), IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
+                sendApiMessage(response, inputDismissGroup.getOperator(), IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -45,7 +46,7 @@ public class DismissGroupAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -16,6 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.InputUpdateFriendStatusRequest;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -34,7 +35,7 @@ public class FriendRelationAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputUpdateFriendStatusRequest friendAdd = getRequestBody(request.getNettyRequest(), InputUpdateFriendStatusRequest.class);
             if (friendAdd != null
@@ -45,7 +46,7 @@ public class FriendRelationAction extends AdminAction {
                 if (!StringUtil.isNullOrEmpty(friendAdd.getExtra())) {
                     friendRequestBuilder = friendRequestBuilder.setExtra(friendAdd.getExtra());
                 }
-                sendApiMessage(friendAdd.getUserId(), IMTopic.HandleFriendRequestTopic, friendRequestBuilder.build().toByteArray(), result -> {
+                sendApiMessage(response, friendAdd.getUserId(), IMTopic.HandleFriendRequestTopic, friendRequestBuilder.build().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -53,7 +54,7 @@ public class FriendRelationAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -36,7 +36,7 @@ public class FriendRelationGetAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputUserId inputGetFriendList = getRequestBody(request.getNettyRequest(), InputUserId.class);
             List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
@@ -47,7 +47,7 @@ public class FriendRelationGetAction extends AdminAction {
                     list.add(data.getFriendUid());
                 }
             }
-            setResponseContent(RestResult.ok(new OutputStringList(list)));
+            setResponseContent(RestResult.ok(new OutputStringList(list)), response);
         }
         return true;
     }

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

@@ -32,7 +32,7 @@ public class GetChatroomInfoAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetChatroomInfo getChatroomInfo = getRequestBody(request.getNettyRequest(), InputGetChatroomInfo.class);
             String chatroomid = getChatroomInfo.getChatroomId();
@@ -46,9 +46,9 @@ public class GetChatroomInfoAction extends AdminAction {
                 } else {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                 }
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -39,7 +39,7 @@ public class GetChatroomMembersAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetChatroomInfo getChatroomInfo = getRequestBody(request.getNettyRequest(), InputGetChatroomInfo.class);
             String chatroomid = getChatroomInfo.getChatroomId();
@@ -58,9 +58,9 @@ public class GetChatroomMembersAction extends AdminAction {
                 } else {
                     result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                 }
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -35,7 +35,7 @@ public class GetGroupInfoAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
             if (inputGetGroup != null
@@ -53,11 +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);
                 }
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -39,7 +39,7 @@ public class GetGroupMembersAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
             if (inputGetGroup != null
@@ -62,14 +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);
                 }
 
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -15,6 +15,7 @@ import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.InputGetToken;
 import cn.wildfirechat.pojos.OutputGetIMTokenData;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.handler.codec.http.FullHttpRequest;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
@@ -31,14 +32,14 @@ public class GetIMTokenAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetToken input = getRequestBody(request.getNettyRequest(), InputGetToken.class);
             String userId = input.getUserId();
 
 
             WFCMessage.GetTokenRequest getTokenRequest = WFCMessage.GetTokenRequest.newBuilder().setUserId(userId).setClientId(input.getClientId()).setPlatform(input.getPlatform() == null ? 0 : input.getPlatform()).build();
-            sendApiMessage(userId, input.getClientId(), IMTopic.GetTokenTopic, getTokenRequest.toByteArray(), result -> {
+            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

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

@@ -34,7 +34,7 @@ public class GetSystemSettingAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             SystemSettingPojo inputUserId = getRequestBody(request.getNettyRequest(), SystemSettingPojo.class);
             if (inputUserId != null) {
@@ -47,9 +47,9 @@ public class GetSystemSettingAction extends AdminAction {
                     result = RestResult.ok(output);
                 }
 
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -33,7 +33,7 @@ public class GetUserAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId != null
@@ -55,9 +55,9 @@ public class GetUserAction extends AdminAction {
                     result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
                 }
 
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -29,12 +29,12 @@ public class GetUserBlockListAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             OutputUserBlockStatusList list = new OutputUserBlockStatusList();
             list.setStatusList(messagesStore.getUserStatusList());
             RestResult result = RestResult.ok(list);
-            setResponseContent(result);
+            setResponseContent(result, response);
         }
         return true;
     }

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

@@ -32,16 +32,16 @@ public class GetUserBlockStatusAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId != null
                 && !StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
 
                 int status = messagesStore.getUserStatus(inputUserId.getUserId());
-                setResponseContent(RestResult.ok(new OutputUserStatus(status)));
+                setResponseContent(RestResult.ok(new OutputUserStatus(status)), response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -38,7 +38,7 @@ public class GetUserGroupsAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputUserId inputUserId = getRequestBody(request.getNettyRequest(), InputUserId.class);
             if (inputUserId != null
@@ -48,9 +48,9 @@ public class GetUserGroupsAction extends AdminAction {
                 OutputGroupIds outputGroupIds = new OutputGroupIds();
                 outputGroupIds.setGroupIds(new ArrayList<>(groupIds));
                 RestResult result = RestResult.ok(outputGroupIds);
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -16,6 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.InputKickoffGroupMember;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -33,11 +34,11 @@ public class KickoffGroupMemberAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
             if (inputKickoffGroupMember.isValide()) {
-                sendApiMessage(inputKickoffGroupMember.getOperator(), IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                sendApiMessage(response, inputKickoffGroupMember.getOperator(), IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -45,7 +46,7 @@ public class KickoffGroupMemberAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -31,14 +31,14 @@ public class KickoffUserClientAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             StringPairPojo pojo = getRequestBody(request.getNettyRequest(), StringPairPojo.class);
             if (pojo != null && !StringUtil.isNullOrEmpty(pojo.getFirst())) {
                 sessionsStore.kickoffUserClient(pojo.getFirst(), pojo.getSecond());
                 sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, null);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -17,6 +17,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -33,11 +34,11 @@ public class ModifyGroupInfoAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class);
             if (inputAddGroupMember.isValide()) {
-                sendApiMessage(inputAddGroupMember.getOperator(), IMTopic.ModifyGroupInfoTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                sendApiMessage(response, inputAddGroupMember.getOperator(), IMTopic.ModifyGroupInfoTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -45,7 +46,7 @@ public class ModifyGroupInfoAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -17,6 +17,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -33,11 +34,11 @@ public class ModifyGroupMemberAliasAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputSetGroupMemberAlias inputSetGroupMemberAlias = getRequestBody(request.getNettyRequest(), InputSetGroupMemberAlias.class);
             if (inputSetGroupMemberAlias.isValide()) {
-                sendApiMessage(inputSetGroupMemberAlias.getOperator(), IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), result -> {
+                sendApiMessage(response, inputSetGroupMemberAlias.getOperator(), IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -45,7 +46,7 @@ public class ModifyGroupMemberAliasAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -18,6 +18,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -34,11 +35,11 @@ public class MulticastMessageAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             MulticastMessageData sendMessageData = getRequestBody(request.getNettyRequest(), MulticastMessageData.class);
             if (MulticastMessageData.isValide(sendMessageData)) {
-                sendApiMessage(sendMessageData.getSender(), IMTopic.MultiCastMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
+                sendApiMessage(response, sendMessageData.getSender(), IMTopic.MultiCastMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -52,7 +53,7 @@ public class MulticastMessageAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -34,7 +34,7 @@ public class PutSystemSettingAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             SystemSettingPojo inputUserId = getRequestBody(request.getNettyRequest(), SystemSettingPojo.class);
             if (inputUserId != null
@@ -47,9 +47,9 @@ public class PutSystemSettingAction extends AdminAction {
                 } else {
                     result = RestResult.ok();
                 }
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -17,6 +17,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -33,11 +34,11 @@ public class QuitGroupMemberAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputQuitGroup inputQuitGroup = getRequestBody(request.getNettyRequest(), InputQuitGroup.class);
             if (inputQuitGroup.isValide()) {
-                sendApiMessage(inputQuitGroup.getOperator(), IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), result -> {
+                sendApiMessage(response, inputQuitGroup.getOperator(), IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -45,7 +46,7 @@ public class QuitGroupMemberAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -16,6 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.RecallMessageData;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -34,13 +35,13 @@ public class RecallMessageAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             RecallMessageData recallMessageData = getRequestBody(request.getNettyRequest(), RecallMessageData.class);
             if (recallMessageData != null && !StringUtil.isNullOrEmpty(recallMessageData.getOperator())) {
 
                 WFCMessage.INT64Buf idBuf = WFCMessage.INT64Buf.newBuilder().setId(recallMessageData.getMessageUid()).build();
-                sendApiMessage(recallMessageData.getOperator(), IMTopic.RecallMessageTopic, idBuf.toByteArray(), result -> {
+                sendApiMessage(response, recallMessageData.getOperator(), IMTopic.RecallMessageTopic, idBuf.toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -48,7 +49,7 @@ public class RecallMessageAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -17,6 +17,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -34,13 +35,13 @@ public class RecallMultiCastMessageAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             RecallMultiCastMessageData recallMessageData = getRequestBody(request.getNettyRequest(), RecallMultiCastMessageData.class);
             if (recallMessageData != null && !StringUtil.isNullOrEmpty(recallMessageData.operator)) {
 
                 WFCMessage.RecallMultiCastMessageRequest recallRequest = WFCMessage.RecallMultiCastMessageRequest.newBuilder().setMessageId(recallMessageData.messageUid).addAllReceiver(recallMessageData.receivers).build();
-                sendApiMessage(recallMessageData.operator, IMTopic.RecallMultiCastMessageTopic, recallRequest.toByteArray(), result -> {
+                sendApiMessage(response, recallMessageData.operator, IMTopic.RecallMultiCastMessageTopic, recallRequest.toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -48,7 +49,7 @@ public class RecallMultiCastMessageAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -37,7 +37,7 @@ public class RelationGetAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             StringPairPojo input = getRequestBody(request.getNettyRequest(), StringPairPojo.class);
             FriendData data = messagesStore.getFriendData(input.getFirst(), input.getSecond());
@@ -51,7 +51,7 @@ public class RelationGetAction extends AdminAction {
                 out.alias = data.getAlias();
                 out.extra = data.getExtra();
             }
-            setResponseContent(RestResult.ok(out));
+            setResponseContent(RestResult.ok(out), response);
         }
         return true;
     }

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

@@ -18,6 +18,7 @@ import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.SendMessageData;
 import cn.wildfirechat.pojos.SendMessageResult;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -35,11 +36,11 @@ public class SendMessageAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
             if (SendMessageData.isValide(sendMessageData) && !StringUtil.isNullOrEmpty(sendMessageData.getSender())) {
-                sendApiMessage(sendMessageData.getSender(), IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
+                sendApiMessage(response, sendMessageData.getSender(), IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -53,7 +54,7 @@ public class SendMessageAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -30,7 +30,7 @@ public class SensitiveWordAddAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputOutputSensitiveWords input = getRequestBody(request.getNettyRequest(), InputOutputSensitiveWords.class);
             if (input != null && input.getWords() != null && !input.getWords().isEmpty()) {
@@ -38,7 +38,7 @@ public class SensitiveWordAddAction extends AdminAction {
                 response.setStatus(HttpResponseStatus.OK);
                 sendResponse(response, errorCode, null);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -30,7 +30,7 @@ public class SensitiveWordDeleteAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputOutputSensitiveWords input = getRequestBody(request.getNettyRequest(), InputOutputSensitiveWords.class);
             if (input != null && input.getWords() != null && !input.getWords().isEmpty()) {
@@ -39,7 +39,7 @@ public class SensitiveWordDeleteAction extends AdminAction {
 
                 sendResponse(response, errorCode, null);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -29,7 +29,7 @@ public class SensitiveWordQueryAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
                 List<String> words = messagesStore.getAllSensitiveWords();
                 InputOutputSensitiveWords out = new InputOutputSensitiveWords();

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

@@ -17,6 +17,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -33,11 +34,11 @@ public class SetGroupManagerAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputSetGroupManager inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputSetGroupManager.class);
             if (inputAddGroupMember.isValide()) {
-                sendApiMessage(inputAddGroupMember.getOperator(), IMTopic.SetGroupManagerTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                sendApiMessage(response, inputAddGroupMember.getOperator(), IMTopic.SetGroupManagerTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -45,7 +46,7 @@ public class SetGroupManagerAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -16,6 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import cn.wildfirechat.pojos.InputTransferGroup;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -33,11 +34,11 @@ public class TransferGroupAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputTransferGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputTransferGroup.class);
             if (inputDismissGroup.isValide()) {
-                sendApiMessage(inputDismissGroup.getOperator(), IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
+                sendApiMessage(response, inputDismissGroup.getOperator(), IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -45,7 +46,7 @@ public class TransferGroupAction extends AdminAction {
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -41,7 +41,7 @@ public class UpdateUserAction extends AdminAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputUpdateUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputUpdateUserInfo.class);
             if (inputCreateUser != null
@@ -50,9 +50,9 @@ public class UpdateUserAction extends AdminAction {
                 && inputCreateUser.flag > 0) {
 
                 ErrorCode errorCode = messagesStore.updateUserInfo(inputCreateUser.userInfo, inputCreateUser.flag);
-                setResponseContent(RestResult.resultOf(errorCode));
+                setResponseContent(RestResult.resultOf(errorCode), response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -92,7 +92,7 @@ abstract public class ChannelAction extends Action {
         return localSign.equals(sign) ? ErrorCode.ERROR_CODE_SUCCESS : ErrorCode.ERROR_CODE_AUTH_FAILURE;
     }
 
-    protected void sendResponse(ErrorCode errorCode, Object data) {
+    protected void sendResponse(Response response, ErrorCode errorCode, Object data) {
         response.setStatus(HttpResponseStatus.OK);
         if (errorCode == null) {
             errorCode = ErrorCode.ERROR_CODE_SUCCESS;
@@ -115,10 +115,10 @@ abstract public class ChannelAction extends Action {
         return null;
     }
 
-    protected void sendApiMessage(String topic, byte[] message, Callback callback) {
-        sendApiMessage(channelInfo.getOwner(), topic, message, callback);
+    protected void sendApiMessage(Response response, String topic, byte[] message, Callback callback) {
+        sendApiMessage(response, channelInfo.getOwner(), topic, message, callback);
     }
-    protected void sendApiMessage(String user, String topic, byte[] message, Callback 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) {
@@ -126,12 +126,12 @@ abstract public class ChannelAction extends Action {
             }
             @Override
             public void onError(ErrorCode errorCode) {
-                sendResponse(errorCode, null);
+                sendResponse(response, errorCode, null);
             }
 
             @Override
             public void onTimeout() {
-                sendResponse(ErrorCode.ERROR_CODE_TIMEOUT, null);
+                sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
             }
 
             @Override

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

@@ -29,9 +29,9 @@ import io.netty.util.internal.StringUtil;
 public class GetChannelAction extends ChannelAction {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-            setResponseContent(RestResult.ok(OutputGetChannelInfo.fromPbInfo(channelInfo)));
+            setResponseContent(RestResult.ok(OutputGetChannelInfo.fromPbInfo(channelInfo)), response);
         }
         return true;
     }

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

@@ -31,12 +31,12 @@ import java.util.ArrayList;
 public class GetChannelSubscribersAction extends ChannelAction {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             OutputStringList outputStringList = new OutputStringList();
             outputStringList.setList(new ArrayList<>());
             outputStringList.getList().addAll(messagesStore.getChannelSubscriber(channelInfo.getTargetId()));
-            setResponseContent(RestResult.ok(outputStringList));
+            setResponseContent(RestResult.ok(outputStringList), response);
         }
         return true;
     }

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

@@ -31,7 +31,7 @@ import io.netty.util.internal.StringUtil;
 public class GetUserAction extends ChannelAction {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId != null
@@ -69,9 +69,9 @@ public class GetUserAction extends ChannelAction {
                     }
                 }
 
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -28,24 +28,24 @@ import win.liyufan.im.IMTopic;
 @HttpMethod("POST")
 public class ModifyChannelProfileAction extends ChannelAction {
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             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();
-                sendApiMessage(IMTopic.ModifyChannelInfoTopic, modifyChannelInfo.toByteArray(), result -> {
+                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(null, null);
+                        sendResponse(response, null, null);
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                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;
@@ -39,9 +40,20 @@ public class SendMessageAction extends ChannelAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    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);
@@ -51,21 +63,21 @@ public class SendMessageAction extends ChannelAction {
             sendMessageData.setPayload(sendChannelMessageData.getPayload());
             sendMessageData.setToUsers(sendChannelMessageData.getTargets());
             if (SendMessageData.isValide(sendMessageData)) {
-                sendApiMessage(IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
+                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(null, new SendMessageResult(messageId, timestamp));
+                        sendResponse(response, null, new SendMessageResult(messageId, timestamp));
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -19,6 +19,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
@@ -30,7 +31,7 @@ import win.liyufan.im.IMTopic;
 public class SubscriberChannelAction extends ChannelAction {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputChannelSubscribe input = getRequestBody(request.getNettyRequest(), InputChannelSubscribe.class);
             if (input != null && !StringUtil.isNullOrEmpty(input.getTarget())) {
@@ -41,19 +42,19 @@ public class SubscriberChannelAction extends ChannelAction {
                     return true;
                 }
                 WFCMessage.ListenChannel listenChannel = WFCMessage.ListenChannel.newBuilder().setChannelId(channelInfo.getTargetId()).setListen(input.getSubscribe()).build();
-                sendApiMessage(input.getTarget(), IMTopic.ChannelListenTopic, listenChannel.toByteArray(), result -> {
+                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(null, null);
+                        sendResponse(response, null, null);
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -34,24 +34,24 @@ public class AddGroupMemberAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputAddGroupMember inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputAddGroupMember.class);
             inputAddGroupMember.setOperator(robot.getUid());
             if (inputAddGroupMember.isValide()) {
-                sendApiRequest(IMTopic.AddGroupMemberTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                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(null, null);
+                        sendResponse(response, null, null);
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -37,7 +37,7 @@ public class CreateGroupAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputCreateGroup inputCreateGroup = getRequestBody(request.getNettyRequest(), InputCreateGroup.class);
             inputCreateGroup.setOperator(robot.getUid());
@@ -45,7 +45,7 @@ public class CreateGroupAction extends RobotAction {
             if (inputCreateGroup.isValide()) {
                 PojoGroupInfo group_info = inputCreateGroup.getGroup().getGroup_info();
                 WFCMessage.CreateGroupRequest createGroupRequest = inputCreateGroup.toProtoGroupRequest();
-                sendApiRequest(IMTopic.CreateGroupTopic, createGroupRequest.toByteArray(), result -> {
+                sendApiRequest(response, IMTopic.CreateGroupTopic, createGroupRequest.toByteArray(), result -> {
                     ByteBuf byteBuf = Unpooled.buffer();
                     byteBuf.writeBytes(result);
                     ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
@@ -53,14 +53,14 @@ public class CreateGroupAction extends RobotAction {
                         byte[] data = new byte[byteBuf.readableBytes()];
                         byteBuf.readBytes(data);
                         String groupId = new String(data);
-                        sendResponse(null, new OutputCreateGroupResult(groupId));
+                        sendResponse(response, null, new OutputCreateGroupResult(groupId));
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -26,13 +26,13 @@ import io.netty.util.internal.StringUtil;
 public class DeleteCallbackAction extends RobotAction {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             if(!StringUtil.isNullOrEmpty(robot.getCallback())) {
                 robot = robot.toBuilder().clearCallback().setState(0).build();
                 messagesStore.addRobot(robot);
             }
-            setResponseContent(RestResult.ok());
+            setResponseContent(RestResult.ok(), response);
         }
         return true;
     }

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

@@ -34,24 +34,24 @@ public class DismissGroupAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputDismissGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputDismissGroup.class);
             inputDismissGroup.setOperator(robot.getUid());
             if (inputDismissGroup.isValide()) {
-                sendApiRequest(IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
+                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(null, null);
+                        sendResponse(response, null, null);
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -29,11 +29,11 @@ import io.netty.util.internal.StringUtil;
 public class GetCallbackAction extends RobotAction {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             RobotCallbackPojo out = new RobotCallbackPojo();
             out.setUrl(robot.getCallback());
-            setResponseContent(RestResult.ok(out));
+            setResponseContent(RestResult.ok(out), response);
         }
         return true;
     }

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

@@ -34,7 +34,7 @@ public class GetGroupInfoAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
             if (inputGetGroup != null
@@ -52,11 +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);
                 }
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -39,7 +39,7 @@ public class GetGroupMembersAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
             String robotId = robot.getUid();
@@ -66,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) {
@@ -74,9 +75,9 @@ public class GetGroupMembersAction extends RobotAction {
                     result = RestResult.ok(out);
                 }
 
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -28,7 +28,7 @@ import cn.wildfirechat.common.ErrorCode;
 public class GetUserAction extends RobotAction {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId != null
@@ -49,9 +49,9 @@ public class GetUserAction extends RobotAction {
                 } else {
                     result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
                 }
-                setResponseContent(result);
+                setResponseContent(result, response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -34,24 +34,24 @@ public class KickoffGroupMemberAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
             inputKickoffGroupMember.setOperator(robot.getUid());
             if (inputKickoffGroupMember.isValide()) {
-                sendApiRequest(IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                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(null, null);
+                        sendResponse(response, null, null);
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -34,24 +34,24 @@ public class ModifyGroupInfoAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class);
             inputAddGroupMember.setOperator(robot.getUid());
             if (inputAddGroupMember.isValide()) {
-                sendApiRequest(IMTopic.ModifyGroupInfoTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), result -> {
+                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(null, null);
+                        sendResponse(response, null, null);
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -34,24 +34,24 @@ public class ModifyGroupMemberAliasAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputSetGroupMemberAlias inputSetGroupMemberAlias = getRequestBody(request.getNettyRequest(), InputSetGroupMemberAlias.class);
             inputSetGroupMemberAlias.setOperator(robot.getUid());
             if (inputSetGroupMemberAlias.isValide()) {
-                sendApiRequest(IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), result -> {
+                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(null, null);
+                        sendResponse(response, null, null);
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -34,24 +34,24 @@ public class QuitGroupMemberAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputQuitGroup inputQuitGroup = getRequestBody(request.getNettyRequest(), InputQuitGroup.class);
             inputQuitGroup.setOperator(robot.getUid());
             if (inputQuitGroup.isValide()) {
-                sendApiRequest(IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), result -> {
+                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(null, null);
+                        sendResponse(response, null, null);
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -95,7 +95,7 @@ abstract public class RobotAction extends Action {
         return localSign.equals(sign) ? ErrorCode.ERROR_CODE_SUCCESS : ErrorCode.ERROR_CODE_AUTH_FAILURE;
     }
 
-    protected void sendResponse(ErrorCode errorCode, Object data) {
+    protected void sendResponse(Response response, ErrorCode errorCode, Object data) {
         response.setStatus(HttpResponseStatus.OK);
         if (errorCode == null) {
             errorCode = ErrorCode.ERROR_CODE_SUCCESS;
@@ -124,7 +124,7 @@ abstract public class RobotAction extends Action {
         return null;
     }
 
-    protected void sendApiRequest(String topic, byte[] message, Callback callback) {
+    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) {
@@ -133,12 +133,12 @@ abstract public class RobotAction extends Action {
 
             @Override
             public void onError(ErrorCode errorCode) {
-                sendResponse(errorCode, null);
+                sendResponse(response, errorCode, null);
             }
 
             @Override
             public void onTimeout() {
-                sendResponse(ErrorCode.ERROR_CODE_TIMEOUT, null);
+                sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
             }
 
             @Override

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

@@ -35,26 +35,26 @@ public class SendMessageAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
             sendMessageData.setSender(robot.getUid());
             if (SendMessageData.isValide(sendMessageData)) {
-                sendApiRequest(IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), result -> {
+                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(null, new SendMessageResult(messageId, timestamp));
+                        sendResponse(response, null, new SendMessageResult(messageId, timestamp));
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -27,7 +27,7 @@ import io.netty.util.internal.StringUtil;
 public class SetCallbackAction extends RobotAction {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             RobotCallbackPojo input = getRequestBody(request.getNettyRequest(), RobotCallbackPojo.class);
             if(!StringUtil.isNullOrEmpty(input.getUrl())) {
@@ -35,9 +35,9 @@ public class SetCallbackAction extends RobotAction {
                     robot = robot.toBuilder().setCallback(input.getUrl()).setState(1).build();
                     messagesStore.addRobot(robot);
                 }
-                setResponseContent(RestResult.ok());
+                setResponseContent(RestResult.ok(), response);
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
 
         }

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

@@ -34,24 +34,24 @@ public class TransferGroupAction extends RobotAction {
     }
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputTransferGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputTransferGroup.class);
             inputDismissGroup.setOperator(robot.getUid());
             if (inputDismissGroup.isValide()) {
-                sendApiRequest(IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), result -> {
+                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(null, null);
+                        sendResponse(response, null, null);
                     } else {
-                        sendResponse(errorCode, null);
+                        sendResponse(response, errorCode, null);
                     }
                 });
                 return false;
             } else {
-                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER));
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
             }
         }
         return true;

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

@@ -28,7 +28,7 @@ import static cn.wildfirechat.pojos.MyInfoType.*;
 public class UpdateProfileAction extends RobotAction {
 
     @Override
-    public boolean action(Request request) {
+    public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             IntStringPairPojo input = getRequestBody(request.getNettyRequest(), IntStringPairPojo.class);
 
@@ -85,7 +85,7 @@ public class UpdateProfileAction extends RobotAction {
                     result.setErrorCode(ErrorCode.ERROR_CODE_SERVER_ERROR);
                 }
             }
-            setResponseContent(result);
+            setResponseContent(result, response);
         }
         return true;
     }

broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java

@@ -53,7 +53,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 			Action errorAction = ServerSetting.getErrorAction(ServerSetting.MAPPING_ERROR);
 			request.putParam(UnknownErrorAction.ERROR_PARAM_NAME, e);
 			response.setContent(e.toString());
-			errorAction.doAction(request);
+			errorAction.doAction(request, response);
 
             //如果发送请求未被触发，则触发之，否则跳过。
             if(!response.isSent()){
@@ -134,9 +134,8 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 			}
 		}
         action.ctx = ctx;
-		action.response = response;
 
-		boolean isSync = action.doAction(request);
+		boolean isSync = action.doAction(request, response);
 
 		if(isSync) {
             //如果发送请求未被触发，则触发之，否则跳过。

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";

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/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/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);
@@ -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;
@@ -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 {
@@ -381,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);
@@ -519,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) {
@@ -926,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);
 
@@ -948,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);
         }
@@ -1104,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);
 
@@ -1161,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++;
@@ -2104,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)) {
@@ -2130,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);
                 }
             }
         }
@@ -2458,6 +2499,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
+
         if (mDisableStrangerChat) {
             //在禁止私聊时，允许机器人，物联网设备及管理员进行私聊。
             IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
@@ -2538,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;
     }
 
@@ -2583,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;
         }
 
@@ -2641,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())
@@ -3075,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;
     }
 
@@ -3134,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);
 
@@ -3174,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;
     }
 
@@ -3406,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);
 
@@ -3441,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/server/Server.java

@@ -346,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;
     }

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/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) {

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.62</version>
+        <version>0.65</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/src/main/java/cn/wildfirechat/common/APIPath.java

@@ -70,6 +70,11 @@ public interface APIPath {
     String Get_System_Setting = "/admin/system/get_setting";
     String Put_System_Setting = "/admin/system/put_setting";
 
+    String Conference_List = "/admin/conference/list";
+    String Conference_List_Participant = "/admin/conference/list_participant";
+    String Conference_Create = "/admin/conference/create";
+    String Conference_Destroy = "/admin/conference/destroy";
+
     String Channel_User_Info = "/channel/user_info";
     String Channel_Update_Profile = "/channel/update_profile";
     String Channel_Get_Profile = "/channel/get_profile";