update version to 0.47

* commit '30a62cfc58d12dc17406504873f1bc0e36f83a0d':
  Bump junit from 4.8.2 to 4.13.1 in /broker

.github/ISSUE_TEMPLATE.md

@@ -1,13 +1,17 @@
-### Expected behavior
+## 提issue小提示
+为了尽快定位问题，需要提供足够的信息，请按照我们的要求格式来提问。***如果您不按照格式提问，我们将无法回复您的问题***
 
-### Actual behavior
+#### 操作说明
+详细说明操作那个界面，每一步骤都要说得详细，如果是SDK或者api使用问题，需要详细说明调用的那个函数，参数都是什么。
 
-### Steps to reproduce
+#### 表现现象
+描述一下什么现象，比如说函数返回error，errorcode是多少，或者界面上是什么状态，比如发送消息显示发送失败的红点。不要笼统的说功能有问题，不起作用。
 
-### Minimal yet complete reproducer code (or URL to code) or complete log file
+#### 预期结果
+你认为正确的表现应该是什么样的。
 
-### Moquette MQTT version
+#### 补充条件
+是否是毕现的，还是偶现的？是否只有在特殊的网络/设备/平台上出现，还是所有的都出现。还有您用的版本是什么时候的，是不是最新版
 
-### JVM version (e.g. `java -version`)
-
-### OS version (e.g. `uname -a`)
+#### demo对比结果
+请用demo对比测试，demo上是什么状态。

README.md

