version and release note

2，拉人进群时检查是否被拉黑

README.md

@@ -54,6 +54,9 @@
 ## 野火开发文档
 [在线文档](https://docs.wildfirechat.cn/)
 
+## 野火IM论坛
+[野火IM论坛](https://bbs.wildfirechat.cn)
+
 ## 野火性能测试报告及测试方法
 [Github](https://github.com/wildfirechat/Performance_Test), [码云](https://gitee.com/wfchat/Performance_Test)。
 
@@ -70,7 +73,7 @@ PC客户端点[这里](https://github.com/wildfirechat/vue-pc-chat/releases)下
 
 ![野火IM](http://static.wildfirechat.net/wx.jpg)
 
-## 快速使用
+## 快速开始
 可以按照[快速开始](https://docs.wildfirechat.cn/quick_start/)来部署应用服务和IM服务，然后打包移动端，就可以完成聊天和通话功能。
 
 之后再部署开放平台服务、频道（公众号）服务、机器人服务、推送服务、Turn服务（音视频服务）来实现完整的应用功能，详情可以详细阅读文档。
@@ -128,6 +131,18 @@ mvn clean package
 9. 从0.79 版本起把log4j升级到log4j2，因为log4j已经不再维护而且还有已知的漏洞，建议所有客户都升级，升级时注意更新log4j2的配置文件
 10. 0.97版本更改了启动脚本```wildfirechat.sh```，如果是升级服务，请注意更新启动脚本。
 
+## 维护说明
+野火设计理念当中，IM服务和客户端协议栈构成个管道工具，数据在人和人或者人和服务或者服务和服务之间传递，可以通过Server API和自定义消息来对接和开发业务。业务系统把IM系统当作一个工具来使用，是不需要把任何业务逻辑写在IM服务中的。
+
+如果修改了IM服务可能会引起跟客户端协议栈的不兼容，以后也没有可能从社区版IM服务迁移到专业版IM服务，还有一旦修改就跟我们代码不一样了，如果出了问题我们就无法分析和解决。所以 ***我们强烈不推荐在IM服务修改代码，如果修改过就不再提供任何技术支持和服务了***。除了IM服务以外的所有代码可以任意修改。
+
+现有接口足够对接和二开任何业务了，如果发现无法实现你们的业务需求，可以在[论坛](https://bbs.wildfirechat.cn)来咨询，我们会分析如何实现，如果需要添加新接口，我们会及时免费添加。请切记：***不要修改IM服务的代码!*** ***不要修改IM服务的代码!*** ***不要修改IM服务的代码!***
+
+详细维护说明请参考 [野火维护说明](https://docs.wildfirechat.cn/base_knowledge/maintain.html)。
+
+## 服务对象
+因为野火的使用范围比较广，难免被一些不法分子利用，国内反诈反赌力度很大，所以国内多地警方都跟我们都有过联系。***为了预防我们的产品被用于非法目的，试用及购买只能支持境内法人单位，不接受个人或者境外团体。如果我们发现产品被用于非法目的，我们会立即停止技术支持服务并且报警和配合警方调查。请用于非法目的用户绕行！***
+
 ## 应用截图
 登录界面
 

broker/config/wildfirechat.conf

@@ -123,6 +123,12 @@ message.group_mute_exception_types 401,402,403,404,405,407,408,410,411
 ## 用户被全局禁言时允许发送的消息类型
 message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
 
+## 离线用户推送过期天数，0是永不过期，建议配置为7天。
+message.push_expired_days 7
+
+## 群发消息(包括server api群发和全局频道群发)时，目标用户是否来自于t_user表。如果使用野火托管用户信息，请设置为true，否则设置为false。
+message.broadcast.target_from_user_table true
+
 ## 消息转发功能开启时，开关是否不转发server api接口消息。
 ## 当为true时，不转发server api发送的消息；当为false时，转发server api发送的消息。
 message.no_forward_admin_message false
@@ -142,6 +148,9 @@ friend.disable_search false
 ##禁止按照昵称搜索用户。
 friend.disable_nick_name_search false
 
+##禁止按照用户id搜索用户，默认为true。
+friend.disable_user_id_search true
+
 ##禁止发送好友邀请，通过server api添加好友不受此限制(force参数需要为true)
 friend.disable_friend_request false
 
@@ -166,6 +175,18 @@ chatroom.rejoin_when_active true
 ## 当一个聊天室不存在时，如果有用户加入就自动创建
 chatroom.create_when_not_exist true
 
+## 一个用户同一时刻只能加入一个聊天室。
+## 当一个客户端加入一个聊天室时，如果这个客户端已经加入另外一个聊天室了，会自动退出之前的聊天室。
+## 当一个客户端加入一个聊天室时，如果这个用户的其他端已经加入一个聊天室了，kickoff_other_platform为true时会自动退出之前的聊天室，为false时会返回225的错误码。
+## 当自动退出聊天室时，客户端不会收到任何通知，只是不会再收到消息。
+chatroom.kickoff_other_platform true
+
+## 是否允许群主不受限制地撤回自己发送的消息。false可以${message.recall_time_limit}撤回自己的消息；true可以撤回任意时间自己的消息。默认为true。
+group.allow_owner_recall_self_msg true
+
+## 是否允许群管理员不受限制地撤回自己发送的消息。false可以${message.recall_time_limit}撤回自己的消息；true可以撤回任意时间自己的消息。默认为false。
+group.allow_manager_recall_self_msg false
+
 ## 是否允许客户端发送操作群的自定义群通知消息
 group.allow_client_custom_operation_notification true
 
@@ -180,6 +201,9 @@ group.visible_quit_or_kickoff_notification 0
 ## Server API不受此限制。
 #group.forbidden_client_operation 0xFFF
 
+## 是否禁止陌生人拉人入群，默认为false
+group.disable_stranger_invite false
+
 ## 隐藏用户信息属性类型，2是性别，3是电话号码，4是邮箱，5是地址，6是公司信息，7是社交账号，8是Extra信息。当需要隐藏多个时以英文逗号分开;
 ## 本配置是为了提高安全性，避免把对应信息同步到客户端，这样就能防止程序被破解从而拿到用户关键信息。仅对客户端有效，server api不受影响。
 ## 注意，修改本配置不会对已经同步的信息产生影响。
@@ -192,6 +216,9 @@ user.keep_display_name_when_destroy true
 # 因此需要分段多次同步，此开关定义了每次同步的数据的条数。此需要客户端支持，客户端SDK在2021.5.25日后支持此功能。如果确认所有客户端都在这个日志之后才可以打开此设置。
 #sync.data_part_size 1000
 
+## 是否关闭api/version接口。api/version方法可以用来检查IM服务版本，上线确认无问题后，可以关掉这个接口。
+#http.close_api_version false
+
 #*********************************************************************
 # 限频配置
 #*********************************************************************
@@ -264,7 +291,10 @@ server.multi_endpoint false
 ## 是否支持PC多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PC端多端登录。
 server.multi_pc_endpoint false
 
-# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
+## 是否支持PAD多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PAD端多端登录。
+server.multi_pad_endpoint false
+
+# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或pad或web端登录的通知。
 server.multi_platform_notification true
 
 # 当pc或者web在线时，手机是否默认静音，默认为true。注意仅影响默认值，用户可以手动切换是否静音。
@@ -357,10 +387,12 @@ push.ios.server.address http://localhost:8085/ios/push
 #*********************************************************************
 # Sensitive configuration
 #*********************************************************************
-## 内置文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***；3 记录并继续发送
+## 内置文本敏感词过滤处理方法，当命中敏感词后，消息会被记录到t_sensitive_messages表中，然后根据type类型做不同的处理，处理方式如下：
+## 0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***然后正常发送；3 正常发送。
+## 如果开启 message.sensitive.forward.url 配置，命中敏感词的消息还会被回调到这个地址
 sensitive.filter.type 0
 
-## 如果内置敏感词库无法满足您的需求，可以自己开发部署敏感词审核服务。配置如下地址和消息类型，IM服务会把指定消息类型的消息回调到指定地址
+## 如果内置敏感词库无法满足您的需求，可以开发部署独立敏感词审核服务。配置如下地址和消息类型，IM服务会把指定消息类型的消息回调到指定地址，内置的敏感词审核和敏感词转发功能就不再起作用了。
 ## 审核服务返回状态码200表示继续发送，如果需要替换内容，返回状态码200并且内容为替换后的内容。返回403表示不允许发送。其它错误继续发送。
 ## 独立审核服务地址，IM服务会post SendMessageData。如果需要修改消息内容，返回 MessagePayload。请参考应用服务中 "/message/censor" Mapping.
 #sensitive.remote_server_url http://192.168.3.202:8888/message/censor

broker/migrate/mysql/V3__create_sharding_table.sql

@@ -10,7 +10,7 @@ CREATE TABLE `t_messages_0` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -28,7 +28,7 @@ CREATE TABLE `t_messages_1` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -46,7 +46,7 @@ CREATE TABLE `t_messages_2` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -63,7 +63,7 @@ CREATE TABLE `t_messages_3` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -81,7 +81,7 @@ CREATE TABLE `t_messages_4` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -99,7 +99,7 @@ CREATE TABLE `t_messages_5` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -116,7 +116,7 @@ CREATE TABLE `t_messages_6` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -134,7 +134,7 @@ CREATE TABLE `t_messages_7` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -152,7 +152,7 @@ CREATE TABLE `t_messages_8` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -169,7 +169,7 @@ CREATE TABLE `t_messages_9` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -187,7 +187,7 @@ CREATE TABLE `t_messages_10` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -205,7 +205,7 @@ CREATE TABLE `t_messages_11` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -222,7 +222,7 @@ CREATE TABLE `t_messages_12` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -240,7 +240,7 @@ CREATE TABLE `t_messages_13` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -258,7 +258,7 @@ CREATE TABLE `t_messages_14` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -275,7 +275,7 @@ CREATE TABLE `t_messages_15` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -293,7 +293,7 @@ CREATE TABLE `t_messages_16` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -311,7 +311,7 @@ CREATE TABLE `t_messages_17` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -328,7 +328,7 @@ CREATE TABLE `t_messages_18` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -346,7 +346,7 @@ CREATE TABLE `t_messages_19` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -364,7 +364,7 @@ CREATE TABLE `t_messages_20` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -381,7 +381,7 @@ CREATE TABLE `t_messages_21` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -399,7 +399,7 @@ CREATE TABLE `t_messages_22` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -417,7 +417,7 @@ CREATE TABLE `t_messages_23` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -434,7 +434,7 @@ CREATE TABLE `t_messages_24` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -452,7 +452,7 @@ CREATE TABLE `t_messages_25` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -470,7 +470,7 @@ CREATE TABLE `t_messages_26` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -487,7 +487,7 @@ CREATE TABLE `t_messages_27` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -505,7 +505,7 @@ CREATE TABLE `t_messages_28` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -523,7 +523,7 @@ CREATE TABLE `t_messages_29` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -540,7 +540,7 @@ CREATE TABLE `t_messages_30` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -558,7 +558,7 @@ CREATE TABLE `t_messages_31` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -576,7 +576,7 @@ CREATE TABLE `t_messages_32` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -593,7 +593,7 @@ CREATE TABLE `t_messages_33` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -611,7 +611,7 @@ CREATE TABLE `t_messages_34` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4
@@ -629,7 +629,7 @@ CREATE TABLE `t_messages_35` (
     `_data` BLOB NOT NULL,
     `_searchable_key` TEXT DEFAULT NULL,
     `_dt` DATETIME NOT NULL,
-    INDEX `message_uid_index` (`_mid` DESC)
+    UNIQUE INDEX `message_uid_index` (`_mid` DESC)
   )
 ENGINE = InnoDB
 DEFAULT CHARACTER SET = utf8mb4

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.1.4</version>
+        <version>1.2.4</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -37,14 +37,14 @@
         <!--用于与slf4j保持桥接-->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.17.2</version>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <version>2.22.1</version>
         </dependency>
         <!-- slf4j核心包-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
+            <version>2.0.12</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>
@@ -65,6 +65,18 @@
             <version>1.1.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>3.25.3</version>
+        </dependency>
+
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
@@ -129,37 +141,18 @@
             <version>3.11.5</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.xiaoleilu/hutool -->
         <dependency>
-            <groupId>com.xiaoleilu</groupId>
-            <artifactId>hutool</artifactId>
-            <version>2.15.11</version>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.26</version>
         </dependency>
 
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
-
-
-        <!-- https://mvnrepository.com/artifact/com.mchange/c3p0 -->
         <dependency>
             <groupId>com.mchange</groupId>
             <artifactId>c3p0</artifactId>
             <version>0.9.5.4</version>
         </dependency>
 
-        <!-- needs extra dependencies: objenesis & hamcrest -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>1.9.0</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.fusesource.mqtt-client</groupId>
             <artifactId>mqtt-client</artifactId>
@@ -169,29 +162,7 @@
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-            <version>1.2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-client</artifactId>
-            <version>9.2.0.M1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <!-- use 2.6.0 for Java 7 projects -->
-            <version>2.6.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.191</version>
-            <scope>test</scope>
+            <version>1.2.2</version>
         </dependency>
 
         <dependency>
@@ -214,14 +185,12 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.13.1</version>
+            <version>4.12.0</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.flywaydb/flyway-core -->
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>

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

@@ -12,9 +12,11 @@ package cn.wildfirechat.push;
 public class PushMessage {
     public String sender;
     public String senderName;
+    public String senderPortrait;
     public int convType;
     public String target;
     public String targetName;
+    public String targetPortrait;
     public String userId;
     public int line;
     public int cntType;
@@ -34,12 +36,14 @@ public class PushMessage {
     public String language;
     public long messageId;
 
-    public PushMessage(String sender, int conversationType, String target, int line, int messageContentType, long serverTime, String senderName, String targetName, int unReceivedMsg, int mentionedType, boolean isHiddenDetail, String language) {
+    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) {
         this.sender = sender;
         this.convType = conversationType;
         this.target = target;
         this.senderName = senderName;
+        this.senderPortrait = senderPortrait;
         this.targetName = targetName;
+        this.targetPortrait = targetPortrait;
         this.line = line;
         this.cntType = messageContentType;
         this.serverTime = serverTime;

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

@@ -95,9 +95,15 @@ public class PushServer {
         pushMessage.deviceToken = session.getDeviceToken();
         pushMessage.unReceivedMsg = badge;
         pushMessage.userId = session.getUsername();
-        if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS || session.getPlatform() == ProtoConstants.Platform.Platform_Android) {
+        if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_iPad ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_Android ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_APad ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_Harmony ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad
+        ) {
             String url = androidPushServerUrl;
-            if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS) {
+            if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS || session.getPlatform() == ProtoConstants.Platform.Platform_iPad) {
                 url = iOSPushServerUrl;
                 pushMessage.voipDeviceToken = session.getVoipDeviceToken();
             }

broker/src/main/java/com/xiaoleilu/loServer/LoFileServer.java

@@ -1,8 +1,6 @@
 package com.xiaoleilu.loServer;
 
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.DateUtil;
+import cn.hutool.core.date.DateUtil;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.ClassUtil;
 import com.xiaoleilu.loServer.annotation.Route;

broker/src/main/java/com/xiaoleilu/loServer/LoServer.java

@@ -1,6 +1,6 @@
 package com.xiaoleilu.loServer;
 
-import com.xiaoleilu.hutool.util.DateUtil;
+import cn.hutool.core.date.DateUtil;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.AdminActionHandler;

broker/src/main/java/com/xiaoleilu/loServer/ServerSetting.java

@@ -5,11 +5,9 @@ import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.xiaoleilu.hutool.lang.Singleton;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.FileUtil;
-import com.xiaoleilu.hutool.util.StrUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.lang.Singleton;
+import cn.hutool.core.util.StrUtil;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.DefaultIndexAction;
 import com.xiaoleilu.loServer.action.UnknownErrorAction;
@@ -189,7 +187,7 @@ public class ServerSetting {
 	 * @param filterClass Filter类
 	 */
 	public static void setFilter(String path, Class<? extends Filter> filterClass) {
-		setFilter(path, (Filter)Singleton.get(filterClass));
+		setFilter(path, (Filter) Singleton.get(filterClass));
 	}
 	//----------------------------------------------------------------------------------------------- Filter end
 	

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

@@ -47,6 +47,8 @@ abstract public class Action {
     protected static RateLimiter robotLimiter = null;
     protected static RateLimiter channelLimiter = null;
 
+    protected static boolean closeApiVersion = false;
+
     public static void init(IConfig config) {
         int adminRate = 10000;
         int robotRate = 1000;
@@ -70,6 +72,11 @@ abstract public class Action {
         adminLimiter = new RateLimiter(10, adminRate);
         robotLimiter = new RateLimiter(10, robotRate);
         channelLimiter = new RateLimiter(10, channelRate);
+
+        try {
+            closeApiVersion = Boolean.parseBoolean(config.getProperty(HTTP_CLOSE_API_VERSION, "false"));
+        } catch (Exception e) {
+        }
     }
 
     protected class Result {

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

@@ -31,6 +31,11 @@ public class CheckTokenAction extends Action {
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
+            if(closeApiVersion) {
+                response.sendError(HttpResponseStatus.NOT_FOUND, "404 Not found!");
+                return true;
+            }
+
             response.setStatus(HttpResponseStatus.OK);
             String userId = request.getParam("userId");
             String clientId = request.getParam("clientId");

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

@@ -8,13 +8,11 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
 import com.hazelcast.core.HazelcastInstance;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.DateUtil;
-import com.xiaoleilu.hutool.util.FileUtil;
-import com.xiaoleilu.hutool.util.ReUtil;
-import com.xiaoleilu.hutool.util.StrUtil;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
@@ -24,6 +22,8 @@ import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import org.slf4j.LoggerFactory;
 
+import static cn.hutool.core.date.DatePattern.HTTP_DATETIME_PATTERN;
+
 /**
  * 默认的主页Action，当访问主页且没有定义主页Action时，调用此Action
  * 
@@ -96,7 +96,7 @@ public class FileAction extends Action {
     }
 
     private static final Pattern INSECURE_URI = Pattern.compile(".*[<>&\"].*");
-	private static final SimpleDateFormat HTTP_DATE_FORMATER = new SimpleDateFormat(DateUtil.HTTP_DATETIME_PATTERN, Locale.US);
+	private static final SimpleDateFormat HTTP_DATE_FORMATER = new SimpleDateFormat(HTTP_DATETIME_PATTERN, Locale.US);
 
 	
 	/**

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

@@ -1,9 +1,6 @@
 package com.xiaoleilu.loServer.action;
 
 import com.hazelcast.core.HazelcastInstance;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.StrUtil;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
 import io.moquette.spi.IMessagesStore;

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

@@ -4,9 +4,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import com.hazelcast.core.HazelcastInstance;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.StrUtil;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
 

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

@@ -30,8 +30,12 @@ public class VersionAction extends Action {
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-            response.setStatus(HttpResponseStatus.OK);
+            if(closeApiVersion) {
+                response.sendError(HttpResponseStatus.NOT_FOUND, "404 Not found!");
+                return true;
+            }
 
+            response.setStatus(HttpResponseStatus.OK);
             try {
 
                 response.setContent(Utility.formatJson(gson.toJson(GitRepositoryState.getGitRepositoryState())));

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/GetAllUserAction.java

@@ -0,0 +1,59 @@
+/*
+ * 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.InputGetUserList;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputGetUserList;
+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_All)
+@HttpMethod("POST")
+public class GetAllUserAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetUserList input = getRequestBody(request.getNettyRequest(), InputGetUserList.class);
+            if (input != null && input.count > 0 && input.offset >= 0) {
+                List<WFCMessage.User> users = messagesStore.getUserInfoList(input.count, input.offset);
+                OutputGetUserList outputGetUserList = new OutputGetUserList();
+                outputGetUserList.userInfoList = new ArrayList<>();
+                for (WFCMessage.User user : users) {
+                    outputGetUserList.userInfoList.add(InputOutputUserInfo.fromPbUser(user));
+                }
+
+                RestResult result = RestResult.ok(outputGetUserList);
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -57,6 +57,9 @@ public class GetGroupInfoAction extends AdminAction {
                     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);
                     result = RestResult.ok(pojoGroupInfo);
                 }
                 setResponseContent(result, response);

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

@@ -0,0 +1,47 @@
+/*
+ * 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.*;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.MemorySessionStore;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import java.util.Collection;
+
+@Route(APIPath.User_Online_List)
+@HttpMethod("POST")
+public class GetOnlineUserAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            GetOnlineUserRequest getOnlineUserRequest = getRequestBody(request.getNettyRequest(), GetOnlineUserRequest.class);
+            if (getOnlineUserRequest.nodeId == 1) {
+                GetOnlineUserResult result = messagesStore.getOnlineUsers(getOnlineUserRequest.offset, getOnlineUserRequest.count);
+                setResponseContent(RestResult.ok(result), response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,61 @@
+/*
+ * 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.InputGetChatroomInfo;
+import cn.wildfirechat.pojos.InputUserId;
+import cn.wildfirechat.pojos.OutputStringList;
+import cn.wildfirechat.pojos.OutputUserChatroom;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.UserClientEntry;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@Route(APIPath.Chatroom_GetUserChatroom)
+@HttpMethod("POST")
+public class GetUserChatroomAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputUserId inputUserId = getRequestBody(request.getNettyRequest(), InputUserId.class);
+            String userId = inputUserId.getUserId();
+            if (!StringUtil.isNullOrEmpty(userId)) {
+                OutputUserChatroom outputUserChatroom = messagesStore.getUserChatroom(userId);
+
+                RestResult result;
+                if (outputUserChatroom != null) {
+                    result = RestResult.ok(outputUserChatroom);
+                } else {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                }
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,55 @@
+/*
+ * 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.InputGetUserGroupByType;
+import cn.wildfirechat.pojos.InputUserId;
+import cn.wildfirechat.pojos.OutputGroupIds;
+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.Set;
+
+@Route(APIPath.Get_User_Groups_By_Type)
+@HttpMethod("POST")
+public class GetUserGroupsByTypeAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetUserGroupByType input = getRequestBody(request.getNettyRequest(), InputGetUserGroupByType.class);
+            if (input != null
+                && (!StringUtil.isNullOrEmpty(input.getUserId()))) {
+
+                Set<String> groupIds = messagesStore.getUserGroupIds(input.getUserId(), input.getGroupMemberTypes());
+                OutputGroupIds outputGroupIds = new OutputGroupIds();
+                outputGroupIds.setGroupIds(new ArrayList<>(groupIds));
+                RestResult result = RestResult.ok(outputGroupIds);
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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.GetOnlineUserCountResult;
+import cn.wildfirechat.pojos.GetUserSessionResult;
+import cn.wildfirechat.pojos.InputUserId;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.MemorySessionStore;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import java.util.Collection;
+
+@Route(APIPath.User_Online_Count)
+@HttpMethod("POST")
+public class GetUserOnlineCountAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            int count = messagesStore.getOnlineUserCount();
+            GetOnlineUserCountResult result = new GetOnlineUserCountResult();
+            GetOnlineUserCountResult.Node node = new GetOnlineUserCountResult.Node();
+            node.node = 1;
+            node.count = count;
+            result.add(node);
+
+            setResponseContent(RestResult.ok(result), response);
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,57 @@
+/*
+ * 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.GetUserSessionResult;
+import cn.wildfirechat.pojos.InputGetChatroomInfo;
+import cn.wildfirechat.pojos.InputUserId;
+import cn.wildfirechat.pojos.OutputStringList;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.MemorySessionStore;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import java.util.Collection;
+
+@Route(APIPath.User_Session_List)
+@HttpMethod("POST")
+public class GetUserSessionsAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputUserId inputUserId = getRequestBody(request.getNettyRequest(), InputUserId.class);
+            String userId = inputUserId.getUserId();
+            if (!StringUtil.isNullOrEmpty(userId)) {
+                Collection<MemorySessionStore.Session> sessions = sessionsStore.sessionForUser(userId);
+                GetUserSessionResult result = new GetUserSessionResult();
+                for (MemorySessionStore.Session session : sessions) {
+                    boolean isOnline = sessionsStore.isClientOnline(session.getClientID());
+                    result.userSessions.add(new GetUserSessionResult.UserSession(session.getUsername(), session.getClientID(), session.getPlatform(), session.getPushType(), session.getDeviceToken(), session.getVoipDeviceToken(), isOnline));
+                }
+
+                setResponseContent(RestResult.ok(result), response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+        }
+        return true;
+    }
+}

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

@@ -25,6 +25,9 @@ import io.netty.util.internal.StringUtil;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
 @Route(APIPath.Msg_Recall)
 @HttpMethod("POST")
 public class RecallMessageAction extends AdminAction {
@@ -42,10 +45,9 @@ public class RecallMessageAction extends AdminAction {
 
                 WFCMessage.INT64Buf idBuf = WFCMessage.INT64Buf.newBuilder().setId(recallMessageData.getMessageUid()).build();
                 sendApiMessage(response, recallMessageData.getOperator(), IMTopic.RecallMessageTopic, idBuf.toByteArray(), result -> {
-                    ByteBuf byteBuf = Unpooled.buffer();
-                    byteBuf.writeBytes(result);
-                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
-                    return new Result(errorCode);
+                    ErrorCode errorCode = ErrorCode.fromCode(result[0]);
+                    byte[] data = Arrays.copyOfRange(result,1, result.length);
+                    return new Result(errorCode, new String(data, StandardCharsets.UTF_8));
                 });
                 return false;
             } else {

broker/src/main/java/com/xiaoleilu/loServer/exception/ServerSettingException.java

@@ -1,31 +1,32 @@
-package com.xiaoleilu.loServer.exception;
-
-import com.xiaoleilu.hutool.util.StrUtil;
-
-/**
- * 设置异常
- * @author xiaoleilu
- */
-public class ServerSettingException extends RuntimeException{
-	private static final long serialVersionUID = -4134588858314744501L;
-
-	public ServerSettingException(Throwable e) {
-		super(e);
-	}
-	
-	public ServerSettingException(String message) {
-		super(message);
-	}
-	
-	public ServerSettingException(String messageTemplate, Object... params) {
-		super(StrUtil.format(messageTemplate, params));
-	}
-	
-	public ServerSettingException(String message, Throwable throwable) {
-		super(message, throwable);
-	}
-	
-	public ServerSettingException(Throwable throwable, String messageTemplate, Object... params) {
-		super(StrUtil.format(messageTemplate, params), throwable);
-	}
-}
+package com.xiaoleilu.loServer.exception;
+
+
+import cn.hutool.core.util.StrUtil;
+
+/**
+ * 设置异常
+ * @author xiaoleilu
+ */
+public class ServerSettingException extends RuntimeException{
+	private static final long serialVersionUID = -4134588858314744501L;
+
+	public ServerSettingException(Throwable e) {
+		super(e);
+	}
+	
+	public ServerSettingException(String message) {
+		super(message);
+	}
+	
+	public ServerSettingException(String messageTemplate, Object... params) {
+		super(StrUtil.format(messageTemplate, params));
+	}
+	
+	public ServerSettingException(String message, Throwable throwable) {
+		super(message, throwable);
+	}
+	
+	public ServerSettingException(Throwable throwable, String messageTemplate, Object... params) {
+		super(StrUtil.format(messageTemplate, params), throwable);
+	}
+}

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

@@ -1,7 +1,7 @@
 package com.xiaoleilu.loServer.handler;
 
+import cn.hutool.core.lang.Singleton;
 import cn.wildfirechat.common.IMExceptionEvent;
-import com.xiaoleilu.hutool.lang.Singleton;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.UnknownErrorAction;

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

@@ -8,7 +8,6 @@
 
 package com.xiaoleilu.loServer.handler;
 
-import com.xiaoleilu.hutool.lang.Singleton;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.FileAction;

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

@@ -1,28 +1,27 @@
-package com.xiaoleilu.loServer.handler;
-
-import com.xiaoleilu.hutool.log.StaticLog;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.FileRegion;
-import io.netty.handler.codec.http.DefaultHttpResponse;
-import io.netty.handler.codec.http.HttpContentCompressor;
-
-/**
- * 解决大文件传输与Gzip压缩冲突问题
- * @author Looly
- *
- */
-public class HttpChunkContentCompressor extends HttpContentCompressor {
-	@Override
-	public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
-		StaticLog.debug("Write object [{}]", msg);
-		
-		if (msg instanceof FileRegion || msg instanceof DefaultHttpResponse) {
-			//文件传输不经过Gzip压缩
-			ctx.write(msg, promise);
-		}else{
-			super.write(ctx, msg, promise);
-		}
-	}
-}
+package com.xiaoleilu.loServer.handler;
+
+import cn.hutool.log.StaticLog;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.FileRegion;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpContentCompressor;
+
+/**
+ * 解决大文件传输与Gzip压缩冲突问题
+ * @author Looly
+ *
+ */
+public class HttpChunkContentCompressor extends HttpContentCompressor {
+	@Override
+	public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+		StaticLog.debug("Write object [{}]", msg);
+		
+		if (msg instanceof FileRegion || msg instanceof DefaultHttpResponse) {
+			//文件传输不经过Gzip压缩
+			ctx.write(msg, promise);
+		}else{
+			super.write(ctx, msg, promise);
+		}
+	}
+}

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

@@ -1,7 +1,6 @@
 package com.xiaoleilu.loServer.handler;
 
 import io.netty.util.internal.StringUtil;
-import com.xiaoleilu.hutool.util.FileUtil;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;

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

@@ -8,7 +8,6 @@
 
 package com.xiaoleilu.loServer.handler;
 
-import com.xiaoleilu.hutool.lang.Singleton;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.action.FileAction;

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

@@ -10,15 +10,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import com.xiaoleilu.hutool.http.HttpUtil;
-import com.xiaoleilu.hutool.lang.Conver;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.CharsetUtil;
-import com.xiaoleilu.hutool.util.DateUtil;
-import com.xiaoleilu.hutool.util.StrUtil;
-import com.xiaoleilu.hutool.util.URLUtil;
-
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.net.NetUtil;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.URLUtil;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpHeaderNames;
@@ -261,7 +258,7 @@ public class Request {
 	 * @return 获得Integer类型请求参数
 	 */
 	public Integer getIntParam(String name, Integer defaultValue) {
-		return Conver.toInt(getParam(name), defaultValue);
+		return Convert.toInt(getParam(name), defaultValue);
 	}
 
 	/**
@@ -270,7 +267,7 @@ public class Request {
 	 * @return 获得long类型请求参数
 	 */
 	public Long getLongParam(String name, Long defaultValue) {
-		return Conver.toLong(getParam(name), defaultValue);
+		return Convert.toLong(getParam(name), defaultValue);
 	}
 
 	/**
@@ -279,7 +276,7 @@ public class Request {
 	 * @return 获得Double类型请求参数
 	 */
 	public Double getDoubleParam(String name, Double defaultValue) {
-		return Conver.toDouble(getParam(name), defaultValue);
+		return Convert.toDouble(getParam(name), defaultValue);
 	}
 
 	/**
@@ -288,7 +285,7 @@ public class Request {
 	 * @return 获得Float类型请求参数
 	 */
 	public Float getFloatParam(String name, Float defaultValue) {
-		return Conver.toFloat(getParam(name), defaultValue);
+		return Convert.toFloat(getParam(name), defaultValue);
 	}
 
 	/**
@@ -297,7 +294,7 @@ public class Request {
 	 * @return 获得Boolean类型请求参数
 	 */
 	public Boolean getBoolParam(String name, Boolean defaultValue) {
-		return Conver.toBool(getParam(name), defaultValue);
+		return Convert.toBool(getParam(name), defaultValue);
 	}
 
 	/**
@@ -477,7 +474,7 @@ public class Request {
 	protected void putIp(ChannelHandlerContext ctx) {
 		String ip = getHeader("X-Forwarded-For");
 		if (StrUtil.isNotBlank(ip)) {
-			ip = HttpUtil.getMultistageReverseProxyIp(ip);
+			ip = NetUtil.getMultistageReverseProxyIp(ip);
 		} else {
 			final InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress();
 			ip = insocket.getAddress().getHostAddress();

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

@@ -13,12 +13,9 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TimeZone;
 
-import com.xiaoleilu.hutool.http.HttpUtil;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-import com.xiaoleilu.hutool.util.CharsetUtil;
-import com.xiaoleilu.hutool.util.DateUtil;
-import com.xiaoleilu.hutool.util.StrUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.CharsetUtil;
+import cn.hutool.core.util.StrUtil;
 import com.xiaoleilu.loServer.ServerSetting;
 import com.xiaoleilu.loServer.listener.FileProgressiveFutureListener;
 
@@ -44,6 +41,8 @@ import io.netty.handler.codec.http.cookie.ServerCookieEncoder;
 import org.apache.tika.Tika;
 import org.slf4j.LoggerFactory;
 
+import static cn.hutool.core.date.DatePattern.HTTP_DATETIME_PATTERN;
+
 /**
  * 响应对象
  * 
@@ -332,7 +331,7 @@ public class Response {
 	 * @param httpCacheSeconds 缓存时间，单位秒
 	 */
 	public void setDateAndCache(long lastModify, int httpCacheSeconds) {
-		SimpleDateFormat formatter = new SimpleDateFormat(DateUtil.HTTP_DATETIME_PATTERN, Locale.US);
+		SimpleDateFormat formatter = new SimpleDateFormat(HTTP_DATETIME_PATTERN, Locale.US);
 		formatter.setTimeZone(TimeZone.getTimeZone("GMT"));
 
 		// Date header

broker/src/main/java/com/xiaoleilu/loServer/listener/FileProgressiveFutureListener.java

@@ -2,10 +2,7 @@ package com.xiaoleilu.loServer.listener;
 
 import java.io.RandomAccessFile;
 
-import com.xiaoleilu.hutool.io.IoUtil;
-import com.xiaoleilu.hutool.log.Log;
-import com.xiaoleilu.hutool.log.StaticLog;
-
+import cn.hutool.core.io.IoUtil;
 import io.netty.channel.ChannelProgressiveFuture;
 import io.netty.channel.ChannelProgressiveFutureListener;
 import org.slf4j.LoggerFactory;

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

@@ -135,6 +135,7 @@ public final class BrokerConstants {
 
     public static final String SERVER_MULTI_ENDPOINT = "server.multi_endpoint";
     public static final String SERVER_MULTI_PC_ENDPOINT = "server.multi_pc_endpoint";
+    public static final String SERVER_MULTI_PAD_ENDPOINT = "server.multi_pad_endpoint";
     public static final String SERVER_MULTI_PLATFROM_NOTIFICATION = "server.multi_platform_notification";
     public static final String SERVER_MOBILE_DEFAULT_SILENT_WHEN_PC_ONLINE = "server.mobile_default_silent_when_pc_online";
     public static final String SERVER_CLIENT_SUPPORT_KICKOFF_EVENT = "server.client_support_kickoff_event";
@@ -153,12 +154,18 @@ public final class BrokerConstants {
 
     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_Forward_With_Client_Info = "message.forward_with_client_info";
+
+    public static final String BROADCAST_Target_From_User_Table = "message.broadcast.target_from_user_table";
+
     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 FRIEND_Disable_Search = "friend.disable_search";
     public static final String FRIEND_Disable_NickName_Search = "friend.disable_nick_name_search";
+    public static final String FRIEND_Disable_UserId_Search = "friend.disable_user_id_search";
     public static final String FRIEND_Disable_Friend_Request = "friend.disable_friend_request";
     public static final String FRIEND_Repeat_Request_Duration = "friend.repeat_request_duration";
     public static final String FRIEND_Reject_Request_Duration = "friend.reject_request_duration";
@@ -169,14 +176,18 @@ public final class BrokerConstants {
     public static final String CHATROOM_Participant_Idle_Time = "chatroom.participant_idle_time";
     public static final String CHATROOM_Rejoin_When_Active = "chatroom.rejoin_when_active";
     public static final String CHATROOM_Create_When_Not_Exist = "chatroom.create_when_not_exist";
+    public static final String CHATROOM_Kickoff_Other_Platform = "chatroom.kickoff_other_platform";
 
-
+    public static final String GROUP_Allow_Owner_Recall_Self_Msg = "group.allow_owner_recall_self_msg";
+    public static final String GROUP_Allow_Manager_Recall_Self_Msg = "group.allow_manager_recall_self_msg";
     public static final String GROUP_Allow_Client_Custom_Operation_Notification = "group.allow_client_custom_operation_notification";
     public static final String GROUP_Allow_Robot_Custom_Operation_Notification = "group.allow_robot_custom_operation_notificatio";
 
     public static final String GROUP_Visible_Quit_Kickoff_Notification = "group.visible_quit_or_kickoff_notification";
     public static final String GROUP_Forbidden_Client_Operation = "group.forbidden_client_operation";
 
+    public static final String GROUP_Disable_Stranger_Invite = "group.disable_stranger_invite";
+
     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";
 
@@ -199,6 +210,9 @@ public final class BrokerConstants {
     public static final String HTTP_CHANNEL_RATE_LIMIT = "http.channel.rate_limit";
     public static final String CLIENT_REQUEST_RATE_LIMIT = "client.request_rate_limit";
 
+    public static final String HTTP_CLOSE_API_VERSION = "http.close_api_version";
+
+
     private BrokerConstants() {
     }
 }

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

@@ -0,0 +1,23 @@
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+
+import java.util.List;
+
+@Handler(IMTopic.ListenedChannelListTopic)
+public class ChannelListenedListHandler extends IMHandler<Void> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, Void request, Qos1PublishHandler.IMCallback callback) {
+        List<String> channelInfoList = m_messagesStore.getListenedChannels(fromUser);
+        WFCMessage.IDListBuf.Builder builder = WFCMessage.IDListBuf.newBuilder();
+        builder.addAllId(channelInfoList);
+        byte[] data = builder.build().toByteArray();
+        ackPayload.ensureWritable(data.length).writeBytes(data);
+        return ErrorCode.ERROR_CODE_SUCCESS;
+    }
+}

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

@@ -50,6 +50,14 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
                 return ErrorCode.ERROR_CODE_NOT_RIGHT;
             }
         }
+
+        if(requestSourceType == ProtoConstants.RequestSourceType.Request_From_User) {
+            ErrorCode errorCode = m_messagesStore.canAddGroupMembers(fromUser, request.getGroup().getMembersList());
+            if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                return errorCode;
+            }
+        }
+
         WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList(), request.getMemberExtra(), isAdmin);
         if (groupInfo != null) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {

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

@@ -10,7 +10,6 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import com.xiaoleilu.hutool.system.UserInfo;
 import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.moquette.spi.impl.security.TokenAuthenticator;

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

@@ -23,7 +23,7 @@ public class RecallMessageHandler extends IMHandler<WFCMessage.INT64Buf> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.INT64Buf int64Buf, Qos1PublishHandler.IMCallback callback) {
         boolean isAdmin = requestSourceType == ProtoConstants.RequestSourceType.Request_From_Admin;
-        ErrorCode errorCode = m_messagesStore.recallMessage(int64Buf.getId(), fromUser, clientID, isAdmin);
+        ErrorCode errorCode = m_messagesStore.recallMessage(int64Buf.getId(), fromUser, clientID, isAdmin, ackPayload);
 
         if(errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
             return errorCode;

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

@@ -12,7 +12,6 @@ import cn.wildfirechat.pojos.SystemSettingPojo;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import cn.wildfirechat.server.ThreadPoolExecutorWrapper;
-import com.google.protobuf.InvalidProtocolBufferException;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.MultiMap;
 import com.hazelcast.util.StringUtil;
@@ -39,6 +38,7 @@ import static cn.wildfirechat.common.IMExceptionEvent.EventType.RDBS_Exception;
 import static cn.wildfirechat.proto.ProtoConstants.PersistFlag.Transparent;
 import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
 import static cn.wildfirechat.proto.ProtoConstants.SearchUserType.*;
+import static win.liyufan.im.UserSettingScope.kUserSettingPrivacySearchable;
 
 public class DatabaseStore {
     private static final Logger LOG = LoggerFactory.getLogger(DatabaseStore.class);
@@ -161,18 +161,12 @@ public class DatabaseStore {
         }
         return null;
     }
-    //searchType
-    // 0 模糊匹配displayName, 精确匹配账户名和电话号码
-    // 1 精确匹配账户名和电话号码
-    // 2 精确匹配账户名
-    // 3 精确匹配电话号码
-    List<WFCMessage.User> searchUserFromDB(String keyword, int searchType, int page) {
+
+    List<WFCMessage.User> searchUserByNameMobileUserId(String keyword, int searchType) {
+        ArrayList<WFCMessage.User> out = new ArrayList<>();
         Connection connection = null;
         PreparedStatement statement = null;
         ResultSet rs = null;
-
-        ArrayList<WFCMessage.User> out = new ArrayList<>();
-
         try {
             connection = DBUtil.getConnection();
             String sql = "select `_uid`, `_name`" +
@@ -185,61 +179,42 @@ public class DatabaseStore {
                 ", `_company`" +
                 ", `_social`" +
                 ", `_extra`" +
-                ", `_dt` from t_user";
-            switch (searchType) {
-                case SearchUserType_Name_Mobile:
-                    sql += " where (`_name` = ? or `_mobile` = ?) ";
-                    break;
-                case SearchUserType_Name:
-                    sql += " where `_name` = ? ";
-                    break;
-                case SearchUserType_Mobile:
-                    sql += " where `_mobile` = ? ";
-                    break;
-                case SearchUserType_General:
-                default:
-                    sql += " where (`_display_name` like ? or `_name` = ? or `_mobile` = ?) ";
-                    break;
-            }
+                ", `_dt`, `_type` from t_user";
 
+            int sqlParaCount = 1;
+            if(searchType == SearchUserType_Name) {
+                sql += " where `_name` = ? ";
+            } else if(searchType == SearchUserType_Mobile) {
+                sql += " where `_mobile` = ? ";
+            } else if(searchType == SearchUserType_UserId) {
+                sql += " where `_uid` = ? ";
+            } else if(searchType == SearchUserType_Name_Mobile || searchType == SearchUserType_Name_Mobile_DisplayName) {
+                sqlParaCount = 2;
+                sql += " where (`_name` = ? or `_mobile` = ?) ";
+            } else {
+                sqlParaCount = 3;
+                sql += " where (`_name` = ? or `_mobile` = ? or `_uid` = ?) ";
+            }
 
             sql += " and `_type` <> 2 and `_deleted` = 0"; //can search normal user(0) and robot(1) and admin(100), can not search things
 
-            if (searchType == SearchUserType_Name_Mobile || searchType == SearchUserType_Name || searchType == SearchUserType_Mobile) {
+            if(searchType == SearchUserType_Name || searchType == SearchUserType_Mobile || searchType == SearchUserType_UserId) {
                 sql += " limit 1";
+            } else if(searchType == SearchUserType_Name_Mobile || searchType == SearchUserType_Name_Mobile_DisplayName) {
+                sql += " limit 2";
             } else {
-                sql += " limit 20";
-            }
-            
-            if (page > 0) {
-                sql += " offset " + page * 20;
+                sql += " limit 3";
             }
 
             statement = connection.prepareStatement(sql);
-            int index = 1;
-
-            switch (searchType) {
-                case SearchUserType_Name_Mobile:
-                    statement.setString(index++, keyword);
-                    statement.setString(index++, keyword);
-                    break;
-                case SearchUserType_Name:
-                case SearchUserType_Mobile:
-                    statement.setString(index++, keyword);
-                    break;
-                case SearchUserType_General:
-                default:
-                    statement.setString(index++, "%" + keyword + "%");
-                    statement.setString(index++, keyword);
-                    statement.setString(index++, keyword);
-                    break;
+            for (int i = 0; i < sqlParaCount; i++) {
+                statement.setString(i+1, keyword);
             }
 
-
             rs = statement.executeQuery();
             while (rs.next()) {
                 WFCMessage.User.Builder builder = WFCMessage.User.newBuilder();
-                index = 1;
+                int index = 1;
 
                 String value = rs.getString(index++);
                 value = (value == null ? "" : value);
@@ -287,6 +262,9 @@ public class DatabaseStore {
                 long longValue = rs.getLong(index++);
                 builder.setUpdateDt(longValue);
 
+                int type = rs.getInt(index++);
+                builder.setType( type);
+
                 WFCMessage.User user = builder.build();
 
                 out.add(user);
@@ -298,6 +276,258 @@ public class DatabaseStore {
         } finally {
             DBUtil.closeDB(connection, statement, rs);
         }
+
+        List<WFCMessage.User> filter = new ArrayList<>();
+        for (WFCMessage.User user : out) {
+            WFCMessage.UserSettingEntry userSettingEntry = Server.getServer().getStore().messagesStore().getUserSetting(user.getUid(), kUserSettingPrivacySearchable, null);
+            if(userSettingEntry != null) {
+                int value = 0;
+                try {
+                    value = StringUtil.isNullOrEmpty(userSettingEntry.getValue())?0:Integer.parseInt(userSettingEntry.getValue());
+                } catch (NumberFormatException e) {
+                    e.printStackTrace();
+                }
+                if((value & ProtoConstants.DisableSearchMask.DisableSearchNameMask) > 0) {
+                    if (searchType == SearchUserType_Name) {
+                        filter.add(user);
+                        continue;
+                    } else if(searchType == SearchUserType_Name_Mobile || searchType == SearchUserType_Name_Mobile_DisplayName) {
+                        if(keyword.equals(user.getName())) {
+                            if(!keyword.equals(user.getMobile())) {
+                                filter.add(user);
+                                continue;
+                            } else if((value & ProtoConstants.DisableSearchMask.DisableSearchMobileMask) > 0) {
+                                filter.add(user);
+                                continue;
+                            }
+                        }
+                    } else if(searchType == SearchUserType_Name_Mobile_UserId) {
+                        if(keyword.equals(user.getName())) {
+                            if(keyword.equals(user.getMobile()) && keyword.equals(user.getUid())) {
+                                if((value & ProtoConstants.DisableSearchMask.DisableSearchMobileMask) > 0 && (value & ProtoConstants.DisableSearchMask.DisableSearchUserIdMask) > 0) {
+                                    filter.add(user);
+                                    continue;
+                                }
+                            } else if(keyword.equals(user.getMobile())) {
+                                if((value & ProtoConstants.DisableSearchMask.DisableSearchMobileMask) > 0) {
+                                    filter.add(user);
+                                    continue;
+                                }
+                            } else if(keyword.equals(user.getUid())) {
+                                if((value & ProtoConstants.DisableSearchMask.DisableSearchUserIdMask) > 0) {
+                                    filter.add(user);
+                                    continue;
+                                }
+                            } else {
+                                filter.add(user);
+                                continue;
+                            }
+                        }
+                    }
+                }
+
+
+                if((value & ProtoConstants.DisableSearchMask.DisableSearchMobileMask) > 0) {
+                    if (searchType == SearchUserType_Mobile) {
+                        filter.add(user);
+                        continue;
+                    } else if(searchType == SearchUserType_Name_Mobile || searchType == SearchUserType_Name_Mobile_DisplayName) {
+                        if(keyword.equals(user.getMobile())) {
+                            if(!keyword.equals(user.getName())) {
+                                filter.add(user);
+                                continue;
+                            } else if((value & ProtoConstants.DisableSearchMask.DisableSearchNameMask) > 0) {
+                                filter.add(user);
+                                continue;
+                            }
+                        }
+                    } else if(searchType == SearchUserType_Name_Mobile_UserId) {
+                        if(keyword.equals(user.getMobile())) {
+                            if(keyword.equals(user.getName()) && keyword.equals(user.getUid())) {
+                                if((value & ProtoConstants.DisableSearchMask.DisableSearchNameMask) > 0 && (value & ProtoConstants.DisableSearchMask.DisableSearchUserIdMask) > 0) {
+                                    filter.add(user);
+                                    continue;
+                                }
+                            } else if(keyword.equals(user.getName())) {
+                                if((value & ProtoConstants.DisableSearchMask.DisableSearchNameMask) > 0) {
+                                    filter.add(user);
+                                    continue;
+                                }
+                            } else if(keyword.equals(user.getUid())) {
+                                if((value & ProtoConstants.DisableSearchMask.DisableSearchUserIdMask) > 0) {
+                                    filter.add(user);
+                                    continue;
+                                }
+                            } else {
+                                filter.add(user);
+                                continue;
+                            }
+                        }
+                    }
+                }
+
+                if((value & ProtoConstants.DisableSearchMask.DisableSearchUserIdMask) > 0) {
+                    if (searchType == SearchUserType_UserId) {
+                        filter.add(user);
+                        continue;
+                    } else if(searchType == SearchUserType_Name_Mobile_UserId) {
+                        if(keyword.equals(user.getUid())) {
+                            if(keyword.equals(user.getName()) && keyword.equals(user.getMobile())) {
+                                if((value & ProtoConstants.DisableSearchMask.DisableSearchNameMask) > 0 && (value & ProtoConstants.DisableSearchMask.DisableSearchMobileMask) > 0) {
+                                    filter.add(user);
+                                    continue;
+                                }
+                            } else if(keyword.equals(user.getName())) {
+                                if((value & ProtoConstants.DisableSearchMask.DisableSearchNameMask) > 0) {
+                                    filter.add(user);
+                                    continue;
+                                }
+                            } else if(keyword.equals(user.getMobile())) {
+                                if((value & ProtoConstants.DisableSearchMask.DisableSearchMobileMask) > 0) {
+                                    filter.add(user);
+                                    continue;
+                                }
+                            } else {
+                                filter.add(user);
+                                continue;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        out.removeAll(filter);
+
+        return out;
+    }
+
+    List<WFCMessage.User> searchUserByDisplayName(String keyword, int page, List<WFCMessage.User> nameOrIdMatched) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+
+        ArrayList<WFCMessage.User> out = new ArrayList<>();
+
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select u._uid, u._name, u._display_name, u._portrait, u._mobile, u._gender, u._email, u._address, u._company, u._social, u._extra, u._dt, u._type " +
+                " from t_user u left join (select _uid, _value from t_user_setting where _scope = 27) s on u._uid = s._uid " +
+                " where u._display_name like ? ESCAPE '!' and u._type <> 2 and u._deleted = 0 ";
+            if(nameOrIdMatched.size() == 1) {
+                sql += " and u._uid <> ? and u._name <> ?";
+            } else if(nameOrIdMatched.size() == 2) {
+                sql += " and u._uid <> ? and u._uid <>? and u._name <> ? and u._name <>? ";
+            }
+            sql += " and (s._value is null or (s._value <> 1 and s._value <> 3 and s._value <> 5 and s._value <> 7)) limit ";
+
+            if(page == 0) {
+                sql += (20 - nameOrIdMatched.size());
+            } else {
+                sql += 20;
+            }
+
+            if (page > 0) {
+                sql += " offset " + (page * 20 - nameOrIdMatched.size());
+            }
+
+            keyword = keyword
+                .replace("!", "!!")
+                .replace("%", "!%")
+                .replace("_", "!_")
+                .replace("[", "![");
+
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, "%" + keyword + "%");
+            if(nameOrIdMatched.size() == 1) {
+                statement.setString(2, nameOrIdMatched.toArray(new WFCMessage.User[0])[0].getUid());
+                statement.setString(3, nameOrIdMatched.toArray(new WFCMessage.User[0])[0].getUid());
+            } else if(nameOrIdMatched.size() == 2) {
+                statement.setString(2, nameOrIdMatched.toArray(new WFCMessage.User[0])[0].getUid());
+                statement.setString(3, nameOrIdMatched.toArray(new WFCMessage.User[0])[1].getUid());
+                statement.setString(4, nameOrIdMatched.toArray(new WFCMessage.User[0])[0].getUid());
+                statement.setString(5, nameOrIdMatched.toArray(new WFCMessage.User[0])[1].getUid());
+            }
+
+            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);
+
+                long longValue = rs.getLong(index++);
+                builder.setUpdateDt(longValue);
+
+                int type = rs.getInt(index++);
+                builder.setType(type);
+
+                WFCMessage.User user = builder.build();
+
+                out.add(user);
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return out;
+    }
+
+    List<WFCMessage.User> searchUserFromDB(String keyword, int searchType, int page) {
+        List<WFCMessage.User> nameOrIdMatched = searchUserByNameMobileUserId(keyword, searchType);
+        List<WFCMessage.User> out = new ArrayList<>();
+        if(page == 0) {
+            out.addAll(nameOrIdMatched);
+        }
+
+        if(searchType == SearchUserType_General || searchType == SearchUserType_Name_Mobile_DisplayName) {
+            List<WFCMessage.User> general = searchUserByDisplayName(keyword, page, nameOrIdMatched);
+            general.removeAll(nameOrIdMatched);
+            out.addAll(general);
+        }
         return out;
     }
 
@@ -1568,10 +1798,12 @@ public class DatabaseStore {
         try {
             connection = DBUtil.getConnection();
             String sql;
-            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_LINUX) {
+            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_LINUX || platform == ProtoConstants.Platform.Platform_HarmonyPC) {
+                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ? or `_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
+            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_Harmony) {
+                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
+            } else if(platform == ProtoConstants.Platform.Platform_iPad || platform == ProtoConstants.Platform.Platform_APad || platform == ProtoConstants.Platform.Platform_HarmonyPad) {
                 sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
-            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android) {
-                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
             } else {
                 sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and `_platform` = ? and `_cid` <> ? and `_deleted` = 0";
             }
@@ -1586,13 +1818,19 @@ public class DatabaseStore {
 
             statement.setString(index++, uid);
 
-            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_LINUX) {
+            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_LINUX || platform == ProtoConstants.Platform.Platform_HarmonyPC) {
                 statement.setInt(index++, ProtoConstants.Platform.Platform_Windows);
                 statement.setInt(index++, ProtoConstants.Platform.Platform_OSX);
                 statement.setInt(index++, ProtoConstants.Platform.Platform_LINUX);
-            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android) {
+                statement.setInt(index++, ProtoConstants.Platform.Platform_HarmonyPC);
+            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_Harmony) {
                 statement.setInt(index++, ProtoConstants.Platform.Platform_iOS);
                 statement.setInt(index++, ProtoConstants.Platform.Platform_Android);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_Harmony);
+            } else if(platform == ProtoConstants.Platform.Platform_iPad || platform == ProtoConstants.Platform.Platform_APad || platform == ProtoConstants.Platform.Platform_HarmonyPad) {
+                statement.setInt(index++, ProtoConstants.Platform.Platform_iPad);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_APad);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_HarmonyPad);
             } else {
                 statement.setInt(index++, platform);
             }
@@ -1709,6 +1947,45 @@ public class DatabaseStore {
         return null;
     }
 
+    Set<String> getUserGroupIds(String userId, List<Integer> memberTypes) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select _gid from t_group_member where _mid = ? ";
+            if(!memberTypes.isEmpty()) {
+                sql += " and _type in (";
+                for (int i = 0; i < memberTypes.size(); i++) {
+                    if(i > 0) {
+                        sql += ",";
+                    }
+                    sql += memberTypes.get(i);
+                }
+                sql += ")";
+            }
+            statement = connection.prepareStatement(sql);
+
+            statement.setString(1, userId);
+
+            rs = statement.executeQuery();
+            Set<String> out = new HashSet<>();
+            while (rs.next()) {
+                String uid = rs.getString(1);
+                out.add(uid);
+            }
+            return out;
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return null;
+    }
+
+
     Set<String> getCommonGroupIds(String userId1, String userId2) {
         Connection connection = null;
         PreparedStatement statement = null;
@@ -2640,17 +2917,117 @@ public class DatabaseStore {
         return null;
     }
 
-    Set<String> getAllEnds() {
+    List<WFCMessage.User> getAllUsers(int count, int offset) {
+        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 order by _createTime limit ? offset ?";
+            statement = connection.prepareStatement(sql);
+
+            int index = 1;
+            statement.setInt(1, count);
+            statement.setInt(2, offset);
+
+
+            rs = statement.executeQuery();
+            while (rs.next()) {
+                WFCMessage.User.Builder builder = WFCMessage.User.newBuilder();
+                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;
+    }
+
+    Set<String> getAllEnds(boolean fromUserTable) {
         Connection connection = null;
         PreparedStatement statement = null;
         ResultSet rs = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "select distinct(`_uid`) from t_user_session where `_deleted` = 0";
+            String sql;
+            if(fromUserTable) {
+                sql = "select distinct(`_uid`) from t_user_session";
+            } else {
+                sql = "select distinct(`_uid`) from t_user where `_deleted` = 0 and `_type` <> 1 and `_type` <> 2";
+            }
             statement = connection.prepareStatement(sql);
 
-
-
             rs = statement.executeQuery();
             Set<String> out = new HashSet<>();
             while (rs.next()) {
@@ -3268,7 +3645,7 @@ public class DatabaseStore {
                 ", `_extra`" +
                 ", `_dt` from t_channel";
             if (buzzy) {
-                sql += " where `_name` like ?";
+                sql += " where `_name` like ? ESCAPE '!' ";
             } else {
                 sql += " where `_name` = ?";
             }
@@ -3282,6 +3659,12 @@ public class DatabaseStore {
                 sql += " offset " + page * 20;
             }
 
+            keyword = keyword
+                .replace("!", "!!")
+                .replace("%", "!%")
+                .replace("_", "!_")
+                .replace("[", "![");
+
             statement = connection.prepareStatement(sql);
             int index = 1;
             if (buzzy) {

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

@@ -23,6 +23,7 @@ import com.google.gson.Gson;
 import com.google.protobuf.ByteString;
 import com.hazelcast.core.*;
 import com.hazelcast.util.StringUtil;
+import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.model.FriendData;
 import cn.wildfirechat.common.ErrorCode;
@@ -35,6 +36,7 @@ import io.moquette.spi.IMessagesStore;
 import io.moquette.spi.impl.security.AES;
 import io.moquette.spi.security.Tokenor;
 import io.moquette.spi.impl.subscriptions.Topic;
+import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.mqtt.MqttVersion;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.json.simple.JSONObject;
@@ -44,6 +46,7 @@ import win.liyufan.im.*;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -135,18 +138,29 @@ public class MemoryMessagesStore implements IMessagesStore {
     private ConcurrentHashMap<String, Boolean> userPushHiddenDetail = new ConcurrentHashMap<>();
     private ConcurrentHashMap<String, Boolean> userConvSlientMap = new ConcurrentHashMap<>();
 
+    private LinkedHashMap<String, Long> repeatFriendRequest = new LinkedHashMap<String, Long>() {
+        @Override
+        protected boolean removeEldestEntry(Map.Entry<String, Long> eldest) {
+            return System.currentTimeMillis() - eldest.getValue() > 5 * 60 * 1000;
+        }
+    };
+
     private boolean mDisableSearch = false;
     private boolean mDisableNicknameSearch = false;
+    private boolean mDisableUserIdSearch = false;
     private boolean mDisableFriendRequest = false;
     private long mFriendRequestDuration = 7 * 24 * 60 * 60 * 1000;
     private long mFriendRejectDuration = 30 * 24 * 60 * 60 * 1000;
     private long mFriendRequestExpiration = 7 * 24 * 60 * 60 * 1000;
     private boolean mFriendRobotAutoAccept = true;
 
+    private long mPushExpiredTimes = 604800000L;
+
     private boolean mMultiPlatformNotification = false;
     private boolean mMobileDefaultSilentWhenPCOnline = true;
     private boolean mDisableStrangerChat = false;
     private Set<String> mAllowStrangerChatSet = new HashSet<>();
+    private boolean mDisableStrangerAddGroup = false;
 
     private Set<String> mClientSignatureSet = new HashSet<>();
     private boolean mRejectEmptySignature = true;
@@ -154,6 +168,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     private long mChatroomParticipantIdleTime = 900000;
     private boolean mChatroomRejoinWhenActive = true;
     private boolean mChatroomCreateWhenNotExist = true;
+    private boolean mChatroomKickoffOtherPlatform = true;
 
     private List<Integer> mForbiddenClientSendTypes = new ArrayList<>();
     private List<Integer> mBlackListExceptionTypes = new ArrayList<>();
@@ -169,6 +184,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     private String mChannelInfoUpdateCallback;
     private String mChatroomInfoUpdateCallback;
     private String mChatroomMemberUpdateCallback;
+    private boolean mGroupAllowOwnerRecallSelfMsg = false;
+    private boolean mGroupAllowManagerRecallSelfMsg = false;
     private boolean mGroupAllowClientCustomOperationNotification;
     private boolean mGroupAllowRobotCustomOperationNotification;
     private int mGroupVisibleQuitKickoffNotification;
@@ -177,6 +194,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     private boolean keepDisplayNameWhenDestroyUser = true;
     private String mRecallForwardUrl = null;
 
+    private boolean mBroadcastTargetFromUserTable = false;
+
     private boolean mForwardMessageWithClientInfo = false;
     private boolean mRobotCallbackWithClientInfo = false;
     private boolean mChannelCallbackWithClientInfo = false;
@@ -266,6 +285,12 @@ public class MemoryMessagesStore implements IMessagesStore {
             Utility.printExecption(LOG, e);
             printMissConfigLog(FRIEND_Disable_NickName_Search, mDisableNicknameSearch + "");
         }
+        try {
+            mDisableUserIdSearch = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.FRIEND_Disable_UserId_Search, "true"));
+        } catch (Exception e) {
+
+        }
+
         try {
             mDisableFriendRequest = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.FRIEND_Disable_Friend_Request));
         } catch (Exception e) {
@@ -304,6 +329,12 @@ public class MemoryMessagesStore implements IMessagesStore {
         } catch (Exception e) {
         }
 
+        try {
+            mPushExpiredTimes = Long.parseLong(m_Server.getConfig().getProperty(BrokerConstants.MESSAGE_Push_Expired_Days, "7")) * 86400000L;
+            if(mPushExpiredTimes == 0) mPushExpiredTimes = Long.MAX_VALUE;
+        } catch (Exception e) {
+        }
+
         try {
             mChatroomRejoinWhenActive = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.CHATROOM_Rejoin_When_Active));
         } catch (Exception e) {
@@ -320,6 +351,12 @@ public class MemoryMessagesStore implements IMessagesStore {
             printMissConfigLog(CHATROOM_Create_When_Not_Exist, mChatroomCreateWhenNotExist + "");
         }
 
+        try {
+            mChatroomKickoffOtherPlatform = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.CHATROOM_Kickoff_Other_Platform, "true"));
+        } catch (Exception e) {
+        }
+
+
         try {
             mChatroomParticipantIdleTime = Long.parseLong(m_Server.getConfig().getProperty(CHATROOM_Participant_Idle_Time, "900000"));
         } catch (Exception e) {
@@ -451,6 +488,17 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         }
 
+        try {
+            mGroupAllowOwnerRecallSelfMsg = Boolean.parseBoolean(server.getConfig().getProperty(GROUP_Allow_Owner_Recall_Self_Msg, "true"));
+        } catch (Exception e) {
+
+        }
+        try {
+            mGroupAllowManagerRecallSelfMsg = Boolean.parseBoolean(server.getConfig().getProperty(GROUP_Allow_Manager_Recall_Self_Msg, "false"));
+        } catch (Exception e) {
+
+        }
+
         try {
             mGroupAllowClientCustomOperationNotification = Boolean.parseBoolean(server.getConfig().getProperty(GROUP_Allow_Client_Custom_Operation_Notification));
         } catch (Exception e) {
@@ -469,6 +517,11 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         }
 
+        try {
+            mDisableStrangerAddGroup = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.GROUP_Disable_Stranger_Invite, "false"));
+        } catch (Exception e) {
+        }
+
         try {
             String s = server.getConfig().getProperty(GROUP_Forbidden_Client_Operation, null);
             if(!StringUtil.isNullOrEmptyAfterTrim(s)) {
@@ -516,6 +569,13 @@ public class MemoryMessagesStore implements IMessagesStore {
         } catch (Exception e) {
 
         }
+
+        try {
+            mBroadcastTargetFromUserTable = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.BROADCAST_Target_From_User_Table, "false"));
+        } catch (Exception e) {
+
+        }
+
         try {
             mRobotCallbackWithClientInfo = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.ROBOT_Callback_With_Client_Info, "false"));
         } catch (Exception e) {
@@ -704,7 +764,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public Set<String> getAllEnds() {
-        return databaseStore.getAllEnds();
+        return databaseStore.getAllEnds(mBroadcastTargetFromUserTable);
     }
     @Override
     public WFCMessage.PullMessageResult fetchMessage(String user, String exceptClientId, long fromMessageId, int pullType) {
@@ -810,7 +870,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                         }
 
                         if (bundle.getMessage().getContent().getExpireDuration() > 0) {
-                            if (System.currentTimeMillis() > bundle.getMessage().getServerTimestamp() + bundle.getMessage().getContent().getExpireDuration()*1000) {
+                            if (System.currentTimeMillis() > bundle.getMessage().getServerTimestamp() + bundle.getMessage().getContent().getExpireDuration()* 1000L) {
                                 continue;
                             }
                         }
@@ -896,7 +956,29 @@ public class MemoryMessagesStore implements IMessagesStore {
         Collection<UserClientEntry> members = chatroomMembers.get(chatroomId);
         return members;
     }
-    //Todo chatroom
+
+    @Override
+    public OutputUserChatroom getUserChatroom(String userId) {
+        String chatroomId = (String) m_Server.getHazelcastInstance().getMap(USER_CHATROOM).get(userId);
+        if(chatroomId != null) {
+            MultiMap<String, UserClientEntry> chatroomMembers = m_Server.getHazelcastInstance().getMultiMap(CHATROOM_MEMBER_IDS);
+            for (UserClientEntry userClientEntry : chatroomMembers.get(chatroomId)) {
+                if(userClientEntry.userId.equals(userId)) {
+                    OutputUserChatroom outputUserChatroom = new OutputUserChatroom();
+                    outputUserChatroom.userId = userId;
+                    outputUserChatroom.chatroomId = chatroomId;
+                    outputUserChatroom.clientId = userClientEntry.clientId;
+                    MemorySessionStore.Session session = m_Server.getStore().sessionsStore().getSession(userClientEntry.clientId);
+                    if(session != null) {
+                        outputUserChatroom.platform = session.getPlatform();
+                    }
+                    return outputUserChatroom;
+                }
+            }
+        }
+        return null;
+    }
+
     @Override
     public WFCMessage.PullMessageResult fetchChatroomMessage(String fromUser, String chatroomId, String exceptClientId, long fromMessageId) {
         WFCMessage.PullMessageResult.Builder builder = WFCMessage.PullMessageResult.newBuilder();
@@ -1119,6 +1201,85 @@ public class MemoryMessagesStore implements IMessagesStore {
         return messageSeq;
     }
 
+    @Override
+    public ErrorCode canAddGroupMembers(String fromUser, List<WFCMessage.GroupMember> memberList) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+        IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
+
+        WFCMessage.User operator = mUserMap.get(fromUser);
+        if(operator != null && operator.getType() > 1) {
+            return ErrorCode.ERROR_CODE_SUCCESS;
+        }
+
+        if (mDisableStrangerAddGroup) {
+            for (WFCMessage.GroupMember groupMember : memberList) {
+                String targetUser = groupMember.getMemberId();
+                if(fromUser.equals(targetUser)) {
+                    continue;
+                }
+
+                Collection<FriendData> friendDatas = friendsMap.get(targetUser);
+                if (friendDatas == null || friendDatas.size() == 0) {
+                    friendDatas = loadFriend(friendsMap, targetUser);
+                }
+
+                boolean allow = false;
+                for (FriendData friendData : friendDatas) {
+                    if (friendData.getFriendUid().equals(fromUser)) {
+                        if (friendData.getBlacked() == 1) {
+                            return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
+                        } else {
+                            if (friendData.getState() == 0) {
+                                allow = true;
+                            }
+                            break;
+                        }
+                    }
+                }
+                if(allow) {
+                    continue;
+                }
+
+                //在禁止私聊时，是否是允许私聊的用户id
+                if(mAllowStrangerChatSet.contains(targetUser) || mAllowStrangerChatSet.contains(fromUser)) {
+                    continue;
+                }
+
+                //在禁止私聊时，允许机器人，物联网设备及管理员进行私聊。
+                WFCMessage.User target = mUserMap.get(targetUser);
+                if (target != null && target.getType() != ProtoConstants.UserType.UserType_Normal) {
+                    continue;
+                }
+
+                return ErrorCode.ERROR_CODE_NOT_RIGHT;
+            }
+        } else {
+            for (WFCMessage.GroupMember groupMember : memberList) {
+                String targetUser = groupMember.getMemberId();
+                if(fromUser.equals(targetUser)) {
+                    continue;
+                }
+
+                Collection<FriendData> friendDatas = friendsMap.get(targetUser);
+                if (friendDatas == null || friendDatas.size() == 0) {
+                    friendDatas = loadFriend(friendsMap, targetUser);
+                }
+
+                for (FriendData friendData : friendDatas) {
+                    if (friendData.getFriendUid().equals(fromUser)) {
+                        if (friendData.getBlacked() == 1) {
+                            return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return ErrorCode.ERROR_CODE_SUCCESS;
+    }
+
     @Override
     public WFCMessage.GroupInfo createGroup(String fromUser, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList, String memberExtra, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -1194,17 +1355,35 @@ public class MemoryMessagesStore implements IMessagesStore {
         mIMap.set(groupId, groupInfo);
         databaseStore.persistGroupMember(groupId, updatedMemberList, false);
 
-        callbackGroupEvent(fromUser, groupInfo.getTargetId(), ProtoConstants.GroupUpdateEventType.Group_Event_Create);
+        callbackGroupEvent(fromUser, groupInfo.getTargetId(), ProtoConstants.GroupUpdateEventType.Group_Event_Create, groupInfo);
         return groupInfo;
     }
 
 
-    private void callbackGroupEvent(String operatorId, String groupId, int type) {
+    private void callbackGroupEvent(String operatorId, String groupId, int type, WFCMessage.GroupInfo groupInfo) {
         if (!StringUtil.isNullOrEmpty(mGroupInfoUpdateCallback)) {
             GroupUpdateEvent event = new GroupUpdateEvent();
             event.operatorId = operatorId;
             event.groupId = groupId;
             event.type = type;
+            PojoGroupInfo pojoGroupInfo = new PojoGroupInfo();
+            event.groupInfo = pojoGroupInfo;
+            if (groupInfo != null) {
+                pojoGroupInfo.setExtra(groupInfo.getExtra());
+                pojoGroupInfo.setName(groupInfo.getName());
+                pojoGroupInfo.setOwner(groupInfo.getOwner());
+                pojoGroupInfo.setPortrait(groupInfo.getPortrait());
+                pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
+                pojoGroupInfo.setType(groupInfo.getType());
+                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);
+            }
+
             m_Server.getCallbackScheduler().execute(() -> {
                 try {
                     HttpUtils.httpJsonPost(mGroupInfoUpdateCallback, GsonUtil.gson.toJson(event), HttpUtils.HttpPostType.POST_TYPE_Grout_Event_Callback);
@@ -1618,7 +1797,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         removeFavGroup(groupId, ids);
         removeGroupUserSettings(groupId, ids);
 
-        callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Destroy);
+        callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Destroy, groupInfo);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -1703,12 +1882,12 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         if (modifyType == Modify_Group_Mute) {
             if (newInfoBuilder.getMute() > 0) {
-                callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Mute);
+                callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Mute, newInfoBuilder.build());
             } else {
-                callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Unmute);
+                callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Unmute, newInfoBuilder.build());
             }
         } else {
-            callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Update);
+            callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Update, newInfoBuilder.build());
         }
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
@@ -1927,6 +2106,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return databaseStore.getUserGroupIds(userId);
     }
 
+    @Override
+    public Set<String> getUserGroupIds(String userId, List<Integer> memberTypes) {
+        return databaseStore.getUserGroupIds(userId, memberTypes);
+    }
+
     @Override
     public Set<String> getCommonGroupIds(String userId1, String userId2) {
         return databaseStore.getCommonGroupIds(userId1, userId2);
@@ -2050,7 +2234,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Transfer);
+        callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Transfer, groupInfo);
 
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
@@ -2072,6 +2256,10 @@ public class MemoryMessagesStore implements IMessagesStore {
             return ErrorCode.ERROR_CODE_NOT_RIGHT;
         }
 
+        if(userList.contains(groupInfo.getOwner())) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         long updateDt = System.currentTimeMillis();
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
         Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
@@ -2177,7 +2365,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode recallMessage(long messageUid, String operatorId, String clientId, boolean isAdmin) {
+    public ErrorCode recallMessage(long messageUid, String operatorId, String clientId, boolean isAdmin, ByteBuf ackPayload) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<Long, MessageBundle> mIMap = hzInstance.getMap(MESSAGES_MAP);
 
@@ -2206,7 +2394,28 @@ public class MemoryMessagesStore implements IMessagesStore {
                     return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
                 }
                 if (operatorId.equals(groupInfo.getOwner())) {
-                    canRecall = true;
+                    if(operatorId.equals(message.getFromUser())) {
+                        if(mGroupAllowOwnerRecallSelfMsg) {
+                            canRecall = true;
+                        }
+                    } else {
+                        canRecall = true;
+                    }
+                } else {
+                    if(message.getFromUser().equals(operatorId) && mGroupAllowManagerRecallSelfMsg) {
+                        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+                        Collection<WFCMessage.GroupMember> members = groupMembers.get(message.getConversation().getTarget());
+                        if (members == null || members.size() == 0) {
+                            members = loadGroupMemberFromDB(hzInstance, message.getConversation().getTarget());
+                        }
+                        for (WFCMessage.GroupMember member : members) {
+                            if (member.getMemberId().equals(operatorId)) {
+                                if (member.getType() == GroupMemberType_Manager || member.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Owner) {
+                                    canRecall = true;
+                                }
+                            }
+                        }
+                    }
                 }
 
                 if(!canRecall && !message.getFromUser().equals(operatorId)) {
@@ -2272,7 +2481,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             json.put("c", message.getContent().getContent());
             json.put("e", message.getContent().getExtra());
             if (message.getContent().getData() != null && message.getContent().getData().size() > 0) {
-                json.put("b", Base64.getEncoder().encode(message.getContent().getData().toByteArray()));
+                json.put("b", Base64.getEncoder().encodeToString(message.getContent().getData().toByteArray()));
             }
             if (message.getContent().getMediaType() > 0) {
                 json.put("mt", message.getContent().getMediaType());
@@ -2303,6 +2512,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             databaseStore.deleteMessage(messageUid);
 
             mIMap.put(messageUid, messageBundle, 7, TimeUnit.DAYS);
+            ackPayload.writeBytes(recalledContent.getBytes(StandardCharsets.UTF_8));
             return ErrorCode.ERROR_CODE_SUCCESS;
         } else {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
@@ -2553,6 +2763,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         String pcValue = null;
+        String padValue = null;
         for (MemorySessionStore.Session s : m_Server.getStore().sessionsStore().sessionForUser(session.username)) {
             if (s.getDeleted() != 0 || !m_Server.getConnectionsManager().isConnected(s.getClientID())) {
                 continue;
@@ -2562,8 +2773,14 @@ public class MemoryMessagesStore implements IMessagesStore {
                 case Platform_LINUX:
                 case Platform_Windows:
                 case Platform_OSX:
+                case Platform_HarmonyPC:
                     pcValue = System.currentTimeMillis() + "|" + s.getPlatform() + "|" + s.getClientID() + "|" + s.getPhoneName();
                     break;
+                case Platform_iPad:
+                case Platform_APad:
+                case Platform_HarmonyPad:
+                    padValue = System.currentTimeMillis() + "|" + s.getPlatform() + "|" + s.getClientID() + "|" + s.getPhoneName();
+                    break;
                 default:
                     break;
             }
@@ -2573,6 +2790,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (!isOnlineValueEqual(pcentry, pcValue)) {
             updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(pcValue==null?"":pcValue).build(), session.clientID);
         }
+
+        WFCMessage.UserSettingEntry padentry = getUserSetting(session.getUsername(), kUserSettingPCOnline, "Pad");
+        if (!isOnlineValueEqual(padentry, padValue)) {
+            updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("Pad").setValue(padValue==null?"":padValue).build(), session.clientID);
+        }
     }
 
     @Override
@@ -2671,7 +2893,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())) {
@@ -2679,7 +2901,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
         databaseStore.updateUser(user);
         mUserMap.put(user.getUid(), user);
-        databaseStore.updateUserPassword(user.getUid(), password);
 
         callbackUserInfoEvent(user);
     }
@@ -2764,6 +2985,12 @@ public class MemoryMessagesStore implements IMessagesStore {
         String userId = databaseStore.getUserIdByMobile(mobile);
         return getUserInfo(userId);
     }
+
+    @Override
+    public List<WFCMessage.User> getUserInfoList(int count, int offset) {
+        return databaseStore.getAllUsers(count, offset);
+    }
+
     @Override
     public List<WFCMessage.User> searchUser(String keyword, int searchType, int page) {
         if (mDisableSearch) {
@@ -2771,9 +2998,21 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         if (mDisableNicknameSearch && searchType == ProtoConstants.SearchUserType.SearchUserType_General) {
+            searchType = ProtoConstants.SearchUserType.SearchUserType_Name_Mobile_UserId;
+        }
+
+        if(mDisableUserIdSearch && searchType == ProtoConstants.SearchUserType.SearchUserType_Name_Mobile_UserId) {
             searchType = ProtoConstants.SearchUserType.SearchUserType_Name_Mobile;
         }
 
+        if(mDisableUserIdSearch && searchType == ProtoConstants.SearchUserType.SearchUserType_General) {
+            searchType = ProtoConstants.SearchUserType.SearchUserType_Name_Mobile_DisplayName;
+        }
+
+        if(mDisableUserIdSearch && searchType == ProtoConstants.SearchUserType.SearchUserType_UserId) {
+            return new ArrayList<>();
+        }
+
         return databaseStore.searchUserFromDB(keyword, searchType, page);
     }
 
@@ -2928,7 +3167,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         if (mDisableStrangerChat) {
             //在禁止私聊时，是否是允许私聊的用户id
-            if(mAllowStrangerChatSet.contains(targetUser)) {
+            if(mAllowStrangerChatSet.contains(targetUser) || mAllowStrangerChatSet.contains(fromUser)) {
                 return ErrorCode.ERROR_CODE_SUCCESS;
             }
 
@@ -3091,37 +3330,40 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && !isAdmin) {
-            if (mFriendRequestDuration > 0 && System.currentTimeMillis() - existRequest.getUpdateDt() > mFriendRequestDuration) {
-                if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected
-                    && System.currentTimeMillis() - existRequest.getUpdateDt() < mFriendRejectDuration) {
-                    return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED;
+            if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected
+                && System.currentTimeMillis() - existRequest.getUpdateDt() < mFriendRejectDuration) {
+                return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED;
+            }
+
+            if (!(mFriendRequestDuration > 0 && System.currentTimeMillis() - existRequest.getUpdateDt() > mFriendRequestDuration)) {
+                if(System.currentTimeMillis() - existRequest.getUpdateDt() > 5 * 60 * 1000) {
+                    return ErrorCode.ERROR_CODE_FRIEND_ALREADY_REQUEST;
+                } else {
+                    mWriteLock.lock();
+                    try {
+                        String repeatKey = userId + "-" + existRequest.getToUid();
+                        Long lastTime = repeatFriendRequest.get(repeatKey);
+                        if(lastTime != null && System.currentTimeMillis() - lastTime < 5 * 60 * 1000) {
+                            return ErrorCode.ERROR_CODE_FRIEND_ALREADY_REQUEST;
+                        }
+                        repeatFriendRequest.put(repeatKey, System.currentTimeMillis());
+                    } finally {
+                        mWriteLock.unlock();
+                    }
                 }
-            } else {
-                return ErrorCode.ERROR_CODE_FRIEND_ALREADY_REQUEST;
             }
         }
 
-        MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
-
-        FriendData friendData1 = null;
-        Collection<FriendData> friendDatas = friendsMap.get(userId);
-        if (friendDatas == null || friendDatas.size() == 0) {
-            friendDatas = loadFriend(friendsMap, userId);
-        }
-        for (FriendData fd : friendDatas) {
-            if (fd.getFriendUid().equals(request.getTargetUid())) {
-                friendData1 = fd;
-                break;
-            }
-        }
-        if (friendData1 != null && friendData1.getBlacked() > 0 && !isAdmin) {
-            return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
-        }
-
+        FriendData friendData1 = getFriendData(userId, request.getTargetUid());
         if (friendData1 != null && friendData1.getState() == 0) {
             return ErrorCode.ERROR_CODE_ALREADY_FRIENDS;
         }
 
+        FriendData friendData2 = getFriendData(request.getTargetUid(), userId);
+        if (friendData2 != null && friendData2.getBlacked() > 0 && !isAdmin) {
+            return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
+        }
+
         WFCMessage.FriendRequest newRequest = WFCMessage.FriendRequest
             .newBuilder()
             .setFromUid(userId)
@@ -3460,9 +3702,25 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
+        MultiMap<String, UserClientEntry> chatroomMembers = m_Server.getHazelcastInstance().getMultiMap(CHATROOM_MEMBER_IDS);
+        String alreadyInChatroom = (String) m_Server.getHazelcastInstance().getMap(USER_CHATROOM).get(userId);
+        if(alreadyInChatroom != null) {
+            for (UserClientEntry userClientEntry : chatroomMembers.get(alreadyInChatroom)) {
+                if(userClientEntry.userId.equals(userId)) {
+                    if(!chatroomId.equals(alreadyInChatroom) || !userClientEntry.clientId.equals(clientId)) {
+                        if(mChatroomKickoffOtherPlatform) {
+                            handleQuitChatroom(userId, userClientEntry.clientId, chatroomId);
+                        } else {
+                            return ErrorCode.ERROR_CODE_OTHER_CLIENT_ALREADY_IN_CHATROOM;
+                        }
+                    }
+                }
+            }
+        }
+
         m_Server.getStore().sessionsStore().getSession(clientId).refreshLastChatroomActiveTime();
         m_Server.getHazelcastInstance().getMap(USER_CHATROOM).put(userId, chatroomId);
-        m_Server.getHazelcastInstance().getMultiMap(CHATROOM_MEMBER_IDS).put(chatroomId, new UserClientEntry(userId, clientId));
+        chatroomMembers.put(chatroomId, new UserClientEntry(userId, clientId));
 
         mWriteLock.lock();
         chatroomMessages.put(userId, new TreeMap<>());
@@ -4144,6 +4402,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return databaseStore.searchChannelFromDB(keyword, buzzy, page);
     }
 
+
+    @Override
+    public List<String> getListenedChannels(String userId) {
+        return databaseStore.getUserChannels(userId);
+    }
     @Override
     public ErrorCode listenChannel(String operator, String channelId, boolean listen) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -4236,6 +4499,35 @@ public class MemoryMessagesStore implements IMessagesStore {
         return getChannelListener(channelId);
     }
 
+    @Override
+    public int getOnlineUserCount() {
+        return m_Server.getProcessor().getConnectionDescriptors().getActiveConnectionsNo();
+    }
+
+    @Override
+    public GetOnlineUserResult getOnlineUsers(int offset, int count) {
+        List<String> onlineUserIds = new ArrayList<>(m_Server.getProcessor().getConnectionDescriptors().getConnectedClientIds());
+        GetOnlineUserResult result = new GetOnlineUserResult();
+        result.userClients = new ArrayList<>();
+        result.totalCount = onlineUserIds.size();
+        result.offset = offset;
+
+        if(onlineUserIds.size() > offset) {
+            List<String> clientIds = onlineUserIds.subList(offset, Math.min(offset+count, onlineUserIds.size()));
+            for (String clientId : clientIds) {
+                MemorySessionStore.Session session = m_Server.getStore().sessionsStore().getSession(clientId);
+                if(session != null) {
+                    GetOnlineUserResult.UserClient userClient = new GetOnlineUserResult.UserClient();
+                    userClient.userId = session.getUsername();
+                    userClient.clientId = session.getClientID();
+                    userClient.platform = session.getPlatform();
+                    result.userClients.add(userClient);
+                }
+            }
+        }
+        return result;
+    }
+
     @Override
     public Set<String> handleSensitiveWord(String message) {
         updateSensitiveWord();
@@ -4318,6 +4610,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return mFriendRobotAutoAccept;
     }
 
+    @Override
+    public long getPushExpiredTimes() {
+        return mPushExpiredTimes;
+    }
+
     @Override
     public List<Integer> getClientForbiddenSendTypes() {
         return mForbiddenClientSendTypes;

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

@@ -40,6 +40,7 @@ public class MemorySessionStore implements ISessionsStore {
 
     private boolean supportMultiEndpoint = false;
     private boolean supportMultiPCEndpoint = false;
+    private boolean supportMultiPadEndpoint = false;
     private boolean clientSupportKickoff = false;
 
     public static class Session implements Comparable<Session>{
@@ -292,6 +293,10 @@ public class MemorySessionStore implements ISessionsStore {
             supportMultiPCEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_PC_ENDPOINT, "false"));
         } catch (Exception e) {
         }
+        try {
+            supportMultiPadEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_PAD_ENDPOINT, "false"));
+        } catch (Exception e) {
+        }
 
         try {
             clientSupportKickoff = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_CLIENT_SUPPORT_KICKOFF_EVENT, "false"));
@@ -396,6 +401,10 @@ public class MemorySessionStore implements ISessionsStore {
             && !(platform == ProtoConstants.Platform.Platform_Windows && supportMultiPCEndpoint)
             && !(platform == ProtoConstants.Platform.Platform_LINUX && supportMultiPCEndpoint)
             && !(platform == ProtoConstants.Platform.Platform_OSX && supportMultiPCEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_HarmonyPC && supportMultiPCEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_iPad && supportMultiPadEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_APad && supportMultiPadEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_HarmonyPad && supportMultiPadEndpoint)
         ) {
             databaseStore.clearMultiEndpoint(username, clientID, platform);
             if (userSessions.get(username) != null) {
@@ -410,15 +419,19 @@ public class MemorySessionStore implements ISessionsStore {
                         }
 
                         boolean remove = false;
-                        if (platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_iOS) {
-                            if (s.getPlatform() == ProtoConstants.Platform.Platform_Android || s.getPlatform() == ProtoConstants.Platform.Platform_iOS) {
+                        if (platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Harmony) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_Android || s.getPlatform() == ProtoConstants.Platform.Platform_iOS || s.getPlatform() == ProtoConstants.Platform.Platform_Harmony) {
                                 remove = true;
                             }
-                        } else if(platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_LINUX) {
-                            if (s.getPlatform() == ProtoConstants.Platform.Platform_OSX || s.getPlatform() == ProtoConstants.Platform.Platform_Windows || s.getPlatform() == ProtoConstants.Platform.Platform_LINUX) {
+                        } else if(platform == ProtoConstants.Platform.Platform_iPad || platform == ProtoConstants.Platform.Platform_APad || platform == ProtoConstants.Platform.Platform_HarmonyPad) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_iPad || s.getPlatform() == ProtoConstants.Platform.Platform_APad || s.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad) {
                                 remove = true;
                             }
-                        } else {
+                        } else if(platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_LINUX || platform == ProtoConstants.Platform.Platform_HarmonyPC) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_OSX || s.getPlatform() == ProtoConstants.Platform.Platform_Windows || s.getPlatform() == ProtoConstants.Platform.Platform_LINUX || s.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPC) {
+                                remove = true;
+                            }
+                        } else { //web, microapp
                             if (s.getPlatform() ==platform) {
                                 remove = true;
                             }
@@ -615,6 +628,11 @@ public class MemorySessionStore implements ISessionsStore {
         return result;
     }
 
+    @Override
+    public boolean isClientOnline(String clientId) {
+        return mServer.getProcessor().getConnectionDescriptors().isConnected(clientId);
+    }
+
     @Override
     public StoredMessage inFlightAck(String clientID, int messageID) {
         return getSession(clientID).outboundFlightMessages.remove(messageID);
@@ -742,7 +760,12 @@ public class MemorySessionStore implements ISessionsStore {
             if (session.getPlatform() == ProtoConstants.Platform.Platform_LINUX
                 || session.getPlatform() == ProtoConstants.Platform.Platform_WEB
                 || session.getPlatform() == ProtoConstants.Platform.Platform_Windows
-                || session.getPlatform() == ProtoConstants.Platform.Platform_OSX) {
+                || session.getPlatform() == ProtoConstants.Platform.Platform_OSX
+                || session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPC
+                || session.getPlatform() == ProtoConstants.Platform.Platform_iPad
+                || session.getPlatform() == ProtoConstants.Platform.Platform_APad
+                || session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad
+            ) {
                 databaseStore.updateSessionDeleted(operator, pcClientId, 1);
                 sessions.remove(pcClientId);
                 mServer.getProcessor().kickoffSession(session);

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

@@ -357,7 +357,11 @@ public class Server {
     private String getServerIp(IConfig config) {
         String serverIp = config.getProperty(BrokerConstants.SERVER_IP_PROPERTY_NAME);
         if (serverIp == null || serverIp.equals("0.0.0.0")) {
-            serverIp = Utility.getLocalAddress().getHostAddress();
+            if(Utility.getLocalAddress() != null) {
+                serverIp = Utility.getLocalAddress().getHostAddress();
+            } else {
+                serverIp = "0.0.0.0";
+            }
         }
         return serverIp;
     }

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

@@ -16,12 +16,10 @@
 
 package io.moquette.spi;
 
-import cn.wildfirechat.pojos.InputOutputUserInfo;
-import cn.wildfirechat.pojos.SystemSettingPojo;
+import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import com.xiaoleilu.loServer.model.FriendData;
-import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
 import io.moquette.persistence.DatabaseStore;
 import io.moquette.persistence.MemorySessionStore;
 import io.moquette.persistence.UserClientEntry;
@@ -31,10 +29,7 @@ import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import cn.wildfirechat.common.ErrorCode;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Defines the SPI to be implemented by a StorageService that handle persistence of messages
@@ -107,6 +102,7 @@ public interface IMessagesStore {
     WFCMessage.PullMessageResult fetchMessage(String user, String exceptClientId, long fromMessageId, int pullType);
     WFCMessage.PullMessageResult loadRemoteMessages(String user, WFCMessage.Conversation conversation, long beforeUid, int count, Collection<Integer> contentTypes);
     long insertUserMessages(String sender, int conversationType, String target, int line, int messageContentType, String userId, long messageId, boolean directing);
+    ErrorCode canAddGroupMembers(String operator, List<WFCMessage.GroupMember> memberList);
     WFCMessage.GroupInfo createGroup(String operator, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList, String memberExtra, boolean isAdmin);
     ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList, String extra);
     ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList);
@@ -119,6 +115,7 @@ public interface IMessagesStore {
     List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests, String fromUser, boolean isAdmin);
     WFCMessage.GroupInfo getGroupInfo(String groupId);
     Set<String> getUserGroupIds(String userId);
+    Set<String> getUserGroupIds(String userId, List<Integer> types);
     Set<String> getCommonGroupIds(String userId1, String userId2);
     ErrorCode getGroupMembers(String fromUser, String groupId, long maxDt, List<WFCMessage.GroupMember> members);
     WFCMessage.GroupMember getGroupMember(String groupId, String memberId);
@@ -128,7 +125,7 @@ public interface IMessagesStore {
     ErrorCode canSendMessageInGroup(String member, String groupId);
     Set<String> getGroupManagers(String groupId, boolean includeOwner);
 
-    ErrorCode recallMessage(long messageUid, String operatorId, String clientId, boolean isAdmin);
+    ErrorCode recallMessage(long messageUid, String operatorId, String clientId, boolean isAdmin, ByteBuf ackPayload);
     ErrorCode recallCastMessage(long messageUid, String operatorId);
 
     void clearUserMessages(String userId);
@@ -150,7 +147,7 @@ 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);
@@ -158,6 +155,8 @@ public interface IMessagesStore {
     WFCMessage.User getUserInfoByMobile(String mobile);
     List<WFCMessage.User> searchUser(String keyword, int searchType, int page);
 
+    List<WFCMessage.User> getUserInfoList(int count, int offset);
+
     boolean updateSystemSetting(int id, String value, String desc);
     SystemSettingPojo getSystemSetting(int id);
     void createChatroom(String chatroomId, WFCMessage.ChatroomInfo chatroomInfo);
@@ -170,6 +169,7 @@ public interface IMessagesStore {
 
     long insertChatroomMessages(String target, int line, long messageId);
     Collection<UserClientEntry> getChatroomMembers(String chatroomId);
+    OutputUserChatroom getUserChatroom(String userId);
     WFCMessage.PullMessageResult fetchChatroomMessage(String fromUser, String chatroomId, String exceptClientId, long fromMessageId);
 
     ErrorCode verifyToken(String userId, String token, List<String> serverIPs, List<Integer> ports);
@@ -216,12 +216,16 @@ public interface IMessagesStore {
     ErrorCode transferChannel(String operator, String channelId, String newOwner);
     ErrorCode destroyChannel(String operator, String channelId, boolean isAdmin);
     List<WFCMessage.ChannelInfo> searchChannel(String keyword, boolean buzzy, int page);
+    List<String> getListenedChannels(String userId);
     ErrorCode listenChannel(String operator, String channelId, boolean listen);
     WFCMessage.ChannelInfo getChannelInfo(String channelId);
     boolean canSendMessageInChannel(String user, String channelId);
     boolean checkUserInChannel(String user, String channelId);
     Collection<String> getChannelSubscriber(String channelId);
 
+    int getOnlineUserCount();
+    GetOnlineUserResult getOnlineUsers(int offset, int count);
+
     Set<String> handleSensitiveWord(String message);
     boolean addSensitiveWords(List<String> words);
     boolean removeSensitiveWords(List<String> words);
@@ -241,6 +245,8 @@ public interface IMessagesStore {
 
     boolean isRobotAutoAcceptFriendRequest();
 
+    long getPushExpiredTimes();
+
     List<Integer> getClientForbiddenSendTypes();
     List<Integer> getBlackListExceptionTypes();
     List<Integer> getGroupMuteExceptionTypes();

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

@@ -74,6 +74,8 @@ public interface ISessionsStore {
      */
     Collection<ClientSession> getAllSessions();
 
+    boolean isClientOnline(String clientId);
+
     StoredMessage inFlightAck(String clientID, int messageID);
 
     /**

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

@@ -35,14 +35,11 @@ import io.moquette.spi.ISessionsStore;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.mqtt.*;
-import win.liyufan.im.GsonUtil;
-import win.liyufan.im.HttpUtils;
-import win.liyufan.im.IMTopic;
+import win.liyufan.im.*;
 
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import win.liyufan.im.Utility;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -168,6 +165,9 @@ public class MessagesPublisher {
         }
 
         WFCMessage.Message message = null;
+        String senderName = null;
+        String senderPortrait = null;
+        boolean sendNameLoaded = false;
         for (String user : receivers) {
             if (!user.equals(sender)) {
                 WFCMessage.User userInfo = m_messagesStore.getUserInfo(user);
@@ -207,10 +207,10 @@ public class MessagesPublisher {
             }
 
             Collection<Session> sessions = m_sessionsStore.sessionForUser(user);
-            String senderName = null;
-            String targetName = null;
-            boolean nameLoaded = false;
 
+            String targetName = null;
+            String targetPortrait = null;
+            boolean targetNameLoaded = false;
 
             Collection<String> targetClients = null;
             if (pullType == ProtoConstants.PullType.Pull_ChatRoom) {
@@ -223,7 +223,12 @@ public class MessagesPublisher {
                     if (targetSession.getPlatform() == ProtoConstants.Platform.Platform_WEB
                         || targetSession.getPlatform() == ProtoConstants.Platform.Platform_Windows
                         || targetSession.getPlatform() == ProtoConstants.Platform.Platform_LINUX
-                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_OSX) {
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_OSX
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPC
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_iPad
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_APad
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad
+                    ) {
                         boolean targetIsActive = this.connectionDescriptors.isConnected(targetSession.getClientSession().clientID);
                         if (targetIsActive) {
                             isPcOnline = true;
@@ -235,7 +240,7 @@ public class MessagesPublisher {
 
             for (Session targetSession : sessions) {
                 //超过7天不活跃的用户忽略
-                if(System.currentTimeMillis() - targetSession.getLastActiveTime() > 7 * 24 * 60 * 60 * 1000) {
+                if(System.currentTimeMillis() - targetSession.getLastActiveTime() > m_messagesStore.getPushExpiredTimes()) {
                     continue;
                 }
 
@@ -386,10 +391,22 @@ public class MessagesPublisher {
 
                     boolean isHiddenDetail = m_messagesStore.getUserPushHiddenDetail(user);
 
-                    if(!nameLoaded) {
-                        senderName = getUserDisplayName(sender, conversationType == ProtoConstants.ConversationType.ConversationType_Group ? target : null);
-                        targetName = getTargetName(target, conversationType);
-                        nameLoaded = true;
+                    if(!sendNameLoaded) {
+                        List<String> list = new ArrayList<>();
+                        senderName = getUserDisplayName(sender, conversationType == ProtoConstants.ConversationType.ConversationType_Group ? target : null, list);
+                        if(!list.isEmpty()) {
+                            senderPortrait = list.get(0);
+                        }
+                        sendNameLoaded = true;
+                    }
+
+                    if(!targetNameLoaded) {
+                        List<String> list = new ArrayList<>();
+                        targetName = getTargetName(target, conversationType, user, list);
+                        if(!list.isEmpty()) {
+                            targetPortrait = list.get(0);
+                        }
+                        targetNameLoaded = true;
                     }
 
                     String name = senderName;
@@ -399,7 +416,7 @@ public class MessagesPublisher {
                             name = fd.getAlias();
                         }
                     }
-                    this.messageSender.sendPush(sender, conversationType, target, line, messageId, targetSession.getClientID(), pushContent, pushData, messageContentType, serverTime, name, targetName, targetSession.getUnReceivedMsgs(), curMentionType, isHiddenDetail, targetSession.getLanguage());
+                    this.messageSender.sendPush(sender, conversationType, target, line, messageId, targetSession.getClientID(), pushContent, pushData, messageContentType, serverTime, name, senderPortrait, targetName, targetPortrait, targetSession.getUnReceivedMsgs(), curMentionType, isHiddenDetail, targetSession.getLanguage());
                 }
 
             }
@@ -457,14 +474,44 @@ public class MessagesPublisher {
                         LOG.info("the target {} of user {} is not active", targetSession.getClientID(), targetSession.getUsername());
                     }
                 }
+
+                if(sessions.isEmpty() && message.getContent().getType() == 403 && !user.equals(message.getFromUser())) {
+                    WFCMessage.User userInfo = m_messagesStore.getUserInfo(user);
+                    if (userInfo != null && userInfo.getType() == ProtoConstants.UserType.UserType_Robot) {
+                        WFCMessage.Robot robot = m_messagesStore.getRobot(user);
+                        if (robot != null && !StringUtil.isNullOrEmpty(robot.getCallback())) {
+                            OutputClient outputClient = null;
+                            if(m_messagesStore.isRobotCallbackWithClientInfo() && !StringUtil.isNullOrEmpty(exceptClientId)) {
+                                Session session = m_sessionsStore.getSession(exceptClientId);
+                                if(session != null && session.getUsername().equals(message.getFromUser())) {
+                                    outputClient = new OutputClient(session.getPlatform(), exceptClientId);
+                                }
+                            }
+
+                            final WFCMessage.Message finalMsg = message;
+                            OutputClient finalOutputClient = outputClient;
+                            Server.getServer().getCallbackScheduler().execute(() -> {
+                                try {
+                                    HttpUtils.httpJsonPost(robot.getCallback(), GsonUtil.gson.toJson(OutputMessageData.fromProtoMessage(finalMsg, finalOutputClient), OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Robot_Message_Callback);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);
+                                }
+                            });
+                        }
+                    }
+                }
             }
         }
     }
 
-    String getUserDisplayName(String userId, String groupId) {
+    String getUserDisplayName(String userId, String groupId, List<String> portraitList) {
         WFCMessage.User user = m_messagesStore.getUserInfo(userId);
         String userName = null;
         if(user != null) {
+            if(portraitList != null && !StringUtil.isNullOrEmpty(user.getPortrait())) {
+                portraitList.add(user.getPortrait());
+            }
             userName = user.getDisplayName();
         }
         if (!StringUtil.isNullOrEmpty(groupId)) {
@@ -476,17 +523,28 @@ public class MessagesPublisher {
         return userName;
     }
 
-    String getTargetName(String targetId, int cnvType) {
+    String getTargetName(String targetId, int cnvType, String fromUser, List<String> portraitList) {
         if (cnvType == ProtoConstants.ConversationType.ConversationType_Private) {
-            return getUserDisplayName(targetId, null);
+            return getUserDisplayName(targetId, null, portraitList);
         } else if(cnvType == ProtoConstants.ConversationType.ConversationType_Group) {
             WFCMessage.GroupInfo group = m_messagesStore.getGroupInfo(targetId);
             if(group != null) {
+                if(!StringUtil.isNullOrEmpty(group.getPortrait())) {
+                    portraitList.add(group.getPortrait());
+                }
+
+                WFCMessage.UserSettingEntry entry = m_messagesStore.getUserSetting(fromUser, UserSettingScope.kUserSettingGroupRemark, targetId);
+                if(entry != null && !StringUtil.isNullOrEmpty(entry.getValue())) {
+                    return entry.getValue();
+                }
                 return group.getName();
             }
         } else if(cnvType == ProtoConstants.ConversationType.ConversationType_Channel) {
             WFCMessage.ChannelInfo channelInfo = m_messagesStore.getChannelInfo(targetId);
             if (channelInfo != null) {
+                if(!StringUtil.isNullOrEmpty(channelInfo.getPortrait())) {
+                    portraitList.add(channelInfo.getPortrait());
+                }
                 return channelInfo.getName();
             }
         }

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

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

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);
@@ -731,6 +752,10 @@ public class ProtocolProcessor {
         channel.flush();
     }
 
+    public ConnectionDescriptorStore getConnectionDescriptors() {
+        return connectionDescriptors;
+    }
+
     public void addInterceptHandler(InterceptHandler interceptHandler) {
         this.m_interceptor.addInterceptHandler(interceptHandler);
     }

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

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.zip.GZIPOutputStream;
 
+import cn.hutool.core.util.ReflectUtil;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.server.ThreadPoolExecutorWrapper;
 import com.google.gson.Gson;
@@ -92,7 +93,7 @@ public class Qos1PublishHandler extends QosPublishHandler {
             for (Class cls:ClassUtil.getAllAssignedClass(IMHandler.class)) {
                 Handler annotation = (Handler)cls.getAnnotation(Handler.class);
                 if(annotation != null) {
-                    IMHandler handler = (IMHandler) com.xiaoleilu.hutool.util.ClassUtil.newInstance(cls);
+                    IMHandler handler = (IMHandler) ReflectUtil.newInstance(cls);
                     m_imHandlers.put(annotation.value(), handler);
                 }
             }
@@ -140,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());
@@ -243,20 +244,15 @@ public class Qos1PublishHandler extends QosPublishHandler {
         String imtopic = topic.getTopic();
         ByteBuf payload = msg.payload();
         byte[] payloadContent = readBytesAndRewind(payload);
-        if(payloadContent.length == 0) {
-            ByteBuf ackPayload = Unpooled.buffer();
-            ackPayload.ensureWritable(1).writeByte(ERROR_CODE_INVALID_DATA.getCode());
-            sendPubAck(clientID, messageID, ackPayload, ERROR_CODE_INVALID_DATA);
-            return;
-        }
-        
-        MemorySessionStore.Session session = m_sessionStore.getSession(clientID);
-        payloadContent = AES.AESDecrypt(payloadContent, session.getSecret(), true);
-        if(payloadContent == null) {
-            ByteBuf ackPayload = Unpooled.buffer();
-            ackPayload.ensureWritable(1).writeByte(ERROR_CODE_INVALID_DATA.getCode());
-            sendPubAck(clientID, messageID, ackPayload, ERROR_CODE_INVALID_DATA);
-            return;
+        if(payloadContent.length > 0) {
+            MemorySessionStore.Session session = m_sessionStore.getSession(clientID);
+            payloadContent = AES.AESDecrypt(payloadContent, session.getSecret(), true);
+            if(payloadContent == null) {
+                ByteBuf ackPayload = Unpooled.buffer();
+                ackPayload.ensureWritable(1).writeByte(ERROR_CODE_INVALID_DATA.getCode());
+                sendPubAck(clientID, messageID, ackPayload, ERROR_CODE_INVALID_DATA);
+                return;
+            }
         }
 
         imHandler(clientID, username, imtopic, payloadContent, (errorCode, ackPayload) -> sendPubAck(clientID, messageID, ackPayload, errorCode), ProtoConstants.RequestSourceType.Request_From_User);

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

@@ -116,6 +116,27 @@ public class DBUtil {
                 } else if(flyway.info().current().getVersion().getMajor().intValue() < 43) {
                     System.out.println("数据库执行升级需要较长时间，可能长达数分钟或更长，请耐心等待，不要中断。。。");
                 }
+
+                if(flyway.info().current() != null && flyway.info().current().getVersion().getMajor().intValue() < 55) {
+                    Connection connection = null;
+                    PreparedStatement statement = null;
+                    try {
+                        connection = getConnection();
+
+                        String sql = "update flyway_schema_history set checksum = ? where version = ? and checksum = ?";
+
+                        statement = connection.prepareStatement(sql);
+                        int index = 1;
+                        statement.setLong(index++, -931486413L);
+                        statement.setString(index++, "3");
+                        statement.setLong(index++, 478454046L);
+                        statement.executeUpdate();
+                    } catch (SQLException e) {
+                        Utility.printExecption(LOG, e, RDBS_Exception);
+                    } finally {
+                        DBUtil.closeDB(connection, statement);
+                    }
+                }
             }
             flyway.migrate();
 

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

@@ -77,6 +77,7 @@ public interface IMTopic {
     String ChannelSearchTopic = "CHS";
     String ChannelListenTopic = "CHL";
     String ChannelPullTopic = "CHP";
+    String ListenedChannelListTopic = "CHLL";
 
     String GetTokenTopic = "GETTOKEN";
     String DestroyUserTopic = "DESTROYUSER";

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

@@ -14,5 +14,10 @@ public interface UserSettingScope {
     int kUserSettingConversationDraft = 19;
     int kUserSettingDisableSyncDraft = 20;
     int kUserSettingVoipSilent = 21;
-
+    int kUserSettingPttReserved = 22;
+    int kUserSettingCustomState = 23;
+    int kUserSettingDisableSecretChat = 24;
+    int kUserSettingPttSilent = 25;
+    int kUserSettingGroupRemark = 26;
+    int kUserSettingPrivacySearchable = 27;
 }

common/pom.xml

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

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

@@ -5,6 +5,7 @@ public interface APIPath {
     String Chatroom_Destroy = "/admin/chatroom/del";
     String Chatroom_Info = "/admin/chatroom/info";
     String Chatroom_GetMembers = "/admin/chatroom/members";
+    String Chatroom_GetUserChatroom = "/admin/chatroom/user_chatroom";
     String Chatroom_SetBlacklist = "/admin/chatroom/set_black_status";
     String Chatroom_GetBlacklist = "/admin/chatroom/get_black_status";
     String Chatroom_SetManager = "/admin/chatroom/set_manager";
@@ -26,6 +27,7 @@ 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_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";
     String User_Check_Block_Status = "/admin/user/check_block_status";
@@ -35,6 +37,7 @@ public interface APIPath {
     String User_Kickoff_Client = "/admin/user/kickoff_client";
     String User_Online_Count = "/admin/user/online_count";
     String User_Online_List = "/admin/user/online_list";
+    String User_Session_List = "/admin/user/session_list";
     String User_Application_Get_UserInfo = "/admin/user/app_get_user_info";
 
     String Friend_Update_Status = "/admin/friend/status";
@@ -76,6 +79,7 @@ public interface APIPath {
     String Group_Mute_Member = "/admin/group/manager/mute";
     String Group_Allow_Member = "/admin/group/manager/allow";
     String Get_User_Groups = "/admin/group/of_user";
+    String Get_User_Groups_By_Type = "/admin/group/of_user_by_type";
     String Group_Set_Member_Alias = "/admin/group/member/set_alias";
     String Group_Set_Member_Extra = "/admin/group/member/set_extra";
     String Get_Common_Groups = "/admin/group/common_group";
@@ -87,7 +91,7 @@ public interface APIPath {
     String Check_User_Subscribe_Channel = "/admin/channel/is_subscribed";
     String Get_System_Setting = "/admin/system/get_setting";
     String Put_System_Setting = "/admin/system/put_setting";
-
+    String GET_CUSTOMER = "/admin/customer";
     String Health = "/admin/health";
 
     String Conference_List = "/admin/conference/list";
@@ -112,6 +116,8 @@ public interface APIPath {
     String Robot_User_Info = "/robot/user_info";
     String Robot_Get_Profile = "/robot/profile";
     String Robot_Message_Send = "/robot/message/send";
+    String Robot_Message_Recall = "/robot/message/recall";
+    String Robot_Message_Update = "/robot/message/update";
     String Robot_Set_Callback = "/robot/set_callback";
     String Robot_Get_Callback = "/robot/get_callback";
     String Robot_Delete_Callback = "/robot/delete_callback";
@@ -132,4 +138,6 @@ public interface APIPath {
     String Robot_Group_Member_Quit = "/robot/group/member/quit";
     String Robot_Group_Transfer = "/robot/group/transfer";
     String Robot_Group_Set_Manager = "/robot/group/manager/set";
+
+    String Robot_Conference_Request = "/robot/conference/request";
 }

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

@@ -66,6 +66,8 @@ public enum ErrorCode {
 
     ERROR_CODE_FUNCTION_DISABLED(220, "function disabled"),
 
+    ERROR_CODE_OTHER_CLIENT_ALREADY_IN_CHATROOM(225, "other client already in chatroom"),
+
     ERROR_CODE_CHANNEL_NO_EXIST(236, "channel no exist"),
     ERROR_CODE_CHANNEL_NO_SECRET(237, "channel no secret"),
     ERROR_CODE_USER_NOT_PREPARED(238, "user not prepared"),

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

@@ -0,0 +1,48 @@
+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/pojos/ConferenceCreateEvent.java

@@ -10,4 +10,9 @@ public class ConferenceCreateEvent {
     public int bitrate;
     public boolean advance;
     public boolean recording;
+    public long timestamp;
+
+    public ConferenceCreateEvent() {
+        timestamp = System.currentTimeMillis();
+    }
 }

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

@@ -3,4 +3,9 @@ package cn.wildfirechat.pojos;
 public class ConferenceDestroyEvent {
     public String userId;
     public String roomId;
+    public long timestamp;
+
+    public ConferenceDestroyEvent() {
+        timestamp = System.currentTimeMillis();
+    }
 }

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

@@ -4,4 +4,9 @@ public class ConferenceJoinEvent {
     public String userId;
     public String roomId;
     public boolean screenSharing;
+    public long timestamp;
+
+    public ConferenceJoinEvent() {
+        timestamp = System.currentTimeMillis();
+    }
 }

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

@@ -6,4 +6,9 @@ public class ConferenceLeaveEvent {
     public boolean rejoin;
     public boolean kicked;
     public boolean screenSharing;
+    public long timestamp;
+
+    public ConferenceLeaveEvent() {
+        timestamp = System.currentTimeMillis();
+    }
 }

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

@@ -5,4 +5,9 @@ public class ConferencePublishEvent {
     public boolean video;
     public String roomId;
     public boolean screenSharing;
+    public long timestamp;
+
+    public ConferencePublishEvent() {
+        timestamp = System.currentTimeMillis();
+    }
 }

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

@@ -4,4 +4,9 @@ public class ConferenceUnpublishEvent {
     public String userId;
     public String roomId;
     public boolean screenSharing;
+    public long timestamp;
+
+    public ConferenceUnpublishEvent() {
+        timestamp = System.currentTimeMillis();
+    }
 }

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

@@ -0,0 +1,35 @@
+package cn.wildfirechat.pojos;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GetUserSessionResult {
+    public static class UserSession {
+        public String userId;
+        public String clientId;
+        public int platform;
+        public int pushType;
+        public String deviceToken;
+        public String deviceVoipToken;
+        boolean isOnline;
+
+        public UserSession() {
+        }
+
+        public UserSession(String userId, String clientId, int platform, int pushType, String deviceToken, String deviceVoipToken, boolean isOnline) {
+            this.userId = userId;
+            this.clientId = clientId;
+            this.platform = platform;
+            this.pushType = pushType;
+            this.deviceToken = deviceToken;
+            this.deviceVoipToken = deviceVoipToken;
+            this.isOnline = isOnline;
+        }
+    }
+
+    public List<UserSession> userSessions;
+
+    public GetUserSessionResult() {
+        userSessions = new ArrayList<>();
+    }
+}

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

@@ -4,4 +4,5 @@ public class GroupUpdateEvent {
     public String operatorId;
     public String groupId;
     public int type;
+    public PojoGroupInfo groupInfo;
 }

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

@@ -0,0 +1,24 @@
+package cn.wildfirechat.pojos;
+
+public class InputConferenceRequest {
+    public String userId;
+    public String clientId;
+    public String request;
+    public long sessionId;
+    public String roomId;
+    public String data;
+    public boolean advance;
+
+    public InputConferenceRequest() {
+    }
+
+    public InputConferenceRequest(String userId, String clientId, String request, long sessionId, String roomId, String data, boolean advance) {
+        this.userId = userId;
+        this.clientId = clientId;
+        this.request = request;
+        this.sessionId = sessionId;
+        this.roomId = roomId;
+        this.data = data;
+        this.advance = advance;
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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 InputGetUserGroupByType {
+    private String userId;
+    private List<Integer> groupMemberTypes;
+
+    public InputGetUserGroupByType() {
+    }
+
+    public InputGetUserGroupByType(String userId, List<Integer> groupMemberTypes) {
+        this.userId = userId;
+        this.groupMemberTypes = groupMemberTypes;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public List<Integer> getGroupMemberTypes() {
+        return groupMemberTypes;
+    }
+
+    public void setGroupMemberTypes(List<Integer> groupMemberTypes) {
+        this.groupMemberTypes = groupMemberTypes;
+    }
+}

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

@@ -0,0 +1,6 @@
+package cn.wildfirechat.pojos;
+
+public class InputGetUserList {
+    public int count;
+    public int offset;
+}

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/OutputGetUserList.java

@@ -0,0 +1,7 @@
+package cn.wildfirechat.pojos;
+
+import java.util.List;
+
+public class OutputGetUserList {
+    public List<InputOutputUserInfo> userInfoList;
+}

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

@@ -0,0 +1,7 @@
+package cn.wildfirechat.pojos;
+
+public class OutputReadData {
+    public String user;
+    public Conversation conversation;
+    public long readTime;
+}

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

@@ -0,0 +1,16 @@
+/*
+ * 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 OutputUserChatroom {
+    public String userId;
+    public String chatroomId;
+    public String clientId;
+    public int/*ProtoConstants.Platform*/ platform;
+}

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/proto/ProtoConstants.java

@@ -53,6 +53,10 @@ public class ProtoConstants {
         int Platform_LINUX = 7;
         int Platform_iPad = 8;
         int Platform_APad = 9;
+        int Platform_Harmony = 10;
+        int Platform_HarmonyPad = 11;
+        int Platform_HarmonyPC = 12;
+        int Platform_MAX = Platform_HarmonyPC;
     }
 
     //message NotifyMessage & PullMessageRequest -> type
@@ -156,6 +160,8 @@ public class ProtoConstants {
         int Modify_Group_History_Message = 7;
         //仅专业版的server api支持
         int Modify_Group_Max_Member_Count = 8;
+        //仅专业版的server api支持
+        int Modify_Group_Super_Group = 9;
     }
 
     //ModifyGroupInfoRequest -> type
@@ -216,6 +222,16 @@ public class ProtoConstants {
         int SearchUserType_Name_Mobile = 1;
         int SearchUserType_Name = 2;
         int SearchUserType_Mobile = 3;
+        int SearchUserType_UserId = 4;
+        int SearchUserType_Name_Mobile_UserId = 5;
+        int SearchUserType_Name_Mobile_DisplayName = 100;
+    }
+
+    public interface DisableSearchMask {
+        int DisableSearchDisplayNameMask = 1;
+        int DisableSearchNameMask = 2;
+        int DisableSearchMobileMask = 4;
+        int DisableSearchUserIdMask = 8;
     }
 
     public interface UserStatus {

common/src/main/java/io/moquette/spi/impl/security/AES.java

@@ -176,7 +176,7 @@ public class AES {
                     //2018.1.1 0:0:0 以来的小时数
                     int curhour = (int) ((System.currentTimeMillis()/1000 - 1514736000)/3600);
 
-                    if (curhour - hours > 24 && checkTime) {
+                    if (Math.abs(curhour - hours)  > 24 && checkTime) {
                         if(invalidTime != null) {
                             invalidTime[0] = true;
                         }

distribution/pom.xml

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

distribution/src/main/resources/wildfirechat.conf

@@ -121,6 +121,12 @@ message.group_mute_exception_types 401,402,403,404,405,407,408,410,411
 ## 用户被全局禁言时允许发送的消息类型
 message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
 
+## 离线用户推送过期天数，0是永不过期，建议配置为7天。
+message.push_expired_days 7
+
+## 群发消息(包括server api群发和全局频道群发)时，目标用户是否来自于t_user表。如果使用野火托管用户信息，请设置为true，否则设置为false。
+message.broadcast.target_from_user_table true
+
 ## 消息转发功能开启时，开关是否不转发server api接口消息。
 ## 当为true时，不转发server api发送的消息；当为false时，转发server api发送的消息。
 message.no_forward_admin_message false
@@ -140,6 +146,9 @@ friend.disable_search false
 ##禁止按照昵称搜索用户。
 friend.disable_nick_name_search false
 
+##禁止按照用户id搜索用户，默认为true。
+friend.disable_user_id_search true
+
 ##禁止发送好友邀请，通过server api添加好友不受此限制(force参数需要为true)
 friend.disable_friend_request false
 
@@ -164,6 +173,18 @@ chatroom.rejoin_when_active true
 ## 当一个聊天室不存在时，如果有用户加入就自动创建
 chatroom.create_when_not_exist true
 
+## 一个用户同一时刻只能加入一个聊天室。
+## 当一个客户端加入一个聊天室时，如果这个客户端已经加入另外一个聊天室了，会自动退出之前的聊天室。
+## 当一个客户端加入一个聊天室时，如果这个用户的其他端已经加入一个聊天室了，kickoff_other_platform为true时会自动退出之前的聊天室，为false时会返回225的错误码。
+## 当自动退出聊天室时，客户端不会收到任何通知，只是不会再收到消息。
+chatroom.kickoff_other_platform true
+
+## 是否允许群主不受限制地撤回自己发送的消息。false可以${message.recall_time_limit}撤回自己的消息；true可以撤回任意时间自己的消息。默认为true。
+group.allow_owner_recall_self_msg true
+
+## 是否允许群管理员不受限制地撤回自己发送的消息。false可以${message.recall_time_limit}撤回自己的消息；true可以撤回任意时间自己的消息。默认为false。
+group.allow_manager_recall_self_msg false
+
 ## 是否允许客户端发送操作群的自定义群通知消息
 group.allow_client_custom_operation_notification true
 
@@ -179,6 +200,9 @@ group.visible_quit_or_kickoff_notification 0
 ## 如果有客户端有被破解的风险，可以禁止客户端群操作，然后通过Server API操作。Server API不受限制。
 #group.forbidden_client_operation 0xFFF
 
+## 是否禁止陌生人拉人入群，默认为false
+group.disable_stranger_invite false
+
 ## 隐藏用户信息属性类型，2是性别，3是电话号码，4是邮箱，5是地址，6是公司信息，7是社交账号，8是Extra信息。当需要隐藏多个时以英文逗号分开;
 ## 本配置是为了提高安全性，避免把对应信息同步到客户端，这样就能防止程序被破解从而拿到用户关键信息。仅对客户端有效，server api不受影响。
 ## 注意，修改本配置不会对已经同步的信息产生影响。
@@ -188,6 +212,9 @@ group.visible_quit_or_kickoff_notification 0
 # 因此需要分段多次同步，此开关定义了每次同步的数据的条数。此需要客户端支持，客户端SDK在2021.5.25日后支持此功能。如果确认所有客户端都在这个日志之后才可以打开此设置。
 #sync.data_part_size 1000
 
+## 是否关闭api/version接口。api/version方法可以用来检查IM服务版本，上线确认无问题后，可以关掉这个接口。
+#http.close_api_version false
+
 #*********************************************************************
 # 限频配置
 #*********************************************************************
@@ -262,7 +289,10 @@ server.multi_endpoint false
 ## 是否支持PC多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PC端多端登录。
 server.multi_pc_endpoint false
 
-# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
+## 是否支持PAD多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PAD端多端登录。
+server.multi_pad_endpoint false
+
+# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或pad或web端登录的通知。
 server.multi_platform_notification true
 
 # 当pc或者web在线时，手机是否默认静音，默认为true。注意仅影响默认值，用户可以手动切换是否静音。
@@ -365,10 +395,12 @@ push.ios.server.address http://localhost:8085/ios/push
 #*********************************************************************
 # Sensitive configuration
 #*********************************************************************
-## 内置文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***；3 记录并继续发送
+## 内置文本敏感词过滤处理方法，当命中敏感词后，消息会被记录到t_sensitive_messages表中，然后根据type类型做不同的处理，处理方式如下：
+## 0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***然后正常发送；3 正常发送。
+## 如果开启 message.sensitive.forward.url 配置，命中敏感词的消息还会被回调到这个地址
 sensitive.filter.type 0
 
-## 如果内置敏感词库无法满足您的需求，可以自己开发部署敏感词审核服务。配置如下地址和消息类型，IM服务会把指定消息类型的消息回调到指定地址
+## 如果内置敏感词库无法满足您的需求，可以开发部署独立敏感词审核服务。配置如下地址和消息类型，IM服务会把指定消息类型的消息回调到指定地址，内置的敏感词审核和敏感词转发功能就不再起作用了。
 ## 审核服务返回状态码200表示继续发送，如果需要替换内容，返回状态码200并且内容为替换后的内容。返回403表示不允许发送。其它错误继续发送。
 ## 独立审核服务地址，IM服务会post SendMessageData。如果需要修改消息内容，返回 MessagePayload。请参考应用服务中 "/message/censor" Mapping.
 #sensitive.remote_server_url http://192.168.3.202:8888/message/censor

distribution/src/main/scripts/stop.sh

@@ -9,7 +9,7 @@ fi
 
 kill -15 $pid
 
-for i in {1..15}
+for i in {1..30}
 do
   pid=`ps -ef | grep wildfirechat.server.Server | grep -v grep | awk '{print $2}'`
   if [ -z $pid ]; then

docker/Dockerfile

@@ -5,6 +5,8 @@ ADD distribution-*-bundle-tar.tar.gz /opt/im-server/
 RUN sed -i 's/#JAVA_OPTS="$JAVA_OPTS -Xmx128M"/JAVA_OPTS="$JAVA_OPTS -Xmx$JVM_XMX"/g' /opt/im-server/bin/wildfirechat.sh
 RUN sed -i 's/#JAVA_OPTS="$JAVA_OPTS -Xms128M"/JAVA_OPTS="$JAVA_OPTS -Xms$JVM_XMS"/g' /opt/im-server/bin/wildfirechat.sh
 
+RUN chmod a+x /opt/im-server/bin/wildfirechat.sh
+
 WORKDIR /opt/im-server
 
 VOLUME /opt/im-server/config

docker/README.md

@@ -1,7 +1,7 @@
 # 野火IM服务docker使用说明
 
 ## 编译镜像
-首先需要先编译应用服务，在项目根目录下使用下面命令编译
+首先需要先编译IM服务，在项目根目录下使用下面命令编译
 ```
 mvn clean package
 ```
@@ -14,7 +14,7 @@ sudo docker build -t im-server .
 
 ## 运行
 配置：
-运行需要手动指定配置目录，手动指定配置目录的方法如下，其中$PATH_TO_CONFIG为im配置目录，需要为绝对路径，模版为```distribution/src/main/resources```目录。另外需要创建h2数据库目录（如果用mysql就不需要了）、日志目录、内置存储服务目录（如果使用其它对象存储服务就不需要了）。
+运行需要手动指定配置目录，手动指定配置目录的方法如下，其中$PATH_TO_CONFIG为im配置目录，需要为绝对路径，模版为```distribution/src/main/resources```目录。另外需要创建h2数据库目录（如果用mysql就不需要了）、日志目录、内置存储服务目录（如果使用其它对象存储服务就不需要了）。h2数据库目录/日志目录/内置存储服务目录需要有写权限，因为IM服务会写入文件。
 ```
 sudo docker run -it --name im-server -v $PATH_TO_CONFIG:/opt/im-server/config -v $PATH_TO_LOGS:/opt/im-server/logs -v $PATH_TO_H2DB:/opt/im-server/h2db -v $PATH_TO_MEDIA:/opt/im-server/media -e JVM_XMX=256M -e JVM_XMS=256M -p 80:80 -p 1883:1883 -p 8083:8083 -p 8084:8084 -p 18080:18080 im-server
 ```

pom.xml

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

release_note.md

@@ -12,6 +12,77 @@
 
 # 更新记录
 
+--------------
+Release note 1.2.4:
+1. 去掉用户的默认密码。
+2. 去掉频道和机器人的默认头像。
+3. 修改在线状态回调数据，返回此用户的所有端状态。
+
+--------------
+Release note 1.2.3:
+1. 同步专业版IM服务server SDK。
+2. 添加对鸿蒙平台的支持。
+3. 解决server端音视频SDK信令支持问题。
+4. 升级部分依赖，解决漏洞问题
+
+--------------
+Release note 1.2.2:
+1. 解决搜索特殊字符时的转义问题。
+2. SDK添加流式消息。
+3. 添加配置，是否禁止拉陌生人入群。
+4. 放被拉黑时禁止被拉入群
+5. 群组信息变更回调时加上群组信息
+6. 机器人sdk添加撤回和更新消息接口
+
+--------------
+Release note 1.2.1:
+1. 添加获取在线用户功能。
+2. 添加获取用户连接session信息的功能。
+3. 优化按照用户id搜索用户的逻辑。
+4. 解决广播消息没有发给未登录用户的问题。
+
+--------------
+Release note 1.2.0:
+1. 添加配置开关，可以关掉api/version检查接口。
+2. Server SDK会议事件中添加时间戳。
+3. 禁止私聊时，如果一方在允许私聊列表中，允许私聊。
+4. 解决某些特殊情况下获取网卡信息失败导致启动失败的问题。
+5. 支持按照用户ID来搜索用户。
+6. 添加获取某个用户是否在聊天室的接口。
+7. 优化多端加入聊天室的处理。
+
+--------------
+Release note 1.1.9:
+1. 解决服务器时间误差太大引起的问题。
+2. 添加推送过期配置。
+3. 支持发送好友请求后5分钟之内再次发送。
+4. Server API支持根据群成员类型获取用户群列表。
+5. 添加配置，是否允许群主和群管理员无限制撤回自己的消息。
+
+--------------
+Release note 1.1.8:
+1. 解决可以把群主设置为管理员的问题。
+2. 发送好友请求之后5分钟内可以再次发送。
+3. 解决撤回消息中原消息二进制内容格式错误问题。
+
+--------------
+Release note 1.1.7:
+1. 优化用户搜索功能。
+2. 推送消息中使用群备注。
+3. 推送消息中添加发送者和目标头像。
+4. 优化撤回消息流程。
+
+--------------
+Release note 1.1.6:
+1. 支持用户设置查找自己的方法。
+2. 解决获取用户信息返回type无效的问题。
+3. 添加用户获取频道的功能。
+
+--------------
+Release note 1.1.5:
+1. 添加获取所有用户的Server API。
+2. 解决添加好友时没有处理黑名单的问题。
+
 --------------
 Release note 1.1.4:
 1. 添加PC客户端多端登录互踢时没有更新pc在线状态问题。

sdk/pom.xml

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

sdk/sdk_readme.txt

@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.11</version>
+			<version>1.15</version>
 		</dependency>
 
 		<dependency>
@@ -36,20 +36,26 @@
 			<version>2.5.0</version>
 		</dependency>
 
+		<dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
 		<dependency>
 			<groupId>cn.wildfirechat</groupId>
 			<artifactId>sdk</artifactId>
-			<version>0.20</version>
+			<version>1.2.2</version>
 			<scope>system</scope>
-			<systemPath>${project.basedir}/src/lib/sdk-0.20.jar</systemPath>
+			<systemPath>${project.basedir}/src/lib/sdk-1.1.9.jar</systemPath>
 		</dependency>
 
 		<dependency>
 			<groupId>cn.wildfirechat</groupId>
 			<artifactId>common</artifactId>
-			<version>0.20</version>
+			<version>1.2.2</version>
 			<scope>system</scope>
-			<systemPath>${project.basedir}/src/lib/common-0.20.jar</systemPath>
+			<systemPath>${project.basedir}/src/lib/common-1.1.9.jar</systemPath>
 		</dependency>
 	</dependencies>
 

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

@@ -37,6 +37,12 @@ public class ChatroomAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, OutputStringList.class);
     }
 
+    public static IMResult<OutputUserChatroom> getUserChatroom(String userId) throws Exception {
+        String path = APIPath.Chatroom_GetUserChatroom;
+        InputUserId input = new InputUserId(userId);
+        return AdminHttpUtils.httpJsonPost(path, input, OutputUserChatroom.class);
+    }
+
     //仅专业版支持
     //status：0，正常；1，禁言；2，禁止加入
     public static IMResult<Void> setChatroomBlacklist(String chatroomId, String userId, int status) throws Exception {

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

@@ -97,4 +97,8 @@ public class GeneralAdmin {
     public static IMResult<HealthCheckResult> healthCheck() throws Exception {
         return AdminHttpUtils.httpGet(APIPath.Health, HealthCheckResult.class);
     }
+
+    public static IMResult<String> getCustomer() throws Exception {
+        return AdminHttpUtils.httpJsonPost(APIPath.GET_CUSTOMER, null, String.class);
+    }
 }

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

@@ -2,6 +2,7 @@ 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;
 
@@ -178,6 +179,12 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, inputUserId, OutputGroupIds.class);
     }
 
+    public static IMResult<OutputGroupIds> getUserGroupsByType(String user, List</*ProtoConstants.GroupMemberType*/Integer> groupMemberType) throws Exception {
+        String path = APIPath.Get_User_Groups_By_Type;
+        InputGetUserGroupByType input = new InputGetUserGroupByType(user, groupMemberType);
+        return AdminHttpUtils.httpJsonPost(path, input, OutputGroupIds.class);
+    }
+
     public static IMResult<OutputGroupIds> getCommonGroups(String user1, String user2) throws Exception {
         String path = APIPath.Get_Common_Groups;
         StringPairPojo intput = new StringPairPojo(user1, user2);

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

@@ -2,6 +2,7 @@ package cn.wildfirechat.sdk;
 
 import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.messagecontentbuilder.RichNotificationContentBuilder;
+import cn.wildfirechat.messagecontentbuilder.StreamingTextMessageContentBuilder;
 import cn.wildfirechat.messagecontentbuilder.TextMessageContentBuilder;
 import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.proto.ProtoConstants;
@@ -300,6 +301,14 @@ public class Main {
             System.exit(-1);
         }
 
+        IMResult<OutputGetUserList> getUserListIMResult = UserAdmin.getAllUsers(100, 0);
+        if (getUserListIMResult != null && getUserListIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("getUserListIMResult success");
+        } else {
+            System.out.println("getUserListIMResult failure");
+            System.exit(-1);
+        }
+
         if (commercialServer) {
             IMResult<GetOnlineUserCountResult> getOnlineUserCountResultIMResult = UserAdmin.getOnlineUserCount();
             if (getOnlineUserCountResultIMResult != null && getOnlineUserCountResultIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
@@ -316,6 +325,14 @@ public class Main {
                 System.out.println("get user online failure");
                 System.exit(-1);
             }
+
+            IMResult<GetUserSessionResult> getUserSessionResultIMResult = UserAdmin.getUserSession("hygqmws2k");
+            if (getUserSessionResultIMResult != null && getUserSessionResultIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("get user session success");
+            } else {
+                System.out.println("get user session failure");
+                System.exit(-1);
+            }
         }
     }
 
@@ -361,22 +378,6 @@ public class Main {
             System.exit(-1);
         }
 
-        result = RelationAdmin.sendFriendRequest("ff1", "ff2", "hello2", false);
-        if (result != null && result.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("success");
-        } else {
-            System.out.println("failure");
-            System.exit(-1);
-        }
-
-        result = RelationAdmin.sendFriendRequest("ff1", "ff2", "hello3", true);
-        if (result != null && (result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS || result.getErrorCode() == ErrorCode.ERROR_CODE_ALREADY_FRIENDS)) {
-            System.out.println("success");
-        } else {
-            System.out.println("send friend request success");
-            System.exit(-1);
-        }
-
         IMResult<Void> updateFriendStatusResult = RelationAdmin.setUserFriend("ff1", "ff2", true, "{\"from\":1}");
         if (updateFriendStatusResult != null && updateFriendStatusResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("update friend status success");
@@ -643,6 +644,14 @@ public class Main {
             System.exit(-1);
         }
 
+        groupIdsIMResult = GroupAdmin.getUserGroupsByType("user2", Arrays.asList(ProtoConstants.GroupMemberType.GroupMemberType_Manager, ProtoConstants.GroupMemberType.GroupMemberType_Owner));
+        if (groupIdsIMResult != null && groupIdsIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("get user groups by type success");
+        } else {
+            System.out.println("get user groups by type failure");
+            System.exit(-1);
+        }
+
         groupIdsIMResult = GroupAdmin.getCommonGroups("user1", "user2");
         if (groupIdsIMResult != null && groupIdsIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("get user common groups success");
@@ -733,8 +742,8 @@ public class Main {
             System.exit(-1);
         }
 
-        IMResult<Void> voidIMResult = MessageAdmin.recallMessage("user1", resultSendMessage.getResult().getMessageUid());
-        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+        IMResult<String> stringIMResult = MessageAdmin.recallMessage("user1", resultSendMessage.getResult().getMessageUid());
+        if (stringIMResult != null && stringIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("recall message success");
         } else {
             System.out.println("recall message failure");
@@ -742,7 +751,7 @@ public class Main {
         }
 
         if (commercialServer) {
-            voidIMResult = MessageAdmin.deleteMessage(resultSendMessage.getResult().getMessageUid());
+            IMResult<Void> voidIMResult = MessageAdmin.deleteMessage(resultSendMessage.getResult().getMessageUid());
             if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
                 System.out.println("delete message success");
             } else {
@@ -818,12 +827,48 @@ public class Main {
             System.exit(-1);
         }
 
-        voidIMResult = MessageAdmin.recallMultiCastMessage("user1", resultMulticastMessage.result.getMessageUid(), multicastReceivers);
+        IMResult<Void> voidIMResult = MessageAdmin.recallMultiCastMessage("user1", resultMulticastMessage.result.getMessageUid(), multicastReceivers);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("Success");
         } else {
             System.out.println("failure");
         }
+
+        testStreamingText();
+    }
+
+    static void testStreamingText() throws Exception {
+        Conversation conversation = new Conversation();
+        conversation.setTarget("uygqmws2k");
+        conversation.setType(ProtoConstants.ConversationType.ConversationType_Private);
+
+        String fullText = "北京野火无限网络科技有限公司是成立于2019年底的一家科技创新企业，公司的主要目标是为广大企业和单位提供优质可控、私有部署的即时通讯和实时音视频能力，为社会信息化水平提高作出自己的贡献。\n" +
+            "\n" +
+            "野火IM是公司研发一套自主可控的即时通讯组件，具有全部私有化、功能齐全、协议稳定可靠、全平台支持、安全性高和支持国产化等技术特点。客户端分层设计，既可开箱即用，也可与现有系统深度融合。具有完善的服务端API和自定义消息功能，可以任意扩展功能。代码开源率高，方便二次开发和使用。支持多人实时音视频和会议功能，线上沟通更通畅。\n" +
+            "\n" +
+            "公司致力于开源项目，在Github上开源项目广受好评，其中Server项目有超过7.1K个Star，组织合计Star超过1万个。有大量的技术公司受益于我们的开源，为自己的产品添加了即时通讯能力，这也算是我们公司为社会信息化建设做出的一点点贡献吧。\n" +
+            "\n" +
+            "公司以即时通讯技术为核心，持续努力优化和完善即时通讯和实时音视频产品，努力为客户提供最优质的即时通讯和实时音视频能力。";
+        int i = 0;
+        String streamId = UUID.randomUUID().toString();
+        while (i < fullText.length()) {
+            i+= 15;
+
+            boolean finish = i >= fullText.length();
+            String partText = finish?fullText:fullText.substring(0, i);
+
+            MessagePayload payload = StreamingTextMessageContentBuilder.newBuilder(streamId).text(partText).generating(!finish).build();
+
+            IMResult<SendMessageResult> resultSendMessage = MessageAdmin.sendMessage("admin", conversation, payload, null);
+            if (resultSendMessage != null && resultSendMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("send message success");
+            } else {
+                System.out.println("send message failure");
+                System.exit(-1);
+            }
+
+            Thread.sleep(500);
+        }
     }
 
     //***********************************************
@@ -959,6 +1004,14 @@ public class Main {
             System.exit(-1);
         }
 
+        IMResult<OutputUserChatroom>  userChatroomIMResult = ChatroomAdmin.getUserChatroom("uygqmws2k");
+        if(userChatroomIMResult != null && (userChatroomIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS || userChatroomIMResult.getErrorCode() == ErrorCode.ERROR_CODE_NOT_EXIST)) {
+            System.out.println("get user chatroom success");
+        } else {
+            System.out.println("get user chatroom failure");
+            System.exit(-1);
+        }
+
         //下面仅专业版支持
         if(commercialServer) {
             //设置用户聊天室黑名单。0正常；1禁言；2禁止加入。
@@ -1150,7 +1203,7 @@ public class Main {
         payload.setType(1);
         payload.setSearchableContent("hello world");
 
-        IMResult<SendMessageResult> resultRobotSendMessage = robotService.sendMessage("robot1", conversation, payload);
+        IMResult<SendMessageResult> resultRobotSendMessage = robotService.sendMessage(robotService.getRobotId(), conversation, payload);
         if (resultRobotSendMessage != null && resultRobotSendMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("robot send message success");
         } else {
@@ -1158,6 +1211,37 @@ public class Main {
             System.exit(-1);
         }
 
+        if(commercialServer) {
+            Thread.sleep(1000);
+            IMResult<String> recallMessageResult = robotService.recallMessage(resultRobotSendMessage.result.getMessageUid());
+            if (recallMessageResult != null && recallMessageResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("robot recall message success");
+            } else {
+                System.out.println("robot recall message failure");
+                System.exit(-1);
+            }
+
+            payload.setSearchableContent("hello world, hello world");
+            resultRobotSendMessage = robotService.sendMessage(robotService.getRobotId(), conversation, payload);
+            if (resultRobotSendMessage != null && resultRobotSendMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("robot send message success");
+            } else {
+                System.out.println("robot send message failure");
+                System.exit(-1);
+            }
+
+            Thread.sleep(1000);
+            payload.setSearchableContent("hello world, updated message content");
+            IMResult<Void> updateMessageResult = robotService.updateMessage(resultRobotSendMessage.result.getMessageUid(), payload);
+            if (updateMessageResult != null && updateMessageResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("robot update message success");
+            } else {
+                System.out.println("robot update message failure");
+                System.exit(-1);
+            }
+        }
+
+
         IMResult<InputOutputUserInfo> resultRobotGetUserInfo = robotService.getUserInfo("userId1");
         if (resultRobotGetUserInfo != null && resultRobotGetUserInfo.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("robot get user info success");

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

@@ -25,12 +25,12 @@ public class MessageAdmin {
         return AdminHttpUtils.httpJsonPost(path, messageData, SendMessageResult.class);
     }
 
-    public static IMResult<Void> recallMessage(String operator, long messageUid) throws Exception {
+    public static IMResult<String> recallMessage(String operator, long messageUid) throws Exception {
         String path = APIPath.Msg_Recall;
         RecallMessageData messageData = new RecallMessageData();
         messageData.setOperator(operator);
         messageData.setMessageUid(messageUid);
-        return AdminHttpUtils.httpJsonPost(path, messageData, Void.class);
+        return AdminHttpUtils.httpJsonPost(path, messageData, String.class);
     }
 
     //仅专业版支持

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

@@ -17,6 +17,10 @@ public class RobotService {
         robotHttpUtils = new RobotHttpUtils(url, robotId, robotSecret);
     }
 
+    public String getRobotId() {
+        return robotHttpUtils.getRobotId();
+    }
+
     public IMResult<SendMessageResult> sendMessage(String sender, Conversation conversation, MessagePayload payload) throws Exception {
         String path = APIPath.Robot_Message_Send;
         SendMessageData messageData = new SendMessageData();
@@ -26,6 +30,23 @@ public class RobotService {
         return robotHttpUtils.httpJsonPost(path, messageData, SendMessageResult.class);
     }
 
+    public IMResult<String> recallMessage(long messageUid) throws Exception {
+        String path = APIPath.Robot_Message_Recall;
+        RecallMessageData messageData = new RecallMessageData();
+        messageData.setMessageUid(messageUid);
+        return robotHttpUtils.httpJsonPost(path, messageData, String.class);
+    }
+
+    public IMResult<Void> updateMessage(long messageUid, MessagePayload payload) throws Exception {
+        String path = APIPath.Robot_Message_Update;
+        UpdateMessageContentData updateMessageContentData = new UpdateMessageContentData();
+        updateMessageContentData.setMessageUid(messageUid);
+        updateMessageContentData.setPayload(payload);
+        updateMessageContentData.setUpdateTimestamp(0);
+        updateMessageContentData.setDistribute(1);
+        return robotHttpUtils.httpJsonPost(path, updateMessageContentData, Void.class);
+    }
+
     public IMResult<InputOutputUserInfo> getUserInfo(String userId) throws Exception {
         String path = APIPath.Robot_User_Info;
         InputGetUserInfo getUserInfo = new InputGetUserInfo(userId, null, null);
@@ -247,5 +268,10 @@ public class RobotService {
         return configData;
     }
 
+    public IMResult<String> sendConferenceRequest(String robotId, String clientId, String request, long sessionId, String roomId, String data, boolean advance) throws Exception {
+        String path = APIPath.Robot_Conference_Request;
+        InputConferenceRequest input = new InputConferenceRequest(robotId, clientId, request, sessionId, roomId, data, advance);
+        return robotHttpUtils.httpJsonPost(path, input, String.class);
+    }
 
 }

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

@@ -24,6 +24,14 @@ public class UserAdmin {
         return AdminHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
 
+    public static IMResult<OutputGetUserList> getAllUsers(int count, int offset) throws Exception {
+        String path = APIPath.User_Get_All;
+        InputGetUserList input = new InputGetUserList();
+        input.count = count;
+        input.offset = offset;
+        return AdminHttpUtils.httpJsonPost(path, input, OutputGetUserList.class);
+    }
+
     public static IMResult<OutputCreateUser> createUser(InputOutputUserInfo user) throws Exception {
         String path = APIPath.Create_User;
         return AdminHttpUtils.httpJsonPost(path, user, OutputCreateUser.class);
@@ -143,4 +151,9 @@ public class UserAdmin {
         input.setAuthCode(authCode);
         return AdminHttpUtils.httpJsonPost(path, input, OutputApplicationUserInfo.class);
     }
+
+    public static IMResult<GetUserSessionResult> getUserSession(String userId) throws Exception {
+        InputUserId inputUserId = new InputUserId(userId);
+        return AdminHttpUtils.httpJsonPost(APIPath.User_Session_List, inputUserId, GetUserSessionResult.class);
+    }
 }

sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java

@@ -128,7 +128,7 @@ public class AdminHttpUtils extends JsonUtils {
             if (object != null) {
                 jsonStr = gson.toJson(object);
             }
-            LOG.info("http request:{} content: {}", path, jsonStr);
+            LOG.info("http request:{} content: {}", url, jsonStr);
 
             StringEntity entity = new StringEntity(jsonStr, Charset.forName("UTF-8"));
             entity.setContentEncoding("UTF-8");

sdk/src/main/java/cn/wildfirechat/sdk/utilities/ChannelHttpUtils.java

@@ -78,7 +78,7 @@ public class ChannelHttpUtils extends JsonUtils {
             if (object != null) {
                 jsonStr = gson.toJson(object);
             }
-            LOG.info("http request:{} content: {}", path, jsonStr);
+            LOG.info("http request:{} content: {}", url, jsonStr);
 
             StringEntity entity = new StringEntity(jsonStr, Charset.forName("UTF-8"));
             entity.setContentEncoding("UTF-8");

sdk/src/main/java/cn/wildfirechat/sdk/utilities/RobotHttpUtils.java

@@ -79,7 +79,7 @@ public class RobotHttpUtils extends JsonUtils {
             if (object != null) {
                 jsonStr = gson.toJson(object);
             }
-            LOG.info("http request:{} content: {}", path, jsonStr);
+            LOG.info("http request:{} content: {}", url, jsonStr);
 
             if(!StringUtil.isNullOrEmpty(jsonStr)) {
                 StringEntity entity = new StringEntity(jsonStr, Charset.forName("UTF-8"));