version and release note

(cherry picked from commit 1f4cf54990831d4bcc4fcec2fa5479036a581e58)

README.md

@@ -7,9 +7,9 @@
 * 性能强大，专业版IM服务支持百万在线和集群部署，业内顶尖性能水平，详情参考野火性能报告。
 * 部署运维简单，依赖服务少，稍加配置一键启动。
 * 安全加密。网络连接AES加密。客户端数据库SqlCipher加密。安全无小事。
-* 全平台客户端，支持Android、iOS、Web、小程序、UniApp、Flutter、Windows、Mac OS、Linux等所有常见平台。
+* 全平台客户端，支持Android、iOS、鸿蒙、Web、小程序、UniApp、Flutter、Windows、Mac OS、Linux等所有常见平台。
 * 四端同时在线（移动端，pc端，web端和小程序端），数据和状态多端完美同步。
-* 支持国产化。支持国产化操作系统、国产化芯片和国产操作系统。支持国密加密。
+* 支持国产化。支持国产化操作系统、国产化芯片和国产数据库。支持国密加密。
 * 客户端使用微信[mars](https://github.com/tencent/mars)连接库，野火IM可能是最适应中国网络国情的即时通讯服务。
 * 支持加速点加速，即可用于全球应用，也可用于政企内外双网复杂的网络环境。
 * 支持阅读回执和在线状态功能，适用于办公环境。
@@ -22,9 +22,10 @@
 * API丰富，方便与其它服务系统的对接。
 * 拥有机器人和公众号功能，免费的频道（公众号）管理后台。
 * 超级群组功能，可以支持万人大群。
+* 支持多个IM服务组网互通，打破孤岛，适用于集团公司下多个分公司互联互通。
 * 社区版IM服务和移动端免费商用，可以免费构建出完备的移动互联网应用。
 * 收费项目非常便宜，野火独有的试用模式，可以先部署到客户环境试用6个月，试用满意后再购买，避免上当受骗。
-* 技术支持专业和高效，核心研发人员及时处理issue和论坛回复。
+* 技术支持专业高效，***核心研发***及时处理issue和工单，能最快解决用户的技术难题。技术支持不收费，让客户顺利使用是我们最大的愿望。
 
 ## 野火开源项目
 主要包括以下项目：
@@ -119,6 +120,19 @@ mvn clean package
 
 修改之后运行编译命令```mvn clean package```，rpm包生成在```distribution/target```目录下。
 
+## Epoll
+在linux系统中打开Epoll开关可以提高性能，默认软件包内打包的是x86_64的epoll native sdk。如果是arm64的机器，可以把[broker pom](./broker/pom.xml)文件中修改如下：
+```xml
+<dependency>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-transport-native-epoll</artifactId>
+    <version>${netty.version}</version>
+<!--    <classifier>linux-x86_64</classifier>-->
+    <classifier>linux-aarch_64</classifier>
+</dependency>
+```
+然后重新打包。专业版IM服务软件包中有arm64架构的sdk，可以直接替换。epoll只支持x86_64和arm64两个架构，其他架构不要把epoll开关打开。
+
 ## 升级说明
 1. 从0.42 版本增加了群成员数限制，默认为2000。如果您从之前的版本升级到这个版本或以后，需要注意到群成员数的限制。升级之后超出限制的群不受影响，但不能继续加人，如果您想修改默认值，可以在升级版本之后，修改t_setting表，把默认的大小改为您期望的人数。另外修改t_group表，把已经存在的群组max_member_count改成您期望的，然后重启。
 2. 0.50版本添加了是否允许客户端发送群操作通知的配置。如果您在客户端自定义群通知，需要在服务器端配置允许，没有使用自定义群操作通知的不受影响。***
@@ -143,6 +157,9 @@ mvn clean package
 ## 服务对象
 因为野火的使用范围比较广，难免被一些不法分子利用，国内反诈反赌力度很大，所以国内多地警方都跟我们都有过联系。***为了预防我们的产品被用于非法目的，试用及购买只能支持境内法人单位，不接受个人或者境外团体。如果我们发现产品被用于非法目的，我们会立即停止技术支持服务并且报警和配合警方调查。请用于非法目的用户绕行！***
 
+## 常见问题
+请参考文档[常见问题](https://docs.wildfirechat.cn/faq/server.html)
+
 ## 应用截图
 登录界面
 

broker/config/wildfirechat.conf

@@ -68,6 +68,10 @@ token.key testim
 ##是否使用AES256加密。默认客户端和服务器都是AES128加密，如果需要开启AES256，需要客户端和IM服务同时开通。
 #encrypt.use_aes256 true
 
+##当创建一个对象时（用户，群组，频道，机器人等），如果没有传入ID，野火会为这个对象生成一个ID。如果id.use_uuid为true，会使用uuid作为对象ID，否则会使用野火短ID，默认为false。
+## 短ID有个很大的风险是容易被人穷举进行攻击。建议用UUID。
+id.use_uuid true
+
 ##首次登录，是否接收之前的历史消息。
 ##0 不接收历史消息，只接收${message.compensate_time_limit}毫秒以内的消息，由于服务器没有保存已经收取记录，所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉；
 ##1接收，会接收 message.max_queue 配置的条数的历史消息
@@ -94,6 +98,9 @@ message.allow_stranger_chat_list admin,FireRobot,wfc_file_transfer
 ##黑名单策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃
 message.blacklist.strategy 0
 
+##拉黑对方后，对方不能发送消息给你。这个开关确定拉黑对方后你还能不能给对方发送消息。
+message.blacklist.allow_send_to_black false
+
 ##是否禁止服务器端消息搜索，该功能暂未实现。目前的影响是如果打开，则存储消息时不单独保存_searchable_content字段
 message.disable_remote_search  false
 
@@ -126,6 +133,12 @@ message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
 ## 离线用户推送过期天数，0是永不过期，建议配置为7天。
 message.push_expired_days 7
 
+## 当会话静音/全局静音/PC在线静音时，普通消息都不会有推送，如果有某些消息类型需要此时保持推送，可以配置到这里。此配置对消息免打扰时段无效。
+## 此配置只影响远程推送，需要客户端处理客户端在线且在后台收到此消息的处理，需要针对这些消息类型加上本地通知。
+## 强制推送消息的MessagePayload中pushContent和pushData至少要存在一个才可以推送。
+## 消息类型以英文逗号分割。
+#message.force_push_types 401,402
+
 ## 群发消息(包括server api群发和全局频道群发)时，目标用户是否来自于t_user表。如果使用野火托管用户信息，请设置为true，否则设置为false。
 message.broadcast.target_from_user_table true
 
@@ -142,6 +155,10 @@ robot.callback_with_client_info false
 ## 频道回调信息是否带上用户clientId和平台类型。
 channel.callback_with_client_info false
 
+## 频道回调新方式，在新方式下，如果有callback地址就会总是回调客户端发送的消息（包括owner和订阅者）。automatic属性控制订阅者发送的消息是否发给owner， 0发，1不发。
+## 旧的方式是，automatic为0时，订阅者的消息发给owner，不转发消息到callback地址。为1时，把订阅者的消息转发给callback地址，不发给owner。
+channel.new_callback_feature true
+
 ##禁止搜索用户
 friend.disable_search false
 
@@ -163,6 +180,9 @@ friend.reject_request_duration 2592000000
 ##好友请求过期时间，单位是毫秒，默认是7天，0为无限长期限。
 friend.request_expiration_duration 604800000
 
+##好友请求限制频率，一个用户24小时之内允许请求好友的次数，默认不限频。
+friend.request_rate_limit 30
+
 ##请求添加机器人为好友时，机器人是否自动接受，默认为true
 friend.robot_auto_accept true
 
@@ -204,6 +224,9 @@ group.visible_quit_or_kickoff_notification 0
 ## 是否禁止陌生人拉人入群，默认为false
 group.disable_stranger_invite false
 
+## 群组信息是否标记删除
+group.enable_mark_deletion true
+
 ## 隐藏用户信息属性类型，2是性别，3是电话号码，4是邮箱，5是地址，6是公司信息，7是社交账号，8是Extra信息。当需要隐藏多个时以英文逗号分开;
 ## 本配置是为了提高安全性，避免把对应信息同步到客户端，这样就能防止程序被破解从而拿到用户关键信息。仅对客户端有效，server api不受影响。
 ## 注意，修改本配置不会对已经同步的信息产生影响。
@@ -241,15 +264,6 @@ client.request_rate_limit 100
 ##关于对象存储的详细信息请参考：https://docs.wildfirechat.cn/server/oss.html
 media.server.use_qiniu 0
 
-##媒体类型分类
-#Media_Type_GENERAL = 0,
-#Media_Type_IMAGE = 1,
-#Media_Type_VOICE = 2,
-#Media_Type_VIDEO = 3,
-#Media_Type_FILE = 4,
-#Media_Type_PORTRAIT = 5,
-#Media_Type_FAVORITE = 6
-
 # qiniu media server configuration
 qiniu.server_url  http://up.qbox.me
 qiniu.access_key tU3vdBK5BL5j4N7jI5N5uZgq_HQDo170w5C9Amnn
@@ -273,11 +287,21 @@ qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn
 qiniu.bucket_favorite_name storage
 qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 
+##媒体类型分类
+#Media_Type_GENERAL = 0,
+#Media_Type_IMAGE = 1,
+#Media_Type_VOICE = 2,
+#Media_Type_VIDEO = 3,
+#Media_Type_FILE = 4,
+#Media_Type_PORTRAIT = 5,
+#Media_Type_FAVORITE = 6,
+#Media_Type_STICKER = 7,
+#Media_Type_MOMENTS = 8
 
 # local media server configuration
 # 本地媒体服务器配置。
 local.media.storage.root media
-# 如果使用内置文件存储，文件上传后地址默认为 http://server.ip:http_port/fs/5/2021/03/27/08/filename。
+# 如果使用内置文件存储，文件上传后地址默认为 http://server.ip:http_port/fs/5/2021/03/27/08/filename。fs目录下按照类型存放文件，媒体类型见上面注释，比如5就是Media_Type_PORTRAIT，是客户端的头像文件。
 # 如果需要使用nginx添加https支持，请打开下面配置，这样客户端得到的文件地址为 https://example.com/media/fs/5/2021/03/27/08/filename。
 # 需要nginx把请求从https://example.com/media/fs 转到 http://server.ip:http_port/fs。注意需要带上所有header。
 # 尽管内置文件存储可以使用，但是我们还是建议使用专业级别的对象存储服务，社区版可以使用七牛，专业版另外支持阿里云和也是私有对象存储。详情请参考 https://docs.wildfirechat.cn/server/oss.html
@@ -317,6 +341,10 @@ push.android.server.address http://localhost:8085/android/push
 ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
 push.ios.server.address http://localhost:8085/ios/push
 
+##鸿蒙推送服务器地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+push.harmony.server.address http://localhost:8085/harmony/push
+
 #*********************************************************************
 # 监控配置
 #*********************************************************************

broker/migrate/h2/V48__group_add_deleted_column.sql

@@ -0,0 +1,2 @@
+alter table `t_group` add column `_deleted` tinyint NOT NULL DEFAULT 0;
+

broker/migrate/h2/V49__add_domain_table.sql

@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS `t_domain`;
+CREATE TABLE `t_domain` (
+  `_domain_id` varchar(64) NOT NULL PRIMARY KEY,
+  `_name` varchar(64) NOT NULL,
+  `_desc` varchar(256) DEFAULT '',
+  `_email` varchar(64) DEFAULT '',
+  `_tel` varchar(64) DEFAULT '',
+  `_address` varchar(64) DEFAULT '',
+  `_extra` varchar(1024) DEFAULT '',
+  `_dt` bigint(20) NOT NULL
+);
+
+alter table `t_user` add column `_external` tinyint DEFAULT 0;

broker/migrate/mysql/V55__group_add_deleted_column.sql

@@ -0,0 +1 @@
+alter table `t_group` add column `_deleted` tinyint NOT NULL DEFAULT 0;

broker/migrate/mysql/V56__add_domain_table.sql

@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS `t_domain`;
+CREATE TABLE `t_domain` (
+  `_domain_id` varchar(128) NOT NULL PRIMARY KEY,
+  `_name` varchar(64) NOT NULL,
+  `_desc` varchar(256) DEFAULT '',
+  `_email` varchar(64) DEFAULT '',
+  `_tel` varchar(64) DEFAULT '',
+  `_address` varchar(64) DEFAULT '',
+  `_extra` varchar(1024) DEFAULT '',
+  `_dt` bigint(20) NOT NULL
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;
+
+alter table `t_user` add column `_external` tinyint DEFAULT 0;

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.2.3</version>
+        <version>1.3.0</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -124,9 +124,7 @@
             <artifactId>netty-transport-native-epoll</artifactId>
             <version>${netty.version}</version>
             <classifier>linux-x86_64</classifier>
-            <!--
-            <classifier>${os.detected.name}-${os.detected.arch}</classifier>
-             -->
+<!--            <classifier>linux-aarch_64</classifier>-->
         </dependency>
 
         <dependency>

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

@@ -34,6 +34,7 @@ public class PushMessage {
     public String voipDeviceToken;
     public boolean isHiddenDetail;
     public String language;
+    public boolean republish;
     public long messageId;
 
     public PushMessage(String sender, int conversationType, String target, int line, int messageContentType, long serverTime, String senderName, String senderPortrait, String targetName, String targetPortrait, int unReceivedMsg, int mentionedType, boolean isHiddenDetail, String language) {
@@ -65,6 +66,7 @@ public class PushMessage {
         this.mentionedType = mentionedType;
         this.isHiddenDetail = isHiddenDetail;
         this.language = language;
+        this.republish = messageContentType == 80 || messageContentType == 81;
     }
     public PushMessage(String sender, String target, long serverTime, String senderName, int unReceivedMsg, String language, int pushMessageType) {
         this.sender = sender;

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

@@ -24,8 +24,7 @@ import win.liyufan.im.Utility;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import static io.moquette.BrokerConstants.PUSH_ANDROID_SERVER_ADDRESS;
-import static io.moquette.BrokerConstants.PUSH_IOS_SERVER_ADDRESS;
+import static io.moquette.BrokerConstants.*;
 import static win.liyufan.im.HttpUtils.HttpPostType.POST_TYPE_Push;
 
 public class PushServer {
@@ -47,6 +46,7 @@ public class PushServer {
 
     private String androidPushServerUrl;
     private String iOSPushServerUrl;
+    private String harmonyPushServerUrl;
 
     private PushServer() {
     }
@@ -59,6 +59,7 @@ public class PushServer {
         this.sessionsStore = sessionsStore;
         this.androidPushServerUrl = config.getProperty(PUSH_ANDROID_SERVER_ADDRESS);
         this.iOSPushServerUrl = config.getProperty(PUSH_IOS_SERVER_ADDRESS);
+        this.harmonyPushServerUrl = config.getProperty(PUSH_HARMONY_SERVER_ADDRESS);
     }
 
     public void pushMessage(PushMessage pushMessage, String deviceId, String pushContent) {
@@ -106,6 +107,8 @@ public class PushServer {
             if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS || session.getPlatform() == ProtoConstants.Platform.Platform_iPad) {
                 url = iOSPushServerUrl;
                 pushMessage.voipDeviceToken = session.getVoipDeviceToken();
+            } else if (session.getPlatform() == ProtoConstants.Platform.Platform_Harmony || session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad) {
+                url = harmonyPushServerUrl;
             }
             HttpUtils.httpJsonPost(url, gson.toJson(pushMessage, pushMessage.getClass()), POST_TYPE_Push);
         } else {

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

@@ -48,10 +48,6 @@ public class CreateChatroomAction extends AdminAction {
                     inputCreateChatroom.setChatroomId(messagesStore.getShortUUID());
                 }
 
-                if (inputCreateChatroom.getPortrait() == null || inputCreateChatroom.getPortrait().length() == 0) {
-                    inputCreateChatroom.setPortrait("https://avatars.io/gravatar/" + inputCreateChatroom.getChatroomId());
-                }
-
                 WFCMessage.ChatroomInfo info = inputCreateChatroom.toChatroomInfo();
                 messagesStore.createChatroom(inputCreateChatroom.getChatroomId(), info);
                 setResponseContent(RestResult.ok(new OutputCreateChatroom(inputCreateChatroom.getChatroomId())), response);

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

@@ -45,23 +45,13 @@ public class CreateRobotAction extends AdminAction {
             if (inputCreateRobot != null
                 && !StringUtil.isNullOrEmpty(inputCreateRobot.getName())) {
 
-                if(StringUtil.isNullOrEmpty(inputCreateRobot.getPassword())) {
-                    inputCreateRobot.setPassword(UUIDGenerator.getUUID());
-                }
-
                 if(StringUtil.isNullOrEmpty(inputCreateRobot.getUserId())) {
                     inputCreateRobot.setUserId(messagesStore.getShortUUID());
                 }
 
-                if (inputCreateRobot.getPortrait() == null || inputCreateRobot.getPortrait().length() == 0) {
-                    inputCreateRobot.setPortrait("https://avatars.io/gravatar/" + inputCreateRobot.getUserId());
-                }
-
                 WFCMessage.User newUser = inputCreateRobot.toUser();
-
-
                 try {
-                    messagesStore.addUserInfo(newUser, inputCreateRobot.getPassword());
+                    messagesStore.addUserInfo(newUser);
                 } catch (Exception e) {
                     e.printStackTrace();
                     Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ADMIN_API_Exception);

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

@@ -47,10 +47,6 @@ public class CreateUserAction extends AdminAction {
                 && !StringUtil.isNullOrEmpty(inputCreateUser.getName())
                 && (inputCreateUser.getType() == ProtoConstants.UserType.UserType_Normal || inputCreateUser.getType() == ProtoConstants.UserType.UserType_Admin || inputCreateUser.getType() == ProtoConstants.UserType.UserType_Super_Admin)) {
 
-                if(StringUtil.isNullOrEmpty(inputCreateUser.getPassword())) {
-                    inputCreateUser.setPassword(UUIDGenerator.getUUID());
-                }
-
                 if(StringUtil.isNullOrEmpty(inputCreateUser.getUserId())) {
                     inputCreateUser.setUserId(messagesStore.getShortUUID());
                 }
@@ -85,7 +81,7 @@ public class CreateUserAction extends AdminAction {
 
 
                 try {
-                    messagesStore.addUserInfo(newUserBuilder.build(), inputCreateUser.getPassword());
+                    messagesStore.addUserInfo(newUserBuilder.build());
                 } catch (Exception e) {
                     e.printStackTrace();
                     Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ADMIN_API_Exception);

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

@@ -53,6 +53,7 @@ public class GetGroupInfoAction extends AdminAction {
                     pojoGroupInfo.setPortrait(groupInfo.getPortrait());
                     pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
                     pojoGroupInfo.setType(groupInfo.getType());
+                    pojoGroupInfo.setMember_count(groupInfo.getMemberCount());
                     pojoGroupInfo.setMute(groupInfo.getMute());
                     pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
                     pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
@@ -60,6 +61,9 @@ public class GetGroupInfoAction extends AdminAction {
                     pojoGroupInfo.setMax_member_count(groupInfo.getMemberCount());
                     pojoGroupInfo.setHistory_message(groupInfo.getHistoryMessage());
                     pojoGroupInfo.setSuper_group(groupInfo.getSuperGroup()>0);
+                    pojoGroupInfo.setDeleted(groupInfo.getDeleted()>0);
+                    pojoGroupInfo.setUpdate_dt(groupInfo.getUpdateDt());
+                    pojoGroupInfo.setMember_update_dt(groupInfo.getMemberUpdateDt());
                     result = RestResult.ok(pojoGroupInfo);
                 }
                 setResponseContent(result, response);

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

@@ -0,0 +1,66 @@
+/*
+ * 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.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputUserInfoList;
+import cn.wildfirechat.proto.WFCMessage;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.User_Get_Email_Info)
+@HttpMethod("POST")
+public class GetUsersByEmailAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            String email = getRequestBody(request.getNettyRequest(), String.class);
+            if (!StringUtil.isNullOrEmpty(email)) {
+
+                List<WFCMessage.User> users = messagesStore.getUserInfosByEmail(email);
+                List<InputOutputUserInfo> list = new ArrayList<>();
+                for (WFCMessage.User user : users) {
+                    list.add(InputOutputUserInfo.fromPbUser(user));
+                }
+
+                RestResult result;
+                if (list.isEmpty()) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    OutputUserInfoList outputUserInfoList = new OutputUserInfoList();
+                    outputUserInfoList.userInfos = list;
+                    result = RestResult.ok(outputUserInfoList);
+                }
+
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -52,10 +52,17 @@ public class GetGroupInfoAction extends RobotAction {
                     pojoGroupInfo.setPortrait(groupInfo.getPortrait());
                     pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
                     pojoGroupInfo.setType(groupInfo.getType());
+                    pojoGroupInfo.setMember_count(groupInfo.getMemberCount());
                     pojoGroupInfo.setMute(groupInfo.getMute());
                     pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
                     pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
                     pojoGroupInfo.setSearchable(groupInfo.getSearchable());
+                    pojoGroupInfo.setMax_member_count(groupInfo.getMemberCount());
+                    pojoGroupInfo.setHistory_message(groupInfo.getHistoryMessage());
+                    pojoGroupInfo.setSuper_group(groupInfo.getSuperGroup()>0);
+                    pojoGroupInfo.setDeleted(groupInfo.getDeleted()>0);
+                    pojoGroupInfo.setUpdate_dt(groupInfo.getUpdateDt());
+                    pojoGroupInfo.setMember_update_dt(groupInfo.getMemberUpdateDt());
                     result = RestResult.ok(pojoGroupInfo);
                 }
                 setResponseContent(result, response);

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

@@ -80,6 +80,7 @@ public class UpdateProfileAction extends RobotAction {
             RestResult result = RestResult.ok();
             if(modified) {
                 try {
+                    builder.setUpdateDt(System.currentTimeMillis());
                     messagesStore.updateUserInfo(builder.build());
                 } catch (Exception e) {
                     e.printStackTrace();

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

@@ -90,6 +90,7 @@ public final class BrokerConstants {
 
     public static final String PUSH_ANDROID_SERVER_ADDRESS = "push.android.server.address";
     public static final String PUSH_IOS_SERVER_ADDRESS = "push.ios.server.address";
+    public static final String PUSH_HARMONY_SERVER_ADDRESS = "push.harmony.server.address";
 
     public static final String MONITOR_Exception_Event_Address = "monitor.exception_event_address";
 
@@ -115,6 +116,8 @@ public final class BrokerConstants {
     public static final String CONNECT_CLIENT_SIGNATURE_LIST = "connect.client_signature_list";
     public static final String CONNECT_REJECT_EMPTY_SIGNATURE = "connect.reject_empty_signature";
 
+    public static final String ID_USE_UUID = "id.use_uuid";
+
     public static final String EMBED_DB_PROPERTY_NAME = "embed.db";
     public static final String DB_AUTO_CLEAN_HISTORY_MESSAGES = "db.auto_clean_history_messages";
     public static final String H2DB_PATH = "h2db.path";
@@ -151,10 +154,12 @@ public final class BrokerConstants {
     public static final String MESSAGE_Allow_Stranger_Chat_List = "message.allow_stranger_chat_list";
 
     public static final String MESSAGE_Blacklist_Strategy = "message.blacklist.strategy";
+    public static final String MESSAGE_Blacklist_Allow_Send = "message.blacklist.allow_send_to_black";
 
     public static final String MESSAGE_NO_Forward_Admin_Message = "message.no_forward_admin_message";
 
     public static final String MESSAGE_Push_Expired_Days = "message.push_expired_days";
+    public static final String MESSAGE_Force_Push_Types = "message.force_push_types";
 
     public static final String MESSAGE_Forward_With_Client_Info = "message.forward_with_client_info";
 
@@ -162,6 +167,8 @@ public final class BrokerConstants {
 
     public static final String ROBOT_Callback_With_Client_Info = "robot.callback_with_client_info";
     public static final String CHANNEL_Callback_With_Client_Info = "channel.callback_with_client_info";
+    public static final String CHANNEL_New_Callback_Feature = "channel.new_callback_feature";
+
 
     public static final String FRIEND_Disable_Search = "friend.disable_search";
     public static final String FRIEND_Disable_NickName_Search = "friend.disable_nick_name_search";
@@ -170,6 +177,7 @@ 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_Request_Rate_Limit = "friend.request_rate_limit";
     public static final String FRIEND_Request_Robot_Auto_Accept = "friend.robot_auto_accept";
 
 
@@ -188,6 +196,8 @@ public final class BrokerConstants {
 
     public static final String GROUP_Disable_Stranger_Invite = "group.disable_stranger_invite";
 
+    public static final String GROUP_INFO_MARK_DELETION = "group.enable_mark_deletion";
+
     public static final String USER_HIDE_PROPERTIES = "user.hide_properties";
     public static final String USER_KEEP_DISPLAY_NAME_WHEN_DESTROY = "user.keep_display_name_when_destroy";
 

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

@@ -24,7 +24,8 @@ public class AddFriendHandler extends GroupHandler<WFCMessage.AddFriendRequest>
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.AddFriendRequest request, Qos1PublishHandler.IMCallback callback) {
             long[] head = new long[1];
             boolean isAdmin = requestSourceType == ProtoConstants.RequestSourceType.Request_From_Admin;
-            ErrorCode errorCode = m_messagesStore.saveAddFriendRequest(fromUser, request, head, isAdmin);
+            boolean isRobot = requestSourceType == ProtoConstants.RequestSourceType.Request_From_Robot;
+            ErrorCode errorCode = m_messagesStore.saveAddFriendRequest(fromUser, request, head, isAdmin, isRobot);
             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/AddGroupMember.java

@@ -43,7 +43,7 @@ public class AddGroupMember extends GroupHandler<WFCMessage.AddGroupMemberReques
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, getMemberIdList(request.getAddedMemberList())).getAddGroupNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, getMemberIdList(request.getAddedMemberList())).setExtra(request.getExtra()).getAddGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
         }

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

@@ -27,7 +27,7 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
 
         if (!StringUtil.isNullOrEmpty(request.getGroup().getGroupInfo().getTargetId())) {
             WFCMessage.GroupInfo existGroupInfo = m_messagesStore.getGroupInfo(request.getGroup().getGroupInfo().getTargetId());
-            if (existGroupInfo != null) {
+            if (existGroupInfo != null && existGroupInfo.getDeleted() == 0) {
                 return ErrorCode.ERROR_CODE_GROUP_ALREADY_EXIST;
             }
         }
@@ -59,11 +59,11 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
         }
 
         WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList(), request.getMemberExtra(), isAdmin);
-        if (groupInfo != null) {
+        if (groupInfo != null && groupInfo.getDeleted() == 0) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
             } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(groupInfo.getTargetId(), fromUser, groupInfo.getName(), "").getCreateGroupNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(groupInfo.getTargetId(), fromUser, groupInfo.getName(), "").setExtra(request.getMemberExtra()).getCreateGroupNotifyContent();
                 sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), content);
             }
         }

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

@@ -43,13 +43,13 @@ public class QuitGroupHandler extends GroupHandler<WFCMessage.QuitGroupRequest>
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitGroupNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getKeepMsg()>0?"1":"0", "").getQuitGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
 
             if((m_messagesStore.getVisibleQuitKickoffNotification() & 0x01) > 0) {
                 Set<String> toUsers = m_messagesStore.getGroupManagers(request.getGroupId(), true);
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitVisibleGroupNotifyContent();
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getKeepMsg()>0?"1":"0", "").getQuitVisibleGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content, toUsers);
             }
         }

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

@@ -37,6 +37,7 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
     private Set<Integer> mForwardExcludeMessageTypes = new HashSet<>();
     private String mMentionForwardUrl = null;
     private int mBlacklistStrategy = 0; //黑名单中时，0失败，1吞掉。
+    private boolean mBlacklistAllowSend2Black = true;
     private boolean mNoForwardAdminMessage = false;
 
     private String mRemoteSensitiveServerUrl = null;
@@ -69,6 +70,12 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             e.printStackTrace();
             Utility.printExecption(LOG, e);
         }
+
+        try {
+            mBlacklistAllowSend2Black = Boolean.parseBoolean(mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Blacklist_Allow_Send, "true"));
+        } catch (Exception e) {
+        }
+
         try {
             mRemoteSensitiveServerUrl = mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Remote_Server_URL);
             if(!StringUtil.isNullOrEmpty(mRemoteSensitiveServerUrl)) {
@@ -154,6 +161,13 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
                                 return errorCode;
                             }
                         }
+
+                        if(!mBlacklistAllowSend2Black) {
+                            errorCode = m_messagesStore.isBlacked(fromUser, message.getConversation().getTarget());
+                            if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                                return errorCode;
+                            }
+                        }
                     }
 
                     userStatus = m_messagesStore.getUserStatus(message.getConversation().getTarget());

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

@@ -36,6 +36,7 @@ import java.util.function.Function;
 
 import static cn.wildfirechat.common.IMExceptionEvent.EventType.RDBS_Exception;
 import static cn.wildfirechat.proto.ProtoConstants.PersistFlag.Transparent;
+import static io.moquette.BrokerConstants.GROUP_INFO_MARK_DELETION;
 import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
 import static cn.wildfirechat.proto.ProtoConstants.SearchUserType.*;
 import static win.liyufan.im.UserSettingScope.kUserSettingPrivacySearchable;
@@ -45,6 +46,7 @@ public class DatabaseStore {
     private final ThreadPoolExecutorWrapper mScheduler;
     private boolean disableRemoteMessageSearch = false;
     private boolean encryptMessage = false;
+    private boolean keepGroupInfo = false;
     public void setDisableRemoteMessageSearch(boolean disableRemoteMessageSearch) {
         this.disableRemoteMessageSearch = disableRemoteMessageSearch;
     }
@@ -55,6 +57,11 @@ public class DatabaseStore {
 
     public DatabaseStore(ThreadPoolExecutorWrapper scheduler) {
         this.mScheduler = scheduler;
+        try {
+            keepGroupInfo = Boolean.parseBoolean(Server.getServer().getConfig().getProperty(GROUP_INFO_MARK_DELETION, "false"));
+        } catch (Exception e) {
+
+        }
     }
 
     TreeMap<Long, Long> reloadUserMessageMaps(String userId) {
@@ -1129,7 +1136,16 @@ public class DatabaseStore {
                 }
 
                 if (!expired) {
-                    messages.add(message);
+                    boolean duplicated = false;
+                    for (WFCMessage.Message msg : messages) {
+                        if(message.getMessageId() == msg.getMessageId()) {
+                            duplicated = true;
+                            break;
+                        }
+                    }
+                    if(!duplicated) {
+                        messages.add(message);
+                    }
                 }
             }
 
@@ -1425,7 +1441,8 @@ public class DatabaseStore {
                 ", `_join_type`" +
                 ", `_private_chat`" +
                 ", `_searchable`" +
-                ", `_member_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
+                ", `_deleted`" +
+                ", `_member_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
                 " ON DUPLICATE KEY UPDATE " +
                 "`_name` = ?," +
                 "`_portrait` = ?," +
@@ -1436,8 +1453,9 @@ public class DatabaseStore {
                 "`_mute` = ?" +
                 ", `_join_type` = ?" +
                 ", `_private_chat` = ?" +
-                ", `_searchable` = ?, " +
-                "`_member_dt` = ?";
+                ", `_searchable` = ?" +
+                ", `_deleted` = ?" +
+                ", `_member_dt` = ?";
 
 
             statement = connection.prepareStatement(sql);
@@ -1455,6 +1473,7 @@ public class DatabaseStore {
             statement.setInt(index++, groupInfo.getJoinType());
             statement.setInt(index++, groupInfo.getPrivateChat());
             statement.setInt(index++, groupInfo.getSearchable());
+            statement.setInt(index++, groupInfo.getDeleted());
             statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
 
             statement.setString(index++, groupInfo.getName());
@@ -1467,6 +1486,7 @@ public class DatabaseStore {
             statement.setInt(index++, groupInfo.getJoinType());
             statement.setInt(index++, groupInfo.getPrivateChat());
             statement.setInt(index++, groupInfo.getSearchable());
+            statement.setInt(index++, groupInfo.getDeleted());
             statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
             int count = statement.executeUpdate();
             LOG.info("Update rows {}", count);
@@ -2183,6 +2203,7 @@ public class DatabaseStore {
                 ", `_join_type`" +
                 ", `_private_chat`" +
                 ", `_searchable`" +
+                ", _deleted" +
                 " from t_group  where `_gid` = ?";
 
             statement = connection.prepareStatement(sql);
@@ -2239,6 +2260,9 @@ public class DatabaseStore {
                 intValue = rs.getInt(index++);
                 builder.setSearchable(intValue);
 
+                intValue = rs.getInt(index++);
+                builder.setDeleted(intValue);
+
                 return builder.build();
             }
         } catch (SQLException e) {
@@ -2917,6 +2941,99 @@ public class DatabaseStore {
         return null;
     }
 
+    List<WFCMessage.User> getUserInfosByEmail(String email) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        List<WFCMessage.User> outList = new ArrayList<>();
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select `_uid`, `_name`" +
+                ", `_display_name`" +
+                ", `_portrait`" +
+                ", `_mobile`" +
+                ", `_gender`" +
+                ", `_email`" +
+                ", `_address`" +
+                ", `_company`" +
+                ", `_social`" +
+                ", `_extra`" +
+                ", `_type`" +
+                ", `_deleted`" +
+                ", `_dt` from t_user where `_deleted` = 0 and `_email` = ?";
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, email);
+
+            rs = statement.executeQuery();
+            while (rs.next()) {
+                WFCMessage.User.Builder builder = WFCMessage.User.newBuilder();
+                int index = 1;
+                String value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setUid(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setName(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setDisplayName(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setPortrait(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setMobile(value);
+
+                int gender = rs.getInt(index++);
+                builder.setGender(gender);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setEmail(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setAddress(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setCompany(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setSocial(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setExtra(value);
+
+                int type = rs.getInt(index++);
+                builder.setType(type);
+
+                int deleted = rs.getInt(index++);
+                builder.setDeleted(deleted);
+
+                long longValue = rs.getLong(index++);
+                if(longValue <= 0)
+                    longValue = 1;
+                builder.setUpdateDt(longValue);
+
+                outList.add(builder.build());
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return outList;
+    }
+
     List<WFCMessage.User> getAllUsers(int count, int offset) {
         Connection connection = null;
         PreparedStatement statement = null;
@@ -3317,8 +3434,12 @@ public class DatabaseStore {
         PreparedStatement statement = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "delete from t_group where _gid = ?";
-
+            String sql;
+            if(keepGroupInfo) {
+                sql = "update t_group set _deleted = 1, _dt = _dt+1, _member_count = 0, _member_dt = _member_dt+1 where _gid = ?";
+            } else {
+                sql = "delete from t_group where _gid = ?";
+            }
 
             statement = connection.prepareStatement(sql);
             int index = 1;
@@ -3650,7 +3771,11 @@ public class DatabaseStore {
                 sql += " where `_name` = ?";
             }
 
-            sql += " and _status = 0";
+            sql += " and _status <> 64";
+            sql += " and _status <> 16";
+            sql += " and _status <> 17";
+            sql += " and _status <> 24";
+            sql += " and _status <> 25";
 
             sql += " limit 20";
 

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

@@ -24,6 +24,7 @@ import com.google.protobuf.ByteString;
 import com.hazelcast.core.*;
 import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.model.FriendData;
 import cn.wildfirechat.common.ErrorCode;
@@ -49,6 +50,7 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -73,6 +75,7 @@ import static io.moquette.BrokerConstants.*;
 import static io.moquette.server.Constants.MAX_CHATROOM_MESSAGE_QUEUE;
 import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
 import static cn.wildfirechat.pojos.MyInfoType.*;
+import static win.liyufan.im.UserSettingScope.kUserSettingAddFriendNoVerify;
 import static win.liyufan.im.UserSettingScope.kUserSettingPCOnline;
 
 public class MemoryMessagesStore implements IMessagesStore {
@@ -152,9 +155,11 @@ 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 RateLimiter mFriendRateLimiter;
     private boolean mFriendRobotAutoAccept = true;
 
     private long mPushExpiredTimes = 604800000L;
+    private Set<Integer> mForcePushTypes = new HashSet<>();
 
     private boolean mMultiPlatformNotification = false;
     private boolean mMobileDefaultSilentWhenPCOnline = true;
@@ -162,6 +167,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     private Set<String> mAllowStrangerChatSet = new HashSet<>();
     private boolean mDisableStrangerAddGroup = false;
 
+    private boolean mIDUseUUID = true;
+
     private Set<String> mClientSignatureSet = new HashSet<>();
     private boolean mRejectEmptySignature = true;
 
@@ -199,6 +206,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     private boolean mForwardMessageWithClientInfo = false;
     private boolean mRobotCallbackWithClientInfo = false;
     private boolean mChannelCallbackWithClientInfo = false;
+    private boolean mChannelNewCallbackFeature = true;
 
     private Set<Integer> mUserHideProperties = new HashSet<>();
 
@@ -257,6 +265,20 @@ public class MemoryMessagesStore implements IMessagesStore {
             e.printStackTrace();
         }
 
+        try {
+            String forcePushTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGE_Force_Push_Types);
+            if(!StringUtil.isNullOrEmptyAfterTrim(forcePushTypes)) {
+                forcePushTypes = forcePushTypes.replace("，", ",");
+                for (String s : forcePushTypes.split(",")) {
+                    int type = Integer.parseInt(s.trim());
+                    if(type > 0) {
+                        mForcePushTypes.add(type);
+                    }
+                }
+            }
+        } catch (Exception e) {
+        }
+
         try {
             mMultiPlatformNotification = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_PLATFROM_NOTIFICATION, "false"));
         } catch (Exception e) {
@@ -323,6 +345,13 @@ public class MemoryMessagesStore implements IMessagesStore {
             printMissConfigLog(FRIEND_Request_Expiration_Duration, mFriendRequestExpiration + "");
         }
 
+        try {
+            int friendRequestRateLimit = Integer.parseInt(m_Server.getConfig().getProperty(FRIEND_Request_Rate_Limit, "0"));
+            if(friendRequestRateLimit > 0) {
+                mFriendRateLimiter = new RateLimiter(86400, friendRequestRateLimit);
+            }
+        } catch (Exception e) {
+        }
 
         try {
             mFriendRobotAutoAccept = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.FRIEND_Request_Robot_Auto_Accept, "true"));
@@ -584,13 +613,22 @@ public class MemoryMessagesStore implements IMessagesStore {
         try {
             mChannelCallbackWithClientInfo = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.CHANNEL_Callback_With_Client_Info, "false"));
         } catch (Exception e) {
-
         }
+        try {
+            mChannelNewCallbackFeature = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.CHANNEL_New_Callback_Feature, "true"));
+        } catch (Exception e) {
+        }
+
         try {
             mRecallForwardUrl = server.getConfig().getProperty(BrokerConstants.MESSAGE_RecallMsg_Forward_Url);
         } catch (Exception e) {
 
         }
+
+        try {
+            mIDUseUUID = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.ID_USE_UUID, "false"));
+        } catch (Exception e) {
+        }
     }
 
     private void printMissConfigLog(String config, String defaultValue) {
@@ -714,7 +752,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             if (channelInfo != null) {
                 if (channelInfo.getOwner().equals(fromUser)) {
                     if(requestSourceType == ProtoConstants.RequestSourceType.Request_From_Channel
-                        && channelInfo.getAutomatic() != 0) {
+                        && channelInfo.getAutomatic() != 0 && !isChannelNewCallbackFeature()) {
                         LOG.info("Channel api message not send to the owner when automatic");
                     } else {
                         notifyReceivers.add(fromUser);
@@ -744,7 +782,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                     }
                 } else {
                     notifyReceivers.add(fromUser);
-                    if (channelInfo.getAutomatic() == 0) {
+                    if (channelInfo.getAutomatic() == 0 || isChannelNewCallbackFeature()) {
                         notifyReceivers.add(channelInfo.getOwner());
                     } else {
                         LOG.info("Channel api message not send to the owner when automatic");
@@ -1368,7 +1406,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             event.type = type;
             PojoGroupInfo pojoGroupInfo = new PojoGroupInfo();
             event.groupInfo = pojoGroupInfo;
-            if (groupInfo != null) {
+            if (groupInfo != null && groupInfo.getDeleted() == 0) {
                 pojoGroupInfo.setExtra(groupInfo.getExtra());
                 pojoGroupInfo.setName(groupInfo.getName());
                 pojoGroupInfo.setOwner(groupInfo.getOwner());
@@ -1702,8 +1740,19 @@ public class MemoryMessagesStore implements IMessagesStore {
             WFCMessage.GroupMember newOwner = null;
             for (WFCMessage.GroupMember member :members) {
                 if (!member.getMemberId().equals(operator) && member.getType() != GroupMemberType_Removed) {
-                    newOwner = member;
-                    break;
+                    if(newOwner == null) {
+                        newOwner = member;
+                    } else {
+                        if(newOwner.getType() == GroupMemberType_Silent && member.getType() != GroupMemberType_Silent) {
+                            newOwner = member;
+                        } else if(newOwner.getType() != GroupMemberType_Manager && member.getType() == GroupMemberType_Manager) {
+                            newOwner = member;
+                        } else if(newOwner.getType() == member.getType()) {
+                            if(newOwner.getCreateDt() > member.getCreateDt() && member.getCreateDt() > 0) {
+                                newOwner = member;
+                            }
+                        }
+                    }
                 }
             }
 
@@ -1900,7 +1949,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
         if (groupInfo == null) {
             groupInfo = databaseStore.getPersistGroupInfo(groupId);
-            if (groupInfo != null) {
+            if (groupInfo != null && groupInfo.getDeleted() == 0) {
                 mIMap.set(groupId, groupInfo);
             } else {
                 return ErrorCode.ERROR_CODE_NOT_EXIST;
@@ -1985,7 +2034,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
         if (groupInfo == null) {
             groupInfo = databaseStore.getPersistGroupInfo(groupId);
-            if (groupInfo != null) {
+            if (groupInfo != null && groupInfo.getDeleted() == 0) {
                 mIMap.set(groupId, groupInfo);
             } else {
                 return ErrorCode.ERROR_CODE_NOT_EXIST;
@@ -2069,16 +2118,12 @@ public class MemoryMessagesStore implements IMessagesStore {
         ArrayList<WFCMessage.GroupInfo> out = new ArrayList<>();
         for (WFCMessage.UserRequest request : requests) {
             WFCMessage.GroupInfo groupInfo = mIMap.get(request.getUid());
-            if (groupInfo == null) {
-                groupInfo = databaseStore.getPersistGroupInfo(request.getUid());
-                if (groupInfo != null) {
-                    mIMap.set(request.getUid(), groupInfo);
-                }
-            }
-
             if (groupInfo != null && groupInfo.getUpdateDt() > request.getUpdateDt()) {
-                if(!isAdmin && !StringUtil.isNullOrEmpty(fromUser)) {
+                if(!isAdmin && !StringUtil.isNullOrEmpty(fromUser) && groupInfo.getDeleted() == 0) {
                     WFCMessage.GroupMember gm = getGroupMember(groupInfo.getTargetId(), fromUser);
+                    if((gm == null || gm.getType() == GroupMemberType_Removed) && request.getUpdateDt() > 0) {
+                        continue;
+                    }
                     if(gm == null) {
                         groupInfo = groupInfo.toBuilder().setMemberUpdateDt(-1).build();
                     } else if(gm.getType() == GroupMemberType_Removed) {
@@ -2306,7 +2351,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         IMap<String, WFCMessage.GroupInfo> groups = hzInstance.getMap(GROUPS_MAP);
         WFCMessage.GroupInfo groupInfo = groups.get(groupId);
         boolean isMute = false;
-        if (groupInfo != null) {
+        if (groupInfo != null && groupInfo.getDeleted() == 0) {
             if (groupInfo.getOwner().equals(memberId)) {
                 return ErrorCode.ERROR_CODE_SUCCESS;
             }
@@ -2391,7 +2436,8 @@ public class MemoryMessagesStore implements IMessagesStore {
 
                 WFCMessage.GroupInfo groupInfo = groupMap.get(message.getConversation().getTarget());
                 if (groupInfo == null) {
-                    return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
+                    LOG.info("recall message failure, group {} not exist", message.getConversation().getTarget());
+                    return ErrorCode.ERROR_CODE_NOT_EXIST;
                 }
                 if (operatorId.equals(groupInfo.getOwner())) {
                     if(operatorId.equals(message.getFromUser())) {
@@ -2828,7 +2874,9 @@ public class MemoryMessagesStore implements IMessagesStore {
         IMap<String, Integer> mUserMap = hzInstance.getMap(USER_STATUS);
         ArrayList<InputOutputUserBlockStatus> out = new ArrayList<>();
         for (Map.Entry<String, Integer> entry : mUserMap.entrySet()) {
-            out.add(new InputOutputUserBlockStatus(entry.getKey(), entry.getValue()));
+            if(entry.getValue() > 0) {
+                out.add(new InputOutputUserBlockStatus(entry.getKey(), entry.getValue()));
+            }
         }
         return out;
     }
@@ -2893,7 +2941,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public void addUserInfo(WFCMessage.User user, String password) throws Exception {
+    public void addUserInfo(WFCMessage.User user) throws Exception {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
         if (databaseStore.isUidAndNameConflict(user.getUid(), user.getName())) {
@@ -2901,7 +2949,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
         databaseStore.updateUser(user);
         mUserMap.put(user.getUid(), user);
-        databaseStore.updateUserPassword(user.getUid(), password);
 
         callbackUserInfoEvent(user);
     }
@@ -2987,6 +3034,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return getUserInfo(userId);
     }
 
+    @Override
+    public List<WFCMessage.User> getUserInfosByEmail(String email) {
+        return databaseStore.getUserInfosByEmail(email);
+    }
+
     @Override
     public List<WFCMessage.User> getUserInfoList(int count, int offset) {
         return databaseStore.getAllUsers(count, offset);
@@ -3192,6 +3244,30 @@ public class MemoryMessagesStore implements IMessagesStore {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    @Override
+    public ErrorCode isBlacked(String fromUser, String userId) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+
+        Collection<FriendData> friendDatas = friendsMap.get(fromUser);
+
+        if (friendDatas == null || friendDatas.size() == 0) {
+            friendDatas = loadFriend(friendsMap, fromUser);
+        }
+
+        for (FriendData friendData : friendDatas) {
+            if (friendData.getFriendUid().equals(userId)) {
+                if (friendData.getBlacked() == 1) {
+                    return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
+                } else {
+                    break;
+                }
+            }
+        }
+
+        return ErrorCode.ERROR_CODE_SUCCESS;
+    }
+
     synchronized Collection<FriendData> loadFriend(MultiMap<String, FriendData> friendsMap, String userId) {
         Collection<FriendData> friends = databaseStore.getPersistFriends(userId);
         if (friends != null) {
@@ -3309,13 +3385,24 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head, boolean isAdmin) {
+    public ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head, boolean isAdmin, boolean isRobot) {
         if (!isAdmin && mDisableFriendRequest) {
             return ErrorCode.ERROR_CODE_NOT_RIGHT;
         }
 
+        if(!isRobot && !isAdmin && mFriendRateLimiter != null) {
+            if(!mFriendRateLimiter.isGranted(userId)) {
+                LOG.error("User {} request add friend over frequency", userId);
+                return ErrorCode.ERROR_CODE_OVER_FREQUENCY;
+            }
+        }
+
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, WFCMessage.FriendRequest> requestMap = hzInstance.getMultiMap(USER_FRIENDS_REQUEST);
+
+        WFCMessage.UserSettingEntry userSettingData = getUserSetting(request.getTargetUid(), kUserSettingAddFriendNoVerify, "");
+        boolean noVerify = userSettingData != null && "1".equals(userSettingData.getValue());
+
         Collection<WFCMessage.FriendRequest> requests = requestMap.get(userId);
         if (requests == null || requests.size() == 0) {
             requests = loadFriendRequest(requestMap, userId);
@@ -3330,7 +3417,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && !isAdmin) {
+        if (!noVerify && existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && !isAdmin) {
             if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected
                 && System.currentTimeMillis() - existRequest.getUpdateDt() < mFriendRejectDuration) {
                 return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED;
@@ -3372,7 +3459,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             .setReason(request.getReason())
             .setExtra(request.getExtra())
             .setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Sent)
-            .setToReadStatus(false)
+            .setToReadStatus(noVerify)
             .setUpdateDt(System.currentTimeMillis())
             .build();
 
@@ -3380,6 +3467,12 @@ public class MemoryMessagesStore implements IMessagesStore {
         requestMap.remove(userId);
         requestMap.remove(request.getTargetUid());
 
+
+        if(noVerify) {
+            WFCMessage.HandleFriendRequest handleFriendRequest = WFCMessage.HandleFriendRequest.newBuilder().setTargetUid(userId).setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Accepted).build();
+            ServerAPIHelper.sendRequest(request.getTargetUid(), null, IMTopic.HandleFriendRequestTopic, handleFriendRequest.toByteArray(), null, ProtoConstants.RequestSourceType.Request_From_User);
+        }
+
         head[0] = newRequest.getUpdateDt();
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
@@ -4606,6 +4699,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return mChannelCallbackWithClientInfo;
     }
 
+    @Override
+    public boolean isChannelNewCallbackFeature() {
+        return mChannelNewCallbackFeature;
+    }
+
     @Override
     public boolean isRobotAutoAcceptFriendRequest() {
         return mFriendRobotAutoAccept;
@@ -4616,6 +4714,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return mPushExpiredTimes;
     }
 
+    @Override
+    public Set<Integer> getForcePushTypes() {
+        return mForcePushTypes;
+    }
+
     @Override
     public List<Integer> getClientForbiddenSendTypes() {
         return mForbiddenClientSendTypes;
@@ -4734,9 +4837,11 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public String getShortUUID(){
-        int id = databaseStore.getGeneratedId();
-        if (id > 0) {
-            return IDUtils.toUid(id);
+        if(!mIDUseUUID) {
+            int id = databaseStore.getGeneratedId();
+            if (id > 0) {
+                return IDUtils.toUid(id);
+            }
         }
         return UUIDGenerator.getUUID();
     }

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

@@ -135,7 +135,6 @@ public class NettyAcceptor implements ServerAcceptor {
                         }
                     }
                 })
-            .option(ChannelOption.SO_BACKLOG, 10240) // 服务端可连接队列大小
             .option(ChannelOption.SO_BACKLOG, nettySoBacklog)
             .option(ChannelOption.SO_REUSEADDR, nettySoReuseaddr)
             .childOption(ChannelOption.TCP_NODELAY, nettyTcpNodelay)

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

@@ -147,12 +147,13 @@ public interface IMessagesStore {
     List<InputOutputUserBlockStatus> getUserStatusList();
 
     ErrorCode updateUserInfo(InputOutputUserInfo userInfo, int flag);
-    void addUserInfo(WFCMessage.User user, String password) throws Exception;
+    void addUserInfo(WFCMessage.User user) throws Exception;
     void destroyUser(String userId);
     void updateUserInfo(WFCMessage.User user) throws Exception;
     WFCMessage.User getUserInfo(String userId);
     WFCMessage.User getUserInfoByName(String name);
     WFCMessage.User getUserInfoByMobile(String mobile);
+    List<WFCMessage.User> getUserInfosByEmail(String email);
     List<WFCMessage.User> searchUser(String keyword, int searchType, int page);
 
     List<WFCMessage.User> getUserInfoList(int count, int offset);
@@ -178,13 +179,14 @@ public interface IMessagesStore {
     void clearUserFriend(String userId);
     List<WFCMessage.FriendRequest> getFriendRequestList(String userId, long version);
 
-    ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head, boolean isAdmin);
+    ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head, boolean isAdmin, boolean isRobot);
     ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin);
     ErrorCode deleteFriend(String userId, String friendUid, long[] head);
     ErrorCode blackUserRequest(String fromUser, String targetUserId, int status, long[] head);
     FriendData getFriendData(String fromUser, String targetUserId);
     ErrorCode SyncFriendRequestUnread(String userId, long unreadDt, long[] head);
     ErrorCode isAllowUserMessage(String fromUser, String userId);
+    ErrorCode isBlacked(String fromUser, String userId);
     ErrorCode setFriendAliasRequest(String fromUser, String targetUserId, String alias, long[] head);
     ErrorCode setFriendExtraRequest(String fromUser, String targetUserId, String extra, long[] head);
 
@@ -242,10 +244,12 @@ public interface IMessagesStore {
     boolean isForwardMessageWithClientInfo();
     boolean isRobotCallbackWithClientInfo();
     boolean isChannelCallbackWithClientInfo();
+    boolean isChannelNewCallbackFeature();
 
     boolean isRobotAutoAcceptFriendRequest();
 
     long getPushExpiredTimes();
+    Set<Integer> getForcePushTypes();
 
     List<Integer> getClientForbiddenSendTypes();
     List<Integer> getBlackListExceptionTypes();

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

@@ -21,7 +21,6 @@ import cn.wildfirechat.pojos.OutputMessageData;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import cn.wildfirechat.push.PushServer;
-import com.google.gson.Gson;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.util.StringUtil;
 import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus;
@@ -271,6 +270,7 @@ public class MessagesPublisher {
                 boolean isVoipSilent;
                 boolean isNoDisturb;
                 boolean isConvSilent = false;
+                boolean isForcePush = false;
                 if (pullType == ProtoConstants.PullType.Pull_ChatRoom) {
                     isSilent = true;
                     isConvSilent = true;
@@ -289,6 +289,11 @@ public class MessagesPublisher {
                             conversation = WFCMessage.Conversation.newBuilder().setType(conversationType).setLine(line).setTarget(target).build();
                         }
 
+                        if(m_messagesStore.getForcePushTypes().contains(messageContentType)) {
+                           LOG.info("The message type {} force push", messageContentType);
+                            isForcePush = true;
+                        }
+
                         if (m_messagesStore.getUserConversationSilent(user, conversation)) {
                             LOG.info("The conversation {}-{}-{} is slient", conversation.getType(), conversation.getTarget(), conversation.getLine());
                             isConvSilent = true;
@@ -369,17 +374,17 @@ public class MessagesPublisher {
                         continue;
                     }
 
-                    if (isConvSilent && !isVoip) {
+                    if (isConvSilent && !isVoip && !isForcePush) {
                         LOG.info("Silent of user or conversation");
                         continue;
                     }
 
-                    if (isSilent && !isVoip) {
+                    if (isSilent && !isVoip && !isForcePush) {
                         LOG.info("Silent of user");
                         continue;
                     }
 
-                    if(isVoip && isVoipSilent) {
+                    if(isVoip && isVoipSilent && !isForcePush) {
                         LOG.info("voip silent of user");
                         continue;
                     }
@@ -663,7 +668,15 @@ public class MessagesPublisher {
     public void publish2Receivers(WFCMessage.Message message, Set<String> receivers, String exceptClientId, int pullType) {
         if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
             WFCMessage.ChannelInfo channelInfo = m_messagesStore.getChannelInfo(message.getConversation().getTarget());
-            if (channelInfo != null && !StringUtil.isNullOrEmpty(channelInfo.getCallback()) && channelInfo.getAutomatic() == 1 && !message.getFromUser().equals(channelInfo.getOwner())) {
+
+            boolean forwardMsg;
+            if(m_messagesStore.isChannelNewCallbackFeature()) {
+                forwardMsg = channelInfo != null && !StringUtil.isNullOrEmpty(channelInfo.getCallback()) && !StringUtil.isNullOrEmpty(exceptClientId);
+            } else {
+                forwardMsg = channelInfo != null && !StringUtil.isNullOrEmpty(channelInfo.getCallback()) && channelInfo.getAutomatic() == 1 && !message.getFromUser().equals(channelInfo.getOwner());
+            }
+
+            if (forwardMsg) {
                 OutputClient outputClient = null;
                 if(m_messagesStore.isChannelCallbackWithClientInfo() && !StringUtil.isNullOrEmpty(exceptClientId)) {
                     Session session = m_sessionsStore.getSession(exceptClientId);
@@ -762,7 +775,10 @@ public class MessagesPublisher {
     }
 
     public void notifyChannelListenStatusChanged(WFCMessage.ChannelInfo channelInfo, String user, boolean listen) {
-        if (channelInfo == null || StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) {
+        if (channelInfo == null || StringUtil.isNullOrEmpty(channelInfo.getCallback())) {
+            return;
+        }
+        if(!m_messagesStore.isChannelNewCallbackFeature() && channelInfo.getAutomatic() == 0) {
             return;
         }
 

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

@@ -17,6 +17,7 @@
 package io.moquette.spi.impl;
 
 import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.OutputCheckUserOnline;
 import cn.wildfirechat.pojos.UserOnlineStatus;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
@@ -266,7 +267,27 @@ public class ProtocolProcessor {
         if (!StringUtil.isNullOrEmpty(mUserOnlineStatusCallback)) {
             mServer.getCallbackScheduler().execute(() -> {
                 try {
-                    HttpUtils.httpJsonPost(mUserOnlineStatusCallback, GsonUtil.gson.toJson(new UserOnlineStatus(userId, clientId, platform, status, packageName)), HttpUtils.HttpPostType.POST_TYPE_User_Online_Event_Callback);
+                    int sessionstatus;
+                    Collection<MemorySessionStore.Session> useSessions = m_sessionsStore.sessionForUser(userId);
+                    UserOnlineStatus userOnlineStatus = new UserOnlineStatus(userId, clientId, platform, status, packageName);
+                    userOnlineStatus.sessions = new ArrayList<>();
+
+                    for (MemorySessionStore.Session session : useSessions) {
+                        if (session.getDeleted() > 0) {
+                            continue;
+                        }
+
+                        ConnectionDescriptor descriptor = connectionDescriptors.getConnection(session.getClientID());
+                        if (descriptor == null) {
+                            sessionstatus = 1;
+                        } else {
+                            sessionstatus = 0;
+                        }
+
+                        userOnlineStatus.sessions.add(new OutputCheckUserOnline.Session(userId, session.getClientID(), session.getPlatform(), sessionstatus, session.getLastActiveTime(), session.getAppName()));
+                    }
+
+                    HttpUtils.httpJsonPost(mUserOnlineStatusCallback, GsonUtil.gson.toJson(userOnlineStatus), HttpUtils.HttpPostType.POST_TYPE_User_Online_Event_Callback);
                 } catch (Exception e) {
                     e.printStackTrace();
                     Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);

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

@@ -141,7 +141,7 @@ public class Qos1PublishHandler extends QosPublishHandler {
                     status = 0;
                 }
 
-                out.addSession(userId, session.getClientID(), session.getPlatform(), status, session.getLastActiveTime());
+                out.addSession(userId, session.getClientID(), session.getPlatform(), status, session.getLastActiveTime(), session.getAppName());
             }
 
             callback.onRouteHandled(GsonUtil.gson.toJson(out).getBytes());

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

@@ -102,7 +102,7 @@ public class HttpUtils {
                     if(httpCallback != null) {
                         int code = response.code();
                         if(code == 200) {
-                            if(response.body() != null && response.body().contentLength() > 0) {
+                            if(response.body() != null) {
                                 httpCallback.onSuccess(response.body().string());
                             } else {
                                 httpCallback.onSuccess(null);

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

@@ -20,4 +20,5 @@ public interface UserSettingScope {
     int kUserSettingPttSilent = 25;
     int kUserSettingGroupRemark = 26;
     int kUserSettingPrivacySearchable = 27;
+    int kUserSettingAddFriendNoVerify = 28;
 }

common/pom.xml

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

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

@@ -17,9 +17,15 @@ public interface APIPath {
     String Sensitive_Del = "/admin/sensitive/del";
     String Sensitive_Query = "/admin/sensitive/query";
 
+    String Create_Domain = "/admin/domain/create";
+    String Get_Domain = "/admin/domain/get";
+    String Destroy_Domain = "/admin/domain/destroy";
+    String List_Domain = "/admin/domain/list";
+
     String Create_User = "/admin/user/create";
     String Update_User = "/admin/user/update";
     String Destroy_User = "/admin/user/destroy";
+    String Search_User = "/admin/user/search_user";
     String Create_Robot = "/admin/robot/create";
     String CreateOrUpdate_Device = "/admin/device/create";
     String Get_Device = "/admin/device/get";
@@ -27,6 +33,8 @@ public interface APIPath {
     String User_Get_Token = "/admin/user/get_token";
     String User_Update_Block_Status = "/admin/user/update_block_status";
     String User_Get_Info = "/admin/user/get_info";
+    String User_Batch_Get_Infos = "/admin/user/batch_get_infos";
+    String User_Get_Email_Info = "/admin/user/get_info_by_email";
     String User_Get_All = "/admin/user/all";
     String User_Get_Robot_Info = "/admin/user/get_robot_info";
     String User_Get_Blocked_List = "/admin/user/get_blocked_list";
@@ -51,7 +59,10 @@ public interface APIPath {
     String Friend_Get_Requests = "/admin/friend/get_requests";
     String Relation_Get = "/admin/relation/get";
 
+    String Handle_Friend_Send_Request = "/admin/friend/handle_send_request";
+
     String Msg_Send = "/admin/message/send";
+    String Msg_Publish = "/admin/message/publish";
     String Msg_Recall = "/admin/message/recall";
     String Msg_Delete = "/admin/message/delete";
     String Msg_Update = "/admin/message/update";
@@ -69,6 +80,7 @@ public interface APIPath {
     String Group_Dismiss = "/admin/group/del";
     String Group_Transfer = "/admin/group/transfer";
     String Group_Get_Info = "/admin/group/get_info";
+    String Group_Batch_Info = "/admin/group/batch_infos";
     String Group_Modify_Info = "/admin/group/modify";
     String Group_Member_List = "/admin/group/member/list";
     String Group_Member_Get = "/admin/group/member/get";
@@ -84,6 +96,10 @@ public interface APIPath {
     String Group_Set_Member_Extra = "/admin/group/member/set_extra";
     String Get_Common_Groups = "/admin/group/common_group";
 
+    String Sync_Group = "/admin/mesh/group_sync";
+    String Conference_User_Request = "/admin/conference/user_request";
+    String Conference_User_Event = "/admin/conference/user_event";
+
     String Create_Channel = "/admin/channel/create";
     String Destroy_Channel = "/admin/channel/destroy";
     String Get_Channel_Info = "/admin/channel/get";

common/src/main/java/cn/wildfirechat/messagecontentbuilder/MediaMessageContentBuilder.java

@@ -1,19 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-
-abstract public class MediaMessageContentBuilder extends MessageContentBuilder{
-    private String remoteMediaUrl;
-
-    public MediaMessageContentBuilder remoteMediaUrl(String remoteMediaUrl) {
-        this.remoteMediaUrl = remoteMediaUrl;
-        return this;
-    }
-
-    @Override
-    protected MessagePayload encodeBase() {
-        MessagePayload payload = super.encodeBase();
-        payload.setRemoteMediaUrl(remoteMediaUrl);
-        return payload;
-    }
-}

common/src/main/java/cn/wildfirechat/messagecontentbuilder/MessageContentBuilder.java

@@ -1,33 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-
-import java.util.List;
-
-public abstract class MessageContentBuilder {
-    private int mentionedType;
-    private List<String> mentionedTargets;
-    private String extra;
-    public MessageContentBuilder mentionedType(int mentionedType) {
-        this.mentionedType = mentionedType;
-        return this;
-    }
-    public MessageContentBuilder mentionedTargets(List<String> mentionedTargets) {
-        this.mentionedTargets = mentionedTargets;
-        return this;
-    }
-
-    public MessageContentBuilder extra(String extra) {
-        this.extra = extra;
-        return this;
-    }
-
-    protected MessagePayload encodeBase() {
-        MessagePayload payload = new MessagePayload();
-        payload.setMentionedType(mentionedType);
-        payload.setMentionedTarget(mentionedTargets);
-        payload.setExtra(extra);
-        return payload;
-    }
-    abstract public MessagePayload build();
-}

common/src/main/java/cn/wildfirechat/messagecontentbuilder/SoundMessageContentBuilder.java

@@ -1,25 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-import cn.wildfirechat.proto.ProtoConstants;
-import org.json.simple.JSONObject;
-
-public class SoundMessageContentBuilder extends MediaMessageContentBuilder {
-    private int duration;
-    public static SoundMessageContentBuilder newBuilder(int duration) {
-        SoundMessageContentBuilder builder = new SoundMessageContentBuilder();
-        builder.duration = duration;
-        return builder;
-    }
-    @Override
-    public MessagePayload build() {
-        MessagePayload payload = encodeBase();
-        payload.setType(ProtoConstants.ContentType.Voice);
-        payload.setMediaType(ProtoConstants.MessageMediaType.VOICE);
-        payload.setPersistFlag(ProtoConstants.PersistFlag.Persist_And_Count);
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("duration", duration);
-        payload.setContent(jsonObject.toJSONString());
-        return payload;
-    }
-}

common/src/main/java/cn/wildfirechat/messagecontentbuilder/StreamingTextMessageContentBuilder.java

@@ -1,48 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-import cn.wildfirechat.proto.ProtoConstants;
-import com.google.gson.Gson;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
-
-public class StreamingTextMessageContentBuilder extends MessageContentBuilder{
-    private String text;
-    private String streamId;
-    private boolean generating;
-    public static StreamingTextMessageContentBuilder newBuilder(String streamId) {
-        StreamingTextMessageContentBuilder builder = new StreamingTextMessageContentBuilder();
-        builder.generating = false;
-        builder.streamId = streamId;
-        return builder;
-    }
-    public StreamingTextMessageContentBuilder text(String text) {
-        this.text = text;
-        return this;
-    }
-
-    public StreamingTextMessageContentBuilder generating(boolean generating) {
-        this.generating = generating;
-        return this;
-    }
-
-    @Override
-    public MessagePayload build() {
-        MessagePayload payload = encodeBase();
-        payload.setSearchableContent(text);
-        payload.setContent(streamId);
-        if(generating) {
-            //正在生成消息的类型是14，存储标记位为透传为4。
-            payload.setType(14);
-            payload.setPersistFlag(4);
-        } else {
-            //已经生成消息的类型是15，存储标记位为透传为3。
-            payload.setType(15);
-            payload.setPersistFlag(3);
-        }
-        return payload;
-    }
-}

common/src/main/java/cn/wildfirechat/messagecontentbuilder/TextMessageContentBuilder.java

@@ -1,21 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-import cn.wildfirechat.proto.ProtoConstants;
-
-public class TextMessageContentBuilder extends MessageContentBuilder{
-    private String text;
-    public static TextMessageContentBuilder newBuilder(String text) {
-        TextMessageContentBuilder builder = new TextMessageContentBuilder();
-        builder.text = text;
-        return builder;
-    }
-    @Override
-    public MessagePayload build() {
-        MessagePayload payload = encodeBase();
-        payload.setType(ProtoConstants.ContentType.Text);
-        payload.setPersistFlag(ProtoConstants.PersistFlag.Persist_And_Count);
-        payload.setSearchableContent(text);
-        return payload;
-    }
-}

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

@@ -1,5 +1,6 @@
 package cn.wildfirechat.pojos;
 
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,3 +34,4 @@ public class GetUserSessionResult {
         userSessions = new ArrayList<>();
     }
 }
+

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

@@ -13,6 +13,7 @@ import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.protobuf.ByteString;
+import io.netty.util.internal.StringUtil;
 
 import java.util.List;
 
@@ -32,6 +33,8 @@ public class GroupNotificationBinaryContent {
     //value2(member or something)
     private String m;
 
+    private String extra;
+
     public GroupNotificationBinaryContent() {
     }
 
@@ -89,8 +92,18 @@ public class GroupNotificationBinaryContent {
         this.ms = ms;
     }
 
+    public GroupNotificationBinaryContent setExtra(String extra) {
+        this.extra = extra;
+        return this;
+    }
+
     public WFCMessage.MessageContent getGroupNotifyContent(int groupContentType) {
-        return WFCMessage.MessageContent.newBuilder().setType(groupContentType).setData(ByteString.copyFromUtf8(new GsonBuilder().disableHtmlEscaping().create().toJson(this))).build();
+        WFCMessage.MessageContent.Builder builder = WFCMessage.MessageContent.newBuilder().setType(groupContentType).setData(ByteString.copyFromUtf8(new GsonBuilder().disableHtmlEscaping().create().toJson(this)));
+        if(!StringUtil.isNullOrEmpty(extra)) {
+            builder.setExtra(extra);
+        }
+        return builder.build();
+
     }
 
     public WFCMessage.MessageContent getAddGroupNotifyContent() {

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

@@ -17,6 +17,7 @@ import java.util.List;
 public class InputAddGroupMember extends InputGroupBase {
     private String group_id;
     private List<PojoGroupMember> members;
+    private String member_extra;
 
     public String getGroup_id() {
         return group_id;
@@ -34,6 +35,14 @@ public class InputAddGroupMember extends InputGroupBase {
         this.members = members;
     }
 
+    public String getMember_extra() {
+        return member_extra;
+    }
+
+    public void setMemberExtra(String extra) {
+        this.member_extra = extra;
+    }
+
     public boolean isValide() {
         return true;
     }
@@ -41,6 +50,9 @@ public class InputAddGroupMember extends InputGroupBase {
     public WFCMessage.AddGroupMemberRequest toProtoGroupRequest() {
         WFCMessage.AddGroupMemberRequest.Builder addGroupBuilder = WFCMessage.AddGroupMemberRequest.newBuilder();
         addGroupBuilder.setGroupId(group_id);
+        if(!StringUtil.isNullOrEmpty(member_extra)) {
+            addGroupBuilder.setExtra(member_extra);
+        }
         for (PojoGroupMember pojoGroupMember : getMembers()) {
             WFCMessage.GroupMember.Builder groupMemberBuilder = WFCMessage.GroupMember.newBuilder().setMemberId(pojoGroupMember.getMember_id());
             if (!StringUtil.isNullOrEmpty(pojoGroupMember.getAlias())) {

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

@@ -1,3 +1,11 @@
+/*
+ * 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 InputConferenceRequest {

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

@@ -16,6 +16,7 @@ import java.util.List;
 
 public class InputCreateGroup extends InputGroupBase {
     private PojoGroup group;
+    private String member_extra;
 
     public boolean isValide() {
         return true;
@@ -68,6 +69,7 @@ public class InputCreateGroup extends InputGroupBase {
         if(group_info.isSuper_group()) {
             groupInfoBuilder.setSuperGroup(1);
         }
+        groupInfoBuilder.setDeleted(0);
 
         groupBuilder.setGroupInfo(groupInfoBuilder);
         if(group.getMembers() != null) {
@@ -86,6 +88,9 @@ public class InputCreateGroup extends InputGroupBase {
 
         WFCMessage.CreateGroupRequest.Builder createGroupReqBuilder = WFCMessage.CreateGroupRequest.newBuilder();
         createGroupReqBuilder.setGroup(groupBuilder);
+        if(!StringUtil.isNullOrEmpty(member_extra)) {
+            createGroupReqBuilder.setMemberExtra(member_extra);
+        }
         if (to_lines != null) {
             for (Integer line : to_lines
             ) {
@@ -106,4 +111,12 @@ public class InputCreateGroup extends InputGroupBase {
     public void setGroup(PojoGroup group) {
         this.group = group;
     }
+
+    public String getMember_extra() {
+        return member_extra;
+    }
+
+    public void setMember_extra(String member_extra) {
+        this.member_extra = member_extra;
+    }
 }

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

@@ -0,0 +1,35 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+public class InputGetUserSK {
+    private String uid;
+    private String cid;
+
+    public InputGetUserSK(String uid, String cid) {
+        this.uid = uid;
+        this.cid = cid;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getCid() {
+        return cid;
+    }
+
+    public void setCid(String cid) {
+        this.cid = cid;
+    }
+}

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

@@ -15,6 +15,7 @@ public class InputGroupBase {
     public String operator;
     public List<Integer> to_lines;
     public MessagePayload  notify_message;
+    private boolean isMeshMessage;
 
     public String getOperator() {
         return operator;
@@ -39,4 +40,12 @@ public class InputGroupBase {
     public void setNotify_message(MessagePayload notify_message) {
         this.notify_message = notify_message;
     }
+
+    public boolean isMeshMessage() {
+        return isMeshMessage;
+    }
+
+    public void setMeshMessage(boolean meshMessage) {
+        isMeshMessage = meshMessage;
+    }
 }

common/src/main/java/cn/wildfirechat/pojos/InputHandleFriendRequest.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 InputHandleFriendRequest {
+    private String userId;
+    private String friendUid;
+    private int status;
+    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 int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public boolean isForce() {
+        return force;
+    }
+
+    public void setForce(boolean force) {
+        this.force = force;
+    }
+}

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

@@ -0,0 +1,13 @@
+package cn.wildfirechat.pojos;
+
+public class InputIntValue {
+    public int value;
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/InputOutputDomainInfo.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;
+
+
+public class InputOutputDomainInfo {
+    public String domainId;
+    public String name;
+    public String desc;
+    public String email;
+    public String tel;
+    public String address;
+    public String extra;
+    public long dt;
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+    public long getDt() {
+        return dt;
+    }
+
+    public void setDt(long dt) {
+        this.dt = dt;
+    }
+}

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

@@ -0,0 +1,24 @@
+/*
+ * 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 java.util.List;
+
+public class InputOutputDomainInfoList {
+    public List<InputOutputDomainInfo> infos;
+
+    public List<InputOutputDomainInfo> getInfos() {
+        return infos;
+    }
+
+    public void setInfos(List<InputOutputDomainInfo> infos) {
+        this.infos = infos;
+    }
+}

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

@@ -0,0 +1,13 @@
+package cn.wildfirechat.pojos;
+
+public class InputStringValue {
+    public String value;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

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

@@ -19,18 +19,23 @@ public class OutputCheckUserOnline {
         public int platform;
         public int status; //0 online, 1 have session offline
         public long lastSeen;
+        public String packageName;
 
-        public Session(String clientId, String userId, int platform, int status, long lastSeen) {
+        public Session() {
+        }
+
+        public Session(String clientId, String userId, int platform, int status, long lastSeen, String packageName) {
             this.clientId = clientId;
             this.userId = userId;
             this.platform = platform;
             this.status = status;
             this.lastSeen = lastSeen;
+            this.packageName = packageName;
         }
     }
 
-    public void addSession(String userId, String clientId, int platform, int status, long lastSeen) {
-        Session session = new Session(clientId, userId, platform, status, lastSeen);
+    public void addSession(String userId, String clientId, int platform, int status, long lastSeen, String packageName) {
+        Session session = new Session(clientId, userId, platform, status, lastSeen, packageName);
         sessions.add(session);
     }
 

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

@@ -1,5 +1,14 @@
+/*
+ * 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 OutputReadData {
     public String user;
     public Conversation conversation;

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

@@ -0,0 +1,18 @@
+/*
+ * 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 java.util.List;
+
+public class OutputUserInfoList {
+    public List<InputOutputUserInfo> userInfos;
+}

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

@@ -14,6 +14,7 @@ public class PojoGroupInfo {
     String portrait;
     String owner;
     int type;
+    int member_count;
     String extra;
     int mute;
     int join_type;
@@ -22,6 +23,9 @@ public class PojoGroupInfo {
     int max_member_count;
     int history_message;
     boolean super_group;
+    boolean deleted;
+    long update_dt;
+    long member_update_dt;
 
     public String getTarget_id() {
         return target_id;
@@ -126,4 +130,36 @@ public class PojoGroupInfo {
     public void setSuper_group(boolean super_group) {
         this.super_group = super_group;
     }
+
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public long getUpdate_dt() {
+        return update_dt;
+    }
+
+    public void setUpdate_dt(long update_dt) {
+        this.update_dt = update_dt;
+    }
+
+    public int getMember_count() {
+        return member_count;
+    }
+
+    public void setMember_count(int member_count) {
+        this.member_count = member_count;
+    }
+
+    public long getMember_update_dt() {
+        return member_update_dt;
+    }
+
+    public void setMember_update_dt(long member_update_dt) {
+        this.member_update_dt = member_update_dt;
+    }
 }

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

@@ -0,0 +1,23 @@
+/*
+ * 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 java.util.List;
+
+public class PojoGroupInfoList {
+    public List<PojoGroupInfo> groupInfoList;
+
+    public List<PojoGroupInfo> getGroupInfoList() {
+        return groupInfoList;
+    }
+
+    public void setGroupInfoList(List<PojoGroupInfo> groupInfoList) {
+        this.groupInfoList = groupInfoList;
+    }
+}

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

@@ -13,6 +13,7 @@ public class PojoGroupMember {
     String alias;
     int type;
     String extra;
+    long updateDt;
     long createDt;
 
     public String getMember_id() {
@@ -47,6 +48,14 @@ public class PojoGroupMember {
         this.extra = extra;
     }
 
+    public long getUpdateDt() {
+        return updateDt;
+    }
+
+    public void setUpdateDt(long updateDt) {
+        this.updateDt = updateDt;
+    }
+
     public long getCreateDt() {
         return createDt;
     }

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

@@ -14,6 +14,7 @@ import io.netty.util.internal.StringUtil;
 public class RecallMessageData {
     private String operator;
     private long messageUid;
+    private boolean isUserRecall;
 
     public String getOperator() {
         return operator;
@@ -30,4 +31,12 @@ public class RecallMessageData {
     public void setMessageUid(long messageUid) {
         this.messageUid = messageUid;
     }
+
+    public boolean isUserRecall() {
+        return isUserRecall;
+    }
+
+    public void setUserRecall(boolean userRecall) {
+        isUserRecall = userRecall;
+    }
 }

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

@@ -19,6 +19,7 @@ public class SendMessageData {
     private Conversation conv;
     private MessagePayload payload;
     private List<String> toUsers;
+    private boolean isMeshMessage;
 
     public String getSender() {
         return sender;
@@ -52,6 +53,14 @@ public class SendMessageData {
         this.toUsers = toUsers;
     }
 
+    public boolean isMeshMessage() {
+        return isMeshMessage;
+    }
+
+    public void setMeshMessage(boolean meshMessage) {
+        isMeshMessage = meshMessage;
+    }
+
     public static boolean isValide(SendMessageData sendMessageData) {
         if(sendMessageData == null ||
             sendMessageData.getConv() == null ||

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

@@ -14,6 +14,7 @@ public class UpdateMessageContentData {
     private MessagePayload payload;
     private int distribute;
     private int updateTimestamp;
+    private int meshLocal;
 
     public String getOperator() {
         return operator;
@@ -54,4 +55,12 @@ public class UpdateMessageContentData {
     public void setUpdateTimestamp(int updateTimestamp) {
         this.updateTimestamp = updateTimestamp;
     }
+
+    public int getMeshLocal() {
+        return meshLocal;
+    }
+
+    public void setMeshLocal(int meshLocal) {
+        this.meshLocal = meshLocal;
+    }
 }

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

@@ -1,5 +1,7 @@
 package cn.wildfirechat.pojos;
 
+import java.util.List;
+
 public class UserOnlineStatus {
     public static final int ONLINE = 0;
     public static final int OFFLINE = 1;
@@ -11,6 +13,9 @@ public class UserOnlineStatus {
     public int status;
     public long timestamp;
     public String packageName;
+    public int customState;
+    public String customText;
+    public List<OutputCheckUserOnline.Session> sessions;
 
     public UserOnlineStatus() {
     }

common/src/main/java/cn/wildfirechat/pojos/mesh/MeshRestResult.java

@@ -0,0 +1,139 @@
+package cn.wildfirechat.pojos.mesh;
+
+import com.google.gson.Gson;
+
+public class MeshRestResult<T> {
+    private static Gson gson = new Gson();
+    public enum MeshRestCode {
+        SUCCESS(0, "success"),
+        ERROR_INVALID_MOBILE(1, "无效的电话号码"),
+        ERROR_SEND_SMS_OVER_FREQUENCY(3, "请求验证码太频繁"),
+        ERROR_SERVER_ERROR(4, "服务器异常"),
+        ERROR_CODE_EXPIRED(5, "验证码已过期"),
+        ERROR_CODE_INCORRECT(6, "验证码或密码错误"),
+        ERROR_SERVER_CONFIG_ERROR(7, "服务器配置错误"),
+        ERROR_SESSION_EXPIRED(8, "会话不存在或已过期"),
+        ERROR_SESSION_NOT_VERIFIED(9, "会话没有验证"),
+        ERROR_SESSION_NOT_SCANED(10, "会话没有被扫码"),
+        ERROR_SERVER_NOT_IMPLEMENT(11, "功能没有实现"),
+        ERROR_GROUP_ANNOUNCEMENT_NOT_EXIST(12, "群公告不存在"),
+        ERROR_NOT_LOGIN(13, "没有登录"),
+        ERROR_NO_RIGHT(14, "没有权限"),
+        ERROR_INVALID_PARAMETER(15, "无效参数"),
+        ERROR_NOT_EXIST(16, "对象不存在"),
+        ERROR_USER_NAME_ALREADY_EXIST(17, "用户名已经存在"),
+        ERROR_SESSION_CANCELED(18, "会话已经取消"),
+        ERROR_PASSWORD_INCORRECT(19, "密码错误"),
+        ERROR_FAILURE_TOO_MUCH_TIMES(20, "密码错误次数太多，请等5分钟再试试"),
+        ERROR_USER_FORBIDDEN(21, "用户被封禁");
+        public int code;
+        public String msg;
+
+        MeshRestCode(int code, String msg) {
+            this.code = code;
+            this.msg = msg;
+        }
+
+    }
+    private int remote_im_code;
+    private int remote_mesh_code;
+    private int local_mesh_code;
+    private String error_message;
+    private T result;
+
+    @Override
+    public String toString() {
+        return gson.toJson(this);
+    }
+
+    public static MeshRestResult ok() {
+        return new MeshRestResult();
+    }
+
+    public static MeshRestResult ok(Object object) {
+        return new MeshRestResult(object);
+    }
+
+    public static MeshRestResult remoteIMError(int code, String message) {
+        MeshRestResult r = new MeshRestResult();
+        r.remote_im_code = code;
+        r.error_message = message;
+        return r;
+    }
+
+    public static MeshRestResult remoteMeshError(int code, String message) {
+        MeshRestResult r = new MeshRestResult();
+        r.remote_mesh_code = code;
+        r.error_message = message;
+        return r;
+    }
+
+    public MeshRestResult addRemoteMeshError(int code, String message) {
+        MeshRestResult r = new MeshRestResult();
+        remote_mesh_code = code;
+        error_message = message;
+        return this;
+    }
+
+    public static MeshRestResult localMeshError(int code, String message) {
+        MeshRestResult r = new MeshRestResult();
+        r.local_mesh_code = code;
+        r.error_message = message;
+        return r;
+    }
+
+    public MeshRestResult addLocalMeshError(int code, String message) {
+        local_mesh_code = code;
+        error_message = message;
+        return this;
+    }
+
+
+    public MeshRestResult() {
+
+    }
+
+    public MeshRestResult(T object) {
+        result = object;
+    }
+
+    public T getResult() {
+        return result;
+    }
+
+    public void setResult(T result) {
+        this.result = result;
+    }
+
+    public int getRemote_im_code() {
+        return remote_im_code;
+    }
+
+    public void setRemote_im_code(int remote_im_code) {
+        this.remote_im_code = remote_im_code;
+    }
+
+    public int getRemote_mesh_code() {
+        return remote_mesh_code;
+    }
+
+    public void setRemote_mesh_code(int remote_mesh_code) {
+        this.remote_mesh_code = remote_mesh_code;
+    }
+
+    public int getLocal_mesh_code() {
+        return local_mesh_code;
+    }
+
+    public void setLocal_mesh_code(int local_mesh_code) {
+        this.local_mesh_code = local_mesh_code;
+    }
+
+    public String getError_message() {
+        return error_message;
+    }
+
+    public void setError_message(String error_message) {
+        this.error_message = error_message;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoAddFriendReq.java

@@ -0,0 +1,8 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoAddFriendReq {
+    public String fromUserId;
+    public String reason;
+    public String targetUserId;
+    public String domainId;
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoAddGroupMember.java

@@ -0,0 +1,44 @@
+package cn.wildfirechat.pojos.mesh;
+
+import cn.wildfirechat.pojos.PojoGroupMember;
+
+import java.util.List;
+
+public class PojoAddGroupMember {
+    public String domainId;
+    public String operator;
+    public String group_id;
+    public List<PojoGroupMember> members;
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+
+    public List<PojoGroupMember> getMembers() {
+        return members;
+    }
+
+    public void setMembers(List<PojoGroupMember> members) {
+        this.members = members;
+    }
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoDeleteFriend.java

@@ -0,0 +1,31 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoDeleteFriend {
+    public String domainId;
+    public String operator;
+    public String friendUid;
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getFriendUid() {
+        return friendUid;
+    }
+
+    public void setFriendUid(String friendUid) {
+        this.friendUid = friendUid;
+    }
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoDismissGroup.java

@@ -0,0 +1,31 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoDismissGroup {
+    public String domainId;
+    public String operator;
+    public String group_id;
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoGroupUpdated.java

@@ -0,0 +1,36 @@
+package cn.wildfirechat.pojos.mesh;
+
+import cn.wildfirechat.pojos.PojoGroupInfo;
+import cn.wildfirechat.pojos.PojoGroupMember;
+
+import java.util.List;
+
+public class PojoGroupUpdated {
+    public List<String> domainIds;
+    public PojoGroupInfo groupInfo;
+    public List<PojoGroupMember> members;
+
+    public List<String> getDomainIds() {
+        return domainIds;
+    }
+
+    public void setDomainIds(List<String> domainIds) {
+        this.domainIds = domainIds;
+    }
+
+    public PojoGroupInfo getGroupInfo() {
+        return groupInfo;
+    }
+
+    public void setGroupInfo(PojoGroupInfo groupInfo) {
+        this.groupInfo = groupInfo;
+    }
+
+    public List<PojoGroupMember> getMembers() {
+        return members;
+    }
+
+    public void setMembers(List<PojoGroupMember> members) {
+        this.members = members;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoHandleFriendRequestReq.java

@@ -0,0 +1,8 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoHandleFriendRequestReq {
+    public String userId;
+    public int status;
+    public String targetUserId;
+    public String domainId;
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoKickoffGroupMember.java

@@ -0,0 +1,42 @@
+package cn.wildfirechat.pojos.mesh;
+
+import java.util.List;
+
+public class PojoKickoffGroupMember {
+    public String domainId;
+    public String operator;
+    public String group_id;
+    public List<String> members;
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+
+    public List<String> getMembers() {
+        return members;
+    }
+
+    public void setMembers(List<String> members) {
+        this.members = members;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoModifyGroupInfo.java

@@ -0,0 +1,49 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoModifyGroupInfo {
+    public String domainId;
+    public String operator;
+    public String group_id;
+    public int type;
+    public String value;
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoPublishMessageReq.java

@@ -0,0 +1,13 @@
+package cn.wildfirechat.pojos.mesh;
+
+import cn.wildfirechat.pojos.SendMessageData;
+
+import java.util.List;
+
+public class PojoPublishMessageReq {
+    public SendMessageData messageData;
+    public List<String> receivers;
+    public String domainId;
+    public long messageId;
+    public boolean republish;
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoQuitGroup.java

@@ -0,0 +1,31 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoQuitGroup {
+    public String domainId;
+    public String operator;
+    public String group_id;
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+    
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoRecallMessageReq.java

@@ -0,0 +1,8 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoRecallMessageReq {
+    public String domainId;
+    public long messageId;
+    public String operator;
+    public boolean isSenderRecall;
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoSearchUserReq.java

@@ -0,0 +1,40 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoSearchUserReq {
+    public String keyword;
+    public int searchType;
+    public int page;
+    public String domainId;
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public int getSearchType() {
+        return searchType;
+    }
+
+    public void setSearchType(int searchType) {
+        this.searchType = searchType;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoSearchUserRes.java

@@ -0,0 +1,26 @@
+package cn.wildfirechat.pojos.mesh;
+
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+
+import java.util.List;
+
+public class PojoSearchUserRes {
+    public List<InputOutputUserInfo> userInfos;
+    public String keyword;
+
+    public List<InputOutputUserInfo> getUserInfos() {
+        return userInfos;
+    }
+
+    public void setUserInfos(List<InputOutputUserInfo> userInfos) {
+        this.userInfos = userInfos;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoSendMessageReq.java

@@ -0,0 +1,10 @@
+package cn.wildfirechat.pojos.mesh;
+
+import cn.wildfirechat.pojos.SendMessageData;
+
+public class PojoSendMessageReq {
+    public SendMessageData messageData;
+    public String clientId;
+    public String domainId;
+    public long messageId;
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoString.java

@@ -0,0 +1,22 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoString {
+    public String domainId;
+    public String string;
+
+    public String getString() {
+        return string;
+    }
+
+    public void setString(String string) {
+        this.string = string;
+    }
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoStringList.java

@@ -0,0 +1,24 @@
+package cn.wildfirechat.pojos.mesh;
+
+import java.util.List;
+
+public class PojoStringList {
+    public String domainId;
+    public List<String> stringList;
+
+    public List<String> getStringList() {
+        return stringList;
+    }
+
+    public void setStringList(List<String> stringList) {
+        this.stringList = stringList;
+    }
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoTransferGroup.java

@@ -0,0 +1,40 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoTransferGroup {
+    public String domainId;
+    public String operator;
+    public String newOwner;
+    public String group_id;
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getGroup_id() {
+        return group_id;
+    }
+
+    public void setGroup_id(String group_id) {
+        this.group_id = group_id;
+    }
+
+    public String getNewOwner() {
+        return newOwner;
+    }
+
+    public void setNewOwner(String newOwner) {
+        this.newOwner = newOwner;
+    }
+
+    public String getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(String domainId) {
+        this.domainId = domainId;
+    }
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoUserConferenceEvent.java

@@ -0,0 +1,9 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoUserConferenceEvent {
+    public String domainId;
+    public String data;
+    public String userId;
+    public String clientId;
+    public boolean isRobot;
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoUserConferenceRequest.java

@@ -0,0 +1,12 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoUserConferenceRequest {
+    public String domainId;
+    public String clientID;
+    public String fromUser;
+    public String request;
+    public long sessionId;
+    public String roomId;
+    public String data;
+    public boolean advanced;
+}

common/src/main/java/cn/wildfirechat/pojos/mesh/PojoUserConferenceResponse.java

@@ -0,0 +1,5 @@
+package cn.wildfirechat.pojos.mesh;
+
+public class PojoUserConferenceResponse {
+    public String data;
+}

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

@@ -97,6 +97,10 @@ public class ProtoConstants {
         int Composited = 11;
         int Rich_Notification = 12;
         int Articles = 13;
+        int StreamingText_Generationg = 14;
+        int StreamingText_Generated = 15;
+        int Not_Delivered = 16;
+        int Ptt_Voice = 23;
         int Enter_Channel_Chat = 71;
         int Leave_Channel_Chat = 72;
         int Recall = 80;
@@ -126,6 +130,12 @@ public class ProtoConstants {
         int Quit_Group_Visible_Notification = 121;
         int Modify_Group_Extra = 122;
         int Modify_Group_Member_Extra = 123;
+
+        int Call_Start = 400;
+        int Call_Accept = 401;
+        int Call_End = 402;
+        int Call_Add_Participant = 406;
+        int Call_Multi_Call_Ongoing = 416;
     }
 
     public interface MessagePersistFlag {

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

@@ -1651,6 +1651,16 @@ public final class WFCMessage {
      * <code>optional int32 super_group = 16;</code>
      */
     int getSuperGroup();
+
+    // optional int32 deleted = 17;
+    /**
+     * <code>optional int32 deleted = 17;</code>
+     */
+    boolean hasDeleted();
+    /**
+     * <code>optional int32 deleted = 17;</code>
+     */
+    int getDeleted();
   }
   /**
    * Protobuf type {@code GroupInfo}
@@ -1783,6 +1793,11 @@ public final class WFCMessage {
               superGroup_ = input.readInt32();
               break;
             }
+            case 136: {
+              bitField0_ |= 0x00010000;
+              deleted_ = input.readInt32();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2214,6 +2229,22 @@ public final class WFCMessage {
       return superGroup_;
     }
 
+    // optional int32 deleted = 17;
+    public static final int DELETED_FIELD_NUMBER = 17;
+    private int deleted_;
+    /**
+     * <code>optional int32 deleted = 17;</code>
+     */
+    public boolean hasDeleted() {
+      return ((bitField0_ & 0x00010000) == 0x00010000);
+    }
+    /**
+     * <code>optional int32 deleted = 17;</code>
+     */
+    public int getDeleted() {
+      return deleted_;
+    }
+
     private void initFields() {
       targetId_ = "";
       name_ = "";
@@ -2231,6 +2262,7 @@ public final class WFCMessage {
       maxMemberCount_ = 0;
       historyMessage_ = 0;
       superGroup_ = 0;
+      deleted_ = 0;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -2300,6 +2332,9 @@ public final class WFCMessage {
       if (((bitField0_ & 0x00008000) == 0x00008000)) {
         output.writeInt32(16, superGroup_);
       }
+      if (((bitField0_ & 0x00010000) == 0x00010000)) {
+        output.writeInt32(17, deleted_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -2373,6 +2408,10 @@ public final class WFCMessage {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(16, superGroup_);
       }
+      if (((bitField0_ & 0x00010000) == 0x00010000)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(17, deleted_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -2521,6 +2560,8 @@ public final class WFCMessage {
         bitField0_ = (bitField0_ & ~0x00004000);
         superGroup_ = 0;
         bitField0_ = (bitField0_ & ~0x00008000);
+        deleted_ = 0;
+        bitField0_ = (bitField0_ & ~0x00010000);
         return this;
       }
 
@@ -2613,6 +2654,10 @@ public final class WFCMessage {
           to_bitField0_ |= 0x00008000;
         }
         result.superGroup_ = superGroup_;
+        if (((from_bitField0_ & 0x00010000) == 0x00010000)) {
+          to_bitField0_ |= 0x00010000;
+        }
+        result.deleted_ = deleted_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -2687,6 +2732,9 @@ public final class WFCMessage {
         if (other.hasSuperGroup()) {
           setSuperGroup(other.getSuperGroup());
         }
+        if (other.hasDeleted()) {
+          setDeleted(other.getDeleted());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -3455,6 +3503,39 @@ public final class WFCMessage {
         return this;
       }
 
+      // optional int32 deleted = 17;
+      private int deleted_ ;
+      /**
+       * <code>optional int32 deleted = 17;</code>
+       */
+      public boolean hasDeleted() {
+        return ((bitField0_ & 0x00010000) == 0x00010000);
+      }
+      /**
+       * <code>optional int32 deleted = 17;</code>
+       */
+      public int getDeleted() {
+        return deleted_;
+      }
+      /**
+       * <code>optional int32 deleted = 17;</code>
+       */
+      public Builder setDeleted(int value) {
+        bitField0_ |= 0x00010000;
+        deleted_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 deleted = 17;</code>
+       */
+      public Builder clearDeleted() {
+        bitField0_ = (bitField0_ & ~0x00010000);
+        deleted_ = 0;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:GroupInfo)
     }
 
@@ -41793,6 +41874,16 @@ public final class WFCMessage {
      * <code>optional .MessageContent notify_content = 3;</code>
      */
     cn.wildfirechat.proto.WFCMessage.MessageContentOrBuilder getNotifyContentOrBuilder();
+
+    // optional int32 keep_msg = 4;
+    /**
+     * <code>optional int32 keep_msg = 4;</code>
+     */
+    boolean hasKeepMsg();
+    /**
+     * <code>optional int32 keep_msg = 4;</code>
+     */
+    int getKeepMsg();
   }
   /**
    * Protobuf type {@code QuitGroupRequest}
@@ -41884,6 +41975,11 @@ public final class WFCMessage {
               bitField0_ |= 0x00000002;
               break;
             }
+            case 32: {
+              bitField0_ |= 0x00000004;
+              keepMsg_ = input.readInt32();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -42015,10 +42111,27 @@ public final class WFCMessage {
       return notifyContent_;
     }
 
+    // optional int32 keep_msg = 4;
+    public static final int KEEP_MSG_FIELD_NUMBER = 4;
+    private int keepMsg_;
+    /**
+     * <code>optional int32 keep_msg = 4;</code>
+     */
+    public boolean hasKeepMsg() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional int32 keep_msg = 4;</code>
+     */
+    public int getKeepMsg() {
+      return keepMsg_;
+    }
+
     private void initFields() {
       groupId_ = "";
       toLine_ = java.util.Collections.emptyList();
       notifyContent_ = cn.wildfirechat.proto.WFCMessage.MessageContent.getDefaultInstance();
+      keepMsg_ = 0;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -42051,6 +42164,9 @@ public final class WFCMessage {
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeMessage(3, notifyContent_);
       }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeInt32(4, keepMsg_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -42077,6 +42193,10 @@ public final class WFCMessage {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, notifyContent_);
       }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, keepMsg_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -42204,6 +42324,8 @@ public final class WFCMessage {
           notifyContentBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
+        keepMsg_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -42249,6 +42371,10 @@ public final class WFCMessage {
         } else {
           result.notifyContent_ = notifyContentBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.keepMsg_ = keepMsg_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -42283,6 +42409,9 @@ public final class WFCMessage {
         if (other.hasNotifyContent()) {
           mergeNotifyContent(other.getNotifyContent());
         }
+        if (other.hasKeepMsg()) {
+          setKeepMsg(other.getKeepMsg());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -42577,6 +42706,39 @@ public final class WFCMessage {
         return notifyContentBuilder_;
       }
 
+      // optional int32 keep_msg = 4;
+      private int keepMsg_ ;
+      /**
+       * <code>optional int32 keep_msg = 4;</code>
+       */
+      public boolean hasKeepMsg() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <code>optional int32 keep_msg = 4;</code>
+       */
+      public int getKeepMsg() {
+        return keepMsg_;
+      }
+      /**
+       * <code>optional int32 keep_msg = 4;</code>
+       */
+      public Builder setKeepMsg(int value) {
+        bitField0_ |= 0x00000008;
+        keepMsg_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int32 keep_msg = 4;</code>
+       */
+      public Builder clearKeepMsg() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        keepMsg_ = 0;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:QuitGroupRequest)
     }
 
@@ -67305,7 +67467,7 @@ public final class WFCMessage {
       "dRequest\022\022\n\ntarget_uid\030\001 \002(\t\022\016\n\006reason\030\002" +
       " \002(\t\022\r\n\005extra\030\003 \001(\t\":\n\014Conversation\022\014\n\004t" +
       "ype\030\001 \002(\005\022\016\n\006target\030\002 \002(\t\022\014\n\004line\030\003 \002(\005\"" +
-      "\300\002\n\tGroupInfo\022\021\n\ttarget_id\030\001 \001(\t\022\014\n\004name" +
+      "\321\002\n\tGroupInfo\022\021\n\ttarget_id\030\001 \001(\t\022\014\n\004name" +
       "\030\002 \002(\t\022\020\n\010portrait\030\003 \001(\t\022\r\n\005owner\030\004 \001(\t\022" +
       "\014\n\004type\030\005 \002(\005\022\024\n\014member_count\030\006 \001(\005\022\r\n\005e" +
       "xtra\030\007 \001(\t\022\021\n\tupdate_dt\030\010 \001(\003\022\030\n\020member_" +
@@ -67313,172 +67475,173 @@ public final class WFCMessage {
       "pe\030\013 \001(\005\022\024\n\014private_chat\030\014 \001(\005\022\022\n\nsearch",
       "able\030\r \001(\005\022\030\n\020max_member_count\030\016 \001(\005\022\027\n\017" +
       "history_message\030\017 \001(\005\022\023\n\013super_group\030\020 \001" +
-      "(\005\"r\n\013GroupMember\022\021\n\tmember_id\030\001 \002(\t\022\r\n\005" +
-      "alias\030\002 \001(\t\022\014\n\004type\030\003 \002(\005\022\021\n\tupdate_dt\030\004" +
-      " \001(\003\022\021\n\tcreate_dt\030\005 \001(\003\022\r\n\005extra\030\006 \001(\t\"F" +
-      "\n\005Group\022\036\n\ngroup_info\030\001 \002(\0132\n.GroupInfo\022" +
-      "\035\n\007members\030\002 \003(\0132\014.GroupMember\"\313\001\n\013Chann" +
-      "elMenu\022\014\n\004type\030\001 \002(\t\022\014\n\004name\030\002 \002(\t\022\013\n\003ke" +
-      "y\030\003 \001(\t\022\013\n\003url\030\004 \001(\t\022\020\n\010media_id\030\005 \001(\t\022\022" +
-      "\n\narticle_id\030\006 \001(\t\022\016\n\006app_id\030\007 \001(\t\022\020\n\010ap",
-      "p_page\030\010 \001(\t\022\036\n\010sub_menu\030\t \003(\0132\014.Channel" +
-      "Menu\022\017\n\007menu_id\030\n \001(\t\022\r\n\005extra\030\013 \001(\t\"-\n\017" +
-      "ChannelMenuList\022\032\n\004menu\030\001 \003(\0132\014.ChannelM" +
-      "enu\"\340\001\n\013ChannelInfo\022\021\n\ttarget_id\030\001 \001(\t\022\014" +
-      "\n\004name\030\002 \002(\t\022\020\n\010portrait\030\003 \001(\t\022\r\n\005owner\030" +
-      "\004 \001(\t\022\016\n\006status\030\005 \001(\005\022\014\n\004desc\030\006 \001(\t\022\r\n\005e" +
-      "xtra\030\007 \001(\t\022\021\n\tupdate_dt\030\010 \001(\003\022\016\n\006secret\030" +
-      "\t \001(\t\022\020\n\010callback\030\n \001(\t\022\021\n\tautomatic\030\013 \001" +
-      "(\005\022\032\n\004menu\030\014 \003(\0132\014.ChannelMenu\"D\n\021Modify" +
-      "ChannelInfo\022\022\n\nchannel_id\030\001 \002(\t\022\014\n\004type\030",
-      "\002 \002(\005\022\r\n\005value\030\003 \002(\t\"8\n\017TransferChannel\022" +
-      "\022\n\nchannel_id\030\001 \002(\t\022\021\n\tnew_owner\030\002 \002(\t\"3" +
-      "\n\017PullChannelInfo\022\022\n\nchannel_id\030\001 \002(\t\022\014\n" +
-      "\004head\030\002 \002(\003\"H\n\023PullChannelListener\022\022\n\nch" +
-      "annel_id\030\001 \002(\t\022\016\n\006offset\030\002 \002(\005\022\r\n\005count\030" +
-      "\003 \002(\005\"R\n\031PullChannelListenerResult\022\023\n\013to" +
-      "tal_count\030\001 \002(\005\022\016\n\006offset\030\002 \002(\005\022\020\n\010liste" +
-      "ner\030\003 \003(\t\"3\n\rListenChannel\022\022\n\nchannel_id" +
-      "\030\001 \002(\t\022\016\n\006listen\030\002 \002(\005\"E\n\023SearchChannelR" +
-      "esult\022\035\n\007channel\030\001 \003(\0132\014.ChannelInfo\022\017\n\007",
-      "keyword\030\002 \002(\t\"\235\002\n\016MessageContent\022\014\n\004type" +
-      "\030\001 \002(\005\022\032\n\022searchable_content\030\002 \001(\t\022\024\n\014pu" +
-      "sh_content\030\003 \001(\t\022\017\n\007content\030\004 \001(\t\022\014\n\004dat" +
-      "a\030\005 \001(\014\022\021\n\tmediaType\030\006 \001(\005\022\026\n\016remoteMedi" +
-      "aUrl\030\007 \001(\t\022\024\n\014persist_flag\030\010 \001(\005\022\027\n\017expi" +
-      "re_duration\030\t \001(\005\022\026\n\016mentioned_type\030\n \001(" +
-      "\005\022\030\n\020mentioned_target\030\013 \003(\t\022\r\n\005extra\030\014 \001" +
-      "(\t\022\021\n\tpush_data\030\r \001(\t\"\226\001\n\025AddGroupMember" +
-      "Request\022\020\n\010group_id\030\001 \002(\t\022\"\n\014added_membe" +
-      "r\030\002 \003(\0132\014.GroupMember\022\017\n\007to_line\030\003 \003(\005\022\'",
-      "\n\016notify_content\030\004 \001(\0132\017.MessageContent\022" +
-      "\r\n\005extra\030\005 \001(\t\"{\n\022CreateGroupRequest\022\025\n\005" +
-      "group\030\001 \002(\0132\006.Group\022\017\n\007to_line\030\002 \003(\005\022\'\n\016" +
-      "notify_content\030\003 \001(\0132\017.MessageContent\022\024\n" +
-      "\014member_extra\030\004 \001(\t\"a\n\023DismissGroupReque" +
-      "st\022\020\n\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n" +
-      "\016notify_content\030\003 \001(\0132\017.MessageContent\"\245" +
-      "\001\n\rFriendRequest\022\020\n\010from_uid\030\001 \001(\t\022\016\n\006to" +
-      "_uid\030\002 \002(\t\022\016\n\006reason\030\003 \002(\t\022\016\n\006status\030\004 \001" +
-      "(\005\022\021\n\tupdate_dt\030\005 \001(\003\022\030\n\020from_read_statu",
-      "s\030\006 \001(\010\022\026\n\016to_read_status\030\007 \001(\010\022\r\n\005extra" +
-      "\030\010 \001(\t\"#\n\rGeneralResult\022\022\n\nerror_code\030\001 " +
-      "\002(\005\"?\n\025GetUploadTokenRequest\022\022\n\nmedia_ty" +
-      "pe\030\001 \002(\005\022\022\n\nmedia_path\030\002 \002(\t\"S\n\024GetUploa" +
-      "dTokenResult\022\016\n\006domain\030\001 \002(\t\022\r\n\005token\030\002 " +
-      "\002(\t\022\016\n\006server\030\003 \002(\t\022\014\n\004port\030\004 \001(\005\"H\n\023Han" +
-      "dleFriendRequest\022\022\n\ntarget_uid\030\001 \002(\t\022\016\n\006" +
-      "status\030\002 \002(\005\022\r\n\005extra\030\003 \001(\t\"\023\n\005IDBuf\022\n\n\002" +
-      "id\030\001 \002(\t\"\027\n\tIDListBuf\022\n\n\002id\030\001 \003(\t\"\256\001\n\007Me" +
-      "ssage\022#\n\014conversation\030\001 \002(\0132\r.Conversati",
-      "on\022\021\n\tfrom_user\030\002 \002(\t\022 \n\007content\030\003 \002(\0132\017" +
-      ".MessageContent\022\022\n\nmessage_id\030\004 \001(\003\022\030\n\020s" +
-      "erver_timestamp\030\005 \001(\003\022\017\n\007to_user\030\006 \001(\t\022\n" +
-      "\n\002to\030\007 \003(\t\"\353\001\n\004User\022\013\n\003uid\030\001 \002(\t\022\014\n\004name" +
-      "\030\002 \001(\t\022\024\n\014display_name\030\003 \001(\t\022\020\n\010portrait" +
-      "\030\004 \001(\t\022\016\n\006mobile\030\005 \001(\t\022\r\n\005email\030\006 \001(\t\022\017\n" +
-      "\007address\030\007 \001(\t\022\017\n\007company\030\010 \001(\t\022\r\n\005extra" +
-      "\030\t \001(\t\022\021\n\tupdate_dt\030\n \001(\003\022\016\n\006gender\030\013 \001(" +
-      "\005\022\016\n\006social\030\014 \001(\t\022\014\n\004type\030\r \001(\005\022\017\n\007delet" +
-      "ed\030\016 \001(\005\"c\n\005Robot\022\013\n\003uid\030\001 \002(\t\022\r\n\005state\030",
-      "\002 \002(\005\022\r\n\005owner\030\003 \001(\t\022\016\n\006secret\030\004 \001(\t\022\020\n\010" +
-      "callback\030\005 \001(\t\022\r\n\005extra\030\006 \001(\t\"(\n\017GetRobo" +
-      "tsResult\022\025\n\005entry\030\001 \003(\0132\006.Robot\"g\n\030Uploa" +
-      "dDeviceTokenRequest\022\020\n\010platform\030\001 \002(\005\022\020\n" +
-      "\010app_name\030\002 \002(\t\022\024\n\014device_token\030\003 \002(\t\022\021\n" +
-      "\tpush_type\030\004 \002(\005\"\201\001\n\026ModifyGroupInfoRequ" +
-      "est\022\020\n\010group_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\r\n\005v" +
-      "alue\030\003 \002(\t\022\017\n\007to_line\030\004 \003(\005\022\'\n\016notify_co" +
-      "ntent\030\005 \001(\0132\017.MessageContent\"\203\001\n\026SetGrou" +
-      "pManagerRequest\022\020\n\010group_id\030\001 \002(\t\022\014\n\004typ",
-      "e\030\002 \002(\005\022\017\n\007user_id\030\003 \003(\t\022\017\n\007to_line\030\004 \003(" +
-      "\005\022\'\n\016notify_content\030\005 \001(\0132\017.MessageConte" +
-      "nt\"(\n\tInfoEntry\022\014\n\004type\030\001 \002(\005\022\r\n\005value\030\002" +
-      " \002(\t\"0\n\023ModifyMyInfoRequest\022\031\n\005entry\030\001 \003" +
-      "(\0132\n.InfoEntry\";\n\rNotifyMessage\022\014\n\004type\030" +
-      "\001 \002(\005\022\014\n\004head\030\002 \002(\003\022\016\n\006target\030\003 \001(\t\"=\n\022P" +
-      "ullMessageRequest\022\n\n\002id\030\001 \002(\003\022\014\n\004type\030\002 " +
-      "\002(\005\022\r\n\005delay\030\003 \001(\003\"M\n\021PullMessageResult\022" +
-      "\031\n\007message\030\001 \003(\0132\010.Message\022\017\n\007current\030\002 " +
-      "\002(\003\022\014\n\004head\030\003 \002(\003\"/\n\023PullGroupInfoResult",
-      "\022\030\n\004info\030\001 \003(\0132\n.GroupInfo\"6\n\026PullGroupM" +
-      "emberRequest\022\016\n\006target\030\001 \002(\t\022\014\n\004head\030\002 \002" +
-      "(\003\"5\n\025PullGroupMemberResult\022\034\n\006member\030\001 " +
-      "\003(\0132\014.GroupMember\"-\n\013UserRequest\022\013\n\003uid\030" +
-      "\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(\003\"0\n\017PullUserRequ" +
-      "est\022\035\n\007request\030\001 \003(\0132\014.UserRequest\"/\n\nUs" +
-      "erResult\022\023\n\004user\030\001 \002(\0132\005.User\022\014\n\004code\030\002 " +
-      "\002(\005\"-\n\016PullUserResult\022\033\n\006result\030\001 \003(\0132\013." +
-      "UserResult\"^\n\020QuitGroupRequest\022\020\n\010group_" +
-      "id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n\016notify_cont",
-      "ent\030\003 \001(\0132\017.MessageContent\"~\n\030RemoveGrou" +
-      "pMemberRequest\022\020\n\010group_id\030\001 \002(\t\022\026\n\016remo" +
-      "ved_member\030\002 \003(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016not" +
-      "ify_content\030\004 \001(\0132\017.MessageContent\"u\n\024Tr" +
-      "ansferGroupRequest\022\020\n\010group_id\030\001 \002(\t\022\021\n\t" +
-      "new_owner\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016noti" +
-      "fy_content\030\004 \001(\0132\017.MessageContent\"\206\001\n\026Mo" +
-      "difyGroupMemberAlias\022\020\n\010group_id\030\001 \002(\t\022\r" +
-      "\n\005alias\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify" +
-      "_content\030\004 \001(\0132\017.MessageContent\022\021\n\tmembe",
-      "r_id\030\005 \001(\t\"\206\001\n\026ModifyGroupMemberExtra\022\020\n" +
-      "\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n\016noti" +
-      "fy_content\030\003 \001(\0132\017.MessageContent\022\r\n\005ext" +
-      "ra\030\004 \001(\t\022\021\n\tmember_id\030\005 \001(\t\"P\n\020UserSetti" +
-      "ngEntry\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005v" +
-      "alue\030\003 \002(\t\022\021\n\tupdate_dt\030\004 \002(\003\"A\n\024ModifyU" +
-      "serSettingReq\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(" +
-      "\t\022\r\n\005value\030\003 \002(\t\"\032\n\007Version\022\017\n\007version\030\001" +
-      " \002(\003\"8\n\024GetUserSettingResult\022 \n\005entry\030\001 " +
-      "\003(\0132\021.UserSettingEntry\"f\n\006Friend\022\013\n\003uid\030",
-      "\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\021\n\tupdate_dt\030\003 \002(\003\022" +
-      "\r\n\005alias\030\004 \001(\t\022\017\n\007blacked\030\005 \001(\005\022\r\n\005extra" +
-      "\030\006 \001(\t\"*\n\020GetFriendsResult\022\026\n\005entry\030\001 \003(" +
-      "\0132\007.Friend\"7\n\026GetFriendRequestResult\022\035\n\005" +
-      "entry\030\001 \003(\0132\016.FriendRequest\"\243\001\n\021ConnectA" +
-      "ckPayload\022\020\n\010msg_head\030\001 \001(\003\022\023\n\013friend_he" +
-      "ad\030\002 \001(\003\022\026\n\016friend_rq_head\030\003 \001(\003\022\024\n\014sett" +
-      "ing_head\030\004 \001(\003\022\021\n\tnode_addr\030\005 \001(\t\022\021\n\tnod" +
-      "e_port\030\006 \001(\005\022\023\n\013server_time\030\007 \001(\003\"P\n\rIMH" +
-      "ttpWrapper\022\r\n\005token\030\001 \002(\t\022\021\n\tclient_id\030\002",
-      " \002(\t\022\017\n\007request\030\003 \002(\t\022\014\n\004data\030\004 \001(\014\"A\n\021S" +
-      "earchUserRequest\022\017\n\007keyword\030\001 \002(\t\022\r\n\005fuz" +
-      "zy\030\002 \001(\005\022\014\n\004page\030\003 \001(\005\"(\n\020SearchUserResu" +
-      "lt\022\024\n\005entry\030\001 \003(\0132\005.User\"@\n\026GetChatroomI" +
-      "nfoRequest\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tupdat" +
-      "e_dt\030\002 \001(\003\"\227\001\n\014ChatroomInfo\022\r\n\005title\030\001 \002" +
-      "(\t\022\014\n\004desc\030\002 \001(\t\022\020\n\010portrait\030\003 \001(\t\022\024\n\014me" +
-      "mber_count\030\004 \001(\005\022\021\n\tcreate_dt\030\005 \001(\003\022\021\n\tu" +
-      "pdate_dt\030\006 \001(\003\022\r\n\005extra\030\007 \001(\t\022\r\n\005state\030\010" +
-      " \001(\005\"F\n\034GetChatroomMemberInfoRequest\022\023\n\013",
-      "chatroom_id\030\001 \002(\t\022\021\n\tmax_count\030\002 \001(\005\";\n\022" +
-      "ChatroomMemberInfo\022\024\n\014member_count\030\001 \001(\005" +
-      "\022\017\n\007members\030\002 \003(\t\"\026\n\010INT64Buf\022\n\n\002id\030\001 \002(" +
-      "\003\"4\n\023NotifyRecallMessage\022\n\n\002id\030\001 \002(\003\022\021\n\t" +
-      "from_user\030\002 \002(\t\"/\n\020BlackUserRequest\022\013\n\003u" +
-      "id\030\001 \002(\t\022\016\n\006status\030\002 \002(\005\"\323\001\n\014RouteReques" +
-      "t\022\013\n\003app\030\001 \001(\t\022\020\n\010platform\030\002 \001(\005\022\021\n\tpush" +
-      "_type\030\003 \001(\005\022\023\n\013device_name\030\004 \001(\t\022\026\n\016devi" +
-      "ce_version\030\005 \001(\t\022\022\n\nphone_name\030\006 \001(\t\022\020\n\010" +
-      "language\030\007 \001(\t\022\024\n\014carrier_name\030\010 \001(\t\022\023\n\013",
-      "app_version\030\t \001(\t\022\023\n\013sdk_version\030\n \001(\t\"D" +
-      "\n\rRouteResponse\022\014\n\004host\030\001 \002(\t\022\021\n\tlong_po" +
-      "rt\030\002 \002(\005\022\022\n\nshort_port\030\003 \002(\005\"G\n\017GetToken" +
-      "Request\022\017\n\007user_id\030\001 \002(\t\022\021\n\tclient_id\030\002 " +
-      "\002(\t\022\020\n\010platform\030\003 \001(\005\"r\n\022LoadRemoteMessa" +
-      "ges\022#\n\014conversation\030\001 \002(\0132\r.Conversation" +
-      "\022\022\n\nbefore_uid\030\002 \002(\003\022\r\n\005count\030\003 \002(\005\022\024\n\014c" +
-      "ontent_type\030\004 \003(\005\"a\n\020MultiCastMessage\022\021\n" +
-      "\tfrom_user\030\001 \002(\t\022 \n\007content\030\002 \002(\0132\017.Mess" +
-      "ageContent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 \002(\005\"E\n\035",
-      "RecallMultiCastMessageRequest\022\022\n\nmessage" +
-      "_id\030\001 \002(\003\022\020\n\010receiver\030\002 \003(\t\"@\n\017AuthCodeR" +
-      "equest\022\021\n\ttarget_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022" +
-      "\014\n\004host\030\003 \002(\t\"o\n\030ApplicationConfigReques" +
-      "t\022\r\n\005appId\030\001 \002(\t\022\017\n\007appType\030\002 \002(\005\022\021\n\ttim" +
-      "estamp\030\003 \002(\003\022\r\n\005nonce\030\004 \002(\t\022\021\n\tsignature" +
-      "\030\005 \002(\tB/\n\025cn.wildfirechat.protoB\nWFCMess" +
-      "ageZ\n./go;proto"
+      "(\005\022\017\n\007deleted\030\021 \001(\005\"r\n\013GroupMember\022\021\n\tme" +
+      "mber_id\030\001 \002(\t\022\r\n\005alias\030\002 \001(\t\022\014\n\004type\030\003 \002" +
+      "(\005\022\021\n\tupdate_dt\030\004 \001(\003\022\021\n\tcreate_dt\030\005 \001(\003" +
+      "\022\r\n\005extra\030\006 \001(\t\"F\n\005Group\022\036\n\ngroup_info\030\001" +
+      " \002(\0132\n.GroupInfo\022\035\n\007members\030\002 \003(\0132\014.Grou" +
+      "pMember\"\313\001\n\013ChannelMenu\022\014\n\004type\030\001 \002(\t\022\014\n" +
+      "\004name\030\002 \002(\t\022\013\n\003key\030\003 \001(\t\022\013\n\003url\030\004 \001(\t\022\020\n" +
+      "\010media_id\030\005 \001(\t\022\022\n\narticle_id\030\006 \001(\t\022\016\n\006a",
+      "pp_id\030\007 \001(\t\022\020\n\010app_page\030\010 \001(\t\022\036\n\010sub_men" +
+      "u\030\t \003(\0132\014.ChannelMenu\022\017\n\007menu_id\030\n \001(\t\022\r" +
+      "\n\005extra\030\013 \001(\t\"-\n\017ChannelMenuList\022\032\n\004menu" +
+      "\030\001 \003(\0132\014.ChannelMenu\"\340\001\n\013ChannelInfo\022\021\n\t" +
+      "target_id\030\001 \001(\t\022\014\n\004name\030\002 \002(\t\022\020\n\010portrai" +
+      "t\030\003 \001(\t\022\r\n\005owner\030\004 \001(\t\022\016\n\006status\030\005 \001(\005\022\014" +
+      "\n\004desc\030\006 \001(\t\022\r\n\005extra\030\007 \001(\t\022\021\n\tupdate_dt" +
+      "\030\010 \001(\003\022\016\n\006secret\030\t \001(\t\022\020\n\010callback\030\n \001(\t" +
+      "\022\021\n\tautomatic\030\013 \001(\005\022\032\n\004menu\030\014 \003(\0132\014.Chan" +
+      "nelMenu\"D\n\021ModifyChannelInfo\022\022\n\nchannel_",
+      "id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\r\n\005value\030\003 \002(\t\"8\n" +
+      "\017TransferChannel\022\022\n\nchannel_id\030\001 \002(\t\022\021\n\t" +
+      "new_owner\030\002 \002(\t\"3\n\017PullChannelInfo\022\022\n\nch" +
+      "annel_id\030\001 \002(\t\022\014\n\004head\030\002 \002(\003\"H\n\023PullChan" +
+      "nelListener\022\022\n\nchannel_id\030\001 \002(\t\022\016\n\006offse" +
+      "t\030\002 \002(\005\022\r\n\005count\030\003 \002(\005\"R\n\031PullChannelLis" +
+      "tenerResult\022\023\n\013total_count\030\001 \002(\005\022\016\n\006offs" +
+      "et\030\002 \002(\005\022\020\n\010listener\030\003 \003(\t\"3\n\rListenChan" +
+      "nel\022\022\n\nchannel_id\030\001 \002(\t\022\016\n\006listen\030\002 \002(\005\"" +
+      "E\n\023SearchChannelResult\022\035\n\007channel\030\001 \003(\0132",
+      "\014.ChannelInfo\022\017\n\007keyword\030\002 \002(\t\"\235\002\n\016Messa" +
+      "geContent\022\014\n\004type\030\001 \002(\005\022\032\n\022searchable_co" +
+      "ntent\030\002 \001(\t\022\024\n\014push_content\030\003 \001(\t\022\017\n\007con" +
+      "tent\030\004 \001(\t\022\014\n\004data\030\005 \001(\014\022\021\n\tmediaType\030\006 " +
+      "\001(\005\022\026\n\016remoteMediaUrl\030\007 \001(\t\022\024\n\014persist_f" +
+      "lag\030\010 \001(\005\022\027\n\017expire_duration\030\t \001(\005\022\026\n\016me" +
+      "ntioned_type\030\n \001(\005\022\030\n\020mentioned_target\030\013" +
+      " \003(\t\022\r\n\005extra\030\014 \001(\t\022\021\n\tpush_data\030\r \001(\t\"\226" +
+      "\001\n\025AddGroupMemberRequest\022\020\n\010group_id\030\001 \002" +
+      "(\t\022\"\n\014added_member\030\002 \003(\0132\014.GroupMember\022\017",
+      "\n\007to_line\030\003 \003(\005\022\'\n\016notify_content\030\004 \001(\0132" +
+      "\017.MessageContent\022\r\n\005extra\030\005 \001(\t\"{\n\022Creat" +
+      "eGroupRequest\022\025\n\005group\030\001 \002(\0132\006.Group\022\017\n\007" +
+      "to_line\030\002 \003(\005\022\'\n\016notify_content\030\003 \001(\0132\017." +
+      "MessageContent\022\024\n\014member_extra\030\004 \001(\t\"a\n\023" +
+      "DismissGroupRequest\022\020\n\010group_id\030\001 \002(\t\022\017\n" +
+      "\007to_line\030\002 \003(\005\022\'\n\016notify_content\030\003 \001(\0132\017" +
+      ".MessageContent\"\245\001\n\rFriendRequest\022\020\n\010fro" +
+      "m_uid\030\001 \001(\t\022\016\n\006to_uid\030\002 \002(\t\022\016\n\006reason\030\003 " +
+      "\002(\t\022\016\n\006status\030\004 \001(\005\022\021\n\tupdate_dt\030\005 \001(\003\022\030",
+      "\n\020from_read_status\030\006 \001(\010\022\026\n\016to_read_stat" +
+      "us\030\007 \001(\010\022\r\n\005extra\030\010 \001(\t\"#\n\rGeneralResult" +
+      "\022\022\n\nerror_code\030\001 \002(\005\"?\n\025GetUploadTokenRe" +
+      "quest\022\022\n\nmedia_type\030\001 \002(\005\022\022\n\nmedia_path\030" +
+      "\002 \002(\t\"S\n\024GetUploadTokenResult\022\016\n\006domain\030" +
+      "\001 \002(\t\022\r\n\005token\030\002 \002(\t\022\016\n\006server\030\003 \002(\t\022\014\n\004" +
+      "port\030\004 \001(\005\"H\n\023HandleFriendRequest\022\022\n\ntar" +
+      "get_uid\030\001 \002(\t\022\016\n\006status\030\002 \002(\005\022\r\n\005extra\030\003" +
+      " \001(\t\"\023\n\005IDBuf\022\n\n\002id\030\001 \002(\t\"\027\n\tIDListBuf\022\n" +
+      "\n\002id\030\001 \003(\t\"\256\001\n\007Message\022#\n\014conversation\030\001",
+      " \002(\0132\r.Conversation\022\021\n\tfrom_user\030\002 \002(\t\022 " +
+      "\n\007content\030\003 \002(\0132\017.MessageContent\022\022\n\nmess" +
+      "age_id\030\004 \001(\003\022\030\n\020server_timestamp\030\005 \001(\003\022\017" +
+      "\n\007to_user\030\006 \001(\t\022\n\n\002to\030\007 \003(\t\"\353\001\n\004User\022\013\n\003" +
+      "uid\030\001 \002(\t\022\014\n\004name\030\002 \001(\t\022\024\n\014display_name\030" +
+      "\003 \001(\t\022\020\n\010portrait\030\004 \001(\t\022\016\n\006mobile\030\005 \001(\t\022" +
+      "\r\n\005email\030\006 \001(\t\022\017\n\007address\030\007 \001(\t\022\017\n\007compa" +
+      "ny\030\010 \001(\t\022\r\n\005extra\030\t \001(\t\022\021\n\tupdate_dt\030\n \001" +
+      "(\003\022\016\n\006gender\030\013 \001(\005\022\016\n\006social\030\014 \001(\t\022\014\n\004ty" +
+      "pe\030\r \001(\005\022\017\n\007deleted\030\016 \001(\005\"c\n\005Robot\022\013\n\003ui",
+      "d\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\r\n\005owner\030\003 \001(\t\022\016\n" +
+      "\006secret\030\004 \001(\t\022\020\n\010callback\030\005 \001(\t\022\r\n\005extra" +
+      "\030\006 \001(\t\"(\n\017GetRobotsResult\022\025\n\005entry\030\001 \003(\013" +
+      "2\006.Robot\"g\n\030UploadDeviceTokenRequest\022\020\n\010" +
+      "platform\030\001 \002(\005\022\020\n\010app_name\030\002 \002(\t\022\024\n\014devi" +
+      "ce_token\030\003 \002(\t\022\021\n\tpush_type\030\004 \002(\005\"\201\001\n\026Mo" +
+      "difyGroupInfoRequest\022\020\n\010group_id\030\001 \002(\t\022\014" +
+      "\n\004type\030\002 \002(\005\022\r\n\005value\030\003 \002(\t\022\017\n\007to_line\030\004" +
+      " \003(\005\022\'\n\016notify_content\030\005 \001(\0132\017.MessageCo" +
+      "ntent\"\203\001\n\026SetGroupManagerRequest\022\020\n\010grou",
+      "p_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\017\n\007user_id\030\003 \003(" +
+      "\t\022\017\n\007to_line\030\004 \003(\005\022\'\n\016notify_content\030\005 \001" +
+      "(\0132\017.MessageContent\"(\n\tInfoEntry\022\014\n\004type" +
+      "\030\001 \002(\005\022\r\n\005value\030\002 \002(\t\"0\n\023ModifyMyInfoReq" +
+      "uest\022\031\n\005entry\030\001 \003(\0132\n.InfoEntry\";\n\rNotif" +
+      "yMessage\022\014\n\004type\030\001 \002(\005\022\014\n\004head\030\002 \002(\003\022\016\n\006" +
+      "target\030\003 \001(\t\"=\n\022PullMessageRequest\022\n\n\002id" +
+      "\030\001 \002(\003\022\014\n\004type\030\002 \002(\005\022\r\n\005delay\030\003 \001(\003\"M\n\021P" +
+      "ullMessageResult\022\031\n\007message\030\001 \003(\0132\010.Mess" +
+      "age\022\017\n\007current\030\002 \002(\003\022\014\n\004head\030\003 \002(\003\"/\n\023Pu",
+      "llGroupInfoResult\022\030\n\004info\030\001 \003(\0132\n.GroupI" +
+      "nfo\"6\n\026PullGroupMemberRequest\022\016\n\006target\030" +
+      "\001 \002(\t\022\014\n\004head\030\002 \002(\003\"5\n\025PullGroupMemberRe" +
+      "sult\022\034\n\006member\030\001 \003(\0132\014.GroupMember\"-\n\013Us" +
+      "erRequest\022\013\n\003uid\030\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(" +
+      "\003\"0\n\017PullUserRequest\022\035\n\007request\030\001 \003(\0132\014." +
+      "UserRequest\"/\n\nUserResult\022\023\n\004user\030\001 \002(\0132" +
+      "\005.User\022\014\n\004code\030\002 \002(\005\"-\n\016PullUserResult\022\033" +
+      "\n\006result\030\001 \003(\0132\013.UserResult\"p\n\020QuitGroup" +
+      "Request\022\020\n\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003",
+      "(\005\022\'\n\016notify_content\030\003 \001(\0132\017.MessageCont" +
+      "ent\022\020\n\010keep_msg\030\004 \001(\005\"~\n\030RemoveGroupMemb" +
+      "erRequest\022\020\n\010group_id\030\001 \002(\t\022\026\n\016removed_m" +
+      "ember\030\002 \003(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_c" +
+      "ontent\030\004 \001(\0132\017.MessageContent\"u\n\024Transfe" +
+      "rGroupRequest\022\020\n\010group_id\030\001 \002(\t\022\021\n\tnew_o" +
+      "wner\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_co" +
+      "ntent\030\004 \001(\0132\017.MessageContent\"\206\001\n\026ModifyG" +
+      "roupMemberAlias\022\020\n\010group_id\030\001 \002(\t\022\r\n\005ali" +
+      "as\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_cont",
+      "ent\030\004 \001(\0132\017.MessageContent\022\021\n\tmember_id\030" +
+      "\005 \001(\t\"\206\001\n\026ModifyGroupMemberExtra\022\020\n\010grou" +
+      "p_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n\016notify_co" +
+      "ntent\030\003 \001(\0132\017.MessageContent\022\r\n\005extra\030\004 " +
+      "\001(\t\022\021\n\tmember_id\030\005 \001(\t\"P\n\020UserSettingEnt" +
+      "ry\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005value\030" +
+      "\003 \002(\t\022\021\n\tupdate_dt\030\004 \002(\003\"A\n\024ModifyUserSe" +
+      "ttingReq\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005" +
+      "value\030\003 \002(\t\"\032\n\007Version\022\017\n\007version\030\001 \002(\003\"" +
+      "8\n\024GetUserSettingResult\022 \n\005entry\030\001 \003(\0132\021",
+      ".UserSettingEntry\"f\n\006Friend\022\013\n\003uid\030\001 \002(\t" +
+      "\022\r\n\005state\030\002 \002(\005\022\021\n\tupdate_dt\030\003 \002(\003\022\r\n\005al" +
+      "ias\030\004 \001(\t\022\017\n\007blacked\030\005 \001(\005\022\r\n\005extra\030\006 \001(" +
+      "\t\"*\n\020GetFriendsResult\022\026\n\005entry\030\001 \003(\0132\007.F" +
+      "riend\"7\n\026GetFriendRequestResult\022\035\n\005entry" +
+      "\030\001 \003(\0132\016.FriendRequest\"\243\001\n\021ConnectAckPay" +
+      "load\022\020\n\010msg_head\030\001 \001(\003\022\023\n\013friend_head\030\002 " +
+      "\001(\003\022\026\n\016friend_rq_head\030\003 \001(\003\022\024\n\014setting_h" +
+      "ead\030\004 \001(\003\022\021\n\tnode_addr\030\005 \001(\t\022\021\n\tnode_por" +
+      "t\030\006 \001(\005\022\023\n\013server_time\030\007 \001(\003\"P\n\rIMHttpWr",
+      "apper\022\r\n\005token\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022" +
+      "\017\n\007request\030\003 \002(\t\022\014\n\004data\030\004 \001(\014\"A\n\021Search" +
+      "UserRequest\022\017\n\007keyword\030\001 \002(\t\022\r\n\005fuzzy\030\002 " +
+      "\001(\005\022\014\n\004page\030\003 \001(\005\"(\n\020SearchUserResult\022\024\n" +
+      "\005entry\030\001 \003(\0132\005.User\"@\n\026GetChatroomInfoRe" +
+      "quest\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tupdate_dt\030" +
+      "\002 \001(\003\"\227\001\n\014ChatroomInfo\022\r\n\005title\030\001 \002(\t\022\014\n" +
+      "\004desc\030\002 \001(\t\022\020\n\010portrait\030\003 \001(\t\022\024\n\014member_" +
+      "count\030\004 \001(\005\022\021\n\tcreate_dt\030\005 \001(\003\022\021\n\tupdate" +
+      "_dt\030\006 \001(\003\022\r\n\005extra\030\007 \001(\t\022\r\n\005state\030\010 \001(\005\"",
+      "F\n\034GetChatroomMemberInfoRequest\022\023\n\013chatr" +
+      "oom_id\030\001 \002(\t\022\021\n\tmax_count\030\002 \001(\005\";\n\022Chatr" +
+      "oomMemberInfo\022\024\n\014member_count\030\001 \001(\005\022\017\n\007m" +
+      "embers\030\002 \003(\t\"\026\n\010INT64Buf\022\n\n\002id\030\001 \002(\003\"4\n\023" +
+      "NotifyRecallMessage\022\n\n\002id\030\001 \002(\003\022\021\n\tfrom_" +
+      "user\030\002 \002(\t\"/\n\020BlackUserRequest\022\013\n\003uid\030\001 " +
+      "\002(\t\022\016\n\006status\030\002 \002(\005\"\323\001\n\014RouteRequest\022\013\n\003" +
+      "app\030\001 \001(\t\022\020\n\010platform\030\002 \001(\005\022\021\n\tpush_type" +
+      "\030\003 \001(\005\022\023\n\013device_name\030\004 \001(\t\022\026\n\016device_ve" +
+      "rsion\030\005 \001(\t\022\022\n\nphone_name\030\006 \001(\t\022\020\n\010langu",
+      "age\030\007 \001(\t\022\024\n\014carrier_name\030\010 \001(\t\022\023\n\013app_v" +
+      "ersion\030\t \001(\t\022\023\n\013sdk_version\030\n \001(\t\"D\n\rRou" +
+      "teResponse\022\014\n\004host\030\001 \002(\t\022\021\n\tlong_port\030\002 " +
+      "\002(\005\022\022\n\nshort_port\030\003 \002(\005\"G\n\017GetTokenReque" +
+      "st\022\017\n\007user_id\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022\020" +
+      "\n\010platform\030\003 \001(\005\"r\n\022LoadRemoteMessages\022#" +
+      "\n\014conversation\030\001 \002(\0132\r.Conversation\022\022\n\nb" +
+      "efore_uid\030\002 \002(\003\022\r\n\005count\030\003 \002(\005\022\024\n\014conten" +
+      "t_type\030\004 \003(\005\"a\n\020MultiCastMessage\022\021\n\tfrom" +
+      "_user\030\001 \002(\t\022 \n\007content\030\002 \002(\0132\017.MessageCo",
+      "ntent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 \002(\005\"E\n\035Recal" +
+      "lMultiCastMessageRequest\022\022\n\nmessage_id\030\001" +
+      " \002(\003\022\020\n\010receiver\030\002 \003(\t\"@\n\017AuthCodeReques" +
+      "t\022\021\n\ttarget_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\014\n\004ho" +
+      "st\030\003 \002(\t\"o\n\030ApplicationConfigRequest\022\r\n\005" +
+      "appId\030\001 \002(\t\022\017\n\007appType\030\002 \002(\005\022\021\n\ttimestam" +
+      "p\030\003 \002(\003\022\r\n\005nonce\030\004 \002(\t\022\021\n\tsignature\030\005 \002(" +
+      "\tB/\n\025cn.wildfirechat.protoB\nWFCMessageZ\n" +
+      "./go;proto"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -67502,7 +67665,7 @@ public final class WFCMessage {
           internal_static_GroupInfo_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_GroupInfo_descriptor,
-              new java.lang.String[] { "TargetId", "Name", "Portrait", "Owner", "Type", "MemberCount", "Extra", "UpdateDt", "MemberUpdateDt", "Mute", "JoinType", "PrivateChat", "Searchable", "MaxMemberCount", "HistoryMessage", "SuperGroup", });
+              new java.lang.String[] { "TargetId", "Name", "Portrait", "Owner", "Type", "MemberCount", "Extra", "UpdateDt", "MemberUpdateDt", "Mute", "JoinType", "PrivateChat", "Searchable", "MaxMemberCount", "HistoryMessage", "SuperGroup", "Deleted", });
           internal_static_GroupMember_descriptor =
             getDescriptor().getMessageTypes().get(3);
           internal_static_GroupMember_fieldAccessorTable = new
@@ -67760,7 +67923,7 @@ public final class WFCMessage {
           internal_static_QuitGroupRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_QuitGroupRequest_descriptor,
-              new java.lang.String[] { "GroupId", "ToLine", "NotifyContent", });
+              new java.lang.String[] { "GroupId", "ToLine", "NotifyContent", "KeepMsg", });
           internal_static_RemoveGroupMemberRequest_descriptor =
             getDescriptor().getMessageTypes().get(46);
           internal_static_RemoveGroupMemberRequest_fieldAccessorTable = new

distribution/pom.xml

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

distribution/src/main/resources/wildfirechat.conf

@@ -66,6 +66,10 @@ token.key testim
 ##是否使用AES256加密。默认客户端和服务器都是AES128加密，如果需要开启AES256，需要客户端和IM服务同时开通。
 #encrypt.use_aes256 true
 
+##当创建一个对象时（用户，群组，频道，机器人等），如果没有传入ID，野火会为这个对象生成一个ID。如果id.use_uuid为true，会使用uuid作为对象ID，否则会使用野火短ID，默认为false。
+## 短ID有个很大的风险是容易被人穷举进行攻击。建议用UUID。
+id.use_uuid true
+
 ##首次登录，是否接收之前的历史消息。
 ##0 不接收历史消息，只接收${message.compensate_time_limit}毫秒以内的消息，由于服务器没有保存已经收取记录，所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉；
 ##1接收，会接收 message.max_queue 配置的条数的历史消息
@@ -124,6 +128,12 @@ message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
 ## 离线用户推送过期天数，0是永不过期，建议配置为7天。
 message.push_expired_days 7
 
+## 当会话静音/全局静音/PC在线静音时，普通消息都不会有推送，如果有某些消息类型需要此时保持推送，可以配置到这里。此配置对消息免打扰时段无效。
+## 此配置只影响远程推送，需要客户端处理客户端在线且在后台收到此消息的处理，需要针对这些消息类型加上本地通知。
+## 强制推送消息的MessagePayload中pushContent和pushData至少要存在一个才可以推送。
+## 消息类型以英文逗号分割。
+#message.force_push_types 401,402
+
 ## 群发消息(包括server api群发和全局频道群发)时，目标用户是否来自于t_user表。如果使用野火托管用户信息，请设置为true，否则设置为false。
 message.broadcast.target_from_user_table true
 
@@ -140,6 +150,10 @@ robot.callback_with_client_info false
 ## 频道回调信息是否带上用户clientId和平台类型。
 channel.callback_with_client_info false
 
+## 频道回调新方式，在新方式下，如果有callback地址就会总是回调客户端发送的消息（包括owner和订阅者）。automatic属性控制订阅者发送的消息是否发给owner， 0发，1不发。
+## 旧的方式是，automatic为0时，订阅者的消息发给owner，不转发消息到callback地址。为1时，把订阅者的消息转发给callback地址，不发给owner。
+channel.new_callback_feature true
+
 ##禁止搜索用户
 friend.disable_search false
 
@@ -161,6 +175,9 @@ friend.reject_request_duration 2592000000
 ##好友请求过期时间，单位是毫秒，默认是7天，0为无限长期限。
 friend.request_expiration_duration 604800000
 
+##好友请求限制频率，一个用户24小时之内允许请求好友的次数，默认不限频。
+#friend.request_rate_limit 30
+
 ##请求添加机器人为好友时，机器人是否自动接受，默认为true
 friend.robot_auto_accept true
 
@@ -203,6 +220,9 @@ group.visible_quit_or_kickoff_notification 0
 ## 是否禁止陌生人拉人入群，默认为false
 group.disable_stranger_invite false
 
+## 群组信息是否标记删除
+group.enable_mark_deletion false
+
 ## 隐藏用户信息属性类型，2是性别，3是电话号码，4是邮箱，5是地址，6是公司信息，7是社交账号，8是Extra信息。当需要隐藏多个时以英文逗号分开;
 ## 本配置是为了提高安全性，避免把对应信息同步到客户端，这样就能防止程序被破解从而拿到用户关键信息。仅对客户端有效，server api不受影响。
 ## 注意，修改本配置不会对已经同步的信息产生影响。
@@ -237,15 +257,6 @@ client.request_rate_limit 100
 ##关于对象存储的详细信息请参考：https://docs.wildfirechat.cn/server/oss.html
 media.server.use_qiniu 0
 
-##媒体类型分类
-#Media_Type_GENERAL = 0,
-#Media_Type_IMAGE = 1,
-#Media_Type_VOICE = 2,
-#Media_Type_VIDEO = 3,
-#Media_Type_FILE = 4,
-#Media_Type_PORTRAIT = 5,
-#Media_Type_FAVORITE = 6
-
 # qiniu media server configuration
 ## 上传地址，不同的区域，上传地址也不同，请注意现在正确的地址
 qiniu.server_url  http://up.qbox.me
@@ -271,11 +282,21 @@ qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn
 qiniu.bucket_favorite_name storage
 qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 
+##媒体类型分类
+#Media_Type_GENERAL = 0,
+#Media_Type_IMAGE = 1,
+#Media_Type_VOICE = 2,
+#Media_Type_VIDEO = 3,
+#Media_Type_FILE = 4,
+#Media_Type_PORTRAIT = 5,
+#Media_Type_FAVORITE = 6,
+#Media_Type_STICKER = 7,
+#Media_Type_MOMENTS = 8
 
 # local media server configuration
 # 本地媒体服务器配置。
-local.media.storage.root ./media
-# 如果使用内置文件存储，文件上传后地址默认为 http://server.ip:http_port/fs/5/2021/03/27/08/filename。
+local.media.storage.root media
+# 如果使用内置文件存储，文件上传后地址默认为 http://server.ip:http_port/fs/5/2021/03/27/08/filename。fs目录下按照类型存放文件，媒体类型见上面注释，比如5就是Media_Type_PORTRAIT，是客户端的头像文件。
 # 如果需要使用nginx添加https支持，请打开下面配置，这样客户端得到的文件地址为 https://example.com/media/fs/5/2021/03/27/08/filename。
 # 需要nginx把请求从https://example.com/media/fs 转到 http://server.ip:http_port/fs。注意需要带上所有header。
 # 尽管内置文件存储可以使用，但是我们还是建议使用专业级别的对象存储服务，社区版可以使用七牛，专业版另外支持阿里云和也是私有对象存储。详情请参考 https://docs.wildfirechat.cn/server/oss.html
@@ -315,6 +336,10 @@ push.android.server.address http://localhost:8085/android/push
 ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
 push.ios.server.address http://localhost:8085/ios/push
 
+##鸿蒙推送服务器地址
+##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
+push.harmony.server.address http://localhost:8085/harmony/push
+
 #*********************************************************************
 # 监控配置
 #*********************************************************************
@@ -389,7 +414,7 @@ push.ios.server.address http://localhost:8085/ios/push
 # gain and reduced GC.
 # http://netty.io/wiki/native-transports.html for more information
 #*********************************************************************
-# 如果是linux系统，一定要打开下面这个参数，能大幅度提高性能
+# 如果是linux系统，一定要打开下面这个参数，能大幅度提高性能。默认只支持x86_64架构。如果是arm64架构，可以按照项目说明来更新epoll SDK。其他架构不支持epoll。
 #netty.epoll true
 
 #*********************************************************************

pom.xml

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

release_note.md

@@ -12,6 +12,55 @@
 
 # 更新记录
 
+--------------
+Release note 1.3.0:
+1. 推送信息中添加republish参数，用于标识消息是重新发布的。
+2. 添加好友请求限频功能，在IM服务配置中可以配置每天限制添加的好友数。
+3. 添加配置，是否允许用户发送消息给被拉黑的用户。
+4. 添加鸿蒙回调地址。
+5. 创建群组或者添加群组成员时，群组成员的Extra会放到通知消息的extra中，这样便于业务处理通知消息。
+
+--------------
+Release note 1.2.9:
+1. 解决server api获取群组信息不全的问题。
+2. 添加配置使用uuid作为用户群组等ID。
+
+--------------
+Release note 1.2.8:
+1. server api获取被封禁用户时，过滤掉正常用户。
+2. 解决群组标记删除错误。
+3. SDK中添加发送消息的示例。
+4. 群解散后撤回群中的消息应该失败。
+5. 解决某些时候http请求返回信息无法读取问题。
+
+--------------
+Release note 1.2.7:
+1. 解决搜索频道时某些类型的频道无法被搜索的问题。
+2. 添加频道回调新特性，方便使用。
+3. 解决机器人API修改机器人用户信息客户端没有更新的问题。
+4. Server SDK中关于频道的接口放到ChannelAdmin中。
+5. 添加Mesh功能的SDK。
+
+--------------
+Release note 1.2.6:
+1. 群主强制被退群时（销毁账号/server api强制退群），调整新群主选择，群管理优先，先加入群组优先。
+2. 拉取远程消息时，过滤掉可能重复的消息。
+3. 退群时添加是否保留消息的参数，可以退群后保留原有消息。
+4. 如果不在群组中，当获取群组信息时不更新数据。
+
+--------------
+Release note 1.2.5:
+1. Server API添加通过邮箱获取用户信息的接口。
+2. 支持群组标记删除功能。
+3. 添加配置，可以设置在静音时强制推送指定类型消息。
+4. 支持用户设置添加好友是否验证功能
+
+--------------
+Release note 1.2.4:
+1. 去掉用户的默认密码。
+2. 去掉频道和机器人的默认头像。
+3. 修改在线状态回调数据，返回此用户的所有端状态。
+
 --------------
 Release note 1.2.3:
 1. 同步专业版IM服务server SDK。

sdk/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.2.3</version>
+        <version>1.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -0,0 +1,43 @@
+package cn.wildfirechat.sdk;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.*;
+import cn.wildfirechat.sdk.model.IMResult;
+import cn.wildfirechat.sdk.utilities.AdminHttpUtils;
+
+public class ChannelAdmin {
+    public static IMResult<OutputCreateChannel> createChannel(InputCreateChannel inputCreateChannel) throws Exception {
+        String path = APIPath.Create_Channel;
+        return AdminHttpUtils.httpJsonPost(path, inputCreateChannel, OutputCreateChannel.class);
+    }
+
+    public static IMResult<Void> destroyChannel(String channelId) throws Exception {
+        String path = APIPath.Destroy_Channel;
+        InputChannelId inputChannelId = new InputChannelId(channelId);
+        return AdminHttpUtils.httpJsonPost(path, inputChannelId, Void.class);
+    }
+
+    public static IMResult<OutputGetChannelInfo> getChannelInfo(String channelId) throws Exception {
+        String path = APIPath.Get_Channel_Info;
+        InputChannelId inputChannelId = new InputChannelId(channelId);
+        return AdminHttpUtils.httpJsonPost(path, inputChannelId, OutputGetChannelInfo.class);
+    }
+
+    public static IMResult<Void> subscribeChannel(String channelId, String userId) throws Exception {
+        String path = APIPath.Subscribe_Channel;
+        InputSubscribeChannel input = new InputSubscribeChannel(channelId, userId, 1);
+        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
+    }
+
+    public static IMResult<Void> unsubscribeChannel(String channelId, String userId) throws Exception {
+        String path = APIPath.Subscribe_Channel;
+        InputSubscribeChannel input = new InputSubscribeChannel(channelId, userId, 0);
+        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
+    }
+
+    public static IMResult<OutputBooleanValue> isUserSubscribedChannel(String userId, String channelId) throws Exception {
+        String path = APIPath.Check_User_Subscribe_Channel;
+        InputSubscribeChannel input = new InputSubscribeChannel(channelId, userId, 0);
+        return AdminHttpUtils.httpJsonPost(path, input, OutputBooleanValue.class);
+    }
+}

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

@@ -22,35 +22,59 @@ public class GeneralAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, Void.class);
     }
 
+    /**
+     * @deprecated 请使用 {@link cn.wildfirechat.sdk.ChannelAdmin#createChannel(InputCreateChannel inputCreateChannel)} 代替此方法，因为它将在未来的版本中被移除。
+     */
+    @Deprecated
     public static IMResult<OutputCreateChannel> createChannel(InputCreateChannel inputCreateChannel) throws Exception {
         String path = APIPath.Create_Channel;
         return AdminHttpUtils.httpJsonPost(path, inputCreateChannel, OutputCreateChannel.class);
     }
 
+    /**
+     * @deprecated 请使用 {@link cn.wildfirechat.sdk.ChannelAdmin#destroyChannel(String channelId)} 代替此方法，因为它将在未来的版本中被移除。
+     */
+    @Deprecated
     public static IMResult<Void> destroyChannel(String channelId) throws Exception {
         String path = APIPath.Destroy_Channel;
         InputChannelId inputChannelId = new InputChannelId(channelId);
         return AdminHttpUtils.httpJsonPost(path, inputChannelId, Void.class);
     }
 
+    /**
+     * @deprecated 请使用 {@link cn.wildfirechat.sdk.ChannelAdmin#getChannelInfo(String channelId)} 代替此方法，因为它将在未来的版本中被移除。
+     */
+    @Deprecated
     public static IMResult<OutputGetChannelInfo> getChannelInfo(String channelId) throws Exception {
         String path = APIPath.Get_Channel_Info;
         InputChannelId inputChannelId = new InputChannelId(channelId);
         return AdminHttpUtils.httpJsonPost(path, inputChannelId, OutputGetChannelInfo.class);
     }
 
+    /**
+     * @deprecated 请使用 {@link cn.wildfirechat.sdk.ChannelAdmin#subscribeChannel(String userId, String channelId)} 代替此方法，因为它将在未来的版本中被移除。
+     */
+    @Deprecated
     public static IMResult<Void> subscribeChannel(String channelId, String userId) throws Exception {
         String path = APIPath.Subscribe_Channel;
         InputSubscribeChannel input = new InputSubscribeChannel(channelId, userId, 1);
         return AdminHttpUtils.httpJsonPost(path, input, Void.class);
     }
 
+    /**
+     * @deprecated 请使用 {@link cn.wildfirechat.sdk.ChannelAdmin#unsubscribeChannel(String userId, String channelId)} 代替此方法，因为它将在未来的版本中被移除。
+     */
+    @Deprecated
     public static IMResult<Void> unsubscribeChannel(String channelId, String userId) throws Exception {
         String path = APIPath.Subscribe_Channel;
         InputSubscribeChannel input = new InputSubscribeChannel(channelId, userId, 0);
         return AdminHttpUtils.httpJsonPost(path, input, Void.class);
     }
 
+    /**
+     * @deprecated 请使用 {@link cn.wildfirechat.sdk.ChannelAdmin#isUserSubscribedChannel(String userId, String channelId)} 代替此方法，因为它将在未来的版本中被移除。
+     */
+    @Deprecated
     public static IMResult<OutputBooleanValue> isUserSubscribedChannel(String userId, String channelId) throws Exception {
         String path = APIPath.Check_User_Subscribe_Channel;
         InputSubscribeChannel input = new InputSubscribeChannel(channelId, userId, 0);

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

@@ -2,14 +2,13 @@ package cn.wildfirechat.sdk;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.pojos.*;
-import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.sdk.model.IMResult;
 import cn.wildfirechat.sdk.utilities.AdminHttpUtils;
 
 import java.util.List;
 
 public class GroupAdmin {
-    public static IMResult<OutputCreateGroupResult> createGroup(String operator, PojoGroupInfo group_info, List<PojoGroupMember> members, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+    public static IMResult<OutputCreateGroupResult> createGroup(String operator, PojoGroupInfo group_info, List<PojoGroupMember> members, String member_extra, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Create_Group;
         PojoGroup pojoGroup = new PojoGroup();
         pojoGroup.setGroup_info(group_info);
@@ -17,6 +16,7 @@ public class GroupAdmin {
         InputCreateGroup createGroup = new InputCreateGroup();
         createGroup.setGroup(pojoGroup);
         createGroup.setOperator(operator);
+        createGroup.setMember_extra(member_extra);
         createGroup.setTo_lines(to_lines);
         createGroup.setNotify_message(notify_message);
 
@@ -31,6 +31,11 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, PojoGroupInfo.class);
     }
 
+    public static IMResult<PojoGroupInfoList> batchGroupInfos(List<String> groupIds) throws Exception {
+        String path = APIPath.Group_Batch_Info;
+        return AdminHttpUtils.httpJsonPost(path, groupIds, PojoGroupInfoList.class);
+    }
+
     public static IMResult<Void> dismissGroup(String operator, String groupId, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Group_Dismiss;
         InputDismissGroup dismissGroup = new InputDismissGroup();
@@ -80,12 +85,13 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, PojoGroupMember.class);
     }
 
-    public static IMResult<Void> addGroupMembers(String operator, String groupId, List<PojoGroupMember> groupMembers, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+    public static IMResult<Void> addGroupMembers(String operator, String groupId, List<PojoGroupMember> groupMembers, String member_extra, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Group_Member_Add;
         InputAddGroupMember addGroupMember = new InputAddGroupMember();
         addGroupMember.setGroup_id(groupId);
         addGroupMember.setMembers(groupMembers);
         addGroupMember.setOperator(operator);
+        addGroupMember.setMemberExtra(member_extra);
         addGroupMember.setTo_lines(to_lines);
         addGroupMember.setNotify_message(notify_message);
         return AdminHttpUtils.httpJsonPost(path, addGroupMember, Void.class);

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

@@ -0,0 +1,229 @@
+package cn.wildfirechat.sdk;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.*;
+import cn.wildfirechat.pojos.mesh.*;
+import cn.wildfirechat.sdk.model.IMResult;
+import cn.wildfirechat.sdk.utilities.AdminHttpUtils;
+
+import java.util.List;
+
+public class MeshAdmin {
+    public static IMResult<Void> createDomain(InputOutputDomainInfo domainInfo) throws Exception {
+        String path = APIPath.Create_Domain;
+        return AdminHttpUtils.httpJsonPost(path, domainInfo, Void.class);
+    }
+
+    public static IMResult<InputOutputDomainInfo> getDomain(String domainId) throws Exception {
+        String path = APIPath.Get_Domain;
+        InputStringValue inputId = new InputStringValue();
+        inputId.setValue(domainId);
+        return AdminHttpUtils.httpJsonPost(path, inputId, InputOutputDomainInfo.class);
+    }
+
+    public static IMResult<Void> deleteDomain(String domainId) throws Exception {
+        String path = APIPath.Destroy_Domain;
+        InputStringValue inputId = new InputStringValue();
+        inputId.setValue(domainId);
+        return AdminHttpUtils.httpJsonPost(path, inputId, Void.class);
+    }
+
+    public static IMResult<InputOutputDomainInfoList> getAllDomain() throws Exception {
+        String path = APIPath.List_Domain;
+        return AdminHttpUtils.httpJsonPost(path, null, InputOutputDomainInfoList.class);
+    }
+
+    public static IMResult<OutputUserInfoList> getBatchUserInfos(List<String> userIds) throws Exception {
+        String path = APIPath.User_Batch_Get_Infos;
+        OutputStringList getUserInfo = new OutputStringList(userIds);
+        return AdminHttpUtils.httpJsonPost(path, getUserInfo, OutputUserInfoList.class);
+    }
+
+    public static IMResult<PojoSearchUserRes> searchUser(String keyword, int searchType, int page) throws Exception {
+        String path = APIPath.Search_User;
+        PojoSearchUserReq req = new PojoSearchUserReq();
+        req.keyword = keyword;
+        req.searchType = searchType;
+        req.page = page;
+        return AdminHttpUtils.httpJsonPost(path, req, PojoSearchUserRes.class);
+    }
+
+    public static IMResult<Void> sendFriendRequest(String userId, String targetId, String reason) throws Exception {
+        String path = APIPath.Friend_Send_Request;
+        InputAddFriendRequest input = new InputAddFriendRequest();
+        input.setUserId(userId);
+        input.setFriendUid(targetId);
+        input.setReason(reason);
+        input.setForce(false);
+        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
+    }
+
+    public static IMResult<Void> handleFriendRequest(String userId, String targetId, int status) throws Exception {
+        String path = APIPath.Handle_Friend_Send_Request;
+        InputHandleFriendRequest input = new InputHandleFriendRequest();
+        input.setUserId(userId);
+        input.setFriendUid(targetId);
+        input.setStatus(status);
+        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
+    }
+
+    public static IMResult<SendMessageResult> sendMessage(String sender, Conversation conversation, MessagePayload payload, List<String> toUsers) throws Exception {
+        String path = APIPath.Msg_Send;
+        SendMessageData messageData = new SendMessageData();
+        messageData.setSender(sender);
+        messageData.setConv(conversation);
+        messageData.setPayload(payload);
+        messageData.setToUsers(toUsers);
+        messageData.setMeshMessage(true);
+        if (payload.getType() == 1 && (payload.getSearchableContent() == null || payload.getSearchableContent().isEmpty())) {
+            System.out.println("Payload错误，Payload格式应该跟客户端消息encode出来的Payload对齐，这样客户端才能正确识别。比如文本消息，文本需要放到searchableContent属性。请与客户端同事确认Payload的格式，或则去 https://gitee.com/wfchat/android-chat/tree/master/client/src/main/java/cn/wildfirechat/message 找到消息encode的实现方法！");
+        }
+        return AdminHttpUtils.httpJsonPost(path, messageData, SendMessageResult.class);
+    }
+
+    public static IMResult<SendMessageResult> publishMessage(SendMessageData messageData, List<String> receivers) throws Exception {
+        String path = APIPath.Msg_Publish;
+        PojoPublishMessageReq req = new PojoPublishMessageReq();
+        req.messageData = messageData;
+        req.receivers = receivers;
+        return AdminHttpUtils.httpJsonPost(path, req, SendMessageResult.class);
+    }
+
+    public static IMResult<String> recallMessage(String operator, long messageId) throws Exception {
+        String path = APIPath.Msg_Recall;
+        RecallMessageData req = new RecallMessageData();
+        req.setOperator(operator);
+        req.setMessageUid(messageId);
+        req.setUserRecall(true);
+        return AdminHttpUtils.httpJsonPost(path, req, String.class);
+    }
+
+    public static IMResult<Void> updateMessageContent(String operator, long messageUid, MessagePayload payload, boolean distribute) throws Exception {
+        String path = APIPath.Msg_Update;
+        UpdateMessageContentData updateMessageContentData = new UpdateMessageContentData();
+        updateMessageContentData.setOperator(operator);
+        updateMessageContentData.setMessageUid(messageUid);
+        updateMessageContentData.setPayload(payload);
+        updateMessageContentData.setDistribute(distribute?1:0);
+        updateMessageContentData.setUpdateTimestamp(0);
+        updateMessageContentData.setMeshLocal(1);
+        return AdminHttpUtils.httpJsonPost(path, updateMessageContentData, Void.class);
+    }
+
+    public static IMResult<Void> syncGroup(PojoGroupInfo group_info, List<PojoGroupMember> members) throws Exception {
+        String path = APIPath.Sync_Group;
+        PojoGroup pojoGroup = new PojoGroup();
+        pojoGroup.setGroup_info(group_info);
+        pojoGroup.setMembers(members);
+
+        return AdminHttpUtils.httpJsonPost(path, pojoGroup, Void.class);
+    }
+
+    public static IMResult<PojoGroupInfo> getGroupInfo(String groupId) throws Exception {
+        return GroupAdmin.getGroupInfo(groupId);
+    }
+
+    public static IMResult<OutputGroupMemberList> getGroupMembers(String groupId) throws Exception {
+        return GroupAdmin.getGroupMembers(groupId);
+    }
+
+    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);
+        addGroupMember.setMembers(groupMembers);
+        addGroupMember.setOperator(operator);
+        addGroupMember.setTo_lines(to_lines);
+        addGroupMember.setNotify_message(notify_message);
+        addGroupMember.setMeshMessage(true);
+        return AdminHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
+    }
+
+    public static IMResult<PojoGroupInfoList> batchGroupInfos(List<String> groupIds) throws Exception {
+        return GroupAdmin.batchGroupInfos(groupIds);
+    }
+
+    public static IMResult<Void> quitGroup(String operator, String groupId, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Group_Member_Quit;
+        InputQuitGroup quitGroup = new InputQuitGroup();
+        quitGroup.setGroup_id(groupId);
+        quitGroup.setOperator(operator);
+        quitGroup.setTo_lines(to_lines);
+        quitGroup.setNotify_message(notify_message);
+        quitGroup.setMeshMessage(true);
+        return AdminHttpUtils.httpJsonPost(path, quitGroup, Void.class);
+    }
+
+
+    public static IMResult<Void> dismissGroup(String operator, String groupId, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Group_Dismiss;
+        InputDismissGroup dismissGroup = new InputDismissGroup();
+        dismissGroup.setOperator(operator);
+        dismissGroup.setGroup_id(groupId);
+        dismissGroup.setTo_lines(to_lines);
+        dismissGroup.setNotify_message(notify_message);
+        dismissGroup.setMeshMessage(true);
+        return AdminHttpUtils.httpJsonPost(path, dismissGroup, 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;
+        InputKickoffGroupMember kickoffGroupMember = new InputKickoffGroupMember();
+        kickoffGroupMember.setGroup_id(groupId);
+        kickoffGroupMember.setMembers(groupMemberIds);
+        kickoffGroupMember.setOperator(operator);
+        kickoffGroupMember.setTo_lines(to_lines);
+        kickoffGroupMember.setMeshMessage(true);
+        kickoffGroupMember.setNotify_message(notify_message);
+        return AdminHttpUtils.httpJsonPost(path, kickoffGroupMember, Void.class);
+    }
+
+    public static IMResult<Void> transferGroup(String operator, String groupId, String newOwner, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Group_Transfer;
+        InputTransferGroup transferGroup = new InputTransferGroup();
+        transferGroup.setGroup_id(groupId);
+        transferGroup.setNew_owner(newOwner);
+        transferGroup.setOperator(operator);
+        transferGroup.setTo_lines(to_lines);
+        transferGroup.setNotify_message(notify_message);
+        transferGroup.setMeshMessage(true);
+        return AdminHttpUtils.httpJsonPost(path, transferGroup, Void.class);
+    }
+
+    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);
+        modifyGroupInfo.setOperator(operator);
+        modifyGroupInfo.setTo_lines(to_lines);
+        modifyGroupInfo.setType(type);
+        modifyGroupInfo.setValue(value);
+        modifyGroupInfo.setNotify_message(notify_message);
+        modifyGroupInfo.setMeshMessage(true);
+        return AdminHttpUtils.httpJsonPost(path, modifyGroupInfo, Void.class);
+    }
+
+    public static IMResult<PojoUserConferenceResponse> userConferenceRequest(String clientID, String fromUser, String request, long sessionId, String roomId, String data, boolean advanced) throws Exception {
+        String path = APIPath.Conference_User_Request;
+        PojoUserConferenceRequest conferenceRequest = new PojoUserConferenceRequest();
+        conferenceRequest.clientID = clientID;
+        conferenceRequest.fromUser = fromUser;
+        conferenceRequest.request = request;
+        conferenceRequest.sessionId = sessionId;
+        conferenceRequest.roomId = roomId;
+        conferenceRequest.data = data;
+        conferenceRequest.advanced = advanced;
+        return AdminHttpUtils.httpJsonPost(path, conferenceRequest, PojoUserConferenceResponse.class);
+    }
+
+    public static IMResult<Void> userConferenceEvent(String data, String userId, String clientId, boolean isRobot) throws Exception {
+        String path = APIPath.Conference_User_Event;
+        PojoUserConferenceEvent event = new PojoUserConferenceEvent();
+        event.data = data;
+        event.userId = userId;
+        event.clientId = clientId;
+        event.isRobot = isRobot;
+        return AdminHttpUtils.httpJsonPost(path, event, Void.class);
+    }
+
+}

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

@@ -96,13 +96,14 @@ public class RobotService {
         return robotHttpUtils.httpJsonPost(path, pojo, Void.class);
     }
 
-    public IMResult<OutputCreateGroupResult> createGroup(PojoGroupInfo group_info, List<PojoGroupMember> members, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+    public IMResult<OutputCreateGroupResult> createGroup(PojoGroupInfo group_info, List<PojoGroupMember> members, String member_extra, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Robot_Create_Group;
         PojoGroup pojoGroup = new PojoGroup();
         pojoGroup.setGroup_info(group_info);
         pojoGroup.setMembers(members);
         InputCreateGroup createGroup = new InputCreateGroup();
         createGroup.setGroup(pojoGroup);
+        createGroup.setMember_extra(member_extra);
         createGroup.setTo_lines(to_lines);
         createGroup.setNotify_message(notify_message);
 
@@ -163,11 +164,12 @@ public class RobotService {
         return robotHttpUtils.httpJsonPost(path, input, PojoGroupMember.class);
     }
 
-    public IMResult<Void> addGroupMembers(String groupId, List<PojoGroupMember> groupMembers, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+    public IMResult<Void> addGroupMembers(String groupId, List<PojoGroupMember> groupMembers, String member_extra, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Robot_Group_Member_Add;
         InputAddGroupMember addGroupMember = new InputAddGroupMember();
         addGroupMember.setGroup_id(groupId);
         addGroupMember.setMembers(groupMembers);
+        addGroupMember.setMemberExtra(member_extra);
         addGroupMember.setTo_lines(to_lines);
         addGroupMember.setNotify_message(notify_message);
         return robotHttpUtils.httpJsonPost(path, addGroupMember, Void.class);

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

@@ -24,6 +24,11 @@ public class UserAdmin {
         return AdminHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
 
+    public static IMResult<OutputUserInfoList> getUserByEmail(String email) throws Exception {
+        String path = APIPath.User_Get_Email_Info;
+        return AdminHttpUtils.httpJsonPost(path, email, OutputUserInfoList.class);
+    }
+
     public static IMResult<OutputGetUserList> getAllUsers(int count, int offset) throws Exception {
         String path = APIPath.User_Get_All;
         InputGetUserList input = new InputGetUserList();

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/ArticlesMessageContent.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2022 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+
+public class ArticlesMessageContent extends MessageContent {
+    public Article topArticle;
+    public ArrayList<Article> subArticles;
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Articles;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setSearchableContent(topArticle.title);
+        JSONObject object = new JSONObject();
+
+        object.put("top", topArticle.toJson());
+        if (subArticles != null) {
+            JSONArray jsonArray = new JSONArray();
+            object.put("subArticles", jsonArray);
+            for (Article article : subArticles) {
+                jsonArray.add(article.toJson());
+            }
+        }
+        payload.setBase64edData(Base64.getEncoder().encodeToString(object.toString().getBytes()));
+
+
+        return payload;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        try {
+            JSONObject object = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+            JSONObject topObj = (JSONObject) object.get("top");
+            this.topArticle = Article.fromJson(topObj);
+            JSONArray jsonArray = (JSONArray) object.get("subArticles");
+            if (jsonArray != null && jsonArray.size() > 0) {
+                this.subArticles = new ArrayList<>();
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    subArticles.add(Article.fromJson((JSONObject) jsonArray.get(i)));
+                }
+            }
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    public List<LinkMessageContent> toLinkMessageContent() {
+        List<LinkMessageContent> contents = new ArrayList<>();
+        contents.add(this.topArticle.toLinkMessageContent());
+        if (this.subArticles != null) {
+            for (Article article : subArticles) {
+                contents.add(article.toLinkMessageContent());
+            }
+        }
+        return contents;
+    }
+
+    public static class Article {
+        public String articleId;
+        public String cover;
+        public String title;
+        public String digest;
+        public String url;
+        boolean readReport;
+
+        JSONObject toJson() {
+            JSONObject obj = new JSONObject();
+            obj.put("id", articleId);
+            obj.put("cover", cover);
+            obj.put("title", title);
+            obj.put("digest", digest);
+            obj.put("url", url);
+            obj.put("rr", readReport);
+
+
+            return obj;
+        }
+
+        static Article fromJson(JSONObject obj) {
+            Article article = new Article();
+            article.articleId = (String) obj.get("id");
+            article.cover = (String) obj.get("cover");
+            article.title = (String) obj.get("title");
+            article.digest = (String) obj.get("digest");
+            article.url = (String) obj.get("url");
+            article.readReport = (boolean) obj.get("rr");
+            return article;
+        }
+
+        public LinkMessageContent toLinkMessageContent() {
+            LinkMessageContent content = new LinkMessageContent(this.title, this.url);
+            content.setContentDigest(this.digest);
+            content.setThumbnailUrl(this.cover);
+            return content;
+        }
+
+        public Article() {
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/CallStartMessageContent.java

@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import io.netty.util.internal.StringUtil;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+/**
+ * Created by heavyrain lee on 2017/12/6.
+ */
+
+public class CallStartMessageContent extends MessageContent {
+    private String callId;
+    // 多人视音频是有效，不包含自己，一对一忽略此参数
+    private List<String> targetIds;
+    private long connectTime;
+    private long endTime;
+    private boolean audioOnly;
+    private String pin;
+
+
+    /**
+     * 0, UnKnown,
+     * 1, Busy,
+     * 2, SignalError,
+     * 3, Hangup,
+     * 4, MediaError,
+     * 5, RemoteHangup,
+     * 6, OpenCameraFailure,
+     * 7, Timeout,
+     * 8, AcceptByOtherClient
+     */
+    private int status;
+
+    /**
+     * 0，未知；1，多人版音视频；2，高级版音视频
+     */
+    private int type;
+
+    public CallStartMessageContent() {
+    }
+
+    public CallStartMessageContent(String callId, List<String> targetIds, boolean audioOnly) {
+        this.callId = callId;
+        this.audioOnly = audioOnly;
+        this.targetIds = targetIds;
+    }
+
+    public String getCallId() {
+        return callId;
+    }
+
+    public void setCallId(String callId) {
+        this.callId = callId;
+    }
+
+    public long getConnectTime() {
+        return connectTime;
+    }
+
+    public void setConnectTime(long connectTime) {
+        this.connectTime = connectTime;
+    }
+
+    public long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(long endTime) {
+        this.endTime = endTime;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public boolean isAudioOnly() {
+        return audioOnly;
+    }
+
+    public void setAudioOnly(boolean audioOnly) {
+        this.audioOnly = audioOnly;
+    }
+
+    public List<String> getTargetIds() {
+        return targetIds;
+    }
+
+    public void setTargetIds(List<String> targetIds) {
+        this.targetIds = targetIds;
+    }
+
+    public String getPin() {
+        return pin;
+    }
+
+    public void setPin(String pin) {
+        this.pin = pin;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Call_Start;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setContent(callId);
+        payload.setPushContent("音视频通话邀请");
+
+            JSONObject objWrite = new JSONObject();
+            if (connectTime > 0) {
+                objWrite.put("c", connectTime);
+            }
+
+            if (endTime > 0) {
+                objWrite.put("e", endTime);
+            }
+
+            if (status > 0) {
+                objWrite.put("s", status);
+            }
+
+            objWrite.put("t", targetIds.get(0));
+            JSONArray ts = new JSONArray();
+            ts.addAll(targetIds);
+            objWrite.put("ts", ts);
+            objWrite.put("a", audioOnly ? 1 : 0);
+            objWrite.put("p", pin);
+            if (this.type > 0) {
+                objWrite.put("ty", this.type);
+            }
+
+            payload.setBase64edData(Base64.getEncoder().encodeToString(objWrite.toString().getBytes()));
+
+            JSONObject pushDataWrite = new JSONObject();
+            pushDataWrite.put("callId", callId);
+            pushDataWrite.put("audioOnly", audioOnly);
+            if (targetIds != null && targetIds.size() > 0) {
+                pushDataWrite.put("participants", targetIds);
+            }
+            payload.setPushData(pushDataWrite.toString());
+        return payload;
+    }
+
+
+    @Override
+    public void decode(MessagePayload payload) {
+        callId = payload.getContent();
+
+        try {
+            if (!StringUtil.isNullOrEmpty(payload.getBase64edData())) {
+                JSONObject jsonObject = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+                connectTime = (long) jsonObject.get("c");
+                endTime = (long) jsonObject.get("e");
+                status = (int) jsonObject.get("s");
+                pin = (String) jsonObject.get("p");
+                type = (int) jsonObject.get("ty");
+                JSONArray array = (JSONArray) jsonObject.get("ts");
+                targetIds = new ArrayList<>();
+                if (array == null) {
+                    targetIds.add((String) jsonObject.get("t"));
+                } else {
+                    for (int i = 0; i < array.size(); i++) {
+                        if (array.get(i) instanceof String) {
+                            targetIds.add((String) array.get(i));
+                        }
+                    }
+                }
+                audioOnly = (int)jsonObject.get("a") > 0;
+            }
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/CardMessageContent.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import io.netty.util.internal.StringUtil;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.Base64;
+
+public class CardMessageContent extends MessageContent {
+    /**
+     * 0，用户；1，群组；2，聊天室；3，频道
+     */
+    private int type;
+    private String target;
+    // 用户名，一般是type为用户时使用
+    private String name;
+    private String displayName;
+    private String portrait;
+    private String from;
+
+    public CardMessageContent() {
+    }
+
+    public CardMessageContent(int type, String target, String displayName, String portrait, String from) {
+        this.type = type;
+        this.target = target;
+        this.displayName = displayName;
+        this.portrait = portrait;
+        this.from = from;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getPortrait() {
+        return portrait;
+    }
+
+    public void setPortrait(String portrait) {
+        this.portrait = portrait;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getFrom() {
+        return from;
+    }
+
+    public void setFrom(String from) {
+        this.from = from;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Name_Card;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setContent(target);
+            JSONObject objWrite = new JSONObject();
+            objWrite.put("t", type);
+            objWrite.put("n", name);
+            objWrite.put("d", displayName);
+            objWrite.put("p", portrait);
+            objWrite.put("f", from);
+
+            payload.setBase64edData(Base64.getEncoder().encodeToString(objWrite.toString().getBytes()));
+        return payload;
+    }
+
+
+    @Override
+    public void decode(MessagePayload payload) {
+        target = payload.getContent();
+        try {
+            if (!StringUtil.isNullOrEmpty(payload.getBase64edData())) {
+                JSONObject jsonObject = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+                type = (int) jsonObject.get("t");
+                name = (String) jsonObject.get("n");
+                displayName = (String) jsonObject.get("d");
+                portrait = (String) jsonObject.get("p");
+                from = (String) jsonObject.get("f");
+            }
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/FileMessageContent.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+
+public class FileMessageContent extends MediaMessageContent {
+    private String name;
+    private int size;
+    private static final String FILE_NAME_PREFIX = "[文件] ";
+
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.File;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setSearchableContent(name);
+        payload.setContent(size + "");
+
+        return payload;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        super.decodeBase(payload);
+
+        if (payload.getSearchableContent().startsWith(FILE_NAME_PREFIX)) {
+            name = payload.getSearchableContent().substring(payload.getSearchableContent().indexOf(FILE_NAME_PREFIX) + FILE_NAME_PREFIX.length());
+        } else {
+            name = payload.getSearchableContent();
+        }
+        size = Integer.parseInt(payload.getContent());
+    }
+
+    @Override
+    protected int getMediaType() {
+        return ProtoConstants.MessageMediaType.FILE;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/ImageMessageContent.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+
+import java.util.Base64;
+
+public class ImageMessageContent extends MediaMessageContent {
+    private byte[] thumbnailBytes;
+
+
+    public void setThumbnailBytes(byte[] thumbnailBytes) {
+        this.thumbnailBytes = thumbnailBytes;
+    }
+
+    public byte[] getThumbnailBytes() {
+        return thumbnailBytes;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Image;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setSearchableContent("[图片]");
+        payload.setBase64edData(Base64.getEncoder().encodeToString(thumbnailBytes));
+
+        return payload;
+    }
+
+
+    @Override
+    public void decode(MessagePayload payload) {
+        super.decodeBase(payload);
+        thumbnailBytes = Base64.getDecoder().decode(payload.getBase64edData());
+    }
+
+    @Override
+    protected int getMediaType() {
+        return ProtoConstants.MessageMediaType.IMAGE;
+    }
+}