@@ -43,11 +43,6 @@
 
 ![野火IM](http://static.wildfirechat.cn/download_qrcode.png)
 
-#### 加入野火官方体验交流群
-使用野火IM移动客户端扫码下面二维码（不是使用微信扫码），和野火IM的爱好者一起畅谈野火IM的问题和经验：
-
-![野火IM官方交流群](http://static.wildfirechat.cn/wildfirechat_official_group.jpeg)
-
 #### 应用截图
 ![ios-demo](http://static.wildfirechat.cn/ios-demo.gif)
 
@@ -73,12 +68,11 @@
 
 ## 编译
 在安装JDK1.8以上及maven的前提下，在命令行中执行```mvn clean compile package```，生成的目标文件在```./distribution/target/distribution-xxxx-bundle-tar.tar.gz```
+> 由于使用了一个git的maven插件，如果本地没有git信息就会编译出错，请使用```git clone```的方法下载代码，或者下载压缩包解压后在根目录创建```.git```的空目录。建议用```git clone```的方式下载代码。
 
-## 捐赠者名单
+## 升级说明
+1. 从0.42 版本增加了群成员数限制，默认为2000。如果您从之前的版本升级到这个版本或以后，需要注意到群成员数的限制。升级之后超出限制的群不受影响，但不能继续加人，如果您想修改默认值，可以在升级版本之后，修改t_setting表，把默认的大小改为您期望的人数。另外修改t_group表，把已经存在的群组max_member_count改成您期望的，然后重启。
 
-| 捐赠者 | 商标 | 金额 | 简介 |
-| ----- | ---- | -------- | --- |
-| [SAMOS](http://samos.io) | ![SAMOS](http://static.wildfirechat.cn/SAMOS.png) | 保密 | 一站式区块链解决方案服务商(http://samos.io) |
 
 ## 特别感谢
 1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来，处理MQTT相关业务。

broker/config/wildfirechat.conf

@@ -55,10 +55,12 @@ token.key testim
 ##token的过期时间，单位为毫秒，默认为无限期。如果需要设置无限期，客户端上一定需要加上token过期的处理。token过期的处理请参考文档的常见问题
 ##token.expire_time 2592000000
 
-##首次登录，是否接收之前的历史消息。0 不接收；1接收。
+##首次登录，是否接收之前的历史消息。
+##0 不接收历史消息，只接收5分钟以内的消息，由于服务器没有保存已经收取记录，所以如果有超过5分钟之前未收取的消息也不会收取下拉；
+##1接收，会接收 message.max_queue 配置的条数的历史消息
 message.roaming 0
 
-##是否开启拉取远程历史消息
+##是否开启拉取远程历史消息。如果为1，客户端在会话内如果本地消息读取完了，可以下拉继续加载在服务器上的该会话的消息；如果为0则不能。
 message.remote_history_message 0
 
 ##服务器为每个用户缓存的消息数量。这个值改得太大，拉取消息时间变长，另外会占用大量内存。
@@ -67,13 +69,15 @@ message.max_queue 1024
 ##是否禁止陌生人聊天
 message.disable_stranger_chat false
 
-##黑名单处理策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃；2 敏感词替换为***；3 不处理。
-##所有命中敏感词的消息都会被记录在敏感词消息表中
+##黑名单策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃
 message.blacklist.strategy 0
 
 ##是否禁止服务器端消息搜索，该功能暂未实现。目前的影响是如果打开，则存储消息时不单独保存_searchable_content字段
 message.disable_remote_search  false
 
+##允许客户端撤回消息时限，单位是秒。群组管理员或群主撤回群成员消息、server api不受此限制，可以撤回任意时限内的消息
+message.recall_time_limit 120
+
 ##禁止搜索用户
 friend.disable_search false
 
@@ -92,6 +96,12 @@ friend.reject_request_duration 2592000000
 ##好友请求过期时间，单位是毫秒，默认是7天，0为不限制
 friend.request_expiration_duration 604800000
 
+##添加好友后会发送欢迎消息，比如"你们已经是好友了，可以聊天了"。这个开关控制是用旧的方式还是用新的方式。
+##旧的方式会发送notification消息（contenttype是80），内容会根据好友接收者的语言选择对应的语言，如果双方语言不一致会导致另外一方看到的不是本地语言。
+##新的方式会发送添加好友消息（contenttype是93）和欢迎消息（contenttype是92），需要客户端实现这两种消息。
+##如果客户端已经实现这两种消息可以打开这个开关
+friend.new_welcome_message false
+
 ## 聊天室观众空闲退出时间，单位为毫秒，默认为15分钟，0为永远不退出
 chatroom.participant_idle_time 900000
 
@@ -106,7 +116,8 @@ hazelcast.configuration config/hazelcast.xml
 #*********************************************************************
 # Media server configuration
 #*********************************************************************
-##是否使用七牛云存储。1使用七牛；0使用内存文件服务器。
+##是否使用七牛云存储。1使用七牛；0使用内存文件服务器。默认的七牛账户信息不可用，请在七牛官网申请账户并配置
+## https://docs.wildfirechat.cn/server/media_server.html
 media.server.use_qiniu 0
 
 ##媒体类型分类
@@ -146,47 +157,68 @@ qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 # 本地媒体服务器配置。
 local.media.storage.root media
 
-# 是否支持多端登陆
+# 是否支持多端登陆，为true时支持任意平台任意多个客户端同时登录；为false时每个平台只支持一个端登录，但不同平台可以同时登录。
 server.multi_endpoint false
 
-# 多平台连接状态通知（仅当multi_endpoint为false时有效）
+# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
 server.multi_platform_notification false
 
 #*********************************************************************
 # Push server configuration
 #*********************************************************************
 ##安卓推送服务器地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
 push.android.server.address http://localhost:8085/android/push
+
 ##苹果推送服务器地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
 push.ios.server.address http://localhost:8085/ios/push
 
 #*********************************************************************
-# User online status event callback
+# 各种事件回调
 #*********************************************************************
 ##用户在线状态事件回调地址
-#user.online_status_callback http://localhost:8888/user/online_event
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#user.online_status_callback http://localhost:8888/im_event/user/online
 
-#*********************************************************************
-# MongoDB configuration
-#*********************************************************************
-#专业版支持，社区版请忽略
-#mongodb.client_uri mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
-#mongodb.client_uri mongodb://host1:27017,host2:27017,host3:27017/wfchat?replicaSet=myReplicaSet
-mongodb.client_uri mongodb://wfc:123456@localhost:27017/wfchat
-mongodb.database wfchat
-mongodb.data_expire_days 1096
+##用户信息变动事件回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#relation.relation_update_callback http://localhost:8888/im_event/user/relation
+
+##用户信息变动事件回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#user.user_info_update_callback http://localhost:8888/im_event/user/info
+
+##消息转发地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#message.forward.url http://localhost:8888/im_event/message
+
+##设备信息转发地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#things_message.forward.url http://localhost:8888/im_event/things/message
+
+##群组信息变动事件回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#group.group_info_update_callback http://localhost:8888/im_event/group/info
+
+##群组信息变动事件回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#group.group_member_update_callback http://localhost:8888/im_event/group/member
+
+##频道信息变动回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#channel.channel_info_update_callback http://localhost:8888/im_event/channel/info
+
+##聊天室信息变动回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#chatroom.chatroom_info_update_callback http://localhost:8888/im_event/chatroom/info
+
+##聊天室成员变动回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#chatroom.chatroom_member_update_callback http://localhost:8888/im_event/chatroom/member
 
 #*********************************************************************
 # Sensitive configuration
 #*********************************************************************
 ##文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***；3 记录并继续发送
 sensitive.filter.type 0
-
-#*********************************************************************
-# Message forward configuration
-#*********************************************************************
-##消息转发地址
-#message.forward.url http://localhost:8087/message/forward
-
-##设备信息转发地址
-#things_message.forward.url http://localhost:8087/device/forward

broker/migrate/h2/V29__create_receipt_table.sql

@@ -0,0 +1,42 @@
+
+DROP TABLE IF EXISTS `t_read_report`;
+CREATE TABLE `t_read_report` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NULL,
+  `_type` tinyint NULL,
+  `_line` int(11) NULL,
+  `_target` varchar(64) NULL,
+  `_dt` bigint(20) NOT NULL DEFAULT 0,
+  INDEX `read_report_index` (`_uid`, `_type`, `_line`, `_target`)
+);
+
+DROP TABLE IF EXISTS `t_user_read_report`;
+CREATE TABLE `t_user_read_report` (
+    `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `_rid` int(11) NOT NULL,
+    `_uid` varchar(64) NOT NULL,
+    `_seq` bigint(20) NOT NULL,
+    `_dt` DATETIME NOT NULL DEFAULT NOW(),
+    INDEX `user_read_report_index` (`_uid` DESC, `_seq` DESC),
+    UNIQUE INDEX `user_read_report_index2` (`_uid` DESC, `_rid` DESC)
+);
+
+DROP TABLE IF EXISTS `t_delivery_report`;
+CREATE TABLE `t_delivery_report` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NOT NULL,
+  `_dt` bigint(20) NOT NULL,
+  UNIQUE INDEX `delivery_index` (`_uid`)
+);
+
+
+DROP TABLE IF EXISTS `t_user_delivery_report`;
+CREATE TABLE `t_user_delivery_report` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_rid` varchar(64) NOT NULL,
+  `_uid` varchar(64) NOT NULL,
+  `_seq` bigint(20) NOT NULL,
+  `_dt` DATETIME NOT NULL DEFAULT NOW(),
+  INDEX `user_delivery_index` (`_uid` DESC, `_seq` DESC),
+  UNIQUE INDEX `user_delivery_index2` (`_uid` DESC, `_rid` DESC)
+);

broker/migrate/h2/V30__add_group_member_create_dt.sql

@@ -0,0 +1 @@
+alter table t_group_member add column `_create_dt`  bigint(20) DEFAULT 0;

broker/migrate/h2/V31__add_group_member_count_history_message.sql

@@ -0,0 +1,2 @@
+alter table `t_group` add column `_history_message` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_max_member_count` int(11) NOT NULL DEFAULT 2000;

broker/migrate/h2/V32__alter_setting_column_name.sql

@@ -0,0 +1,2 @@
+alter table `t_settings` change column `value` `_value` varchar(64) NOT NULL;
+alter table `t_settings` change column `desc` `_desc` varchar(64) NOT NULL;

broker/migrate/h2/V35__create_file_transfer_user.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_portrait`,`_type`,`_dt`) values ('wfc_file_transfer','wfc_file_transfer','文件传输助手','https://static.wildfirechat.cn/wfc_file_transfer.png',1,1);
+insert into t_robot (`_uid`,`_owner`,`_secret`,`_callback`,`_state`,`_dt`) values ('wfc_file_transfer', 'wfc_file_transfer', '', '', 0, 1);

broker/migrate/mysql/V34__create_receipt_table.sql

@@ -0,0 +1,54 @@
+
+DROP TABLE IF EXISTS `t_read_report`;
+CREATE TABLE `t_read_report` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NULL,
+  `_type` tinyint NULL,
+  `_line` int(11) NULL,
+  `_target` varchar(64) NULL,
+  `_dt` bigint(20) NOT NULL DEFAULT 0,
+  INDEX `read_report_index` (`_uid`, `_type`, `_line`, `_target`)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;
+
+DROP TABLE IF EXISTS `t_user_read_report`;
+CREATE TABLE `t_user_read_report` (
+    `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `_rid` int(11) NOT NULL,
+    `_uid` varchar(64) NOT NULL,
+    `_seq` bigint(20) NOT NULL,
+    `_dt` DATETIME NOT NULL DEFAULT NOW(),
+    INDEX `user_read_report_index` (`_uid` DESC, `_seq` DESC),
+    UNIQUE INDEX `user_read_report_index2` (`_uid` DESC, `_rid` DESC)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;
+
+DROP TABLE IF EXISTS `t_delivery_report`;
+CREATE TABLE `t_delivery_report` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NOT NULL,
+  `_dt` bigint(20) NOT NULL,
+  UNIQUE INDEX `delivery_index` (`_uid`)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;
+
+
+DROP TABLE IF EXISTS `t_user_delivery_report`;
+CREATE TABLE `t_user_delivery_report` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_rid` varchar(64) NOT NULL,
+  `_uid` varchar(64) NOT NULL,
+  `_seq` bigint(20) NOT NULL,
+  `_dt` DATETIME NOT NULL DEFAULT NOW(),
+  INDEX `user_delivery_index` (`_uid` DESC, `_seq` DESC),
+  UNIQUE INDEX `user_delivery_index2` (`_uid` DESC, `_rid` DESC)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;

broker/migrate/mysql/V35__add_group_member_create_dt.sql

@@ -0,0 +1 @@
+alter table t_group_member add column `_create_dt`  bigint(20) DEFAULT 0, COMMENT "group member create time";

broker/migrate/mysql/V36__add_group_member_count_history_message.sql

@@ -0,0 +1,2 @@
+alter table `t_group` add column `_history_message` tinyint NOT NULL DEFAULT 0, COMMENT "new group member can load group history messages";
+alter table `t_group` add column `_max_member_count` int(11) NOT NULL DEFAULT 2000, COMMENT "max group member count";

broker/migrate/mysql/V37__alter_setting_column_name.sql

@@ -0,0 +1,2 @@
+alter table `t_settings` change column `value` `_value` varchar(64) NOT NULL;
+alter table `t_settings` change column `desc` `_desc` varchar(64) NOT NULL;

broker/migrate/mysql/V40__create_file_transfer_user.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_portrait`,`_type`,`_dt`) values ('wfc_file_transfer','wfc_file_transfer','文件传输助手','https://static.wildfirechat.cn/wfc_file_transfer.png',1,1);
+insert into t_robot (`_uid`,`_owner`,`_secret`,`_callback`,`_state`,`_dt`) values ('wfc_file_transfer', 'wfc_file_transfer', '', '', 0, 1);

broker/migrate/重要！！！必看！！！.txt

@@ -0,0 +1,6 @@
+程序会自动创建数据库和执行migrate里的数据库，不需要手动创建库和执行sql语句。
+
+数据库版本管理使用了flyway，flyway进行数据库升级时会校验数据库脚本的有效性，如果修改过这里的脚本，下次升级时就会失败。
+
+强烈不建议修改数据库表结构，如果有内容（比如默认用户或者默认机器人的属性）需要修改，可以等数据库升级完成后，通过命令行或者数据库客户端进行修改。
+由于服务具有缓存，一般修改过数据库内容后要重启后才能生效。

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.41</version>
+        <version>0.47</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -132,7 +132,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -198,13 +198,6 @@
             <version>2.5</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.46</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
         <dependency>
             <groupId>com.h2database</groupId>

broker/src/main/java/cn/wildfirechat/push/PushMessage.java

@@ -23,6 +23,7 @@ public class PushMessage {
     //推送类型，android推送分为小米/华为/魅族等。ios分别为开发和发布。
     public int pushType;
     public String pushContent;
+    public String pushData;
     public int unReceivedMsg;
     public int mentionedType;
     public String packageName;

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

@@ -109,7 +109,8 @@ public class FileAction extends Action {
 		}
 
 		// 路径安全检查
-		if (httpPath.contains("/.") || httpPath.contains("./") || httpPath.charAt(0) == '.' || httpPath.charAt(httpPath.length() - 1) == '.' || ReUtil.isMatch(INSECURE_URI, httpPath)) {
+        String path = httpPath.substring(0, httpPath.lastIndexOf("/"));
+		if (path.contains("/.") || path.contains("./") || path.charAt(0) == '.' || path.charAt(path.length() - 1) == '.' || ReUtil.isMatch(INSECURE_URI, path)) {
 			return null;
 		}
 

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

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

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

@@ -44,9 +44,20 @@ abstract public class AdminAction extends Action {
         if (!mLimitCounter.isGranted("admin")) {
             return ErrorCode.ERROR_CODE_OVER_FREQUENCY;
         }
+        
         String nonce = request.getHeader("nonce");
+        if (StringUtil.isNullOrEmpty(nonce)) {
+            nonce = request.getHeader("Nonce");
+        }
         String timestamp = request.getHeader("timestamp");
+        if (StringUtil.isNullOrEmpty(timestamp)) {
+            timestamp = request.getHeader("Timestamp");
+        }
         String sign = request.getHeader("sign");
+        if (StringUtil.isNullOrEmpty(sign)) {
+            sign = request.getHeader("Sign");
+        }
+        
         if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign)) {
             return ErrorCode.INVALID_PARAMETER;
         }

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

@@ -61,8 +61,8 @@ public class CreateChannelAction extends AdminAction {
                         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
                             byte[] data = new byte[byteBuf.readableBytes()];
                             byteBuf.readBytes(data);
-                            String secret = new String(data);
-                            sendResponse(response, null, new OutputCreateChannel(inputCreateChannel.getTargetId(), secret));
+                            String channelId = new String(data);
+                            sendResponse(response, null, new OutputCreateChannel(channelId));
                         } else {
                             sendResponse(response, errorCode, null);
                         }

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

@@ -16,7 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import cn.wildfirechat.pojos.InputFriendRequest;
+import cn.wildfirechat.pojos.InputUpdateFriendStatusRequest;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
@@ -41,7 +41,7 @@ public class FriendRelationAction extends AdminAction {
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-            InputFriendRequest friendAdd = getRequestBody(request.getNettyRequest(), InputFriendRequest.class);
+            InputUpdateFriendStatusRequest friendAdd = getRequestBody(request.getNettyRequest(), InputUpdateFriendStatusRequest.class);
             if (friendAdd != null
                 && !StringUtil.isNullOrEmpty(friendAdd.getUserId())
                 && !StringUtil.isNullOrEmpty(friendAdd.getFriendUid())

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

@@ -23,6 +23,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 @Route(APIPath.Friend_Get_List)
@@ -40,6 +41,7 @@ public class FriendRelationGetAction extends AdminAction {
             InputUserId inputGetFriendList = getRequestBody(request.getNettyRequest(), InputUserId.class);
             List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
             List<String> list = new ArrayList<>();
+            dataList.sort(Comparator.comparingLong(FriendData::getTimestamp));
             for (FriendData data : dataList) {
                 if (data.getState() == 0) {
                     list.add(data.getFriendUid());

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

@@ -14,6 +14,7 @@ import cn.wildfirechat.pojos.InputGetGroup;
 import cn.wildfirechat.pojos.OutputGroupMemberList;
 import cn.wildfirechat.pojos.PojoGroupInfo;
 import cn.wildfirechat.pojos.PojoGroupMember;
+import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -45,7 +46,7 @@ public class GetGroupMembersAction extends AdminAction {
                 && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) {
 
                 List<WFCMessage.GroupMember> members = new ArrayList<>();
-                ErrorCode errorCode = messagesStore.getGroupMembers(inputGetGroup.getGroupId(), 0, members);
+                ErrorCode errorCode = messagesStore.getGroupMembers(null, inputGetGroup.getGroupId(), 0, members);
 
 
                 response.setStatus(HttpResponseStatus.OK);
@@ -56,6 +57,9 @@ public class GetGroupMembersAction extends AdminAction {
                     OutputGroupMemberList out = new OutputGroupMemberList();
                     out.setMembers(new ArrayList<>());
                     for (WFCMessage.GroupMember member : members) {
+                        if (member.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Removed) {
+                            continue;
+                        }
                         PojoGroupMember pm = new PojoGroupMember();
                         pm.setMember_id(member.getMemberId());
                         pm.setAlias(member.getAlias());

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

@@ -34,9 +34,21 @@ abstract public class ChannelAction extends Action {
     @Override
     public ErrorCode preAction(Request request, Response response) {
         String nonce = request.getHeader("nonce");
+        if (StringUtil.isNullOrEmpty(nonce)) {
+            nonce = request.getHeader("Nonce");
+        }
         String timestamp = request.getHeader("timestamp");
+        if (StringUtil.isNullOrEmpty(timestamp)) {
+            timestamp = request.getHeader("Timestamp");
+        }
         String sign = request.getHeader("sign");
+        if (StringUtil.isNullOrEmpty(sign)) {
+            sign = request.getHeader("Sign");
+        }
         String cid = request.getHeader("cid");
+        if (StringUtil.isNullOrEmpty(cid)) {
+            cid = request.getHeader("Cid");
+        }
 
         if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(cid)) {
             return ErrorCode.INVALID_PARAMETER;
@@ -63,6 +75,10 @@ abstract public class ChannelAction extends Action {
         if (channelInfo == null) {
             return ErrorCode.INVALID_PARAMETER;
         }
+        
+        if (StringUtil.isNullOrEmpty(channelInfo.getSecret())) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
 
         String str = nonce + "|" + channelInfo.getSecret() + "|" + timestamp;
         String localSign = DigestUtils.sha1Hex(str);

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

@@ -38,9 +38,22 @@ abstract public class RobotAction extends Action {
     @Override
     public ErrorCode preAction(Request request, Response response) {
         String nonce = request.getHeader("nonce");
+        if (StringUtil.isNullOrEmpty(nonce)) {
+            nonce = request.getHeader("Nonce");
+        }
         String timestamp = request.getHeader("timestamp");
+        if (StringUtil.isNullOrEmpty(timestamp)) {
+            timestamp = request.getHeader("Timestamp");
+        }
         String sign = request.getHeader("sign");
+        if (StringUtil.isNullOrEmpty(sign)) {
+            sign = request.getHeader("Sign");
+        }
         String rid = request.getHeader("rid");
+        if (StringUtil.isNullOrEmpty(rid)) {
+            rid = request.getHeader("Rid");
+        }
+
         if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(rid)) {
             return ErrorCode.INVALID_PARAMETER;
         }
@@ -67,6 +80,10 @@ abstract public class RobotAction extends Action {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
+        if (StringUtil.isNullOrEmpty(robot.getSecret())) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         String str = nonce + "|" + robot.getSecret() + "|" + timestamp;
         String localSign = DigestUtils.sha1Hex(str);
         return localSign.equals(sign) ? ErrorCode.ERROR_CODE_SUCCESS : ErrorCode.ERROR_CODE_AUTH_FAILURE;

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

@@ -94,6 +94,17 @@ public final class BrokerConstants {
 
     public static final String USER_ONLINE_STATUS_CALLBACK = "user.online_status_callback";
 
+    public static final String GROUP_INFO_UPDATE_CALLBACK = "group.group_info_update_callback";
+    public static final String GROUP_MEMBER_UPDATE_CALLBACK = "group.group_member_update_callback";
+    public static final String RELATION_UPDATE_CALLBACK = "relation.relation_update_callback";
+    public static final String USER_INFO_UPDATE_CALLBACK = "user.user_info_update_callback";
+
+
+    public static final String CHANNEL_INFO_UPDATE_CALLBACK = "channel.channel_info_update_callback";
+    public static final String CHATROOM_INFO_UPDATE_CALLBACK = "chatroom.chatroom_info_update_callback";
+    public static final String CHATROOM_MEMBER_UPDATE_CALLBACK = "chatroom.chatroom_member_update_callback";
+
+
     public static final String HZ_Cluster_Node_External_IP = "node_external_ip";
     public static final String HZ_Cluster_Node_External_Long_Port = "node_external_long_port";
     public static final String HZ_Cluster_Node_External_Short_Port = "node_external_short_port";
@@ -135,12 +146,15 @@ public final class BrokerConstants {
     public static final String FRIEND_Repeat_Request_Duration = "friend.repeat_request_duration";
     public static final String FRIEND_Reject_Request_Duration = "friend.reject_request_duration";
     public static final String FRIEND_Request_Expiration_Duration = "friend.request_expiration_duration";
+    public static final String FRIEND_New_Welcome_Message = "friend.new_welcome_message";
 
     public static final String CHATROOM_Participant_Idle_Time = "chatroom.participant_idle_time";
     public static final String CHATROOM_Rejoin_When_Active = "chatroom.rejoin_when_active";
 
     public static final String MESSAGES_DISABLE_REMOTE_SEARCH = "message.disable_remote_search";
 
+    public static final String MESSAGES_RECALL_TIME_LIMIT = "message.recall_time_limit";
+
     private BrokerConstants() {
     }
 }

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

@@ -23,7 +23,7 @@ public class AddFriendHandler extends GroupHandler<WFCMessage.AddFriendRequest>
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddFriendRequest request, Qos1PublishHandler.IMCallback callback) {
             long[] head = new long[1];
-            ErrorCode errorCode = m_messagesStore.saveAddFriendRequest(fromUser, request, head);
+            ErrorCode errorCode = m_messagesStore.saveAddFriendRequest(fromUser, request, head, isAdmin);
             if (errorCode == ERROR_CODE_SUCCESS) {
                 WFCMessage.User user = m_messagesStore.getUserInfo(request.getTargetUid());
                 if (user != null && user.getType() == ProtoConstants.UserType.UserType_Normal) {

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

@@ -33,7 +33,13 @@ public class BroadcastMessageHandler extends IMHandler<WFCMessage.Message> {
             }
 
             long timestamp = System.currentTimeMillis();
-            long messageId = MessageShardingUtil.generateId();
+            long messageId = 0;
+            try {
+                messageId = MessageShardingUtil.generateId();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ErrorCode.ERROR_CODE_SERVER_ERROR;
+            }
             message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(message.getConversation().getLine()).setType(ProtoConstants.ConversationType.ConversationType_Private).build()).build();
 
             long count = saveAndBroadcast(fromUser, clientID, message);

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

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

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

@@ -24,7 +24,7 @@ public class GetGroupMemberHandler extends IMHandler<WFCMessage.PullGroupMemberR
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
         List<WFCMessage.GroupMember> members = new ArrayList<>();
-        ErrorCode errorCode = m_messagesStore.getGroupMembers(request.getTarget(), request.getHead(), members);
+        ErrorCode errorCode = m_messagesStore.getGroupMembers(fromUser, request.getTarget(), request.getHead(), members);
 
         if (errorCode == ERROR_CODE_SUCCESS) {
             WFCMessage.PullGroupMemberResult result = WFCMessage.PullGroupMemberResult.newBuilder().addAllMember(members).build();

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

@@ -17,8 +17,10 @@ import java.util.List;
 
 abstract public class GroupHandler<T> extends IMHandler<T> {
     protected void sendGroupNotification(String fromUser, String targetId, List<Integer> lines, WFCMessage.MessageContent content) {
-        if (lines != null) {
+        if (lines == null) {
             lines = new ArrayList<>();
+        } else {
+            lines = new ArrayList<>(lines);
         }
 
         if (lines.isEmpty()) {
@@ -30,9 +32,13 @@ abstract public class GroupHandler<T> extends IMHandler<T> {
             WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder().setContent(content).setServerTimestamp(timestamp);
             builder.setConversation(builder.getConversationBuilder().setType(ProtoConstants.ConversationType.ConversationType_Group).setTarget(targetId).setLine(line));
             builder.setFromUser(fromUser);
-            long messageId = MessageShardingUtil.generateId();
-            builder.setMessageId(messageId);
-            saveAndPublish(fromUser, null, builder.build(), false);
+            try {
+                long messageId = MessageShardingUtil.generateId();
+                builder.setMessageId(messageId);
+                saveAndPublish(fromUser, null, builder.build(), false);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 

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

@@ -32,38 +32,54 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
 
             if (errorCode == ERROR_CODE_SUCCESS) {
                 if (!isAdmin && builder.getConversation() != null && request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
-                    long messageId = MessageShardingUtil.generateId();
-                    long timestamp = System.currentTimeMillis();
-                    builder.setMessageId(messageId);
-                    builder.setServerTimestamp(timestamp);
-                    saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+                    try {
+                        long messageId = MessageShardingUtil.generateId();
+                        long timestamp = System.currentTimeMillis();
+                        builder.setMessageId(messageId);
+                        builder.setServerTimestamp(timestamp);
+                        saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
-                    MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
-                    String language = "zh_CN";
-                    if (session != null && !StringUtil.isNullOrEmpty(session.getLanguage())) {
-                        language = session.getLanguage();
+                        MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
+                        String language = "zh_CN";
+                        if (session != null && !StringUtil.isNullOrEmpty(session.getLanguage())) {
+                            language = session.getLanguage();
+                        }
+                        WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder();
+                        if (m_messagesStore.isNewFriendWelcomeMessage()) {
+                            contentBuilder.setType(92);
+                        } else {
+                            contentBuilder.setType(90).setContent(I18n.getString(language, "Above_Greeting_Message"));
+                        }
+
+                        builder = WFCMessage.Message.newBuilder();
+                        builder.setFromUser(request.getTargetUid());
+                        builder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
+                        builder.setContent(contentBuilder);
+                        timestamp = System.currentTimeMillis();
+                        builder.setServerTimestamp(timestamp);
+
+                        messageId = MessageShardingUtil.generateId();
+                        builder.setMessageId(messageId);
+                        saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+
+                        if (m_messagesStore.isNewFriendWelcomeMessage()) {
+                            contentBuilder.setType(93);
+                        } else {
+                            contentBuilder.setContent(I18n.getString(language, "Friend_Can_Start_Chat"));
+                        }
+
+                        builder.setContent(contentBuilder);
+                        messageId = MessageShardingUtil.generateId();
+                        builder.setMessageId(messageId);
+                        timestamp = System.currentTimeMillis();
+                        builder.setServerTimestamp(timestamp);
+                        saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
-                    WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder().setType(90).setContent(I18n.getString(language, "Above_Greeting_Message"));
-
-                    builder = WFCMessage.Message.newBuilder();
-                    builder.setFromUser(request.getTargetUid());
-                    builder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
-                    builder.setContent(contentBuilder);
-                    timestamp = System.currentTimeMillis();
-                    builder.setServerTimestamp(timestamp);
-
-                    messageId = MessageShardingUtil.generateId();
-                    builder.setMessageId(messageId);
-                    saveAndPublish(request.getTargetUid(), null, builder.build(), false);
-
-                    contentBuilder.setContent(I18n.getString(language, "Friend_Can_Start_Chat"));
-                    builder.setContent(contentBuilder);
-                    messageId = MessageShardingUtil.generateId();
-                    builder.setMessageId(messageId);
-                    timestamp = System.currentTimeMillis();
-                    builder.setServerTimestamp(timestamp);
-                    saveAndPublish(request.getTargetUid(), null, builder.build(), false);
-
+                }
+                if (request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted || isAdmin) {
                     publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
                     publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);
                 }

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

@@ -21,7 +21,7 @@ import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 public class ModifyGroupAliasHandler extends GroupHandler<WFCMessage.ModifyGroupMemberAlias> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias());
+        ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias(), null, isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS && request.hasNotifyContent()) {
             if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());

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

@@ -0,0 +1,35 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
+@Handler(IMTopic.ModifyGroupMemberAliasTopic)
+public class ModifyGroupMemberAliasHandler extends GroupHandler<WFCMessage.ModifyGroupMemberAlias> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) {
+        ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias(), request.getMemberId(), isAdmin);
+        if (errorCode == ERROR_CODE_SUCCESS && request.hasNotifyContent()) {
+            if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0) {
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
+            } else {
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getAlias(), request.getMemberId()).getModifyGroupMemberAliasNotifyContent();
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
+            }
+        }
+        return errorCode;
+    }
+}

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

@@ -36,7 +36,13 @@ public class MultiCastMessageHandler extends IMHandler<WFCMessage.MultiCastMessa
         }
 
         long timestamp = System.currentTimeMillis();
-        long messageId = MessageShardingUtil.generateId();
+        long messageId = 0;
+        try {
+            messageId = MessageShardingUtil.generateId();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ErrorCode.ERROR_CODE_SERVER_ERROR;
+        }
         WFCMessage.Message message = WFCMessage.Message.newBuilder()
             .setContent(multiCastMessage.getContent())
             .setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setType(ConversationType_Private).setLine(multiCastMessage.getLine()).build())

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

@@ -100,7 +100,13 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             }
 
             long timestamp = System.currentTimeMillis();
-            long messageId = MessageShardingUtil.generateId();
+            long messageId = 0;
+            try {
+                messageId = MessageShardingUtil.generateId();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ErrorCode.ERROR_CODE_SERVER_ERROR;
+            }
             message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).build();
 
             if (mForwardUrl != null) {

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

@@ -86,10 +86,10 @@ public class DatabaseStore {
         try {
             connection = DBUtil.getConnection();
             String sql = "insert into t_settings " +
-                " (`id`, `value`, `desc`) values(?, ?, ?)" +
+                " (`id`, `_value`, `_desc`) values(?, ?, ?)" +
                 " ON DUPLICATE KEY UPDATE " +
-                "`value` = ?," +
-                "`desc` = ?";
+                "`_value` = ?," +
+                "`_desc` = ?";
 
 
             statement = connection.prepareStatement(sql);
@@ -120,7 +120,7 @@ public class DatabaseStore {
 
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `value`, `desc` from t_settings where `id` = ?";
+            String sql = "select `_value`, `_desc` from t_settings where `id` = ?";
 
             statement = connection.prepareStatement(sql);
             int index = 1;
@@ -331,7 +331,7 @@ public class DatabaseStore {
             String sql = "select `_mid`" +
                 ", `_alias`" +
                 ", `_type`" +
-                ", `_dt` from t_group_member where _gid = ?";
+                ", `_dt`, `_create_dt` from t_group_member where _gid = ?";
             statement = connection.prepareStatement(sql);
 
             statement.setString(1, groupId);
@@ -358,6 +358,9 @@ public class DatabaseStore {
                 long longValue = rs.getLong(index++);
                 builder.setUpdateDt(longValue);
 
+                longValue = rs.getLong(index++);
+                builder.setCreateDt(longValue);
+
                 WFCMessage.GroupMember member = builder.build();
                 groupMembers.put(groupId, member);
             }
@@ -752,14 +755,22 @@ public class DatabaseStore {
         long[] before = new long[1];
         before[0] = beforeUid;
         boolean hasMore = loadRemoteMessagesFromTable(user, conversation, before, count, MessageShardingUtil.getMessageTable(beforeUid), messages);
-        if (messages.size() < count) {
-            if (hasMore) {
-                loadRemoteMessagesFromTable(user, conversation, before, count - messages.size(), MessageShardingUtil.getMessageTable(beforeUid), messages);
-            } else {
-                String nexTable = MessageShardingUtil.getPreviousMessageTable(before[0]);
-                if (!StringUtil.isNullOrEmpty(nexTable)) {
-                    loadRemoteMessagesFromTable(user, conversation, before, count - messages.size(), nexTable, messages);
-                }
+        while (messages.size() < count && hasMore) {
+            hasMore = loadRemoteMessagesFromTable(user, conversation, before, count - messages.size(), MessageShardingUtil.getMessageTable(beforeUid), messages);
+        }
+
+        int month = 0;
+        while (messages.size() < count && !DBUtil.IsEmbedDB && month++ < 24) {
+            String nexTable = MessageShardingUtil.getMessageTable(beforeUid, -month);
+
+            int size = messages.size();
+            hasMore = true;
+            while (size == messages.size() && hasMore) {
+                hasMore = loadRemoteMessagesFromTable(user, conversation, before, count - messages.size(), nexTable, messages);
+            }
+
+            if (size < messages.size()) {
+                break;
             }
         }
 
@@ -823,7 +834,16 @@ public class DatabaseStore {
                     }
                 }
                 WFCMessage.Message message = builder.build();
-                messages.add(message);
+                boolean expired = false;
+                if (message.getContent().getExpireDuration() > 0) {
+                    if (System.currentTimeMillis() > message.getServerTimestamp() + message.getContent().getExpireDuration()*1000) {
+                        expired = true;
+                    }
+                }
+
+                if (!expired) {
+                    messages.add(message);
+                }
             }
 
             if (count == 0) {
@@ -1039,6 +1059,10 @@ public class DatabaseStore {
 
                 out.add(builder.build());
             }
+            if (out.isEmpty()) {
+                WFCMessage.UserSettingEntry.Builder builder = WFCMessage.UserSettingEntry.newBuilder().setScope(999).setKey("").setValue("").setUpdateDt(0);
+                out.add(builder.build());
+            }
             return out;
         } catch (SQLException e) {
             // TODO Auto-generated catch block
@@ -1338,7 +1362,6 @@ public class DatabaseStore {
     }
 
     void updateSessionDeleted(String uid, String cid, int deleted) {
-        mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
 
@@ -1363,11 +1386,9 @@ public class DatabaseStore {
             } finally {
                 DBUtil.closeDB(connection, statement);
             }
-        });
     }
 
     void updateSessionPlatform(String uid, String cid, int platform) {
-        mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
 
@@ -1392,7 +1413,6 @@ public class DatabaseStore {
             } finally {
                 DBUtil.closeDB(connection, statement);
             }
-        });
     }
 
     private boolean strEqual(String left, String right) {
@@ -1652,7 +1672,7 @@ public class DatabaseStore {
                     ", `_mid`" +
                     ", `_alias`" +
                     ", `_type`" +
-                    ", `_dt`) values(?, ?, ?, ?, ?)" +
+                    ", `_dt`, `_create_dt`) values(?, ?, ?, ?, ?, ?)" +
                     " ON DUPLICATE KEY UPDATE " +
                     "`_alias` = ?," +
                     "`_type` = ?," +
@@ -1673,6 +1693,7 @@ public class DatabaseStore {
                     statement.setString(index++, member.getAlias());
                     statement.setInt(index++, member.getType());
                     statement.setLong(index++, dt);
+                    statement.setLong(index++, member.getCreateDt());
                     statement.setString(index++, member.getAlias());
                     statement.setInt(index++, member.getType());
                     statement.setLong(index++, dt);
@@ -2177,6 +2198,33 @@ public class DatabaseStore {
             }
         });
     }
+    
+    boolean isUidAndNameConflict(String uid, String name) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        long start = System.currentTimeMillis();
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select _uid from t_user where _name = ? and _uid <> ? limit 1";
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, name);
+            statement.setString(2, uid);
+            rs = statement.executeQuery();
+            if (rs.next()) {
+                String conflictId = rs.getString(1);
+                LOG.error("user {} already have name {} !!!", conflictId, name);
+                return true;
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return false;
+    }
 
     void updateUser(final WFCMessage.User user) throws Exception {
         LOG.info("Database update user info {} {}", user.getUid(), user.getUpdateDt());

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

@@ -16,14 +16,14 @@
 
 package io.moquette.persistence;
 
-import cn.wildfirechat.pojos.SystemSettingPojo;
+import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
 import com.google.protobuf.ByteString;
 import com.hazelcast.core.*;
 import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.model.FriendData;
-import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import cn.wildfirechat.common.ErrorCode;
 import io.moquette.BrokerConstants;
 import io.moquette.imhandler.IMHandler;
@@ -34,6 +34,7 @@ import io.moquette.spi.IMessagesStore;
 import io.moquette.spi.security.Tokenor;
 import io.moquette.spi.impl.subscriptions.Topic;
 import io.netty.handler.codec.mqtt.MqttVersion;
+import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import win.liyufan.im.*;
@@ -52,6 +53,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Consumer;
 
 import static cn.wildfirechat.proto.ProtoConstants.ChannelState.Channel_State_Mask_Deleted;
+import static cn.wildfirechat.proto.ProtoConstants.ChannelUpdateEventType.*;
+import static cn.wildfirechat.proto.ProtoConstants.ChatroomMemberUpdateEventType.Chatroom_Member_Event_Join;
+import static cn.wildfirechat.proto.ProtoConstants.ChatroomMemberUpdateEventType.Chatroom_Member_Event_Leave;
+import static cn.wildfirechat.proto.ProtoConstants.ChatroomUpdateEventType.Chatroom_Event_Create;
+import static cn.wildfirechat.proto.ProtoConstants.ChatroomUpdateEventType.Chatroom_Event_Destroy;
 import static cn.wildfirechat.proto.ProtoConstants.GroupMemberType.*;
 import static cn.wildfirechat.proto.ProtoConstants.ModifyChannelInfoType.*;
 import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.*;
@@ -127,6 +133,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 mMultiPlatformNotification = false;
     private boolean mDisableStrangerChat = false;
@@ -134,6 +141,16 @@ public class MemoryMessagesStore implements IMessagesStore {
     private long mChatroomParticipantIdleTime = 900000;
     private boolean mChatroomRejoinWhenActive = true;
 
+    private long mRecallTimeLimit = 300;
+
+    private String mGroupInfoUpdateCallback;
+    private String mGroupMemberUpdateCallback;
+    private String mRelationUpdateCallback;
+    private String mUserInfoUpdateCallback;
+    private String mChannelInfoUpdateCallback;
+    private String mChatroomInfoUpdateCallback;
+    private String mChatroomMemberUpdateCallback;
+
     MemoryMessagesStore(Server server, DatabaseStore databaseStore) {
         m_Server = server;
         this.databaseStore = databaseStore;
@@ -204,6 +221,15 @@ public class MemoryMessagesStore implements IMessagesStore {
             printMissConfigLog(FRIEND_Request_Expiration_Duration, mFriendRequestExpiration + "");
         }
 
+        try {
+            mFriendNewWelcomeMessage = Boolean.parseBoolean(m_Server.getConfig().getProperty(FRIEND_New_Welcome_Message));
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+            printMissConfigLog(FRIEND_New_Welcome_Message, mFriendNewWelcomeMessage + "");
+        }
+
+
         try {
             mChatroomRejoinWhenActive = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.CHATROOM_Rejoin_When_Active));
         } catch (Exception e) {
@@ -225,6 +251,53 @@ public class MemoryMessagesStore implements IMessagesStore {
             databaseStore.setDisableRemoteMessageSearch(disableRemoteMessageSearch);
         } catch (Exception e) {
         }
+
+        try {
+            mRecallTimeLimit = Long.parseLong(m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_RECALL_TIME_LIMIT));
+        } catch (Exception e) {
+        }
+
+        try {
+            mGroupInfoUpdateCallback = server.getConfig().getProperty(GROUP_INFO_UPDATE_CALLBACK);
+        } catch (Exception e) {
+
+        }
+
+        try {
+            mGroupMemberUpdateCallback = server.getConfig().getProperty(GROUP_MEMBER_UPDATE_CALLBACK);
+        } catch (Exception e) {
+
+        }
+
+        try {
+            mRelationUpdateCallback = server.getConfig().getProperty(RELATION_UPDATE_CALLBACK);
+        } catch (Exception e) {
+
+        }
+
+        try {
+            mUserInfoUpdateCallback = server.getConfig().getProperty(USER_INFO_UPDATE_CALLBACK);
+        } catch (Exception e) {
+
+        }
+
+        try {
+            mChannelInfoUpdateCallback = server.getConfig().getProperty(CHANNEL_INFO_UPDATE_CALLBACK);
+        } catch (Exception e) {
+
+        }
+
+        try {
+            mChatroomInfoUpdateCallback = server.getConfig().getProperty(CHATROOM_INFO_UPDATE_CALLBACK);
+        } catch (Exception e) {
+
+        }
+
+        try {
+            mChatroomMemberUpdateCallback = server.getConfig().getProperty(CHATROOM_MEMBER_UPDATE_CALLBACK);
+        } catch (Exception e) {
+
+        }
     }
 
     private void printMissConfigLog(String config, String defaultValue) {
@@ -482,7 +555,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                         }
 
                         if (bundle.getMessage().getContent().getExpireDuration() > 0) {
-                            if (System.currentTimeMillis() < bundle.getMessage().getServerTimestamp() + bundle.getMessage().getContent().getExpireDuration()) {
+                            if (System.currentTimeMillis() > bundle.getMessage().getServerTimestamp() + bundle.getMessage().getContent().getExpireDuration()*1000) {
                                 continue;
                             }
                         }
@@ -576,6 +649,12 @@ public class MemoryMessagesStore implements IMessagesStore {
                 MessageBundle bundle = mIMap.get(targetMessageId);
                 if (bundle != null) {
                     if (exceptClientId == null || !exceptClientId.equals(bundle.getFromClientId()) || !fromUser.equals(bundle.getFromUser())) {
+                        if (bundle.getMessage().getContent().getExpireDuration() > 0) {
+                            if (System.currentTimeMillis() > bundle.getMessage().getServerTimestamp() + bundle.getMessage().getContent().getExpireDuration() * 1000) {
+                                continue;
+                            }
+                        }
+
                         size += bundle.getMessage().getSerializedSize();
                         if (size >= 3 * 1024 * 1024) { //3M
                             break;
@@ -752,7 +831,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public WFCMessage.GroupInfo createGroup(String fromUser, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList) {
+    public WFCMessage.GroupInfo createGroup(String fromUser, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
 
@@ -763,6 +842,26 @@ public class MemoryMessagesStore implements IMessagesStore {
         } else {
             groupId = groupInfo.getTargetId();
         }
+
+        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+
+        String owner = fromUser;
+        if (isAdmin && !StringUtil.isNullOrEmpty(groupInfo.getOwner())) {
+            owner = groupInfo.getOwner();
+        }
+
+        List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
+        for (WFCMessage.GroupMember member : memberList) {
+            if (member.getMemberId().equals(owner)) {
+                member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
+            } else {
+                member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).build();
+            }
+            groupMembers.put(groupId, member);
+            updatedMemberList.add(member);
+            dt++;
+        }
+
         groupInfo = groupInfo.toBuilder()
             .setTargetId(groupId)
             .setName(groupInfo.getName())
@@ -772,29 +871,86 @@ public class MemoryMessagesStore implements IMessagesStore {
             .setUpdateDt(dt)
             .setMemberUpdateDt(dt)
             .setMemberCount(memberList.size())
-            .setOwner(StringUtil.isNullOrEmpty(groupInfo.getOwner()) ? fromUser : groupInfo.getOwner())
+            .setOwner(owner)
             .build();
 
-        mIMap.put(groupId, groupInfo);
-        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
-
-        List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
-        for (WFCMessage.GroupMember member : memberList) {
-            if (member.getMemberId().equals(groupInfo.getOwner())) {
-                member = member.toBuilder().setUpdateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
-            } else {
-                member = member.toBuilder().setUpdateDt(dt).build();
-            }
-            groupMembers.put(groupId, member);
-            updatedMemberList.add(member);
-        }
-
+        mIMap.set(groupId, groupInfo);
         databaseStore.persistGroupMember(groupId, updatedMemberList);
 
+        callbackGroupEvent(fromUser, groupInfo.getTargetId(), ProtoConstants.GroupUpdateEventType.Group_Event_Create);
         return groupInfo;
     }
 
 
+    private void callbackGroupEvent(String operatorId, String groupId, int type) {
+        if (!StringUtil.isNullOrEmpty(mGroupInfoUpdateCallback)) {
+            GroupUpdateEvent event = new GroupUpdateEvent();
+            event.operatorId = operatorId;
+            event.groupId = groupId;
+            event.type = type;
+            m_Server.getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(mGroupInfoUpdateCallback, new Gson().toJson(event)));
+        }
+    }
+
+    private void callbackGroupMemberEvent(String operatorId, String groupId, List<String> memberIds, int type, String value) {
+        if (!StringUtil.isNullOrEmpty(mGroupMemberUpdateCallback)) {
+            GroupMemberUpdateEvent event = new GroupMemberUpdateEvent();
+            event.operatorId = operatorId;
+            event.groupId = groupId;
+            event.memberIds = memberIds;
+            event.type = type;
+            event.value = value;
+            m_Server.getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(mGroupMemberUpdateCallback, new Gson().toJson(event)));
+        }
+    }
+
+    private void callbackRelationEvent(String userId, String targetId, int type, String value) {
+        if (!StringUtil.isNullOrEmpty(mRelationUpdateCallback)) {
+            RelationUpdateEvent event = new RelationUpdateEvent();
+            event.userId = userId;
+            event.targetId = targetId;
+            event.type = type;
+            event.value = value;
+            m_Server.getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(mRelationUpdateCallback, new Gson().toJson(event)));
+        }
+    }
+
+    private void callbackUserInfoEvent(WFCMessage.User user) {
+        if (!StringUtil.isNullOrEmpty(mUserInfoUpdateCallback)) {
+            m_Server.getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(mUserInfoUpdateCallback, new Gson().toJson(InputOutputUserInfo.fromPbUser(user))));
+        }
+    }
+
+    private void callbackChannelInfoUpdateEvent(String operatorId, String channelId, int type) {
+        if (!StringUtil.isNullOrEmpty(mChannelInfoUpdateCallback)) {
+            ChannelUpdateEvent event = new ChannelUpdateEvent();
+            event.operatorId = operatorId;
+            event.channelId = channelId;
+            event.type = type;
+            m_Server.getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(mChannelInfoUpdateCallback, new Gson().toJson(event)));
+        }
+    }
+
+    private void callbackChatroomInfoUpdateEvent(String chatroomId, int type) {
+        if (!StringUtil.isNullOrEmpty(mChatroomInfoUpdateCallback)) {
+            ChatroomUpdateEvent event = new ChatroomUpdateEvent();
+            event.chatroomId = chatroomId;
+            event.type = type;
+            m_Server.getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(mChatroomInfoUpdateCallback, new Gson().toJson(event)));
+        }
+    }
+
+    private void callbackChatroomMemberEvent(String operatorId, String chatroomId, List<String> memberIds, int type) {
+        if (!StringUtil.isNullOrEmpty(mChatroomMemberUpdateCallback)) {
+            ChatroomMemberUpdateEvent event = new ChatroomMemberUpdateEvent();
+            event.operatorId = operatorId;
+            event.chatroomId = chatroomId;
+            event.memberIds = memberIds;
+            event.type = type;
+            m_Server.getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(mChatroomMemberUpdateCallback, new Gson().toJson(event)));
+        }
+    }
+
     @Override
     public ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -806,6 +962,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
 
+        int maxCount = Integer.MAX_VALUE;
+
         if (!isAdmin) {
             boolean isMember = false;
             boolean isManager = false;
@@ -835,6 +993,15 @@ public class MemoryMessagesStore implements IMessagesStore {
             if (!isMember && !(memberList.size() == 1 && operator.equals(memberList.get(0).getMemberId()))) {
                 return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
             }
+
+            SystemSettingPojo maxMemberSetting = databaseStore.getSystemSetting(ProtoConstants.SystemSettingType.Group_Max_Member_Count);
+            if (maxMemberSetting != null) {
+                try {
+                    maxCount = Integer.parseInt(maxMemberSetting.value);
+                } catch (NumberFormatException e) {
+                    e.printStackTrace();
+                }
+            }
         }
 
         long updateDt = System.currentTimeMillis();
@@ -843,12 +1010,20 @@ public class MemoryMessagesStore implements IMessagesStore {
         ArrayList<String> newInviteUsers = new ArrayList<>();
         for (WFCMessage.GroupMember member : memberList) {
             if (member.getMemberId().equals(groupInfo.getOwner())) {
-                member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).setAlias("").build();
+                member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).setCreateDt(updateDt).build();
             } else {
-                member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).setAlias("").build();
+                if (isAdmin) {
+                    if (member.getType() != GroupMemberType_Owner)
+                        member = member.toBuilder().setUpdateDt(updateDt).setCreateDt(updateDt).build();
+                    else
+                        return ErrorCode.INVALID_PARAMETER;
+                } else {
+                    member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).setCreateDt(updateDt).build();
+                }
             }
             tmp.add(member);
             newInviteUsers.add(member.getMemberId());
+            updateDt++;
         }
         memberList = tmp;
 
@@ -858,6 +1033,18 @@ public class MemoryMessagesStore implements IMessagesStore {
             members = loadGroupMemberFromDB(hzInstance, groupId);
         }
 
+        if (maxCount != Integer.MAX_VALUE) {
+            int existCount = 0;
+            for (WFCMessage.GroupMember member : members) {
+                if (member.getType() != GroupMemberType_Removed) {
+                    existCount++;
+                }
+            }
+            if (existCount + newInviteUsers.size() > maxCount) {
+                return ErrorCode.ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT;
+            }
+        }
+
         for (WFCMessage.GroupMember member : members) {
             if (newInviteUsers.contains(member.getMemberId())) {
                 groupMembers.remove(groupId, member);
@@ -878,6 +1065,15 @@ public class MemoryMessagesStore implements IMessagesStore {
         mIMap.put(groupId, groupInfo.toBuilder().setMemberUpdateDt(updateDt).setUpdateDt(updateDt).setMemberCount(count).build());
         databaseStore.persistGroupMember(groupId, memberList);
         databaseStore.updateGroupMemberCountDt(groupId, count, updateDt);
+
+        List<String> memberIds = new ArrayList<>();
+        for (WFCMessage.GroupMember member : memberList) {
+            if (member.getType() != GroupMemberType_Removed) {
+                memberIds.add(member.getMemberId());
+            }
+        }
+
+        callbackGroupMemberEvent(operator, groupId, memberIds, ProtoConstants.GroupMemberUpdateEventType.Group_Member_Event_Join, null);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -886,6 +1082,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         removeGroupMember(groupId, memberList);
         removeFavGroup(groupId, memberList);
         removeGroupUserSettings(groupId, memberList);
+
+        callbackGroupMemberEvent(operator, groupId, memberList, ProtoConstants.GroupMemberUpdateEventType.Group_Member_Event_Kickoff, null);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -964,6 +1162,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         removeGroupMember(groupId, Arrays.asList(operator));
         removeFavGroup(groupId, Arrays.asList(operator));
         removeGroupUserSettings(groupId, Arrays.asList(operator));
+
+        callbackGroupMemberEvent(operator, groupId, Arrays.asList(operator), ProtoConstants.GroupMemberUpdateEventType.Group_Member_Event_Leave, null);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -1031,6 +1231,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         removeFavGroup(groupId, ids);
         removeGroupUserSettings(groupId, ids);
 
+        callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Destroy);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -1063,15 +1264,23 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
 
             if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Normal) {
-                if (oldInfo.getOwner() == null) {
-                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
-                }
-                if (!oldInfo.getOwner().equals(operator)) {
-                    if (modifyType == Modify_Group_Extra) {
+                if (!operator.equals(oldInfo.getOwner())) {
+                    WFCMessage.GroupMember gm = getGroupMember(groupId, operator);
+                    boolean isManager = false;
+                    if (gm != null && gm.getType() == GroupMemberType_Manager) {
+                        isManager = true;
+                    }
+                    if (!isManager && modifyType != Modify_Group_Name && modifyType != Modify_Group_Portrait && modifyType != Modify_Group_Extra) {
                         return ErrorCode.ERROR_CODE_NOT_RIGHT;
                     }
                 }
             }
+
+            if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Free) {
+                if (modifyType != Modify_Group_Name && modifyType != Modify_Group_Portrait && modifyType != Modify_Group_Extra) {
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+            }
         }
 
 
@@ -1098,11 +1307,21 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         newInfoBuilder.setUpdateDt(System.currentTimeMillis());
         mIMap.put(groupId, newInfoBuilder.build());
+
+        if (modifyType == Modify_Group_Mute) {
+            if (newInfoBuilder.getMute() > 0) {
+                callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Mute);
+            } else {
+                callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Unmute);
+            }
+        } else {
+            callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Update);
+        }
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
     @Override
-    public ErrorCode modifyGroupAlias(String operator, String groupId, String alias) {
+    public ErrorCode modifyGroupAlias(String operator, String groupId, String alias, String memberId, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
 
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
@@ -1116,25 +1335,73 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        long updateDt = System.currentTimeMillis();
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
         Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
         if (members == null || members.size() == 0) {
             members = loadGroupMemberFromDB(hzInstance, groupId);
         }
+
+        if (StringUtil.isNullOrEmpty(memberId)) {
+            memberId = operator;
+        } else {
+            if (!isAdmin && !operator.equals(groupInfo.getOwner())) {
+                WFCMessage.GroupMember operatorMember = null;
+                WFCMessage.GroupMember targetMember = null;
+                for (WFCMessage.GroupMember member : members) {
+                    if (member.getMemberId().equals(operator)) {
+                        operatorMember = member;
+                        if (targetMember != null) {
+                            break;
+                        }
+                    }
+                    if ((member.getMemberId().equals(memberId))) {
+                        targetMember = member;
+                        if (operatorMember != null) {
+                            break;
+                        }
+                    }
+                }
+
+                if (operatorMember == null) {
+                    LOG.error("Modify group member alias error, the operator {} is not in group", operator);
+                    return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+                }
+
+                if (targetMember == null) {
+                    LOG.error("Modify group member alias error, the member {} is not in group", memberId);
+                    return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+                }
+
+                if (operatorMember.getType() == GroupMemberType_Manager && targetMember.getType() != GroupMemberType_Manager) {
+                    LOG.error("Modify group member alias error, the operator {} type is {} and the member {} type is {}", operator, operatorMember.getType(), memberId, targetMember.getType());
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+            }
+        }
+
+        long updateDt = System.currentTimeMillis();
+
+        boolean inGroup = false;
         for (WFCMessage.GroupMember member : members) {
-            if (member.getMemberId().equals(operator)) {
+            if (member.getMemberId().equals(memberId)) {
                 groupMembers.remove(groupId, member);
                 member = member.toBuilder().setAlias(alias).setUpdateDt(updateDt).build();
                 databaseStore.persistGroupMember(groupId, Arrays.asList(member));
                 databaseStore.updateGroupMemberCountDt(groupId, -1, updateDt);
                 groupMembers.put(groupId, member);
 
-                mIMap.put(groupId, groupInfo.toBuilder().setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build());
+                mIMap.set(groupId, groupInfo.toBuilder().setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build());
+                inGroup = true;
                 break;
             }
         }
 
+        if (!inGroup) {
+            LOG.error("Modify group member alias error, the member {} is not in group", memberId);
+            return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+        }
+
+        callbackGroupMemberEvent(operator, groupId, Arrays.asList(memberId), ProtoConstants.GroupMemberUpdateEventType.Group_Member_Event_Alias, alias);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -1175,7 +1442,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members) {
+    public ErrorCode getGroupMembers(String fromUser, String groupId, long maxDt, List<WFCMessage.GroupMember> members) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
 
@@ -1191,10 +1458,30 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (memberCollection == null || memberCollection.size() == 0) {
             memberCollection = loadGroupMemberFromDB(hzInstance, groupId);
         }
+        boolean notInGroup = true;
+        WFCMessage.GroupMember self = null;
         for (WFCMessage.GroupMember member:memberCollection) {
             if (member.getUpdateDt() > maxDt) {
                 members.add(member);
             }
+            if (fromUser != null && notInGroup) {
+                if (member.getMemberId().equals(fromUser)) {
+                    if (member.getType() != GroupMemberType_Removed) {
+                        notInGroup = false;
+                    } else {
+                        self = member;
+                        break;
+                    }
+                }
+            }
+        }
+
+        //server api fromUser is null
+        if (fromUser != null && notInGroup) {
+            members.clear();
+            if (self != null) {
+                members.add(self.toBuilder().setUpdateDt(0).setType(GroupMemberType_Removed).build());
+            }
         }
 
         return ErrorCode.ERROR_CODE_SUCCESS;
@@ -1270,6 +1557,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
+        callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Transfer);
 
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
@@ -1308,6 +1596,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         mIMap.put(groupId, groupInfo.toBuilder().setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build());
+
+        callbackGroupMemberEvent(operator, groupId, userList, ProtoConstants.GroupMemberUpdateEventType.Group_Member_Event_Type_Update, (type == 0 ? ProtoConstants.GroupMemberType.GroupMemberType_Normal : ProtoConstants.GroupMemberType.GroupMemberType_Manager) + "");
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -1381,6 +1671,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         IMap<Long, MessageBundle> mIMap = hzInstance.getMap(MESSAGES_MAP);
 
         MessageBundle messageBundle = mIMap.get(messageUid);
+        long now = System.currentTimeMillis();
         if (messageBundle != null) {
             WFCMessage.Message message = messageBundle.getMessage();
             boolean canRecall = false;
@@ -1388,7 +1679,11 @@ public class MemoryMessagesStore implements IMessagesStore {
                 canRecall = true;
             }
             if (!isAdmin && message.getFromUser().equals(operatorId)) {
-                canRecall = true;
+                if (now - message.getServerTimestamp() > mRecallTimeLimit * 1000) {
+                    return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
+                } else {
+                    canRecall = true;
+                }
             }
 
             if (!canRecall && message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group) {
@@ -1396,7 +1691,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
                 WFCMessage.GroupInfo groupInfo = groupMap.get(message.getConversation().getTarget());
                 if (groupInfo == null) {
-                    return ErrorCode.ERROR_CODE_NOT_EXIST;
+                    return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
                 }
                 if (operatorId.equals(groupInfo.getOwner())) {
                     canRecall = true;
@@ -1427,12 +1722,26 @@ public class MemoryMessagesStore implements IMessagesStore {
                 return ErrorCode.ERROR_CODE_NOT_RIGHT;
             }
 
-            String searchContent = message.getContent().getSearchableContent() == null ? "" : message.getContent().getSearchableContent();
-            String cont = message.getContent().getContent() == null ? "" : message.getContent().getContent();
-            String extra = message.getContent().getExtra() == null ? "" : message.getContent().getExtra();
-            String recalledContent = "{\"s\":\"" + message.getFromUser() +  "\",\"ts\":" + message.getServerTimestamp() +  ",\"t\":" + message.getContent().getType() + ",\"sc\":\"" + searchContent + "\",\"c\":\"" + cont + "\",\"e\":\"" + extra  + "\"}";
+            JSONObject json = new JSONObject();
+            json.put("s", message.getFromUser());
+            json.put("ts", message.getServerTimestamp());
+            json.put("t", message.getContent().getType());
+            json.put("sc", message.getContent().getSearchableContent());
+            json.put("c", message.getContent().getContent());
+            json.put("e", message.getContent().getExtra());
+            if (message.getContent().getData() != null && message.getContent().getData().size() > 0) {
+                json.put("b", Base64.getEncoder().encode(message.getContent().getData().toByteArray()));
+            }
+            if (message.getContent().getMediaType() > 0) {
+                json.put("mt", message.getContent().getMediaType());
+            }
+            if (!StringUtil.isNullOrEmpty(message.getContent().getRemoteMediaUrl())) {
+                json.put("mu", message.getContent().getRemoteMediaUrl());
+            }
 
-            message = message.toBuilder().setContent(message.getContent().toBuilder().setContent(operatorId).setType(80).clearSearchableContent().setData(ByteString.copyFrom(String.valueOf(messageUid).getBytes())).setExtra(recalledContent).build()).build();
+            String recalledContent = json.toJSONString();
+
+            message = message.toBuilder().setContent(WFCMessage.MessageContent.newBuilder().setContent(operatorId).setType(80).setData(ByteString.copyFrom(String.valueOf(messageUid).getBytes())).setExtra(recalledContent)).build();
             messageBundle.setMessage(message);
             messageBundle.setFromClientId(clientId);
 
@@ -1577,6 +1886,9 @@ public class MemoryMessagesStore implements IMessagesStore {
             user = builder.build();
             databaseStore.updateUser(user);
             mUserMap.set(userId, user);
+
+            callbackUserInfoEvent(user);
+
             return ErrorCode.ERROR_CODE_SUCCESS;
         } else {
             return ErrorCode.ERROR_CODE_NOT_MODIFIED;
@@ -1674,9 +1986,14 @@ public class MemoryMessagesStore implements IMessagesStore {
     public void addUserInfo(WFCMessage.User user, String password) throws Exception {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
+        if (databaseStore.isUidAndNameConflict(user.getUid(), user.getName())) {
+            throw new Exception("用户名不能重复，必须唯一！！！");
+        }
         databaseStore.updateUser(user);
         mUserMap.put(user.getUid(), user);
         databaseStore.updateUserPassword(user.getUid(), password);
+
+        callbackUserInfoEvent(user);
     }
 
     @Override
@@ -1771,6 +2088,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             chatroomInfo = builder.build();
         }
         chatroomInfoMap.put(chatroomId, chatroomInfo);
+        callbackChatroomInfoUpdateEvent(chatroomId, Chatroom_Event_Create);
     }
 
     @Override
@@ -1781,6 +2099,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (room != null) {
             room = room.toBuilder().setUpdateDt(System.currentTimeMillis()).setState(ProtoConstants.ChatroomState.Chatroom_State_End).build();
             chatroomInfoMap.put(chatroomId, room);
+            callbackChatroomInfoUpdateEvent(chatroomId, Chatroom_Event_Destroy);
         }
     }
 
@@ -1900,60 +2219,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
-    @Override
-    public ErrorCode login(String name, String password, List<String> userIdRet) {
-        Connection connection = null;
-        PreparedStatement statement = null;
-        ResultSet rs = null;
-        try {
-            connection = DBUtil.getConnection();
-            String sql = "select `_uid`, `_passwd_md5` from t_user where `_name` = ?";
-
-            statement = connection.prepareStatement(sql);
-
-            int index = 1;
-            statement.setString(index++, name);
-
-            rs = statement.executeQuery();
-            if (rs.next()) {
-                String uid = rs.getString(1);
-
-                int status = getUserStatus(uid);
-                if (status == 1) {
-                    return ErrorCode.ERROR_CODE_USER_FORBIDDEN;
-                }
-                String pwd_md5 = rs.getString(2);
-                try {
-                    MessageDigest md5 = MessageDigest.getInstance("MD5");
-                    String passwdMd5 = Base64.getEncoder().encodeToString(md5.digest(password.getBytes("utf-8")));
-                    if (passwdMd5.equals(pwd_md5)) {
-                        LOG.info("login success userName={}, userId={}", name, uid);
-                        userIdRet.add(uid);
-                        return ErrorCode.ERROR_CODE_SUCCESS;
-                    } else {
-                        LOG.info("login failure incorrect password, userName={}, userId={}", name, uid);
-                        return ErrorCode.ERROR_CODE_PASSWORD_INCORRECT;
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    Utility.printExecption(LOG, e);
-                    LOG.info("login failure execption password, userName={}", name);
-                    return ErrorCode.ERROR_CODE_PASSWORD_INCORRECT;
-                }
-            } else {
-                LOG.info("login failure user not exist, userName={}", name);
-                return ErrorCode.ERROR_CODE_NOT_EXIST;
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-            Utility.printExecption(LOG, e);
-            LOG.info("login failure db execption, userName={}", name);
-            return ErrorCode.ERROR_CODE_SERVER_ERROR;
-        } finally {
-            DBUtil.closeDB(connection, statement, rs);
-        }
-    }
-
     synchronized Collection<FriendData> loadFriend(MultiMap<String, FriendData> friendsMap, String userId) {
         Collection<FriendData> friends = databaseStore.getPersistFriends(userId);
         if (friends != null) {
@@ -2062,7 +2327,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head) {
+    public ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head, boolean isAdmin) {
         if (mDisableFriendRequest) {
             return ErrorCode.ERROR_CODE_NOT_RIGHT;
         }
@@ -2083,7 +2348,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
+        if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && !isAdmin) {
             if (mFriendRequestDuration > 0 && System.currentTimeMillis() - existRequest.getUpdateDt() > mFriendRequestDuration) {
                 if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected
                     && System.currentTimeMillis() - existRequest.getUpdateDt() < mFriendRejectDuration) {
@@ -2107,7 +2372,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 break;
             }
         }
-        if (friendData1 != null && friendData1.getBlacked() > 0) {
+        if (friendData1 != null && friendData1.getBlacked() > 0 && !isAdmin) {
             return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
         }
 
@@ -2147,6 +2412,26 @@ public class MemoryMessagesStore implements IMessagesStore {
     public ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
 
+
+        if(!isAdmin && request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
+            MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+
+            Collection<FriendData> friends = friendsMap.get(userId);
+            if (friends == null || friends.size() == 0) {
+                friends = loadFriend(friendsMap, userId);
+            }
+
+            for (FriendData fd : friends) {
+                if (fd.getFriendUid().equals(request.getTargetUid())) {
+                    if (fd.getState() == 0) {
+                        return ErrorCode.ERROR_CODE_ALREADY_FRIENDS;
+                    } else {
+                        break;
+                    }
+                }
+            }
+        }
+
         if (isAdmin) {
             MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
 
@@ -2201,6 +2486,8 @@ public class MemoryMessagesStore implements IMessagesStore {
             heads[1] = friendData1.getTimestamp();
             friendsMap.remove(userId);
             friendsMap.remove(request.getTargetUid());
+
+            callbackRelationEvent(userId, request.getTargetUid(), 0, "" + request.getStatus());
             return ErrorCode.ERROR_CODE_SUCCESS;
         }
 
@@ -2224,6 +2511,27 @@ public class MemoryMessagesStore implements IMessagesStore {
             } else {
                 existRequest = existRequest.toBuilder().setStatus(request.getStatus()).setUpdateDt(System.currentTimeMillis()).build();
                 databaseStore.persistOrUpdateFriendRequest(existRequest);
+
+                if (request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
+                    Collection<WFCMessage.FriendRequest> targetRequests = requestMap.get(request.getTargetUid());
+                    if (targetRequests == null || targetRequests.size() == 0) {
+                        targetRequests = loadFriendRequest(requestMap, request.getTargetUid());
+                    }
+
+                    WFCMessage.FriendRequest existTargetRequest = null;
+                    for (WFCMessage.FriendRequest tmpRequest : targetRequests) {
+                        if (tmpRequest.getFromUid().equals(userId)) {
+                            existTargetRequest = tmpRequest;
+                            break;
+                        }
+                    }
+
+                    if (existTargetRequest != null && existTargetRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Sent) {
+                        existTargetRequest = existTargetRequest.toBuilder().setStatus(request.getStatus()).setUpdateDt(existRequest.getUpdateDt()).build();
+                        databaseStore.persistOrUpdateFriendRequest(existTargetRequest);
+                    }
+                }
+
                 if(request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted){
                     MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
                     FriendData friendData1 = new FriendData(userId, request.getTargetUid(), "", request.getExtra(), 0, 0, System.currentTimeMillis());
@@ -2242,6 +2550,8 @@ public class MemoryMessagesStore implements IMessagesStore {
 
                     msgBuilder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(userId).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
                     msgBuilder.setContent(WFCMessage.MessageContent.newBuilder().setType(1).setSearchableContent(existRequest.getReason()).build());
+
+                    callbackRelationEvent(userId, request.getTargetUid(), 0, "1");
                 }
                 return ErrorCode.ERROR_CODE_SUCCESS;
             }
@@ -2252,6 +2562,10 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public ErrorCode blackUserRequest(String fromUser, String targetUserId, int state, long[] heads) {
+        if(state != 0 && state != 1 && state != 2){
+            return ErrorCode.INVALID_PARAMETER;
+        }
+
         if (state == 2) {
             state = 1;
         } else {
@@ -2286,6 +2600,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         heads[0] = friendData.getTimestamp();
 
+        callbackRelationEvent(fromUser, targetUserId, 2, state+"");
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -2339,6 +2654,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         friendsMap.remove(fromUser);
 
+        callbackRelationEvent(fromUser, targetUserId, 1, alias);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -2357,6 +2673,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         chatroomMessages.put(userId, new TreeMap<>());
         mWriteLock.unlock();
 
+        callbackChatroomMemberEvent(userId, chatroomId, Arrays.asList(userId), Chatroom_Member_Event_Join);
 
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
@@ -2369,6 +2686,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         mWriteLock.lock();
         chatroomMessages.remove(userId);
         mWriteLock.unlock();
+
+        callbackChatroomMemberEvent(userId, chatroomId, Arrays.asList(userId), Chatroom_Member_Event_Leave);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -2384,6 +2703,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return true;
     }
 
+    @Override
+    public boolean isNewFriendWelcomeMessage() {
+        return mFriendNewWelcomeMessage;
+    }
+
     @Override
     public ErrorCode deleteFriend(String userId, String friendUid, long[] head) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -2422,6 +2746,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         friendsMap.remove(userId);
         friendsMap.remove(friendUid);
+        callbackRelationEvent(userId, friendUid, 0, "0");
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -2589,7 +2914,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public boolean getUserGlobalSlient(String userId) {
+    public boolean getUserGlobalSilent(String userId) {
         Boolean slient = userGlobalSlientMap.get(userId);
         if (slient == null) {
             WFCMessage.UserSettingEntry entry = getUserSetting(userId, UserSettingScope.kUserSettingGlobalSilent, null);
@@ -2619,7 +2944,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public boolean getUserConversationSlient(String userId, WFCMessage.Conversation conversation) {
+    public boolean getUserConversationSilent(String userId, WFCMessage.Conversation conversation) {
         String key = userId + "|" + conversation.getType() + "|" + conversation.getTarget() + "|" + conversation.getLine();
         Boolean slient = userConvSlientMap.get(key);
         if (slient == null) {
@@ -2635,6 +2960,52 @@ public class MemoryMessagesStore implements IMessagesStore {
         return slient;
     }
 
+    @Override
+    public boolean getSilentWhenPcOnline(String userId) {
+        WFCMessage.UserSettingEntry entry = getUserSetting(userId, UserSettingScope.kUserSettingMuteWhenPCOnline, null);
+        if (entry != null && "1".equals(entry.getValue())) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+    private Date getTodayDate() {
+        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+        int year = calendar.get(Calendar.YEAR);
+        int month = calendar.get(Calendar.MONTH);
+        int day = calendar.get(Calendar.DATE);
+        calendar.set(year, month, day, 0, 0, 0);
+        return calendar.getTime();
+    }
+
+    @Override
+    public boolean isUserNoDisturbing(String userId) {
+        WFCMessage.UserSettingEntry entry = getUserSetting(userId, UserSettingScope.kUserSettingNoDisturbing, "");
+        if (entry != null && !StringUtil.isNullOrEmpty(entry.getValue())) {
+            String[] arr = entry.getValue().split("\\|");
+
+            if (arr.length == 2) {
+                int nowMins = (int)((System.currentTimeMillis() - getTodayDate().getTime())/1000/60);
+                try {
+                    int startMins = Integer.parseInt(arr[0]);
+                    int endMins = Integer.parseInt(arr[1]);
+                    if (endMins > startMins) {
+                        if (endMins > nowMins && nowMins > startMins) {
+                            return true;
+                        }
+                    } else {
+                        if (endMins > nowMins || nowMins > startMins) {
+                            return true;
+                        }
+                    }
+                } catch (NumberFormatException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
     @Override
     public ErrorCode createChannel(String operator, WFCMessage.ChannelInfo channelInfo) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -2642,6 +3013,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         mIMap.put(channelInfo.getTargetId(), channelInfo);
 
+        callbackChannelInfoUpdateEvent(operator, channelInfo.getTargetId(), Channel_Event_Create);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -2694,6 +3066,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         newInfoBuilder.setUpdateDt(System.currentTimeMillis());
         mIMap.put(channelId, newInfoBuilder.build());
+        callbackChannelInfoUpdateEvent(operator, channelId, Channel_Event_Update);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -2720,6 +3093,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         newInfoBuilder.setOwner(newOwner);
         newInfoBuilder.setUpdateDt(System.currentTimeMillis());
         mIMap.put(channelId, newInfoBuilder.build());
+
+        callbackChannelInfoUpdateEvent(operator, channelId, Channel_Event_Transfer);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -2744,6 +3119,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         newInfoBuilder.setStatus(oldInfo.getStatus() | Channel_State_Mask_Deleted);
         newInfoBuilder.setUpdateDt(System.currentTimeMillis());
         mIMap.put(channelId, newInfoBuilder.build());
+
+        callbackChannelInfoUpdateEvent(operator, channelId, Channel_Event_Destroy);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 

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

@@ -94,6 +94,7 @@ public class Server {
 
     private ThreadPoolExecutorWrapper dbScheduler;
     private ThreadPoolExecutorWrapper imBusinessScheduler;
+    private ThreadPoolExecutorWrapper callbackScheduler;
 
     private IConfig mConfig;
 
@@ -243,6 +244,7 @@ public class Server {
         int threadNum = Runtime.getRuntime().availableProcessors() * 2;
         dbScheduler = new ThreadPoolExecutorWrapper(Executors.newScheduledThreadPool(threadNum), threadNum, "db");
         imBusinessScheduler = new ThreadPoolExecutorWrapper(Executors.newScheduledThreadPool(threadNum), threadNum, "business");
+        callbackScheduler = new ThreadPoolExecutorWrapper(Executors.newScheduledThreadPool(1), 1, "callback");
 
         final String handlerProp = System.getProperty(BrokerConstants.INTERCEPT_HANDLER_PROPERTY_NAME);
         if (handlerProp != null) {
@@ -447,6 +449,7 @@ public class Server {
 
         dbScheduler.shutdown();
         imBusinessScheduler.shutdown();
+        callbackScheduler.shutdown();
 
         LOG.info("Moquette server has been stopped.");
     }
@@ -507,4 +510,8 @@ public class Server {
     public ThreadPoolExecutorWrapper getImBusinessScheduler() {
         return imBusinessScheduler;
     }
+
+    public ThreadPoolExecutorWrapper getCallbackScheduler() {
+        return callbackScheduler;
+    }
 }

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

@@ -30,6 +30,7 @@ import io.netty.handler.codec.mqtt.MqttQoS;
 import cn.wildfirechat.common.ErrorCode;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
@@ -104,18 +105,18 @@ 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);
+    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);
     ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList);
     ErrorCode quitGroup(String operator, String groupId);
     void clearUserGroups(String userId);
     ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin);
     ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value, boolean isAdmin);
-    ErrorCode modifyGroupAlias(String operator, String groupId, String alias);
+    ErrorCode modifyGroupAlias(String operator, String groupId, String alias, String memberId, boolean isAdmin);
     List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests);
     WFCMessage.GroupInfo getGroupInfo(String groupId);
     Set<String> getUserGroupIds(String userId);
-    ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members);
+    ErrorCode getGroupMembers(String fromUser, String groupId, long maxDt, List<WFCMessage.GroupMember> members);
     WFCMessage.GroupMember getGroupMember(String groupId, String memberId);
     ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin);
     ErrorCode setGroupManager(String operator, String groupId, int type, List<String> userList, boolean isAdmin);
@@ -159,14 +160,14 @@ public interface IMessagesStore {
     WFCMessage.PullMessageResult fetchChatroomMessage(String fromUser, String chatroomId, String exceptClientId, long fromMessageId);
 
     ErrorCode verifyToken(String userId, String token, List<String> serverIPs, List<Integer> ports);
-    ErrorCode login(String name, String password, List<String> userIdRet);
 
     List<FriendData> getFriendList(String userId, String clientId, long version);
     void clearUserFriend(String userId);
     List<WFCMessage.FriendRequest> getFriendRequestList(String userId, long version);
 
-    ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head);
+    ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head, boolean isAdmin);
     ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin);
+    boolean isNewFriendWelcomeMessage();
     ErrorCode deleteFriend(String userId, String friendUid, long[] head);
     ErrorCode blackUserRequest(String fromUser, String targetUserId, int status, long[] head);
     FriendData getFriendData(String fromUser, String targetUserId);
@@ -184,11 +185,12 @@ public interface IMessagesStore {
     List<WFCMessage.UserSettingEntry> getUserSetting(String userId, int scope);
     long updateUserSettings(String userId, WFCMessage.ModifyUserSettingReq request);
     void clearUserSettings(String userId);
+    boolean getUserGlobalSilent(String userId);
 
-    boolean getUserGlobalSlient(String userId);
     boolean getUserPushHiddenDetail(String userId);
-    boolean getUserConversationSlient(String userId, WFCMessage.Conversation conversation);
-
+    boolean getUserConversationSilent(String userId, WFCMessage.Conversation conversation);
+    boolean getSilentWhenPcOnline(String userId);
+    boolean isUserNoDisturbing(String userId);
     ErrorCode createChannel(String operator, WFCMessage.ChannelInfo channelInfo);
     void clearUserChannels(String userId);
     ErrorCode modifyChannelInfo(String operator, String channelId, int modifyType, String value);

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

@@ -16,6 +16,7 @@
 
 package io.moquette.spi.impl;
 
+import cn.wildfirechat.pojos.OutputMessageData;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import cn.wildfirechat.push.PushServer;
@@ -24,11 +25,11 @@ import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.util.StringUtil;
 import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus;
 import cn.wildfirechat.pojos.SendMessageData;
-import com.xiaoleilu.hutool.system.UserInfo;
 import com.xiaoleilu.loServer.model.FriendData;
 import io.moquette.persistence.*;
 import io.moquette.persistence.MemorySessionStore.Session;
 import io.moquette.server.ConnectionDescriptorStore;
+import io.moquette.server.Server;
 import io.moquette.spi.IMessagesStore;
 import io.moquette.spi.ISessionsStore;
 import io.netty.buffer.ByteBuf;
@@ -158,7 +159,7 @@ public class MessagesPublisher {
         }
     }
 
-    private void publish2Receivers(String sender, int conversationType, String target, int line, long messageHead, Collection<String> receivers, String pushContent, String exceptClientId, int pullType, int messageContentType, long serverTime, int mentionType, List<String> mentionTargets, int persistFlag) {
+    private void publish2Receivers(String sender, int conversationType, String target, int line, long messageHead, Collection<String> receivers, String pushContent, String pushData, String exceptClientId, int pullType, int messageContentType, long serverTime, int mentionType, List<String> mentionTargets, int persistFlag) {
         if (persistFlag == Transparent) {
             publishTransparentMessage2Receivers(messageHead, receivers, pullType);
             return;
@@ -175,7 +176,7 @@ public class MessagesPublisher {
                             message = m_messagesStore.getMessage(messageHead);
                         }
                         final WFCMessage.Message finalMsg = message;
-                        executorCallback.execute(() -> HttpUtils.httpJsonPost(robot.getCallback(), new Gson().toJson(SendMessageData.fromProtoMessage(finalMsg), SendMessageData.class)));
+                        Server.getServer().getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(robot.getCallback(), new Gson().toJson(SendMessageData.fromProtoMessage(finalMsg), SendMessageData.class)));
                         continue;
                     }
                 }
@@ -197,6 +198,23 @@ public class MessagesPublisher {
             if (pullType == ProtoConstants.PullType.Pull_ChatRoom) {
                 targetClients = m_messagesStore.getChatroomMemberClient(user);
             }
+            boolean isPcOnline = false;
+
+            if (!user.equals(sender)) {
+                for (Session targetSession : sessions) {
+                    if (targetSession.getPlatform() == ProtoConstants.Platform.Platform_WEB
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_Windows
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_LINUX
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_OSX) {
+                        boolean targetIsActive = this.connectionDescriptors.isConnected(targetSession.getClientSession().clientID);
+                        if (targetIsActive) {
+                            isPcOnline = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
             for (Session targetSession : sessions) {
                 //超过7天不活跃的用户忽略
                 if(System.currentTimeMillis() - targetSession.getLastActiveTime() > 7 * 24 * 60 * 60 * 1000) {
@@ -226,11 +244,13 @@ public class MessagesPublisher {
                     }
                 }
 
-                boolean isSlient;
+                boolean isSilent;
+                boolean isConvSilent = false;
                 if (pullType == ProtoConstants.PullType.Pull_ChatRoom) {
-                    isSlient = true;
+                    isSilent = true;
+                    isConvSilent = true;
                 } else {
-                    isSlient = false;
+                    isSilent = false;
 
                     if (!user.equals(sender)) {
                         WFCMessage.Conversation conversation;
@@ -240,29 +260,32 @@ public class MessagesPublisher {
                             conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(target).build();
                         }
 
-
-                        if (m_messagesStore.getUserConversationSlient(user, conversation)) {
+                        if (m_messagesStore.getUserConversationSilent(user, conversation)) {
                             LOG.info("The conversation {}-{}-{} is slient", conversation.getType(), conversation.getTarget(), conversation.getLine());
-                            isSlient = true;
+                            isConvSilent = true;
                         }
 
-                        if (m_messagesStore.getUserGlobalSlient(user)) {
+                        if (m_messagesStore.getUserGlobalSilent(user)) {
                             LOG.info("The user {} is global sliented", user);
-                            isSlient = true;
+                            isSilent = true;
+                        }
+
+                        if (!isSilent && isPcOnline && m_messagesStore.getSilentWhenPcOnline(user)) {
+                            LOG.info("The user {} pc online and silent when pc online", user);
+                            isSilent = true;
+                        }
+
+                        if (!isSilent && m_messagesStore.isUserNoDisturbing(user)) {
+                            LOG.info("The user {} is no disturbing", user);
+                            isSilent = true;
                         }
                     }
 
-                    if (!StringUtil.isNullOrEmpty(pushContent) || messageContentType == 400 || messageContentType == 402) {
-                        if (!isSlient) {
+                    if (!StringUtil.isNullOrEmpty(pushContent) || messageContentType == 400) {
+                        if (!isConvSilent && (persistFlag & 0x02) > 0) {
                             targetSession.setUnReceivedMsgs(targetSession.getUnReceivedMsgs() + 1);
                         }
                     }
-
-                    if (isSlient) {
-                        if (mentionType == 2 || (mentionType == 1 && mentionTargets.contains(user))) {
-                            isSlient = false;
-                        }
-                    }
                 }
 
                 boolean needPush = !user.equals(sender);
@@ -293,11 +316,11 @@ public class MessagesPublisher {
                     int curMentionType = 0;
                     if (mentionType == 2) {
                         curMentionType = 2;
-                        isSlient = false;
+                        isConvSilent = false;
                     } else if (mentionType == 1){
                         if (mentionTargets != null && mentionTargets.contains(user)) {
                             curMentionType = 1;
-                            isSlient = false;
+                            isConvSilent = false;
                         }
                     }
 
@@ -311,8 +334,13 @@ public class MessagesPublisher {
                         continue;
                     }
 
-                    if (isSlient) {
-                        LOG.info("Slient of user or conversation");
+                    if (isConvSilent) {
+                        LOG.info("Silent of user or conversation");
+                        continue;
+                    }
+
+                    if (isSilent) {
+                        LOG.info("Silent of user");
                         continue;
                     }
 
@@ -331,7 +359,7 @@ public class MessagesPublisher {
                             name = fd.getAlias();
                         }
                     }
-                    this.messageSender.sendPush(sender, conversationType, target, line, messageHead, targetSession.getClientID(), pushContent, messageContentType, serverTime, name, targetName, targetSession.getUnReceivedMsgs(), curMentionType, isHiddenDetail, targetSession.getLanguage());
+                    this.messageSender.sendPush(sender, conversationType, target, line, messageHead, targetSession.getClientID(), pushContent, pushData, messageContentType, serverTime, name, targetName, targetSession.getUnReceivedMsgs(), curMentionType, isHiddenDetail, targetSession.getLanguage());
                 }
 
             }
@@ -509,7 +537,7 @@ public class MessagesPublisher {
         if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
             WFCMessage.ChannelInfo channelInfo = m_messagesStore.getChannelInfo(message.getConversation().getTarget());
             if (channelInfo != null && !StringUtil.isNullOrEmpty(channelInfo.getCallback())) {
-                executorCallback.execute(() -> HttpUtils.httpJsonPost(channelInfo.getCallback() + "/message", new Gson().toJson(SendMessageData.fromProtoMessage(message), SendMessageData.class)));
+                Server.getServer().getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(channelInfo.getCallback() + "/message", new Gson().toJson(SendMessageData.fromProtoMessage(message), SendMessageData.class)));
             }
         }
         long messageId = message.getMessageId();
@@ -544,18 +572,19 @@ public class MessagesPublisher {
                     message.getConversation().getType(), message.getConversation().getTarget(), message.getConversation().getLine(),
                     messageId,
                     receivers,
-                    pushContent, exceptClientId, pullType, message.getContent().getType(), message.getServerTimestamp(), message.getContent().getMentionedType(), message.getContent().getMentionedTargetList(), message.getContent().getPersistFlag());
+                    pushContent, message.getContent().getPushData(), exceptClientId, pullType, message.getContent().getType(), message.getServerTimestamp(), message.getContent().getMentionedType(), message.getContent().getMentionedTargetList(), message.getContent().getPersistFlag());
 
     }
 
     public void forwardMessage(final WFCMessage.Message message, String forwardUrl) {
-        executorCallback.execute(() -> HttpUtils.httpJsonPost(forwardUrl, new Gson().toJson(SendMessageData.fromProtoMessage(message), SendMessageData.class)));
+        Server.getServer().getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(forwardUrl, new Gson().toJson(OutputMessageData.fromProtoMessage(message), OutputMessageData.class)));
     }
 
     public void notifyChannelListenStatusChanged(WFCMessage.ChannelInfo channelInfo, String user, boolean listen) {
         if (channelInfo == null || StringUtil.isNullOrEmpty(channelInfo.getCallback())) {
             return;
         }
-        executorCallback.execute(() -> HttpUtils.httpJsonPost(channelInfo.getCallback() + "/subscribe", new Gson().toJson(new OutputNotifyChannelSubscribeStatus(user, channelInfo.getTargetId(), listen), OutputNotifyChannelSubscribeStatus.class)));
+
+        Server.getServer().getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(channelInfo.getCallback() + "/subscribe", new Gson().toJson(new OutputNotifyChannelSubscribeStatus(user, channelInfo.getTargetId(), listen), OutputNotifyChannelSubscribeStatus.class)));
     }
 }

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

@@ -37,10 +37,11 @@ class PersistentQueueMessageSender {
         this.connectionDescriptorStore = connectionDescriptorStore;
     }
 
-    void sendPush(String sender, int conversationType, String target, int line, long messageHead, String deviceId, String pushContent, int messageContentType, long serverTime, String senderName, String targetName, int unReceivedMsg, int mentionType, boolean isHiddenDetail, String language) {
+    void sendPush(String sender, int conversationType, String target, int line, long messageHead, String deviceId, String pushContent, String pushData, int messageContentType, long serverTime, String senderName, String targetName, int unReceivedMsg, int mentionType, boolean isHiddenDetail, String language) {
         LOG.info("Send push to {}, message from {}", deviceId, sender);
         PushMessage pushMessage = new PushMessage(sender, conversationType, target, line, messageContentType, serverTime, senderName, targetName, unReceivedMsg, mentionType, isHiddenDetail, language);
         pushMessage.pushContent = pushContent;
+        pushMessage.pushData = pushData;
         PushServer.getServer().pushMessage(pushMessage, deviceId, pushContent);
     }
 

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

@@ -243,18 +243,16 @@ public class ProtocolProcessor {
         MemorySessionStore.Session session = m_sessionsStore.getSession(clientId);
         if(session != null) {
             session.refreshLastActiveTime();
-            forwardOnlineStatusEvent(payload.userName(), clientId, session.getPlatform(), UserOnlineStatus.ONLINE);
+            forwardOnlineStatusEvent(payload.userName(), clientId, session.getPlatform(), UserOnlineStatus.ONLINE, session.getAppName());
             m_messagesStore.updateUserOnlineSetting(session, true);
-        } else {
-            forwardOnlineStatusEvent(payload.userName(), clientId, ProtoConstants.Platform.Platform_UNSET, UserOnlineStatus.ONLINE);
         }
 
         LOG.info("The CONNECT message has been processed. CId={}, username={}", clientId, payload.userName());
     }
 
-    public void forwardOnlineStatusEvent(String userId, String clientId, int platform, int status) {
+    public void forwardOnlineStatusEvent(String userId, String clientId, int platform, int status, String packageName) {
         if (!StringUtil.isNullOrEmpty(mUserOnlineStatusCallback)) {
-            executorCallback.execute(() -> HttpUtils.httpJsonPost(mUserOnlineStatusCallback, new Gson().toJson(new UserOnlineStatus(userId, clientId, platform, status))));
+            mServer.getCallbackScheduler().execute(() -> HttpUtils.httpJsonPost(mUserOnlineStatusCallback, new Gson().toJson(new UserOnlineStatus(userId, clientId, platform, status, packageName))));
         }
     }
 
@@ -562,9 +560,7 @@ public class ProtocolProcessor {
         MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
         if(session != null) {
             m_messagesStore.updateUserOnlineSetting(session, false);
-        }
-        if(session != null) {
-            forwardOnlineStatusEvent(username, clientID, session.getPlatform(), UserOnlineStatus.LOGOUT);
+            forwardOnlineStatusEvent(username, clientID, session.getPlatform(), UserOnlineStatus.LOGOUT, session.getAppName());
         }
 
         channel.closeFuture();
@@ -608,7 +604,7 @@ public class ProtocolProcessor {
         MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
         if(session != null) {
             session.refreshLastActiveTime();
-            forwardOnlineStatusEvent(username, clientID, session.getPlatform(), clearSession ? UserOnlineStatus.LOGOUT : UserOnlineStatus.OFFLINE);
+            forwardOnlineStatusEvent(username, clientID, session.getPlatform(), clearSession ? UserOnlineStatus.LOGOUT : UserOnlineStatus.OFFLINE, session.getAppName());
             m_messagesStore.updateUserOnlineSetting(session, false);
         }
 

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

@@ -28,6 +28,7 @@ public interface IMTopic {
 	String DismissGroupTopic = "GD";
 	String ModifyGroupInfoTopic = "GMI";
     String ModifyGroupAliasTopic = "GMA";
+    String ModifyGroupMemberAliasTopic = "GMMA";
     String GetGroupInfoTopic = "GPGI";
     String GetGroupMemberTopic = "GPGM";
     String TransferGroupTopic = "GTG";

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

@@ -10,10 +10,12 @@ package win.liyufan.im;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class MessageShardingUtil {
     private static SpinLock mLock = new SpinLock();
-    private static int rotateId = 0;
+    private static volatile int rotateId = 0;
+    private static volatile long timeId = 0;
     private static int nodeId = 0;
 
     private static int rotateIdWidth = 15;
@@ -33,19 +35,50 @@ public class MessageShardingUtil {
      * 所以时间限制是到2157/5/15（2的42次幂代表的时间 + (2018-1970)）。节点数限制是小于64，每台服务器每毫秒最多发送32768条消息
      * @return
      */
-    public static long generateId() {
+    public static long generateId() throws Exception {
         mLock.lock();
-        rotateId = (rotateId + 1)&rotateIdMask;
-        mLock.unLock();
 
+        rotateId = (rotateId + 1)&rotateIdMask;
         long id = System.currentTimeMillis() - T201801010000;
 
+        if (id > timeId) {
+            timeId = id;
+            rotateId = 1;
+        } else if(id == timeId) {
+            if (rotateId == (rotateIdMask - 1)) { //当前空间已经用完，等待下一个空间打开
+                while (id <= timeId) {
+                    id = System.currentTimeMillis() - T201801010000;
+                }
+                mLock.unLock();
+                return generateId();
+            }
+        } else { //id < timeId;
+            if (rotateId > (rotateIdMask -1)*9/10) { //空间已经接近用完
+                if (timeId - id < 3000) { //时间回拨小于3秒，等待时间赶上回拨之前记录
+                    while (id < timeId) {
+                        id = System.currentTimeMillis() - T201801010000;
+                    }
+                    mLock.unLock();
+                    return generateId();
+                } else { //时间回拨大于3秒，抛出异常，这段时间消息将不可用。
+                    mLock.unLock();
+                    throw new Exception("Time turn back " + (timeId - id) + " ms, it too long!!!");
+                }
+            } else {
+                id = timeId;
+            }
+
+        }
 
         id <<= nodeIdWidth;
         id += (nodeId & nodeIdMask);
 
         id <<= rotateIdWidth;
         id += rotateId;
+
+        mLock.unLock();
+
+
         return id;
     }
 
@@ -55,7 +88,7 @@ public class MessageShardingUtil {
         }
 
         Calendar calendar = Calendar.getInstance();
-        if (mid != Long.MAX_VALUE) {
+        if (mid != Long.MAX_VALUE && mid != 0) {
             mid >>= (nodeIdWidth + rotateIdWidth);
             Date date = new Date(mid + T201801010000);
             calendar.setTime(date);
@@ -70,6 +103,10 @@ public class MessageShardingUtil {
     }
 
     public static String getPreviousMessageTable(long mid) {
+        return getMessageTable(mid, -1);
+    }
+
+    public static String getMessageTable(long mid, int offset) {
         if (DBUtil.IsEmbedDB) {
             return null;
         }
@@ -81,11 +118,40 @@ public class MessageShardingUtil {
         int month = calendar.get(Calendar.MONTH);
         int year = calendar.get(Calendar.YEAR);
         year %= 3;
-        month = month - 1;
-        if (month == -1) {
-            month = 11;
+
+        month = month + offset;
+        while (month < 0) {
+            month += 12;
             year = (year + 3 - 1)%3;
         }
+        while (month >= 12) {
+            month -= 12;
+            year = (year + 1)%3;
+        }
+
         return "t_messages_" + (year * 12 + month);
     }
+
+    public static void main(String[] args) throws Exception {
+        ConcurrentHashMap<Long, Integer> messageIds = new ConcurrentHashMap<>();
+
+        int threadCount = 1000;
+        int loop = 1000000;
+        for (int i = 0; i < threadCount; i++) {
+            new Thread(()->{
+                for (int j = 0; j < loop; j++) {
+                    try {
+                        long mid = generateId();
+                        if(messageIds.put(mid, j) != null) {
+                            System.out.println("Duplicated message id !!!!!!" + mid);
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }
+
+        Thread.sleep(1000 * 60 * 10);
+    }
 }

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

@@ -3,15 +3,11 @@ package win.liyufan.im;
 public interface UserSettingScope {
     int kUserSettingConversationSilent = 1;
     int kUserSettingGlobalSilent = 2;
-    int kUserSettingConversationTop = 3;
-
     int kUserSettingHiddenNotificationDetail = 4;
-    int kUserSettinGroupHideNickname = 5;
-    int kUserSettingFavouriteGroup = 6;
     int kUserSettingConversationSync = 7;
     int kUserSettingMyChannels = 8;
     int kUserSettingListenedChannels = 9;
     int kUserSettingPCOnline = 10;
-
-    int kUserSettingCustomBegin = 1000;
+    int kUserSettingMuteWhenPCOnline = 15;
+    int kUserSettingNoDisturbing = 17;
 }

common/pom.xml

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

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

@@ -36,6 +36,8 @@ public interface APIPath {
     String Blacklist_Get_List = "/admin/blacklist/list";
     String Friend_Get_Alias = "/admin/friend/get_alias";
     String Friend_Set_Alias = "/admin/friend/set_alias";
+    String Friend_Send_Request = "/admin/friend/send_request";
+    String Friend_Get_Requests = "/admin/friend/get_requests";
 
     String Msg_Send = "/admin/message/send";
     String Msg_Recall = "/admin/message/recall";
@@ -53,6 +55,8 @@ public interface APIPath {
     String Group_Member_Kickoff = "/admin/group/member/del";
     String Group_Member_Quit = "/admin/group/member/quit";
     String Group_Set_Manager = "/admin/group/manager/set";
+    String Group_Mute_Member = "/admin/group/manager/mute";
+    String Group_Allow_Member = "/admin/group/manager/allow";
     String Get_User_Groups = "/admin/group/of_user";
 
 

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

@@ -29,10 +29,6 @@ public enum ErrorCode {
     //Group error
     ERROR_CODE_GROUP_ALREADY_EXIST(11, "group aleady exist"),
 
-
-    //user error
-    ERROR_CODE_PASSWORD_INCORRECT(15, "password incorrect"),
-
     //user error
     ERROR_CODE_FRIEND_ALREADY_REQUEST(16, "already send request"),
     ERROR_CODE_FRIEND_REQUEST_BLOCKED(18, "friend request blocked"),
@@ -42,6 +38,11 @@ public enum ErrorCode {
 
     ERROR_CODE_NOT_IN_CHANNEL(21, "not in channel"),
 
+    ERROR_CODE_ALREADY_FRIENDS(23, "already friends"),
+
+    ERROR_CODE_RECALL_TIME_EXPIRED(24, "time expired"),
+
+    ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT(240, "group exceed max member count"),
     ERROR_CODE_GROUP_MUTED(241, "group is muted"),
     ERROR_CODE_SENSITIVE_MATCHED(242, "sensitive matched"),
     ERROR_CODE_SIGN_EXPIRED(243, "sign expired"),

common/src/main/java/cn/wildfirechat/pojos/ChannelUpdateEvent.java

@@ -0,0 +1,7 @@
+package cn.wildfirechat.pojos;
+
+public class ChannelUpdateEvent {
+    public String operatorId;
+    public String channelId;
+    public int type;
+}

common/src/main/java/cn/wildfirechat/pojos/ChatroomMemberUpdateEvent.java

@@ -0,0 +1,10 @@
+package cn.wildfirechat.pojos;
+
+import java.util.List;
+
+public class ChatroomMemberUpdateEvent {
+    public String operatorId;
+    public String chatroomId;
+    public List<String> memberIds;
+    public int type;
+}

common/src/main/java/cn/wildfirechat/pojos/ChatroomUpdateEvent.java

@@ -0,0 +1,6 @@
+package cn.wildfirechat.pojos;
+
+public class ChatroomUpdateEvent {
+    public String chatroomId;
+    public int type;
+}

common/src/main/java/cn/wildfirechat/pojos/GroupMemberUpdateEvent.java

@@ -0,0 +1,11 @@
+package cn.wildfirechat.pojos;
+
+import java.util.List;
+
+public class GroupMemberUpdateEvent {
+    public String operatorId;
+    public String groupId;
+    public List<String> memberIds;
+    public int type;
+    public String value;
+}

common/src/main/java/cn/wildfirechat/pojos/GroupNotificationBinaryContent.java

@@ -145,6 +145,11 @@ public class GroupNotificationBinaryContent {
         return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_SET_MANAGER);
     }
 
+    public WFCMessage.MessageContent getMuteGroupMemberNotifyContent() {
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_MUTE_MEMBER);
+    }
 
-
+    public WFCMessage.MessageContent getAllowGroupMemberNotifyContent() {
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_ALLOW_MEMBER);
+    }
 }

common/src/main/java/cn/wildfirechat/pojos/GroupUpdateEvent.java

@@ -0,0 +1,7 @@
+package cn.wildfirechat.pojos;
+
+public class GroupUpdateEvent {
+    public String operatorId;
+    public String groupId;
+    public int type;
+}

common/src/main/java/cn/wildfirechat/pojos/InputAddFriendRequest.java

@@ -0,0 +1,50 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+
+public class InputAddFriendRequest {
+    private String userId;
+    private String friendUid;
+    private String reason;
+    private boolean force;
+
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getFriendUid() {
+        return friendUid;
+    }
+
+    public void setFriendUid(String friendUid) {
+        this.friendUid = friendUid;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public boolean isForce() {
+        return force;
+    }
+
+    public void setForce(boolean force) {
+        this.force = force;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/InputCreateGroup.java

@@ -24,27 +24,41 @@ public class InputCreateGroup extends InputGroupBase {
     public WFCMessage.CreateGroupRequest toProtoGroupRequest() {
         WFCMessage.Group.Builder groupBuilder = WFCMessage.Group.newBuilder();
         WFCMessage.GroupInfo.Builder groupInfoBuilder = WFCMessage.GroupInfo.newBuilder();
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().target_id)) {
-            groupInfoBuilder.setTargetId(group.getGroup_info().getTarget_id());
+        PojoGroupInfo group_info = group.getGroup_info();
+        if (!StringUtil.isNullOrEmpty(group_info.target_id)) {
+            groupInfoBuilder.setTargetId(group_info.getTarget_id());
         }
 
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().name)) {
-            groupInfoBuilder.setName(group.getGroup_info().getName());
+        if (!StringUtil.isNullOrEmpty(group_info.name)) {
+            groupInfoBuilder.setName(group_info.getName());
         }
 
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().portrait)) {
-            groupInfoBuilder.setPortrait(group.getGroup_info().getPortrait());
+        if (!StringUtil.isNullOrEmpty(group_info.portrait)) {
+            groupInfoBuilder.setPortrait(group_info.getPortrait());
         }
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().owner)) {
-            groupInfoBuilder.setOwner(group.getGroup_info().getOwner());
+        if (!StringUtil.isNullOrEmpty(group_info.owner)) {
+            groupInfoBuilder.setOwner(group_info.getOwner());
         }
 
-            groupInfoBuilder.setType(group.getGroup_info().getType());
+        groupInfoBuilder.setType(group_info.getType());
 
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().extra)) {
-            groupInfoBuilder.setExtra(group.getGroup_info().getExtra());
+        if (!StringUtil.isNullOrEmpty(group_info.extra)) {
+            groupInfoBuilder.setExtra(group_info.getExtra());
         }
 
+        if (group_info.join_type > 0 && group_info.join_type < 128) {
+            groupInfoBuilder.setJoinType(group_info.join_type);
+        }
+
+        if (group_info.mute > 0 && group_info.mute < 128) {
+            groupInfoBuilder.setMute(group_info.mute);
+        }
+        if (group_info.private_chat > 0 && group_info.private_chat < 128) {
+            groupInfoBuilder.setPrivateChat(group_info.private_chat);
+        }
+        if (group_info.searchable > 0) {
+            groupInfoBuilder.setSearchable(group_info.searchable);
+        }
 
         groupBuilder.setGroupInfo(groupInfoBuilder);
         for (PojoGroupMember pojoGroupMember : group.getMembers()) {

common/src/main/java/cn/wildfirechat/pojos/InputMuteGroupMember.java

@@ -0,0 +1,72 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+
+import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+import java.util.List;
+
+public class InputMuteGroupMember extends InputGroupBase {
+    private String group_id;
+    private List<String> members;
+    private boolean is_manager;
+
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+
+    public List<String> getMembers() {
+        return members;
+    }
+
+    public void setMembers(List<String> members) {
+        this.members = members;
+    }
+
+    public boolean isIs_manager() {
+        return is_manager;
+    }
+
+    public void setIs_manager(boolean is_manager) {
+        this.is_manager = is_manager;
+    }
+
+    public boolean isValide() {
+        if (StringUtil.isNullOrEmpty(operator) || StringUtil.isNullOrEmpty(group_id) || members == null || members.isEmpty()) {
+            return false;
+        }
+        return true;
+    }
+
+    public WFCMessage.SetGroupManagerRequest toProtoGroupRequest() {
+        WFCMessage.SetGroupManagerRequest.Builder addGroupBuilder = WFCMessage.SetGroupManagerRequest.newBuilder();
+        addGroupBuilder.setGroupId(group_id);
+        addGroupBuilder.addAllUserId(members);
+        addGroupBuilder.setType(is_manager ? 1 : 0);
+
+        if (to_lines != null) {
+            for (Integer line : to_lines
+            ) {
+                addGroupBuilder.addToLine(line);
+            }
+        }
+
+        if (notify_message != null) {
+            addGroupBuilder.setNotifyContent(notify_message.toProtoMessageContent());
+        }
+        return addGroupBuilder.build();
+    }
+
+}

common/src/main/java/cn/wildfirechat/pojos/InputUpdateFriendStatusRequest.java

@@ -9,7 +9,7 @@
 package cn.wildfirechat.pojos;
 
 
-public class InputFriendRequest {
+public class InputUpdateFriendStatusRequest {
     private String userId;
     private String friendUid;
     private int status;

common/src/main/java/cn/wildfirechat/pojos/MessagePayload.java

@@ -20,6 +20,7 @@ public class MessagePayload {
     private int type;
     private String searchableContent;
     private String pushContent;
+    private String pushData;
     private String content;
     private String base64edData;
     private int mediaType;
@@ -28,6 +29,8 @@ public class MessagePayload {
     private int expireDuration;
     private int mentionedType;
     private List<String> mentionedTarget;
+    private String extra;
+
 
     public int getType() {
         return type;
@@ -117,6 +120,22 @@ public class MessagePayload {
         this.mentionedTarget = mentionedTarget;
     }
 
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+    public String getPushData() {
+        return pushData;
+    }
+
+    public void setPushData(String pushData) {
+        this.pushData = pushData;
+    }
+
     public WFCMessage.MessageContent toProtoMessageContent() {
         WFCMessage.MessageContent.Builder builder = WFCMessage.MessageContent.newBuilder()
             .setType(type)
@@ -137,6 +156,10 @@ public class MessagePayload {
             builder.setRemoteMediaUrl(remoteMediaUrl);
         if (mentionedTarget != null && mentionedTarget.size() > 0)
             builder.addAllMentionedTarget(mentionedTarget);
+        if (!StringUtil.isNullOrEmpty(extra))
+            builder.setExtra(extra);
+        if (!StringUtil.isNullOrEmpty(pushData))
+            builder.setPushData(pushData);
 
         return builder.build();
     }
@@ -159,6 +182,8 @@ public class MessagePayload {
         payload.mentionedType = protoContent.getMentionedType();
         payload.mentionedTarget = new ArrayList<>();
         payload.mentionedTarget.addAll(protoContent.getMentionedTargetList());
+        payload.extra = protoContent.getExtra();
+        payload.pushData = protoContent.getPushData();
         return payload;
     }
 }

common/src/main/java/cn/wildfirechat/pojos/OutputCreateChannel.java

@@ -13,11 +13,9 @@ import cn.wildfirechat.proto.WFCMessage;
 
 public class OutputCreateChannel {
     private String targetId;
-    private String secret;
 
-    public OutputCreateChannel(String targetId, String secret) {
+    public OutputCreateChannel(String targetId) {
         this.targetId = targetId;
-        this.secret = secret;
     }
 
     public String getTargetId() {
@@ -27,12 +25,4 @@ public class OutputCreateChannel {
     public void setTargetId(String targetId) {
         this.targetId = targetId;
     }
-
-    public String getSecret() {
-        return secret;
-    }
-
-    public void setSecret(String secret) {
-        this.secret = secret;
-    }
 }

common/src/main/java/cn/wildfirechat/pojos/OutputMessageData.java

@@ -0,0 +1,85 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+import java.util.List;
+
+public class OutputMessageData {
+    private long messageId;
+    private String sender;
+    private Conversation conv;
+    private MessagePayload payload;
+    private List<String> toUsers;
+    private long timestamp;
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    public Conversation getConv() {
+        return conv;
+    }
+
+    public void setConv(Conversation conv) {
+        this.conv = conv;
+    }
+
+    public MessagePayload getPayload() {
+        return payload;
+    }
+
+    public void setPayload(MessagePayload payload) {
+        this.payload = payload;
+    }
+
+    public List<String> getToUsers() {
+        return toUsers;
+    }
+
+    public void setToUsers(List<String> toUsers) {
+        this.toUsers = toUsers;
+    }
+
+    public long getMessageId() {
+        return messageId;
+    }
+
+    public void setMessageId(long messageId) {
+        this.messageId = messageId;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public static OutputMessageData fromProtoMessage(WFCMessage.Message protoMessage) {
+        OutputMessageData data = new OutputMessageData();
+        data.messageId = protoMessage.getMessageId();
+        data.sender = protoMessage.getFromUser();
+        data.conv = new Conversation();
+        data.conv.setTarget(protoMessage.getConversation().getTarget());
+        data.conv.setType(protoMessage.getConversation().getType());
+        data.conv.setLine(protoMessage.getConversation().getLine());
+        data.payload = MessagePayload.fromProtoMessageContent(protoMessage.getContent());
+        data.timestamp = protoMessage.getServerTimestamp();
+        data.toUsers = protoMessage.getToList();
+        return data;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/PojoGroupInfo.java

@@ -15,6 +15,12 @@ public class PojoGroupInfo {
     String owner;
     int type;
     String extra;
+    int mute;
+    int join_type;
+    int private_chat;
+    int searchable;
+    int max_member_count;
+    int history_message;
 
     public String getTarget_id() {
         return target_id;
@@ -63,4 +69,52 @@ public class PojoGroupInfo {
     public void setExtra(String extra) {
         this.extra = extra;
     }
+
+    public int getMax_member_count() {
+        return max_member_count;
+    }
+
+    public void setMax_member_count(int max_member_count) {
+        this.max_member_count = max_member_count;
+    }
+
+    public int getMute() {
+        return mute;
+    }
+
+    public void setMute(int mute) {
+        this.mute = mute;
+    }
+
+    public int getJoin_type() {
+        return join_type;
+    }
+
+    public void setJoin_type(int join_type) {
+        this.join_type = join_type;
+    }
+
+    public int getPrivate_chat() {
+        return private_chat;
+    }
+
+    public void setPrivate_chat(int private_chat) {
+        this.private_chat = private_chat;
+    }
+
+    public int getSearchable() {
+        return searchable;
+    }
+
+    public void setSearchable(int searchable) {
+        this.searchable = searchable;
+    }
+
+    public int getHistory_message() {
+        return history_message;
+    }
+
+    public void setHistory_message(int history_message) {
+        this.history_message = history_message;
+    }
 }

common/src/main/java/cn/wildfirechat/pojos/RelationUpdateEvent.java

@@ -0,0 +1,8 @@
+package cn.wildfirechat.pojos;
+
+public class RelationUpdateEvent {
+    public String userId;
+    public String targetId;
+    public int type;
+    public String value;
+}

common/src/main/java/cn/wildfirechat/pojos/UserOnlineStatus.java

@@ -10,12 +10,17 @@ public class UserOnlineStatus {
     public int platform;
     public int status;
     public long timestamp;
+    public String packageName;
 
-    public UserOnlineStatus(String userId, String clientId, int platform, int status) {
+    public UserOnlineStatus() {
+    }
+
+    public UserOnlineStatus(String userId, String clientId, int platform, int status, String packageName) {
         this.userId = userId;
         this.clientId = clientId;
         this.platform = platform;
         this.status = status;
+        this.packageName = packageName;
         this.timestamp = System.currentTimeMillis();
     }
 }

common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java

@@ -28,6 +28,7 @@ public class ProtoConstants {
         int GroupMemberType_Owner = 2;
         int GroupMemberType_Silent = 3;
         int GroupMemberType_Removed = 4;
+        int GroupMemberType_Allowed = 5;
     }
 
     //message FriendRequest -> status
@@ -163,7 +164,42 @@ public class ProtoConstants {
         int Message_Ignore = 1;
     }
 
+    public interface GroupUpdateEventType {
+        int Group_Event_Create = 0;
+        int Group_Event_Update = 1;
+        int Group_Event_Transfer = 2;
+        int Group_Event_Mute = 3;
+        int Group_Event_Unmute = 4;
+        int Group_Event_Destroy = 5;
+    }
 
+    public interface GroupMemberUpdateEventType {
+        int Group_Member_Event_Join = 0;
+        int Group_Member_Event_Leave = 1;
+        int Group_Member_Event_Kickoff = 2;
+        int Group_Member_Event_Type_Update = 3;
+        int Group_Member_Event_Alias = 4;
+    }
+
+    public interface ChannelUpdateEventType {
+        int Channel_Event_Create = 0;
+        int Channel_Event_Update = 1;
+        int Channel_Event_Transfer = 2;
+        int Channel_Event_Destroy = 3;
+    }
+
+    public interface ChatroomUpdateEventType {
+        int Chatroom_Event_Create = 0;
+        int Chatroom_Event_Destroy = 1;
+    }
+
+    public interface ChatroomMemberUpdateEventType {
+        int Chatroom_Member_Event_Join = 0;
+        int Chatroom_Member_Event_Leave = 1;
+        int Chatroom_Member_Event_Kickoff = 2;
+        int Chatroom_Member_Event_Mute = 3;
+        int Chatroom_Member_Event_Unmute = 4;
+    }
 
     public static final int MESSAGE_CONTENT_TYPE_CREATE_GROUP = 104;
     public static final int MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER = 105;
@@ -181,5 +217,7 @@ public class ProtoConstants {
     public static final int MESSAGE_CONTENT_TYPE_CHANGE_SEARCHABLE = 116;
 
     public static final int MESSAGE_CONTENT_TYPE_SET_MANAGER = 117;
+    public static final int MESSAGE_CONTENT_TYPE_MUTE_MEMBER = 118;
+    public static final int MESSAGE_CONTENT_TYPE_ALLOW_MEMBER = 119;
 }
 

distribution/pom.xml

@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.41</version>
+        <version>0.47</version>
     </parent>
 
     <artifactId>distribution</artifactId>

distribution/src/main/resources/c3p0-config.xml

@@ -41,7 +41,7 @@
         <!--关闭连接时，是否提交未提交的事务，默认为false，即关闭连接，回滚未提交的事务 -->
         <property name="autoCommitOnClose">false</property>
         <!--c3p0将建一张名为Test的空表，并使用其自带的查询语句进行测试。如果定义了这个参数那么属性preferredTestQuery将被忽略。你不能在这张Test表上进行任何操作，它将只供c3p0测试使用。默认值: null -->
-        <property name="automaticTestTable">Test</property>
+<!--        <property name="automaticTestTable">Test</property>-->
         <!--如果为false，则获取连接失败将会引起所有等待连接池来获取连接的线程抛出异常，但是数据源仍有效保留，并在下次调用getConnection()的时候继续尝试获取连接。如果设为true，那么在尝试获取连接失败后该数据源将申明已断开并永久关闭。默认: false-->
         <property name="breakAfterAcquireFailure">false</property>
         <!--每60秒检查所有连接池中的空闲连接。默认值: 0，不检查 -->

distribution/src/main/resources/wildfirechat.conf

@@ -37,7 +37,7 @@ http.admin.secret_key 123456
 ##nonce = "76616", timestamp = "1558350862502", sign = "b98f9b0717f59febccf1440067a7f50d9b31bdde"
 http.admin.no_check_time false
 
-##客户端协议栈密钥，需要与客户端协议栈文件libemqq.cc文件中的aes_key值保持一致，16进制byte用逗号分割。这个密钥对安全性帮助不大，客户不要修改
+##客户端协议栈密钥，需要与客户端协议栈文件libemqq.cc文件中的aes_key值保持一致，16进制byte用逗号分割。这个密钥不能修改！！！
 client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F
 
 ##用来生产im token的私钥，只在服务器使用，客户端不用。正式使用时为了安全一定要修改这个值，切记切记
@@ -46,10 +46,12 @@ token.key testim
 ##token的过期时间，单位为毫秒，默认为无限期。如果需要设置无限期，客户端上一定需要加上token过期的处理。token过期的处理请参考文档的常见问题
 ##token.expire_time 2592000000
 
-##首次登录，是否接收之前的历史消息。0 不接收；1接收。
+##首次登录，是否接收之前的历史消息。
+##0 不接收历史消息，只接收5分钟以内的消息，由于服务器没有保存已经收取记录，所以如果有超过5分钟之前未收取的消息也不会收取下拉；
+##1接收，会接收 message.max_queue 配置的条数的历史消息
 message.roaming 0
 
-##是否开启拉取远程历史消息
+##是否开启拉取远程历史消息。如果为1，客户端在会话内如果本地消息读取完了，可以下拉继续加载在服务器上的该会话的消息；如果为0则不能。
 message.remote_history_message 0
 
 ##服务器为每个用户缓存的消息数量。这个值改得太大，拉取消息时间变长，另外会占用大量内存。
@@ -58,13 +60,15 @@ message.max_queue 1024
 ##是否禁止陌生人聊天
 message.disable_stranger_chat false
 
-##黑名单处理策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃；2 敏感词替换为***；3 不处理。
-##所有命中敏感词的消息都会被记录在敏感词消息表中
+##黑名单策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃
 message.blacklist.strategy 0
 
 ##是否禁止服务器端消息搜索，该功能暂未实现。目前的影响是如果打开，则存储消息时不单独保存_searchable_content字段
 message.disable_remote_search  false
 
+##允许客户端撤回消息时限，单位是秒。群组管理员或群主撤回群成员消息、server api不受此限制，可以撤回任意时限内的消息
+message.recall_time_limit 120
+
 ##禁止搜索用户
 friend.disable_search false
 
@@ -83,6 +87,12 @@ friend.reject_request_duration 2592000000
 ##好友请求过期时间，单位是毫秒，默认是7天，0为不限制
 friend.request_expiration_duration 604800000
 
+##添加好友后会发送欢迎消息，比如"你们已经是好友了，可以聊天了"。这个开关控制是用旧的方式还是用新的方式。
+##旧的方式会发送notification消息（contenttype是80），内容会根据好友接收者的语言选择对应的语言，如果双方语言不一致会导致另外一方看到的不是本地语言。
+##新的方式会发送添加好友消息（contenttype是93）和欢迎消息（contenttype是92），需要客户端实现这两种消息。
+##如果客户端已经实现这两种消息可以打开这个开关
+friend.new_welcome_message false
+
 ## 聊天室观众空闲退出时间，单位为毫秒，默认为15分钟，0为永远不退出
 chatroom.participant_idle_time 900000
 
@@ -97,7 +107,8 @@ hazelcast.configuration config/hazelcast.xml
 #*********************************************************************
 # Media server configuration
 #*********************************************************************
-##是否使用七牛云存储。1使用七牛；0使用内存文件服务器。
+##是否使用七牛云存储。1使用七牛；0使用内存文件服务器。默认的七牛账户信息不可用，请在七牛官网申请账户并配置
+## https://docs.wildfirechat.cn/server/media_server.html
 media.server.use_qiniu 0
 
 ##媒体类型分类
@@ -140,37 +151,65 @@ qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 local.media.storage.root ./media
 
 
-# 是否支持多端登陆
+# 是否支持多端登陆，为true时支持任意平台任意多个客户端同时登录；为false时每个平台只支持一个端登录，但不同平台可以同时登录。
 server.multi_endpoint false
 
-# 多平台连接状态通知（仅当multi_endpoint为false时有效）
+# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
 server.multi_platform_notification false
 
 #*********************************************************************
 # Push server configuration
 #*********************************************************************
 ##安卓推送服务器地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
 push.android.server.address http://localhost:8085/android/push
+
 ##苹果推送服务器地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
 push.ios.server.address http://localhost:8085/ios/push
 
-
 #*********************************************************************
-# User online status event callback
+# 各种事件回调
 #*********************************************************************
 ##用户在线状态事件回调地址
-#user.online_status_callback http://localhost:8888/user/online_event
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#user.online_status_callback http://localhost:8888/im_event/user/online
 
+##用户信息变动事件回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#relation.relation_update_callback http://localhost:8888/im_event/user/relation
 
-#*********************************************************************
-# MongoDB configuration
-#*********************************************************************
-#专业版支持，社区版请忽略
-#mongodb.client_uri mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
-#mongodb.client_uri mongodb://host1:27017,host2:27017,host3:27017/wfchat?replicaSet=myReplicaSet
-mongodb.client_uri mongodb://wfc:123456@localhost:27017/wfchat
-mongodb.database wfchat
-mongodb.data_expire_days 1096
+##用户信息变动事件回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#user.user_info_update_callback http://localhost:8888/im_event/user/info
+
+##消息转发地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#message.forward.url http://localhost:8087/im_event/message
+
+##设备信息转发地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#things_message.forward.url http://localhost:8087/im_event/things/message
+
+##群组信息变动事件回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#group.group_info_update_callback http://localhost:8888/im_event/group/info
+
+##群组信息变动事件回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#group.group_member_update_callback http://localhost:8888/im_event/group/member
+
+##频道信息变动回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#channel.channel_info_update_callback http://localhost:8888/im_event/channel/info
+
+##聊天室信息变动回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#chatroom.chatroom_info_update_callback http://localhost:8888/im_event/chatroom/info
+
+##聊天室成员变动回调地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+#chatroom.chatroom_member_update_callback http://localhost:8888/im_event/chatroom/member
 
 #*********************************************************************
 # Netty Configuration
@@ -187,12 +226,3 @@ mongodb.data_expire_days 1096
 #*********************************************************************
 ##文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***
 sensitive.filter.type 0
-
-#*********************************************************************
-# Message forward configuration
-#*********************************************************************
-##消息转发地址
-#message.forward.url http://localhost:8087/message/forward
-
-##设备信息转发地址
-#device.forward.url http://localhost:8087/device/forward

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.41</version>
+    <version>0.47</version>
     <name>Wildfire Chat</name>
     <description>Wildfire Chat Server</description>
     <inceptionYear>2019</inceptionYear>

sdk/pom.xml

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

sdk/src/main/java/cn/wildfirechat/sdk/GroupAdmin.java

@@ -52,7 +52,7 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, transferGroup, Void.class);
     }
 
-    public static IMResult<Void> modifyGroupInfo(String operator, String groupId, int type, String value, List<Integer> to_lines) throws Exception {
+    public static IMResult<Void> modifyGroupInfo(String operator, String groupId, /*ModifyGroupInfoType*/int type, String value, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Group_Modify_Info;
         InputModifyGroupInfo modifyGroupInfo = new InputModifyGroupInfo();
         modifyGroupInfo.setGroup_id(groupId);
@@ -60,6 +60,7 @@ public class GroupAdmin {
         modifyGroupInfo.setTo_lines(to_lines);
         modifyGroupInfo.setType(type);
         modifyGroupInfo.setValue(value);
+        modifyGroupInfo.setNotify_message(notify_message);
         return AdminHttpUtils.httpJsonPost(path, modifyGroupInfo, Void.class);
     }
 
@@ -71,17 +72,11 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, OutputGroupMemberList.class);
     }
 
-    public static IMResult<Void> addGroupMembers(String operator, String groupId, List<String> groupMemberIds, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+    public static IMResult<Void> addGroupMembers(String operator, String groupId, List<PojoGroupMember> groupMembers, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Group_Member_Add;
         InputAddGroupMember addGroupMember = new InputAddGroupMember();
         addGroupMember.setGroup_id(groupId);
-        List<PojoGroupMember> members = new ArrayList<>();
-        for (String mid : groupMemberIds) {
-            PojoGroupMember m = new PojoGroupMember();
-            m.setMember_id(mid);
-            members.add(m);
-        }
-        addGroupMember.setMembers(members);
+        addGroupMember.setMembers(groupMembers);
         addGroupMember.setOperator(operator);
         addGroupMember.setTo_lines(to_lines);
         addGroupMember.setNotify_message(notify_message);
@@ -100,7 +95,29 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
     }
 
+    public static IMResult<Void> muteGroupMemeber(String operator, String groupId, List<String> groupMemberIds, boolean isMute, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Group_Mute_Member;
+        InputMuteGroupMember addGroupMember = new InputMuteGroupMember();
+        addGroupMember.setGroup_id(groupId);
+        addGroupMember.setMembers(groupMemberIds);
+        addGroupMember.setIs_manager(isMute);
+        addGroupMember.setOperator(operator);
+        addGroupMember.setTo_lines(to_lines);
+        addGroupMember.setNotify_message(notify_message);
+        return AdminHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
+    }
 
+    public static IMResult<Void> allowGroupMemeber(String operator, String groupId, List<String> groupMemberIds, boolean isAllow, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Group_Allow_Member;
+        InputMuteGroupMember addGroupMember = new InputMuteGroupMember();
+        addGroupMember.setGroup_id(groupId);
+        addGroupMember.setMembers(groupMemberIds);
+        addGroupMember.setIs_manager(isAllow);
+        addGroupMember.setOperator(operator);
+        addGroupMember.setTo_lines(to_lines);
+        addGroupMember.setNotify_message(notify_message);
+        return AdminHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
+    }
 
     public static IMResult<Void> kickoffGroupMembers(String operator, String groupId, List<String> groupMemberIds, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Group_Member_Kickoff;
@@ -130,5 +147,4 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, inputUserId, OutputGroupIds.class);
     }
 
-
 }

sdk/src/main/java/cn/wildfirechat/sdk/Main.java

@@ -17,13 +17,15 @@ import java.util.List;
 import static cn.wildfirechat.proto.ProtoConstants.SystemSettingType.Group_Max_Member_Count;
 
 public class Main {
+    private static boolean commercialServer = false;
+
     public static void main(String[] args) throws Exception {
         //admin使用的是18080端口，超级管理接口，理论上不能对外开放端口，也不能让非内部服务知悉密钥。
         testAdmin();
 
         //Robot和Channel都是使用的80端口，第三方可以创建或者为第三方创建，第三方可以使用robot或者channel与IM系统进行对接。
         testRobot();
-        //testChannel();
+        testChannel();
     }
 
 
@@ -37,6 +39,11 @@ public class Main {
         testChatroom();
         testMessage();
         testGeneralApi();
+        testSensitiveApi();
+        if (commercialServer) {
+            testDevice();
+        }
+
 
         System.out.println("Congratulation, all admin test case passed!!!!!!!");
     }
@@ -46,7 +53,9 @@ public class Main {
     //***********************************************
     static void testUser() throws Exception {
         InputOutputUserInfo userInfo = new InputOutputUserInfo();
+        //用户ID，必须保证唯一性
         userInfo.setUserId("userId1");
+        //用户名，一般是用户登录帐号，也必须保证唯一性。也就是说所有用户的userId必须不能重复，所有用户的name必须不能重复，但可以同一个用户的userId和name是同一个，一般建议userId使用一个uuid，name是"微信号"且可以修改，
         userInfo.setName("user1");
         userInfo.setMobile("13900000000");
         userInfo.setDisplayName("user 1");
@@ -245,6 +254,30 @@ public class Main {
             System.exit(-1);
         }
 
+        IMResult<Void> result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello", true);
+        if (result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("send friend request success");
+        } else {
+            System.out.println("failure");
+            System.exit(-1);
+        }
+
+        result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello2", false);
+        if (result != null && result.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("success");
+        } else {
+            System.out.println("failure");
+            System.exit(-1);
+        }
+
+        result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello3", true);
+        if (result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("success");
+        } else {
+            System.out.println("send friend request success");
+            System.exit(-1);
+        }
+
         IMResult<Void> updateFriendStatusResult = RelationAdmin.setUserFriend("ff1", "ff2", true, "{\"from\":1}");
         if (updateFriendStatusResult != null && updateFriendStatusResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("update friend status success");
@@ -261,6 +294,23 @@ public class Main {
             System.exit(-1);
         }
 
+        updateFriendStatusResult = RelationAdmin.setUserFriend("ff1", "ff2", false, null);
+        if (updateFriendStatusResult != null && updateFriendStatusResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("update friend status success");
+        } else {
+            System.out.println("update friend status failure");
+            System.exit(-1);
+        }
+
+        resultGetFriendList = RelationAdmin.getFriendList("ff1");
+        if (resultGetFriendList != null && resultGetFriendList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !resultGetFriendList.getResult().getList().contains("ff2")) {
+            System.out.println("get friend status success");
+        } else {
+            System.out.println("get friend status failure");
+            System.exit(-1);
+        }
+
+
         IMResult<Void> updateBlacklistStatusResult = RelationAdmin.setUserBlacklist("ff1", "ff2", true);
         if (updateBlacklistStatusResult != null && updateBlacklistStatusResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("update blacklist status success");
@@ -351,7 +401,7 @@ public class Main {
             System.exit(-1);
         }
 
-        voidIMResult = GroupAdmin.modifyGroupInfo(groupInfo.getOwner(), groupInfo.getTarget_id(), ProtoConstants.ModifyGroupInfoType.Modify_Group_Name,"HelloWorld", null);
+        voidIMResult = GroupAdmin.modifyGroupInfo(groupInfo.getOwner(), groupInfo.getTarget_id(), ProtoConstants.ModifyGroupInfoType.Modify_Group_Name,"HelloWorld", null, null);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("transfer success");
         } else {
@@ -381,7 +431,11 @@ public class Main {
             System.exit(-1);
         }
 
-        voidIMResult = GroupAdmin.addGroupMembers("user1", groupInfo.getTarget_id(), Arrays.asList("use4", "user5"), null, null);
+        PojoGroupMember m = new PojoGroupMember();
+        m.setMember_id("user1");
+        m.setAlias("hello user1");
+        
+        voidIMResult = GroupAdmin.addGroupMembers("user1", groupInfo.getTarget_id(), Arrays.asList(m), null, null);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("add group member success");
         } else {
@@ -435,6 +489,44 @@ public class Main {
             System.exit(-1);
         }
 
+
+        //仅专业版支持
+        if (commercialServer) {
+            //开启群成员禁言
+            voidIMResult = GroupAdmin.muteGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user5"), true, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("mute group member success");
+            } else {
+                System.out.println("mute group member failure");
+                System.exit(-1);
+            }
+            //关闭群成员禁言
+            voidIMResult = GroupAdmin.muteGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user5"), false, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("unmute group member success");
+            } else {
+                System.out.println("unmute group member failure");
+                System.exit(-1);
+            }
+
+            //开启群成员白名单，当群全局禁言时，白名单用户可以发言
+            voidIMResult = GroupAdmin.allowGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user5"), true, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("allow group member success");
+            } else {
+                System.out.println("allow group member failure");
+                System.exit(-1);
+            }
+
+            //关闭群成员白名单
+            voidIMResult = GroupAdmin.allowGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user5"), false, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("unallow group member success");
+            } else {
+                System.out.println("unallow group member failure");
+                System.exit(-1);
+            }
+        }
     }
 
     //***********************************************
@@ -465,20 +557,22 @@ public class Main {
             System.exit(-1);
         }
 
-        voidIMResult = MessageAdmin.deleteMessage(resultSendMessage.getResult().getMessageUid());
-        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("delete message success");
-        } else {
-            System.out.println("delete message failure");
-            System.exit(-1);
-        }
+        if (commercialServer) {
+            voidIMResult = MessageAdmin.deleteMessage(resultSendMessage.getResult().getMessageUid());
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("delete message success");
+            } else {
+                System.out.println("delete message failure");
+                System.exit(-1);
+            }
 
-        IMResult<BroadMessageResult> resultBroadcastMessage = MessageAdmin.broadcastMessage("user1", 0, payload);
-        if (resultBroadcastMessage != null && resultBroadcastMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("broad message success, send message to " + resultBroadcastMessage.getResult().getCount() + " users");
-        } else {
-            System.out.println("broad message failure");
-            System.exit(-1);
+            IMResult<BroadMessageResult> resultBroadcastMessage = MessageAdmin.broadcastMessage("user1", 0, payload);
+            if (resultBroadcastMessage != null && resultBroadcastMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("broad message success, send message to " + resultBroadcastMessage.getResult().getCount() + " users");
+            } else {
+                System.out.println("broad message failure");
+                System.exit(-1);
+            }
         }
 
         List<String> multicastReceivers = Arrays.asList("user2", "user3", "user4");
@@ -556,7 +650,7 @@ public class Main {
                 System.out.println("chatroom info incorrect");
                 System.exit(-1);
             } else {
-                System.out.println("chatroom info incorrect");
+                System.out.println("chatroom info correct");
             }
         } else {
             System.out.println("get chatroom info failure");
@@ -768,6 +862,8 @@ public class Main {
         InputCreateChannel inputCreateChannel = new InputCreateChannel();
         inputCreateChannel.setName("testChannel");
         inputCreateChannel.setOwner("userId1");
+        String secret = "channelsecret";
+        inputCreateChannel.setSecret(secret);
         IMResult<OutputCreateChannel> resultCreateChannel = GeneralAdmin.createChannel(inputCreateChannel);
         if (resultCreateChannel != null && resultCreateChannel.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("create channel success");
@@ -776,56 +872,61 @@ public class Main {
             System.exit(-1);
         }
 
+
         //2. 初始化api
-        ChannelServiceApi channelServiceApi = new ChannelServiceApi("http://localhost", resultCreateChannel.getResult().getTargetId(), resultCreateChannel.getResult().getSecret());
+        ChannelServiceApi channelServiceApi = new ChannelServiceApi("http://localhost", resultCreateChannel.getResult().getTargetId(), secret);
 
-        //3. 测试channel api功能
-        IMResult<Void> resultVoid = channelServiceApi.subscribe("userId2");
-        if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("subscribe success");
-        } else {
-            System.out.println("subscribe failure");
-            System.exit(-1);
-        }
 
-        resultVoid = channelServiceApi.subscribe("userId3");
-        if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("subscribe done");
-        } else {
-            System.out.println("subscribe failure");
-            System.exit(-1);
-        }
 
-        IMResult<OutputStringList> resultStringList = channelServiceApi.getSubscriberList();
-        if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId2") && resultStringList.getResult().getList().contains("userId3")) {
-            System.out.println("get subscriber done");
-        } else {
-            System.out.println("get subscriber failure");
-            System.exit(-1);
-        }
+        if (commercialServer) {
+            //3. 测试channel api功能
+            IMResult<Void> resultVoid = channelServiceApi.subscribe("userId2");
+            if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("subscribe success");
+            } else {
+                System.out.println("subscribe failure");
+                System.exit(-1);
+            }
 
-        resultVoid = channelServiceApi.unsubscribe("userId2");
-        if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("unsubscriber done");
-        } else {
-            System.out.println("unsubscriber failure");
-            System.exit(-1);
-        }
+            resultVoid = channelServiceApi.subscribe("userId3");
+            if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("subscribe done");
+            } else {
+                System.out.println("subscribe failure");
+                System.exit(-1);
+            }
 
-        resultStringList = channelServiceApi.getSubscriberList();
-        if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId3") && !resultStringList.getResult().getList().contains("userId2")) {
-            System.out.println("get subscriber done");
-        } else {
-            System.out.println("get subscriber failure");
-            System.exit(-1);
-        }
+            IMResult<OutputStringList> resultStringList = channelServiceApi.getSubscriberList();
+            if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId2") && resultStringList.getResult().getList().contains("userId3")) {
+                System.out.println("get subscriber done");
+            } else {
+                System.out.println("get subscriber failure");
+                System.exit(-1);
+            }
 
-        IMResult<InputOutputUserInfo> resultGetUserInfo1 = channelServiceApi.getUserInfo("userId3");
-        if (resultGetUserInfo1 != null && resultGetUserInfo1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("get user info success");
-        } else {
-            System.out.println("get user info failure");
-            System.exit(-1);
+            resultVoid = channelServiceApi.unsubscribe("userId2");
+            if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("unsubscriber done");
+            } else {
+                System.out.println("unsubscriber failure");
+                System.exit(-1);
+            }
+
+            resultStringList = channelServiceApi.getSubscriberList();
+            if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId3") && !resultStringList.getResult().getList().contains("userId2")) {
+                System.out.println("get subscriber done");
+            } else {
+                System.out.println("get subscriber failure");
+                System.exit(-1);
+            }
+
+            IMResult<InputOutputUserInfo> resultGetUserInfo1 = channelServiceApi.getUserInfo("userId3");
+            if (resultGetUserInfo1 != null && resultGetUserInfo1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("get user info success");
+            } else {
+                System.out.println("get user info failure");
+                System.exit(-1);
+            }
         }
 
 
@@ -851,19 +952,55 @@ public class Main {
             System.exit(-1);
         }
 
-        IMResult<Void> voidIMResult = channelServiceApi.modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Desc, "this is a test channel, update at:" + new Date().toString());
-        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("modify channel profile success");
+        if (commercialServer) {
+            IMResult<Void> voidIMResult = channelServiceApi.modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Desc, "this is a test channel, update at:" + new Date().toString());
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("modify channel profile success");
+            } else {
+                System.out.println("modify channel profile failure");
+                System.exit(-1);
+            }
+
+            IMResult<OutputGetChannelInfo> outputGetChannelInfoIMResult = channelServiceApi.getChannelInfo();
+            if (outputGetChannelInfoIMResult != null && outputGetChannelInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("destroy user success");
+            } else {
+                System.out.println("destroy user failure");
+                System.exit(-1);
+            }
+        }
+    }
+    static void testSensitiveApi() throws Exception {
+        List<String> words = Arrays.asList("a","b","c");
+        IMResult<Void> addResult = SensitiveAdmin.addSensitives(words);
+        if (addResult != null && addResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("Add sensitive word response success");
         } else {
-            System.out.println("modify channel profile failure");
+            System.out.println("Add sensitive word response error");
             System.exit(-1);
         }
 
-        IMResult<OutputGetChannelInfo> outputGetChannelInfoIMResult = channelServiceApi.getChannelInfo();
-        if (outputGetChannelInfoIMResult != null && outputGetChannelInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("destroy user success");
+        IMResult<InputOutputSensitiveWords> swResult = SensitiveAdmin.getSensitives();
+        if (swResult != null && swResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && swResult.getResult().getWords().containsAll(words)) {
+            System.out.println("Sensitive word added");
         } else {
-            System.out.println("destroy user failure");
+            System.out.println("Sensitive word not added");
+            System.exit(-1);
+        }
+
+        IMResult<Void> removeResult = SensitiveAdmin.removeSensitives(words);
+        if (removeResult != null && removeResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("Remove sensitive word response success");
+        } else {
+            System.out.println("Remove sensitive word response error");
+            System.exit(-1);
+        }
+
+        swResult = SensitiveAdmin.getSensitives();
+        if (swResult != null && swResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !swResult.getResult().getWords().containsAll(words)) {
+            System.out.println("Sensitive word removed");
+        } else {
+            System.out.println("Sensitive word not removed");
             System.exit(-1);
         }
     }

sdk/src/main/java/cn/wildfirechat/sdk/RelationAdmin.java

@@ -8,7 +8,7 @@ import cn.wildfirechat.sdk.utilities.AdminHttpUtils;
 public class RelationAdmin {
     public static IMResult<Void> setUserFriend(String userId, String targetId, boolean isFriend, String extra) throws Exception {
         String path = APIPath.Friend_Update_Status;
-        InputFriendRequest input = new InputFriendRequest();
+        InputUpdateFriendStatusRequest input = new InputUpdateFriendStatusRequest();
         input.setUserId(userId);
         input.setFriendUid(targetId);
         input.setStatus(isFriend ? 0 : 1); //历史遗留问题，在IM数据库中0是好友，1是好友被删除。
@@ -55,4 +55,14 @@ public class RelationAdmin {
         input.setTargetId(targetId);
         return AdminHttpUtils.httpJsonPost(path, input, OutputGetAlias.class);
     }
+
+    public static IMResult<Void> sendFrienRequest(String userId, String targetId, String reason, boolean force) throws Exception {
+        String path = APIPath.Friend_Send_Request;
+        InputAddFriendRequest input = new InputAddFriendRequest();
+        input.setUserId(userId);
+        input.setFriendUid(targetId);
+        input.setReason(reason);
+        input.setForce(force);
+        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
+    }
 }

sdk/src/main/java/cn/wildfirechat/sdk/SensitiveAdmin.java

@@ -22,7 +22,7 @@ public class SensitiveAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, Void.class);
     }
 
-    public static IMResult<InputOutputSensitiveWords> getSensitives(List<String> sensitives) throws Exception {
+    public static IMResult<InputOutputSensitiveWords> getSensitives() throws Exception {
         String path = APIPath.Sensitive_Query;
         return AdminHttpUtils.httpJsonPost(path, null, InputOutputSensitiveWords.class);
     }