机器人API添加根据邮箱获取用户信息和批量获取用户信息的接口

机器人和频道api，请求错误时，result应该为空
添加注释
2026-04-29 15:31:59 +08:00 · 2026-04-26 09:42:22 +08:00 · 2026-04-20 08:19:38 +08:00 · 2026-04-19 20:06:53 +08:00 · 2026-04-10 21:53:24 +08:00 · 2026-04-10 21:41:49 +08:00
146 changed files with 7873 additions and 532 deletions
@@ -30,28 +30,29 @@
 ## 野火开源项目
 主要包括以下项目：

-| [GitHub仓库](https://github.com/wildfirechat)      | [码云仓库](https://gitee.com/wfchat)        | 说明                                                                                      
-| ------------------------------------------------------------ | ----------------------------------------------------- | --------------------------------------------------------------------------
-| [im-server](https://github.com/wildfirechat/im-server)       | [im-server](https://gitee.com/wfchat/im-server)          | 野火社区版IM服务，野火IM的核心服务，处理所有IM相关业务。  |
-| [app-server](https://github.com/wildfirechat/app-server)     | [app-server](https://gitee.com/wfchat/app-server)     | Demo应用服务，模拟客户的应用服登陆处理逻辑及部分二次开发示例。 |
-| [robot_server](https://github.com/wildfirechat/robot_server) | [robot_server](https://gitee.com/wfchat/robot_server) | 机器人服务，演示野火机器人对接其它系统的方法。 |
-| [push_server](https://github.com/wildfirechat/push_server)   | [push_server](https://gitee.com/wfchat/push_server)   | 推送服务器，可以对接所有的系统厂商推送服务或者第三方推送服务。 |
-| [wf-minio](https://github.com/wildfirechat/WF-minio)   | [wf-minio](https://gitee.com/wfchat/WF-minio)   | 私有对象存储服务，用来支持野火IM专业版的文件存储。 |
-| [wf-janus](https://github.com/wildfirechat/wf-janus  )   | [wf-janus](https://gitee.com/wfchat/wf-janus  )   | 高级音视频媒体服务。 |
-| [open-platform](https://github.com/wildfirechat/open-platform)   | [open-platform](https://gitee.com/wfchat/open-platform)   | 野火开放平台服务。  |
-| [daily-report](https://github.com/wildfirechat/daily-report)   | [daily-report](https://github.com/wildfirechat/daily-report)   | 野火开放平台日报 demo服务。 |
-| [channel-platform](https://github.com/wildfirechat/channel-platform)   | [channel-platform](https://gitee.com/wfchat/channel-platform)   | 野火频道(公众号)平台服务。  |
-| [organization-platform](https://github.com/wildfirechat/organization-platform)   | [organization-platform](https://gitee.com/wfchat/organization-platform)   | 野火组织通讯录服务。  |
-| [android-chat](https://github.com/wildfirechat/android-chat) | [android-chat](https://gitee.com/wfchat/android-chat) | 野火IM Android SDK源码和App源码。 |
-| [ios-chat](https://github.com/wildfirechat/ios-chat)         | [ios-chat](https://gitee.com/wfchat/ios-chat)         | 野火IM iOS SDK源码和App源码。|
-| [pc-chat(electron)](https://github.com/wildfirechat/vue-pc-chat)       | [pc-chat(electron)](https://gitee.com/wfchat/vue-pc-chat)       | 基于[Electron](https://electronjs.org/)开发的PC 端                   |                         |
-| [pc-chat(Qt)](https://github.com/wildfirechat/qt-pc-chat)       | [pc-chat(Qt)](https://gitee.com/wfchat/qt-pc-chat)       | 基于Qt开发的PC 端                   |                         |
-| [web-chat](https://github.com/wildfirechat/vue-chat)         | [web-chat](https://gitee.com/wfchat/vue-chat)         | 野火IM Web 端, [体验地址](https://web.wildfirechat.cn)。  |
-| [wx-chat](https://github.com/wildfirechat/wx-chat)           | [wx-chat](https://gitee.com/wfchat/wx-chat)           | 小程序平台的Demo(支持微信、百度、阿里、字节、QQ 等小程序平台)。  |
-| [uni-chat](https://github.com/wildfirechat/uni-chat)           | [uni-chat](https://gitee.com/wfchat/uni-chat)           | UniApp平台移动端应用(使用原生插件)。   |
-| [uni-wfc-client](https://github.com/wildfirechat/uni-wfc-client)           | [uni-wfc-client](https://gitee.com/wfchat/uni-wfc-client)           | UniApp平台原生插件。已[商店](https://ext.dcloud.net.cn/plugin?id=7895)上架   |
-| [wfc_flutter_plugins](https://github.com/wildfirechat/wfc_flutter_plugins)           | [flutter_imclient](https://gitee.com/wfchat/wfc_flutter_plugins)           | Flutter平台原生插件，支持IM和音视频通话。   |
-| [docs](https://github.com/wildfirechat/docs)                 | [docs](https://gitee.com/wfchat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明，[在线查看](https://docs.wildfirechat.cn/)。 |
+| [GitHub仓库](https://github.com/wildfirechat)                                    | [码云仓库](https://gitee.com/wfchat)                                        | 说明                                                                                      
+|--------------------------------------------------------------------------------|-------------------------------------------------------------------------| --------------------------------------------------------------------------
+| [im-server](https://github.com/wildfirechat/im-server)                         | [im-server](https://gitee.com/wfchat/im-server)                         | 野火社区版IM服务，野火IM的核心服务，处理所有IM相关业务。  |
+| [app-server](https://github.com/wildfirechat/app-server)                       | [app-server](https://gitee.com/wfchat/app-server)                       | Demo应用服务，模拟客户的应用服登陆处理逻辑及部分二次开发示例。 |
+| [robot_server](https://github.com/wildfirechat/robot_server)                   | [robot_server](https://gitee.com/wfchat/robot_server)                   | 机器人服务，演示野火机器人对接其它系统的方法。 |
+| [push_server](https://github.com/wildfirechat/push_server)                     | [push_server](https://gitee.com/wfchat/push_server)                     | 推送服务器，可以对接所有的系统厂商推送服务或者第三方推送服务。 |
+| [wf-minio](https://github.com/wildfirechat/WF-minio)                           | [wf-minio](https://gitee.com/wfchat/WF-minio)                           | 私有对象存储服务，用来支持野火IM专业版的文件存储。 |
+| [wf-janus](https://github.com/wildfirechat/wf-janus  )                         | [wf-janus](https://gitee.com/wfchat/wf-janus  )                         | 高级音视频媒体服务。 |
+| [open-platform](https://github.com/wildfirechat/open-platform)                 | [open-platform](https://gitee.com/wfchat/open-platform)                 | 野火开放平台服务。  |
+| [daily-report](https://github.com/wildfirechat/daily-report)                   | [daily-report](https://github.com/wildfirechat/daily-report)            | 野火开放平台日报 demo服务。 |
+| [channel-platform](https://github.com/wildfirechat/channel-platform)           | [channel-platform](https://gitee.com/wfchat/channel-platform)           | 野火频道(公众号)平台服务。  |
+| [organization-platform](https://github.com/wildfirechat/organization-platform) | [organization-platform](https://gitee.com/wfchat/organization-platform) | 野火组织通讯录服务。  |
+| [archive-server](https://github.com/wildfirechat/archive-server)               | [archive-server](https://gitee.com/wfchat/archive-server)               | 野火组织通讯录服务。  |
+| [android-chat](https://github.com/wildfirechat/android-chat)                   | [android-chat](https://gitee.com/wfchat/android-chat)                   | 野火IM Android SDK源码和App源码。 |
+| [ios-chat](https://github.com/wildfirechat/ios-chat)                           | [ios-chat](https://gitee.com/wfchat/ios-chat)                           | 野火IM iOS SDK源码和App源码。|
+| [pc-chat(electron)](https://github.com/wildfirechat/vue-pc-chat)               | [pc-chat(electron)](https://gitee.com/wfchat/vue-pc-chat)               | 基于[Electron](https://electronjs.org/)开发的PC 端                   |                         |
+| [pc-chat(Qt)](https://github.com/wildfirechat/qt-pc-chat)                      | [pc-chat(Qt)](https://gitee.com/wfchat/qt-pc-chat)                      | 基于Qt开发的PC 端                   |                         |
+| [web-chat](https://github.com/wildfirechat/vue-chat)                           | [web-chat](https://gitee.com/wfchat/vue-chat)                           | 野火IM Web 端, [体验地址](https://web.wildfirechat.cn)。  |
+| [wx-chat](https://github.com/wildfirechat/wx-chat)                             | [wx-chat](https://gitee.com/wfchat/wx-chat)                             | 小程序平台的Demo(支持微信、百度、阿里、字节、QQ 等小程序平台)。  |
+| [uni-chat](https://github.com/wildfirechat/uni-chat)                           | [uni-chat](https://gitee.com/wfchat/uni-chat)                           | UniApp平台移动端应用(使用原生插件)。   |
+| [uni-wfc-client](https://github.com/wildfirechat/uni-wfc-client)               | [uni-wfc-client](https://gitee.com/wfchat/uni-wfc-client)               | UniApp平台原生插件。已[商店](https://ext.dcloud.net.cn/plugin?id=7895)上架   |
+| [flutter-chat](https://github.com/wildfirechat/flutter-chat)                   | [flutter-chat](https://gitee.com/wfchat/flutter-chat)                   | Flutter平台原生插件，支持IM和音视频通话。   |
+| [docs](https://github.com/wildfirechat/docs)                                   | [docs](https://gitee.com/wfchat/docs)                                   | 野火IM相关文档，包含设计、概念、开发、使用说明，[在线查看](https://docs.wildfirechat.cn/)。 |

 ## 野火开发文档
 [在线文档](https://docs.wildfirechat.cn/)
@@ -158,6 +159,14 @@ mvn clean package
 ## 服务对象
 因为野火的使用范围比较广，难免被一些不法分子利用，国内反诈反赌力度很大，所以国内多地警方都跟我们都有过联系。***为了预防我们的产品被用于非法目的，试用及购买只能支持境内法人单位，不接受个人或者境外团体。如果我们发现产品被用于非法目的，我们会立即停止技术支持服务并且报警和配合警方调查。请用于非法目的用户绕行！***

+## 群的性能问题
+群的大小和性能不是线性相关的，而是O(N²)的关系，这是群的特性决定的。所以社区版IM服务很难支持很大的群人数，我们建议最大群不要超过500人，像微信的群大小一样。修改方法是修改数据库中```t_settings```表中的群最大人数。
+
+如果是专业版IM服务，普通群性能会有些加强，但也不会提高太多，所以我们就开发了超级群，可以支持上万群成员。关于超级群，请参考[野火超级群组](https://mp.weixin.qq.com/s/ov5ZiaEIUZuvgFBXOrcjbg)。现有客户有接近10W的群组成员能够流畅稳定地运行。
+
+## 网络问题
+如果是自建机房或者私有网络，可能会有跨运营商瓶颈，详情请参考[《从野火 IM 的网络踩坑经历，聊聊跨运营商访问的那些坑》](https://mp.weixin.qq.com/s/Pa8b93oMk58fjMgwtwmePQ)。
+
 ## 常见问题
 请参考文档[常见问题](https://docs.wildfirechat.cn/faq/server.html)

@@ -170,6 +170,16 @@ robot.callback_with_sender_info false
 ## 机器人回调信息是否带上目标的信息，单聊时是对方用户信息，群聊时是群组信息，频道时是频道信息
 robot.callback_with_target_info false

+## 是否允许@会话外的机器人。如果为true，单聊或者群聊时，可以@不在会话中的机器人。当机器人收到消息后，可以回复消息。
+## 如果为false，不能@不在会话中的机器人。机器人不在会话中时，也不能回复消息。
+robot.mention_external_robot true
+
+## 机器人获取信息允许的字段，可以获取userId/displayName/portrait，其他需要这里配置允许。
+## 第一位(1)是name， 第二位(2)是mobile，第三(4)位是email，第四位(8)是address，第五位(16)是company，第六位(32)是extra，
+## 第七位(64)是updateDt，第八位(128)是gender，第九位(256)是social，第十位(512)是type。
+## 比如允许获取name和email就是5(1+4)，允许获取name和mobile和company和type就是531（1+2+16+512），允许全部是1023(1+2+...+512)
+#robot.get_user_info_mask 1023
+
 ## 频道回调信息是否带上用户clientId和平台类型。
 channel.callback_with_client_info false

@@ -189,8 +199,8 @@ friend.disable_search false
 ##禁止按照昵称搜索用户。
 friend.disable_nick_name_search false

-##禁止按照用户id搜索用户，默认为true。
-friend.disable_user_id_search true
+##禁止按照用户id搜索用户，默认为false。
+friend.disable_user_id_search false

 ##禁止发送好友邀请，通过server api添加好友不受此限制(force参数需要为true)
 friend.disable_friend_request false
@@ -207,6 +217,12 @@ friend.request_expiration_duration 604800000
 ##好友请求限制频率，一个用户24小时之内允许请求好友的次数，默认不限频。
 friend.request_rate_limit 30

+##如果搜索电话号码，24小时内搜索错误号码几次就不再允许电话号码搜素。防止有人遍历搜索电话号码
+friend.search_mobile_empty_rate_limit 5
+
+##如果搜索用户，24小时内搜索次数。防止有人遍历用户名或者用户ID乱加好友。另外可以禁止ID搜索friend.disable_user_id_search
+friend.search_rate_limit 100
+
 ##请求添加机器人为好友时，机器人是否自动接受，默认为true
 friend.robot_auto_accept true

@@ -263,6 +279,16 @@ group.enable_mark_deletion true
 ## 销毁用户时，用户信息会被清空，deleted字段设置为1，这个开关控制是否保留用户昵称，默认为true。
 user.keep_display_name_when_destroy true

+## 销毁用户时deleted字段设置为1，这个开关控制是否保留其他信息，默认是false。
+user.keep_full_info_when_destroy false
+
+## 销毁用户时，如果user.keep_full_info_when_destroy为true，会保留所有信息，这个开关控制是否保留这个用户信息的电话号码，默认为false。
+## 当保留所有信息且保留电话号码时，用户如果再注册会用到原来的UID，能够看到原来用户的消息，需要考虑一下是否让已删除用户再次注册登录看到之前的消息。
+user.keep_mobile_when_destroy false
+
+## 销毁用户时是否保留归属于这个用户的所有消息记录，默认为false。
+user.keep_messages_when_destroy false
+
 # 好友/好友请求/用户设置 这三类数据同步的最大条目数。之前是客户第一次登录时，会把所有的对应数据一次下载到客户端，但如果有特别多的信息，会导致无法同步到客户端，
 # 因此需要分段多次同步，此开关定义了每次同步的数据的条数。此需要客户端支持，客户端SDK在2021.5.25日后支持此功能。如果确认所有客户端都在这个日志之后才可以打开此设置。
 #sync.data_part_size 1000
@@ -314,6 +340,15 @@ qiniu.bucket_portrait_name storage
 qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn
 qiniu.bucket_favorite_name storage
 qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
+## custom的桶是给客户预留的，客户可以上传自己的文件到这3个桶中，野火不会用到这几个桶。如果不需要，可以忽略这几个配置
+qiniu.bucket_custom1_name temp1
+qiniu.bucket_custom1_domain http://temp1.wildfirechat.cn
+qiniu.bucket_custom2_name temp2
+qiniu.bucket_custom2_domain http://temp2.wildfirechat.cn
+qiniu.bucket_custom3_name temp3
+qiniu.bucket_custom3_domain http://temp3.wildfirechat.cn
+qiniu.bucket_pan_name pan
+qiniu.bucket_pan_domain http://pan.wildfirechat.cn

 ##媒体类型分类
 #Media_Type_GENERAL = 0,
@@ -346,6 +381,12 @@ server.multi_pc_endpoint false
 ## 是否支持PAD多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PAD端多端登录。
 server.multi_pad_endpoint false

+## 是否支持可穿戴设备多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开可穿戴设备多端登录。
+server.multi_wearable_endpoint false
+
+## 是否支持TV设备多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开TV多端登录。
+server.multi_tv_endpoint false
+
 # 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或pad或web端登录的通知。
 server.multi_platform_notification true

@@ -0,0 +1 @@
+alter table `t_messages` modify column `_target` varchar(129) NOT NULL;
@@ -0,0 +1 @@
+ALTER TABLE `t_user_session` ADD COLUMN `_ip` varchar(40) DEFAULT '';
@@ -0,0 +1 @@
+CREATE INDEX `user_gid_type_index` ON `t_group_member` (`_gid`, `_type`);
@@ -0,0 +1,13 @@
+
+DROP TABLE IF EXISTS `t_conference`;
+CREATE TABLE `t_conference` (
+  `_id` varchar(64) NOT NULL PRIMARY KEY,
+  `_des` varchar(64) NOT NULL,
+  `_pin` varchar(16) NOT NULL,
+  `_max_publishers` int(11) NOT NULL DEFAULT 0,
+  `_bitrate` int(11) NOT NULL DEFAULT 0,
+  `_advance` tinyint NOT NULL DEFAULT 0,
+  `_recording` tinyint NOT NULL DEFAULT 0,
+  `_create_dt` bigint(20) NOT NULL
+);
+
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS `t_join_group_request`;
+CREATE TABLE `t_join_group_request` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NOT NULL,
+  `_gid` varchar(64) NOT NULL,
+  `_mid` varchar(64) NOT NULL,
+  `_request_uid` varchar(64) NOT NULL,
+  `_accept_uid` varchar(64) DEFAULT NULL,
+  `_reason` TEXT DEFAULT NULL,
+  `_extra` TEXT DEFAULT NULL,
+  `_status` tinyint NOT NULL DEFAULT 0,
+  `_dt` bigint(20) NOT NULL,
+  `_read_status` tinyint DEFAULT 0,
+  UNIQUE INDEX `join_group_request_key_index` (`_uid` DESC, `_gid` DESC, `_mid` DESC, `_request_uid` DESC),
+  INDEX `join_group_request_gm_index` (`_gid` DESC, `_mid` DESC),
+  INDEX `join_group_request_sync_index` (`_uid` DESC, `_dt` DESC)
+);
@@ -0,0 +1 @@
+alter table t_friend add index `friend_uid_index` (`_friend_uid`);
@@ -0,0 +1,3 @@
+ALTER TABLE `t_conference` ADD COLUMN `_delete_by` varchar(64) DEFAULT '';
+ALTER TABLE `t_conference` ADD COLUMN `_deleted` tinyint DEFAULT 0;
+ALTER TABLE `t_conference` ADD COLUMN `_delete_dt` bigint(20) DEFAULT 0;
@@ -0,0 +1,37 @@
+alter table `t_messages` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_0` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_1` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_2` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_3` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_4` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_5` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_6` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_7` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_8` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_9` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_10` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_11` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_12` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_13` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_14` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_15` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_16` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_17` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_18` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_19` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_20` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_21` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_22` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_23` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_24` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_25` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_26` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_27` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_28` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_29` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_30` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_31` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_32` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_33` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_34` modify column `_target` varchar(129) NOT NULL;
+alter table `t_messages_35` modify column `_target` varchar(129) NOT NULL;
@@ -0,0 +1 @@
+ALTER TABLE `t_user_session` ADD COLUMN `_ip` varchar(40) DEFAULT '';
@@ -0,0 +1 @@
+CREATE INDEX `user_gid_type_index` ON `t_group_member` (`_gid`, `_type`);
@@ -0,0 +1,16 @@
+
+DROP TABLE IF EXISTS `t_conference`;
+CREATE TABLE `t_conference` (
+  `_id` varchar(64) NOT NULL PRIMARY KEY,
+  `_des` varchar(64) NOT NULL,
+  `_pin` varchar(16) NOT NULL,
+  `_max_publishers` int(11) NOT NULL DEFAULT 0,
+  `_bitrate` int(11) NOT NULL DEFAULT 0,
+  `_advance` tinyint NOT NULL DEFAULT 0,
+  `_recording` tinyint NOT NULL DEFAULT 0,
+  `_create_dt` bigint(20) NOT NULL
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;
+
@@ -0,0 +1,21 @@
+
+DROP TABLE IF EXISTS `t_join_group_request`;
+CREATE TABLE `t_join_group_request` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NOT NULL,
+  `_gid` varchar(64) NOT NULL,
+  `_mid` varchar(64) NOT NULL,
+  `_request_uid` varchar(64) NOT NULL,
+  `_accept_uid` varchar(64) DEFAULT NULL,
+  `_reason` TEXT DEFAULT NULL,
+  `_extra` TEXT DEFAULT NULL,
+  `_status` tinyint NOT NULL DEFAULT 0,
+  `_dt` bigint(20) NOT NULL,
+  `_read_status` tinyint DEFAULT 0,
+  UNIQUE INDEX `join_group_request_key_index` (`_uid` DESC, `_gid` DESC, `_mid` DESC, `_request_uid` DESC),
+  INDEX `join_group_request_gm_index` (`_gid` DESC, `_mid` DESC),
+  INDEX `join_group_request_sync_index` (`_uid` DESC, `_dt` DESC)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;
@@ -0,0 +1 @@
+alter table t_friend add index `friend_uid_index` (`_friend_uid`);
@@ -0,0 +1,3 @@
+ALTER TABLE `t_conference` ADD COLUMN `_delete_by` varchar(64) DEFAULT '';
+ALTER TABLE `t_conference` ADD COLUMN `_deleted` tinyint DEFAULT 0;
+ALTER TABLE `t_conference` ADD COLUMN `_delete_dt` bigint(20) DEFAULT 0;
@@ -5,7 +5,7 @@
        <relativePath>../</relativePath>
        <artifactId>wildfirechat-parent</artifactId>
        <groupId>cn.wildfirechat</groupId>
-        <version>1.3.8</version>
+        <version>1.4.6</version>
    </parent>

    <artifactId>moquette-broker</artifactId>
@@ -211,60 +211,6 @@

    <build>
        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/*Test.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-
-            <!-- Generate the test-jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Includes to generate OSGi headers -->
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
            <plugin>
                <groupId>pl.project13.maven</groupId>
                <artifactId>git-commit-id-plugin</artifactId>
@@ -96,13 +96,18 @@ public class PushServer {
            session.getPlatform() == ProtoConstants.Platform.Platform_Android ||
            session.getPlatform() == ProtoConstants.Platform.Platform_APad ||
            session.getPlatform() == ProtoConstants.Platform.Platform_Harmony ||
-            session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad
+            session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_AppleTV ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_AndroidTV ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyTV ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyWearable ||
+            session.getPlatform() == ProtoConstants.Platform.Platform_AndroidWearable
        ) {
            String url = androidPushServerUrl;
-            if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS || session.getPlatform() == ProtoConstants.Platform.Platform_iPad) {
+            if (session.getPlatform() == ProtoConstants.Platform.Platform_iOS || session.getPlatform() == ProtoConstants.Platform.Platform_iPad || session.getPlatform() == ProtoConstants.Platform.Platform_AppleTV) {
                url = iOSPushServerUrl;
                pushMessage.voipDeviceToken = session.getVoipDeviceToken();
-            } else if (session.getPlatform() == ProtoConstants.Platform.Platform_Harmony || session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad) {
+            } else if (session.getPlatform() == ProtoConstants.Platform.Platform_Harmony || session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyPad || session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyWearable || session.getPlatform() == ProtoConstants.Platform.Platform_HarmonyTV) {
                url = harmonyPushServerUrl;
            }
            HttpUtils.httpJsonPost(url, gson.toJson(pushMessage, pushMessage.getClass()), POST_TYPE_Push);
@@ -35,6 +35,9 @@ public class ThreadPoolExecutorWrapper {
        executor.execute(() -> {
            try {
                task.run();
+            } catch (Exception e) {
+                e.printStackTrace();
+                LOG.info("execute error = {}", e.toString());
            } finally {
                int endCount = runCounter.decrementAndGet();
                LOG.debug("Finish task and current task count {} use time {}", endCount, System.currentTimeMillis()-startTime);
@@ -144,7 +144,7 @@ abstract public class Action {
                errorCode = ErrorCode.ERROR_CODE_SUCCESS;
            }

-            RestResult result = RestResult.resultOf(errorCode, errorCode.getMsg(), RestResult.resultOf(errorCode));
+            RestResult result = RestResult.resultOf(errorCode, errorCode.getMsg(), null);
            response.setContent(gson.toJson(result));
            response.send();
        }
@@ -11,6 +11,7 @@ package com.xiaoleilu.loServer.action;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
+import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
@@ -28,7 +29,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import cn.wildfirechat.common.ErrorCode;

+import java.net.InetSocketAddress;
 import java.util.Base64;
+import java.util.Map;
 import java.util.concurrent.Executor;

@Route("/route")
@@ -111,6 +114,12 @@ public class RouteAction extends Action {
                WFCMessage.IMHttpWrapper wrapper = WFCMessage.IMHttpWrapper.parseFrom(bytes);
                String token = wrapper.getToken();
                String userId = Tokenor.getUserId(token.getBytes());
+
+                String remote = ((InetSocketAddress) ctx.channel().remoteAddress())
+                    .getAddress().getHostAddress();
+                String ip = computeRealIp(request.getHeaders(), remote);
+
+
                LOG.info("RouteAction token={}, userId={}", token, userId);
                if (userId == null) {
                    sendResponse(response, ErrorCode.ERROR_CODE_TOKEN_ERROR, null);
@@ -119,6 +128,8 @@ public class RouteAction extends Action {
                        @Override
                        public void onSuccess(byte[] result) {
                            sendResponse(response, null, result);
+                            //save ip after success response.
+                            sessionsStore.updateSessionIp(userId, wrapper.getClientId(), ip);
                        }

                        @Override
@@ -147,6 +158,20 @@ public class RouteAction extends Action {
        return true;
    }

+    private String computeRealIp(Map<String, String> h, String remote) {
+        String xff = h.get("X-Forwarded-For");
+        if (xff != null && !xff.isEmpty() && !"unknown".equalsIgnoreCase(xff)) {
+            int idx = xff.indexOf(',');
+            String first = (idx > 0 ? xff.substring(0, idx) : xff).trim();
+            return first;
+        }
+        String xri = h.get("X-Real-IP");
+        if (xri != null && !xri.isEmpty() && !"unknown".equalsIgnoreCase(xri)) {
+            return xri;
+        }
+        return remote;
+    }
+
    private void sendResponse(Response response, ErrorCode errorCode, byte[] contents) {
        response.setStatus(HttpResponseStatus.OK);
        if (contents == null) {
@@ -24,6 +24,8 @@ import org.slf4j.LoggerFactory;

 import java.io.File;
 import java.io.RandomAccessFile;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.UUID;
@@ -213,7 +215,7 @@ public class UploadFileAction extends Action {
                    return false;
                }

-
+                remoteFileName = getSafeFileName(remoteFileName);

                String remoteFileExt = "";
                if (remoteFileName.lastIndexOf(".") == -1) {
@@ -339,6 +341,15 @@ public class UploadFileAction extends Action {
        return true;
    }

+    private static String getSafeFileName(String originalFilename) {
+        // Paths.get() 会解析路径，getFileName() 只取最后一部分（纯文件名）
+        Path filenamePath = Paths.get(originalFilename.trim());
+        String safeFilename = filenamePath.getFileName().toString();
+        // 额外过滤特殊字符（可选，根据业务需要）
+        safeFilename = safeFilename.replaceAll("[\\\\/:*?\"<>|]", "_");
+        return safeFilename.isEmpty() ? "default_file_" + System.currentTimeMillis() : safeFilename;
+    }
+
    public static void put(File file, long pos, byte[] data) throws Exception {
        RandomAccessFile raf = null;
        try {
@@ -56,7 +56,7 @@ public class CreateUserAction extends AdminAction {
                if (inputCreateUser.getName() != null)
                    newUserBuilder.setName(inputCreateUser.getName());
                if (inputCreateUser.getDisplayName() != null)
-                    newUserBuilder.setDisplayName(StringUtil.isNullOrEmpty(inputCreateUser.getDisplayName()) ? inputCreateUser.getName() : inputCreateUser.getDisplayName());
+                    newUserBuilder.setDisplayName(inputCreateUser.getDisplayName());
                if (inputCreateUser.getPortrait() != null)
                    newUserBuilder.setPortrait(inputCreateUser.getPortrait());
                if (inputCreateUser.getEmail() != null)
@@ -65,11 +65,8 @@ public class CreateUserAction extends AdminAction {
                    newUserBuilder.setAddress(inputCreateUser.getAddress());
                if (inputCreateUser.getCompany() != null)
                    newUserBuilder.setCompany(inputCreateUser.getCompany());
-
                if (inputCreateUser.getSocial() != null)
                    newUserBuilder.setSocial(inputCreateUser.getSocial());
-
-
                if (inputCreateUser.getMobile() != null)
                    newUserBuilder.setMobile(inputCreateUser.getMobile());
                newUserBuilder.setGender(inputCreateUser.getGender());
@@ -11,12 +11,17 @@ package com.xiaoleilu.loServer.action.admin;
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.pojos.InputUpdateFriendExtra;
+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.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+import win.liyufan.im.IMTopic;

@Route(APIPath.Friend_Set_Extra)
@HttpMethod("POST")
@@ -31,8 +36,17 @@ public class FriendExtraPutAction extends AdminAction {
    public boolean action(Request request, Response response) {
        if (request.getNettyRequest() instanceof FullHttpRequest) {
            InputUpdateFriendExtra input = getRequestBody(request.getNettyRequest(), InputUpdateFriendExtra.class);
-            ErrorCode errorCode = messagesStore.setFriendExtraRequest(input.getOperator(), input.getTargetId(), input.getExtra(), new long[1]);
-            setResponseContent(RestResult.resultOf(errorCode), response);
+            if (input != null && !StringUtil.isNullOrEmpty(input.getOperator()) && !StringUtil.isNullOrEmpty(input.getTargetId())) {
+                sendApiMessage(response, input.getOperator(), IMTopic.SetFriendExtraTopic, WFCMessage.StringPair.newBuilder().setKey(input.getTargetId()).setValue(input.getExtra()==null?"":input.getExtra()).build().toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    return new Result(errorCode);
+                });
+                return false;
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
        }
        return true;
    }
@@ -0,0 +1,62 @@
+/*
+ * 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 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.*;
+
+@Route(APIPath.User_Get_All_Robots)
+@HttpMethod("POST")
+public class GetAllRobotAction 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.Robot> robots = messagesStore.getRobotInfoList(input.count, input.offset);
+
+                OutputGetRobotList outputGetUserList = new OutputGetRobotList();
+                outputGetUserList.robotInfoList = new ArrayList<>();
+                robots.forEach(robotData -> {
+                    WFCMessage.User userInfoData = messagesStore.getUserInfo(robotData.getUid());
+                    if (userInfoData != null && !StringUtil.isNullOrEmpty(userInfoData.getName()) && userInfoData.getDeleted() ==0) {
+                        OutputRobot outputRobot = new OutputRobot();
+                        outputRobot.fromUser(userInfoData);
+                        outputRobot.fromRobot(robotData, true);
+                        outputGetUserList.robotInfoList.add(outputRobot);
+                    }
+                });
+
+                RestResult result = RestResult.ok(outputGetUserList);
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}
@@ -0,0 +1,126 @@
+/*
+ * 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.InputGetPresignedUploadUrl;
+import cn.wildfirechat.pojos.OutputPresignedUploadUrl;
+import com.qiniu.util.Auth;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.robot.RobotAction;
+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.server.config.MediaServerConfig;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import java.util.UUID;
+
+@Route(APIPath.Get_Presigned_Upload_Url)
+@HttpMethod("POST")
+public class GetUploadUrlAction extends AdminAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            if(!MediaServerConfig.USER_QINIU) {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+                return true;
+            }
+
+            InputGetPresignedUploadUrl inputUserId = getRequestBody(request.getNettyRequest(), InputGetPresignedUploadUrl.class);
+
+            if (StringUtil.isNullOrEmpty(inputUserId.contentType)) {
+                inputUserId.contentType = "application/octet-stream";
+            }
+            String uuid = UUID.randomUUID().toString().replace("-", "");
+            inputUserId.fileName = uuid + inputUserId.fileName;
+
+            int type = inputUserId.mediaType;
+            String bucketName;
+            String bucketDomain;
+            switch (type) {
+                case 0:
+                default:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
+                    break;
+                case 1:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_IMAGE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_IMAGE_DOMAIN;
+                    break;
+                case 2:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_VOICE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_VOICE_DOMAIN;
+                    break;
+                case 3:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_VIDEO_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_VIDEO_DOMAIN;
+                    break;
+                case 4:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_FILE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_FILE_DOMAIN;
+                    break;
+                case 5:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_PORTRAIT_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_PORTRAIT_DOMAIN;
+                    break;
+                case 6:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_FAVORITE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_FAVORITE_DOMAIN;
+                    break;
+                case 7:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_STICKER_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_STICKER_DOMAIN;
+                    break;
+                case 8:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN;
+                    break;
+                case 9:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM1_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM1_DOMAIN;
+                    break;
+                case 10:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM2_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM2_DOMAIN;
+                    break;
+                case 11:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN;
+                    break;
+                case 12:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_PAN_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_PAN_DOMAIN;
+                    break;
+            }
+
+            if(StringUtil.isNullOrEmpty(bucketName)) {
+                bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
+                bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
+            }
+
+            String key = inputUserId.fileName;
+            Auth auth = Auth.create(MediaServerConfig.QINIU_ACCESS_KEY, MediaServerConfig.QINIU_SECRET_KEY);
+            String token = auth.uploadToken(bucketName, key);
+            String downloadUrl = bucketDomain + "/" + key;
+            String uploadUrl = "https://" + MediaServerConfig.QINIU_SERVER_URL + "?" + token + "?" + key;
+
+            OutputPresignedUploadUrl outputPresignedUploadUrl = new OutputPresignedUploadUrl();
+            outputPresignedUploadUrl.uploadUrl = uploadUrl;
+            outputPresignedUploadUrl.downloadUrl = downloadUrl;
+            outputPresignedUploadUrl.type = 1;
+            setResponseContent(RestResult.ok(outputPresignedUploadUrl), response);
+        }
+        return true;
+    }
+}
@@ -49,7 +49,7 @@ public class GetUserAction extends AdminAction {
                }

                RestResult result;
-                if (user == null || user.getDeleted() > 0) {
+                if (user == null || (user.getDeleted() > 0 && !inputUserId.isIncludeDeleted())) {
                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                } else {
                    result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
@@ -0,0 +1,49 @@
+/*
+ * 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.InputRobotId;
+import cn.wildfirechat.pojos.InputUserId;
+import cn.wildfirechat.pojos.OutputRobot;
+import cn.wildfirechat.pojos.OutputStringList;
+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;
+
+@Route(APIPath.User_Get_User_Robots)
+@HttpMethod("POST")
+public class GetUserRobotsAction 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);
+            if (inputUserId != null
+                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()))) {
+                RestResult result = RestResult.ok(new OutputStringList(messagesStore.getUserRobotIds(inputUserId.getUserId())));
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+        }
+        return true;
+    }
+}
@@ -0,0 +1,65 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputUserInfoList;
+import cn.wildfirechat.proto.WFCMessage;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.User_Get_By_Mobile)
+@HttpMethod("POST")
+public class GetUsersByMobileAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetUserInfo email = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
+            if (!StringUtil.isNullOrEmpty(email.getMobile())) {
+                List<WFCMessage.User> users = messagesStore.getUserInfosByMobile(email.getMobile(), email.isIncludeDeleted());
+                List<InputOutputUserInfo> list = new ArrayList<>();
+                for (WFCMessage.User user : users) {
+                    list.add(InputOutputUserInfo.fromPbUser(user));
+                }
+
+                RestResult result;
+                if (list.isEmpty()) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    OutputUserInfoList outputUserInfoList = new OutputUserInfoList();
+                    outputUserInfoList.userInfos = list;
+                    result = RestResult.ok(outputUserInfoList);
+                }
+
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.InputStringList;
+import cn.wildfirechat.pojos.OutputUserInfoList;
+import cn.wildfirechat.proto.WFCMessage;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Robot_User_Batch_Get_Infos)
+@HttpMethod("POST")
+public class GetBatchUserAction extends RobotAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputStringList inputUserId = getRequestBody(request.getNettyRequest(), InputStringList.class);
+            if (inputUserId != null && inputUserId.getList() != null && !inputUserId.getList().isEmpty()) {
+
+                OutputUserInfoList res = new OutputUserInfoList();
+                res.userInfos = new ArrayList<>();
+                int mask = messagesStore.getRobotGetUserInfoMask();
+                for (String userId : inputUserId.getList()) {
+                    WFCMessage.User user = messagesStore.getUserInfo(userId);
+                    if(user == null || StringUtil.isNullOrEmpty(user.getName())) {
+                        continue;
+                    }
+                    InputOutputUserInfo inputOutputUserInfo = InputOutputUserInfo.fromPbUser(user);
+                    if((mask & 1) == 0) {
+                        inputOutputUserInfo.setName(null);
+                    }
+                    if((mask & 2) == 0) {
+                        inputOutputUserInfo.setMobile(null);
+                    }
+                    if((mask & 4) == 0) {
+                        inputOutputUserInfo.setEmail(null);
+                    }
+                    if((mask & 8) == 0) {
+                        inputOutputUserInfo.setAddress(null);
+                    }
+                    if((mask & 16) == 0) {
+                        inputOutputUserInfo.setCompany(null);
+                    }
+                    if((mask & 32) == 0) {
+                        inputOutputUserInfo.setExtra(null);
+                    }
+                    if((mask & 64) == 0) {
+                        inputOutputUserInfo.setUpdateDt(0);
+                    }
+                    if((mask & 128) == 0) {
+                        inputOutputUserInfo.setGender(0);
+                    }
+                    if((mask & 256) == 0) {
+                        inputOutputUserInfo.setSocial(null);
+                    }
+                    if((mask & 512) == 0) {
+                        inputOutputUserInfo.setType(0);
+                    }
+                    res.userInfos.add(inputOutputUserInfo);
+                }
+                RestResult result = RestResult.ok(res);
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+        }
+        return true;
+    }
+}
@@ -0,0 +1,139 @@
+/*
+ * 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.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetPresignedUploadUrl;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputPresignedUploadUrl;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.qiniu.util.Auth;
+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.moquette.server.config.MediaServerConfig;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.time.ZonedDateTime;
+import java.util.*;
+
+@Route(APIPath.Robot_Get_Presigned_Upload_Url)
+@HttpMethod("POST")
+public class GetUploadUrlAction extends RobotAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            if(!MediaServerConfig.USER_QINIU) {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+                return true;
+            }
+
+            InputGetPresignedUploadUrl inputUserId = getRequestBody(request.getNettyRequest(), InputGetPresignedUploadUrl.class);
+
+            if (StringUtil.isNullOrEmpty(inputUserId.contentType)) {
+                inputUserId.contentType = "application/octet-stream";
+            }
+            String uuid = UUID.randomUUID().toString().replace("-", "");
+            inputUserId.fileName = uuid + inputUserId.fileName;
+
+            int type = inputUserId.mediaType;
+            String bucketName;
+            String bucketDomain;
+            switch (type) {
+                case 0:
+                default:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
+                    break;
+                case 1:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_IMAGE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_IMAGE_DOMAIN;
+                    break;
+                case 2:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_VOICE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_VOICE_DOMAIN;
+                    break;
+                case 3:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_VIDEO_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_VIDEO_DOMAIN;
+                    break;
+                case 4:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_FILE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_FILE_DOMAIN;
+                    break;
+                case 5:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_PORTRAIT_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_PORTRAIT_DOMAIN;
+                    break;
+                case 6:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_FAVORITE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_FAVORITE_DOMAIN;
+                    break;
+                case 7:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_STICKER_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_STICKER_DOMAIN;
+                    break;
+                case 8:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN;
+                    break;
+                case 9:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM1_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM1_DOMAIN;
+                    break;
+                case 10:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM2_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM2_DOMAIN;
+                    break;
+                case 11:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN;
+                    break;
+                case 12:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_PAN_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_PAN_DOMAIN;
+                    break;
+            }
+
+            if(StringUtil.isNullOrEmpty(bucketName)) {
+                bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
+                bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
+            }
+
+            String key = inputUserId.fileName;
+            Auth auth = Auth.create(MediaServerConfig.QINIU_ACCESS_KEY, MediaServerConfig.QINIU_SECRET_KEY);
+            String token = auth.uploadToken(bucketName, key);
+            String downloadUrl = bucketDomain + "/" + key;
+            String uploadUrl = "https://" + MediaServerConfig.QINIU_SERVER_URL + "?" + token + "?" + key;
+
+            OutputPresignedUploadUrl outputPresignedUploadUrl = new OutputPresignedUploadUrl();
+            outputPresignedUploadUrl.uploadUrl = uploadUrl;
+            outputPresignedUploadUrl.downloadUrl = downloadUrl;
+            outputPresignedUploadUrl.type = 1;
+            setResponseContent(RestResult.ok(outputPresignedUploadUrl), response);
+        }
+        return true;
+    }
+}
@@ -47,7 +47,39 @@ public class GetUserAction extends RobotAction {
                if (user == null || user.getDeleted() > 0) {
                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
                } else {
-                    result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
+                    InputOutputUserInfo outputUserInfo = InputOutputUserInfo.fromPbUser(user);
+                    int mask = messagesStore.getRobotGetUserInfoMask();
+                    if((mask & 1) == 0) {
+                        outputUserInfo.setName(null);
+                    }
+                    if((mask & 2) == 0) {
+                        outputUserInfo.setMobile(null);
+                    }
+                    if((mask & 4) == 0) {
+                        outputUserInfo.setEmail(null);
+                    }
+                    if((mask & 8) == 0) {
+                        outputUserInfo.setAddress(null);
+                    }
+                    if((mask & 16) == 0) {
+                        outputUserInfo.setCompany(null);
+                    }
+                    if((mask & 32) == 0) {
+                        outputUserInfo.setExtra(null);
+                    }
+                    if((mask & 64) == 0) {
+                        outputUserInfo.setUpdateDt(0);
+                    }
+                    if((mask & 128) == 0) {
+                        outputUserInfo.setGender(0);
+                    }
+                    if((mask & 256) == 0) {
+                        outputUserInfo.setSocial(null);
+                    }
+                    if((mask & 512) == 0) {
+                        outputUserInfo.setType(0);
+                    }
+                    result = RestResult.ok(outputUserInfo);
                }
                setResponseContent(result, response);
            } else {
@@ -0,0 +1,92 @@
+/*
+ * 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.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputUserInfoList;
+import cn.wildfirechat.proto.WFCMessage;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Robot_User_Get_Email_Info)
+@HttpMethod("POST")
+public class GetUsersByEmailAction extends RobotAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            String email = getRequestBody(request.getNettyRequest(), String.class);
+            if (!StringUtil.isNullOrEmpty(email)) {
+
+                List<WFCMessage.User> users = messagesStore.getUserInfosByEmail(email);
+                List<InputOutputUserInfo> list = new ArrayList<>();
+                int mask = messagesStore.getRobotGetUserInfoMask();
+                for (WFCMessage.User user : users) {
+                    InputOutputUserInfo outputUserInfo = InputOutputUserInfo.fromPbUser(user);
+                    if((mask & 1) == 0) {
+                        outputUserInfo.setName(null);
+                    }
+                    if((mask & 2) == 0) {
+                        outputUserInfo.setMobile(null);
+                    }
+                    if((mask & 4) == 0) {
+                        outputUserInfo.setEmail(null);
+                    }
+                    if((mask & 8) == 0) {
+                        outputUserInfo.setAddress(null);
+                    }
+                    if((mask & 16) == 0) {
+                        outputUserInfo.setCompany(null);
+                    }
+                    if((mask & 32) == 0) {
+                        outputUserInfo.setExtra(null);
+                    }
+                    if((mask & 64) == 0) {
+                        outputUserInfo.setUpdateDt(0);
+                    }
+                    if((mask & 128) == 0) {
+                        outputUserInfo.setGender(0);
+                    }
+                    if((mask & 256) == 0) {
+                        outputUserInfo.setSocial(null);
+                    }
+                    if((mask & 512) == 0) {
+                        outputUserInfo.setType(0);
+                    }
+                    list.add(outputUserInfo);
+                }
+
+                RestResult result;
+                if (list.isEmpty()) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    OutputUserInfoList outputUserInfoList = new OutputUserInfoList();
+                    outputUserInfoList.userInfos = list;
+                    result = RestResult.ok(outputUserInfoList);
+                }
+
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}
@@ -0,0 +1,112 @@
+/*
+ * 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.robot;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.Conversation;
+import cn.wildfirechat.pojos.ReplyMessageData;
+import cn.wildfirechat.pojos.SendMessageData;
+import cn.wildfirechat.pojos.SendMessageResult;
+import cn.wildfirechat.proto.ProtoConstants;
+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.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.jetbrains.annotations.NotNull;
+import win.liyufan.im.IMTopic;
+
+import java.util.Arrays;
+
+@Route(APIPath.Robot_Message_Reply)
+@HttpMethod("POST")
+public class ReplyMessageAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            ReplyMessageData replyMessageData = getRequestBody(request.getNettyRequest(), ReplyMessageData.class);
+            if (ReplyMessageData.isValide(replyMessageData)) {
+                WFCMessage.Message message = messagesStore.getMessage(replyMessageData.getMessageUid());
+                ErrorCode errorCode = null;
+                if(message == null) {
+                    errorCode = ErrorCode.ERROR_CODE_NOT_EXIST;
+                } else if(!message.getContent().getMentionedTargetList().contains(robot.getUid())) {
+                    errorCode = ErrorCode.ERROR_CODE_INVALID_MESSAGE;
+                } else if(message.getConversation().getType() != ProtoConstants.ConversationType.ConversationType_Private && message.getConversation().getType() != ProtoConstants.ConversationType.ConversationType_Group) {
+                    errorCode = ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
+                } else if(System.currentTimeMillis() - message.getServerTimestamp() > 15*60*1000) {
+                    errorCode = ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
+                } else if(!messagesStore.isRobotMentionExternalRobot()) {
+                    if(message.getConversation().getType() != ProtoConstants.ConversationType.ConversationType_Group) {
+                        errorCode = ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
+                    } else {
+                        WFCMessage.GroupMember member = messagesStore.getGroupMember(message.getConversation().getTarget(), robot.getUid());
+                        if(member == null || member.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Removed) {
+                            errorCode = ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
+                        }
+                    }
+                }
+
+                if(errorCode != null) {
+                    response.setStatus(HttpResponseStatus.OK);
+                    RestResult result = RestResult.resultOf(errorCode);
+                    response.setContent(gson.toJson(result));
+                    return true;
+                }
+
+                SendMessageData sendMessageData = getSendMessageData(message, replyMessageData);
+                WFCMessage.Message newMsg = sendMessageData.toProtoMessage().toBuilder().setMessageId(message.getMessageId()).build();
+                sendApiRequest(response, IMTopic.RobotReplyMessageTopic, newMsg.toByteArray(), result -> {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode ec = ErrorCode.fromCode(byteBuf.readByte());
+                    if (ec == ErrorCode.ERROR_CODE_SUCCESS) {
+                        long messageId = byteBuf.readLong();
+                        long timestamp = byteBuf.readLong();
+                        sendResponse(response, null, new SendMessageResult(messageId, timestamp));
+                    } else {
+                        sendResponse(response, ec, null);
+                    }
+                });
+                return false;
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+        }
+        return true;
+    }
+
+    private @NotNull SendMessageData getSendMessageData(WFCMessage.Message message, ReplyMessageData replyMessageData) {
+        SendMessageData sendMessageData = new SendMessageData();
+        sendMessageData.setSender(robot.getUid());
+        Conversation conversation = new Conversation();
+        conversation.setType(message.getConversation().getType());
+        conversation.setLine(message.getConversation().getLine());
+        conversation.setTarget(message.getConversation().getTarget());
+        sendMessageData.setConv(conversation);
+        sendMessageData.setPayload(replyMessageData.getPayload());
+        if(replyMessageData.isOnly2Sender()) {
+            sendMessageData.setToUsers(Arrays.asList(message.getFromUser()));
+        }
+        return sendMessageData;
+    }
+}
@@ -82,6 +82,15 @@ public final class BrokerConstants {
    public static final String QINIU_BUCKET_PORTRAIT_DOMAIN = "qiniu.bucket_portrait_domain";
    public static final String QINIU_BUCKET_FAVORITE_NAME= "qiniu.bucket_favorite_name";
    public static final String QINIU_BUCKET_FAVORITE_DOMAIN = "qiniu.bucket_favorite_domain";
+    public static final String QINIU_BUCKET_CUSTOM1_NAME= "qiniu.bucket_custom1_name";
+    public static final String QINIU_BUCKET_CUSTOM1_DOMAIN = "qiniu.bucket_custom1_domain";
+    public static final String QINIU_BUCKET_CUSTOM2_NAME= "qiniu.bucket_custom2_name";
+    public static final String QINIU_BUCKET_CUSTOM2_DOMAIN = "qiniu.bucket_custom2_domain";
+    public static final String QINIU_BUCKET_CUSTOM3_NAME= "qiniu.bucket_custom3_name";
+    public static final String QINIU_BUCKET_CUSTOM3_DOMAIN = "qiniu.bucket_custom3_domain";
+    public static final String QINIU_BUCKET_PAN_NAME= "qiniu.bucket_pan_name";
+    public static final String QINIU_BUCKET_PAN_DOMAIN = "qiniu.bucket_pan_domain";
+

    public static final String FILE_STORAGE_ROOT = "local.media.storage.root";
    public static final String FILE_STORAGE_REMOTE_SERVER_URL = "local.media.storage.remote_server_url";
@@ -139,6 +148,8 @@ 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_WEARABLE_ENDPOINT = "server.multi_wearable_endpoint";
+    public static final String SERVER_MULTI_TV_ENDPOINT = "server.multi_tv_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";
@@ -173,6 +184,8 @@ public final class BrokerConstants {
    public static final String ROBOT_Callback_With_Client_Info = "robot.callback_with_client_info";
    public static final String ROBOT_Callback_With_Sender_Info = "robot.callback_with_sender_info";
    public static final String ROBOT_Callback_With_Target_Info = "robot.callback_with_target_info";
+    public static final String ROBOT_Mention_External_Robot = "robot.mention_external_robot";
+    public static final String ROBOT_Get_User_Info_Mask = "robot.get_user_info_mask";

    public static final String CHANNEL_Callback_With_Client_Info = "channel.callback_with_client_info";
    public static final String CHANNEL_Callback_With_Sender_Info = "channel.callback_with_sender_info";
@@ -188,6 +201,8 @@ public final class BrokerConstants {
    public static final String FRIEND_Reject_Request_Duration = "friend.reject_request_duration";
    public static final String FRIEND_Request_Expiration_Duration = "friend.request_expiration_duration";
    public static final String FRIEND_Request_Rate_Limit = "friend.request_rate_limit";
+    public static final String FRIEND_Search_Mobile_Empty_Rate_Limit = "friend.search_mobile_empty_rate_limit";
+    public static final String FRIEND_Search_Rate_Limit = "friend.search_rate_limit";
    public static final String FRIEND_Request_Robot_Auto_Accept = "friend.robot_auto_accept";


@@ -211,6 +226,9 @@ public final class BrokerConstants {

    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";
+    public static final String USER_KEEP_FULL_INFO_WHEN_DESTROY = "user.keep_full_info_when_destroy";
+    public static final String USER_KEEP_MOBILE_WHEN_DESTROY = "user.keep_mobile_when_destroy";
+    public static final String USER_KEEP_MESSAGES_WHEN_DESTROY = "user.keep_messages_when_destroy";

    public static final String SYNC_Data_Part_Size = "sync.data_part_size";

@@ -32,7 +32,6 @@ public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTo
        if (MediaServerConfig.USER_QINIU) {
            Auth auth = Auth.create(MediaServerConfig.QINIU_ACCESS_KEY, MediaServerConfig.QINIU_SECRET_KEY);

-
            String bucketName;
            String bucketDomain;
            switch (type) {
@@ -72,6 +71,22 @@ public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTo
                    bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME;
                    bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN;
                    break;
+                case 9:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM1_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM1_DOMAIN;
+                    break;
+                case 10:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM2_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM2_DOMAIN;
+                    break;
+                case 11:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN;
+                    break;
+                case 12:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_PAN_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_PAN_DOMAIN;
+                    break;
                default:
                    bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
                    bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
@@ -77,6 +77,22 @@ public class GetQiniuUploadTokenHandler extends IMHandler<Byte> {
                     bucketName = MediaServerConfig.QINIU_BUCKET_MOMENTS_NAME;
                     bucketDomain = MediaServerConfig.QINIU_BUCKET_MOMENTS_DOMAIN;
                     break;
+                case 9:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM1_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM1_DOMAIN;
+                    break;
+                case 10:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM2_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM2_DOMAIN;
+                    break;
+                case 11:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN;
+                    break;
+                case 12:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_PAN_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_PAN_DOMAIN;
+                    break;
                default:
                    bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
                    bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
@@ -16,6 +16,7 @@ import io.moquette.spi.impl.security.TokenAuthenticator;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
+import win.liyufan.im.UserSettingScope;

@Handler(IMTopic.GetTokenTopic)
 public class GetTokenHandler extends IMHandler<WFCMessage.GetTokenRequest> {
@@ -26,6 +27,11 @@ public class GetTokenHandler extends IMHandler<WFCMessage.GetTokenRequest> {
        if(userInfo != null && userInfo.getType() == 1) {
            return ErrorCode.ERROR_CODE_ROBOT_NO_TOKEN;
        }
+        if(session.isPcClient() || session.isPadClient() || session.isTVClient()) {
+            if(m_messagesStore.isLocked(session.getUsername(), session.getClientID())) {
+                m_messagesStore.updateUserSettings(session.getUsername(), WFCMessage.ModifyUserSettingReq.newBuilder().setScope(UserSettingScope.UserSettingScopeLockPC).setKey(session.getClientID()).setValue("0").build(), null);
+            }
+        }

        TokenAuthenticator authenticator = new TokenAuthenticator();
        String strToken = authenticator.generateToken(fromUser);
@@ -45,20 +45,20 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                        contentBuilder.setType(92);

                        builder = WFCMessage.Message.newBuilder();
-                        builder.setFromUser(request.getTargetUid());
-                        builder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
+                        builder.setFromUser(fromUser);
+                        builder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(request.getTargetUid()).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
                        builder.setContent(contentBuilder);
                        builder.setServerTimestamp(++timestamp);

                        messageId = MessageShardingUtil.generateId();
                        builder.setMessageId(messageId);
-                        saveAndPublish(request.getTargetUid(), null, builder.build(), requestSourceType);
+                        saveAndPublish(fromUser, null, builder.build(), requestSourceType);
                        contentBuilder.setType(93);
                        builder.setContent(contentBuilder);
                        messageId = MessageShardingUtil.generateId();
                        builder.setMessageId(messageId);
                        builder.setServerTimestamp(++timestamp);
-                        saveAndPublish(request.getTargetUid(), null, builder.build(), requestSourceType);
+                        saveAndPublish(fromUser, null, builder.build(), requestSourceType);
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
@@ -0,0 +1,348 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
+import io.moquette.BrokerConstants;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import win.liyufan.im.*;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
+@Handler(value = IMTopic.RobotReplyMessageTopic)
+public class ReplyMessageHandler extends IMHandler<WFCMessage.Message> {
+    private int mSensitiveType = 0;  //命中敏感词时，0 失败，1 吞掉， 2 敏感词替换成*。
+    private String mForwardUrl = null;
+    private String mSensitiveMessageForwardUrl = null;
+    private Set<Integer> mForwardMessageTypes = new HashSet<>();
+    private Set<Integer> mForwardExcludeMessageTypes = new HashSet<>();
+    private String mMentionForwardUrl = null;
+    private int mBlacklistStrategy = 0; //黑名单中时，0失败，1吞掉。
+    private boolean mBlacklistAllowSend2Black = true;
+    private boolean mNoForwardAdminMessage = false;
+    private boolean mAllowSend2ForbiddenUser = false;
+
+    private String mRemoteSensitiveServerUrl = null;
+    private Set<Integer> mRemoteSensitiveMessageTypes;
+    private boolean mWaitRemoteSensitiveServerResponse = false;
+
+    public ReplyMessageHandler() {
+        super();
+
+        mForwardUrl = mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Forward_Url);
+        if (!StringUtil.isNullOrEmpty(mForwardUrl)) {
+            String forwardTypes = mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Forward_Types);
+            parseTypes(mForwardMessageTypes, forwardTypes);
+            String excludeTypes = mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Forward_Exclude_Types);
+            parseTypes(mForwardExcludeMessageTypes, excludeTypes);
+        }
+        mSensitiveMessageForwardUrl = mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Sensitive_Forward_Url);
+        mMentionForwardUrl = mServer.getConfig().getProperty(BrokerConstants.MESSAGE_MentionMsg_Forward_Url);
+
+        try {
+            mSensitiveType = Integer.parseInt(mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Filter_Type));
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+
+        try {
+            mBlacklistStrategy = Integer.parseInt(mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Blacklist_Strategy));
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+
+        try {
+            mBlacklistAllowSend2Black = Boolean.parseBoolean(mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Blacklist_Allow_Send, "true"));
+        } catch (Exception e) {
+        }
+
+        try {
+            mRemoteSensitiveServerUrl = mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Remote_Server_URL);
+            if(!StringUtil.isNullOrEmpty(mRemoteSensitiveServerUrl)) {
+                mWaitRemoteSensitiveServerResponse = Boolean.parseBoolean(mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Remote_Fail_When_Matched, "false"));
+                String types = mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Remote_Message_Type, "");
+                mRemoteSensitiveMessageTypes = new HashSet<>();
+                if(!StringUtil.isNullOrEmpty(types)) {
+                    String[] ts = types.split(",");
+                    for (String t:ts) {
+                        mRemoteSensitiveMessageTypes.add(Integer.parseInt(t.trim()));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+
+        try {
+            mNoForwardAdminMessage = Boolean.parseBoolean(mServer.getConfig().getProperty(BrokerConstants.MESSAGE_NO_Forward_Admin_Message, "false"));
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+
+        try {
+            mAllowSend2ForbiddenUser = Boolean.parseBoolean(mServer.getConfig().getProperty(BrokerConstants.MESSAGES_ALLOW_SEND_TO_FORBIDDEN_USER, "false"));
+        } catch (Exception e) {}
+    }
+
+    private void parseTypes(Collection<Integer> collection, String types) {
+        try {
+            if (!StringUtil.isNullOrEmpty(types)) {
+                String[] tss = types.split(",");
+                for (String ts:tss) {
+                    if(ts.contains("-")) {
+                        String[] ss = ts.split("-");
+                        if(ss.length == 2) {
+                            int begin = Integer.parseInt(ss[0]);
+                            int end = Integer.parseInt(ss[1]);
+                            for (int i = begin; i <= end ; i++) {
+                                collection.add(i);
+                            }
+                        }
+                    } else {
+                        collection.add(Integer.parseInt(ts.trim()));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.Message message, Qos1PublishHandler.IMCallback callback) {
+        if(requestSourceType != ProtoConstants.RequestSourceType.Request_From_Robot) {
+            return ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
+        }
+
+        ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
+
+        if (message != null) {
+            if(message.getContent().getContent().length() +
+                message.getContent().getSearchableContent().length() +
+                message.getContent().getData().size() +
+                message.getContent().getExtra().length() +
+                message.getContent().getPushContent().length() +
+                message.getContent().getPushData().length() > 64 * 1024) {
+                return ErrorCode.ERROR_CODE_MESSAGE_TOO_LARGE;
+            }
+
+            boolean ignoreMsg = false;
+
+                // 不能在端上直接发送撤回和群通知
+                if (message.getContent().getType() == 80 || message.getContent().getType() == 81 || (message.getContent().getType() >= 100 && message.getContent().getType() < 200)) {
+                    return ErrorCode.INVALID_PARAMETER;
+                }
+
+                if(m_messagesStore.getClientForbiddenSendTypes().contains(message.getContent().getType())) {
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+
+                int userStatus = m_messagesStore.getUserStatus(fromUser);
+                if (userStatus == ProtoConstants.UserStatus.Muted || userStatus == ProtoConstants.UserStatus.Forbidden) {
+                    if(!m_messagesStore.getGlobalMuteExceptionTypes().contains(message.getContent().getType())) {
+                        return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
+                    }
+                }
+
+                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private) {
+                    if(!m_messagesStore.getBlackListExceptionTypes().contains(message.getContent().getType())) {
+                        errorCode = m_messagesStore.isAllowUserMessage(message.getConversation().getTarget(), fromUser, message.getConversation().getLine());
+                        if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                            if (errorCode == ErrorCode.ERROR_CODE_IN_BLACK_LIST && mBlacklistStrategy != ProtoConstants.BlacklistStrategy.Message_Reject) {
+                                ignoreMsg = true;
+                                errorCode = ErrorCode.ERROR_CODE_SUCCESS;
+                            } else {
+                                return errorCode;
+                            }
+                        }
+
+                        if(!mBlacklistAllowSend2Black) {
+                            errorCode = m_messagesStore.isBlacked(fromUser, message.getConversation().getTarget());
+                            if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                                return errorCode;
+                            }
+                        }
+                    }
+
+                    if (!mAllowSend2ForbiddenUser) {
+                        userStatus = m_messagesStore.getUserStatus(message.getConversation().getTarget());
+                        if (userStatus == ProtoConstants.UserStatus.Forbidden) {
+                            return ErrorCode.ERROR_CODE_USER_FORBIDDEN;
+                        }
+                    }
+                }
+
+                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group ) {
+                    if(!m_messagesStore.getGroupMuteExceptionTypes().contains(message.getContent().getType())) {
+                        errorCode = m_messagesStore.canSendMessageInGroup(fromUser, message.getConversation().getTarget());
+                        if(errorCode == ERROR_CODE_NOT_IN_GROUP) {
+                            errorCode = ERROR_CODE_SUCCESS;
+                        }
+                        if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                            return errorCode;
+                        }
+                    }
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
+                    if(!m_messagesStore.getGroupMuteExceptionTypes().contains(message.getContent().getType())) {
+                        if (!m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
+                            return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
+                        }
+                    }
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
+                    if(!m_messagesStore.getGroupMuteExceptionTypes().contains(message.getContent().getType())) {
+                        if (!m_messagesStore.canSendMessageInChannel(fromUser, message.getConversation().getTarget())) {
+                            return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+                        }
+                    }
+                }
+
+            if(message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private) {
+                long beforeMessageId = message.getMessageId();
+                WFCMessage.Message replyMsg = m_messagesStore.getMessage(beforeMessageId);
+                message = message.toBuilder().setConversation(message.getConversation().toBuilder().setTarget(replyMsg.getFromUser() + "|" + replyMsg.getConversation().getTarget())).build();
+            }
+
+            long timestamp = System.currentTimeMillis();
+            final long messageId;
+            try {
+                messageId = MessageShardingUtil.generateId();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ErrorCode.ERROR_CODE_SERVER_ERROR;
+            }
+            message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).build();
+
+
+            if (!StringUtil.isNullOrEmpty(mForwardUrl) && (mForwardMessageTypes.isEmpty() || mForwardMessageTypes.contains(message.getContent().getType()))  && !mForwardExcludeMessageTypes.contains(message.getContent().getType())) {
+                publisher.forwardMessage(message, mForwardUrl, clientID);
+            }
+
+            if(!StringUtil.isNullOrEmpty(mMentionForwardUrl) && message.hasContent() && message.getContent().getMentionedType() != 0) {
+                publisher.forwardMessage(message, mMentionForwardUrl, clientID);
+            }
+
+
+                if(StringUtil.isNullOrEmpty(mRemoteSensitiveServerUrl)) {
+                    Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent());
+                    if (matched != null && !matched.isEmpty()) {
+                        m_messagesStore.storeSensitiveMessage(message);
+                        if (!StringUtil.isNullOrEmpty(mSensitiveMessageForwardUrl)) {
+                            publisher.forwardMessage(message, mSensitiveMessageForwardUrl, clientID);
+                        }
+                        if (mSensitiveType == 0) {
+                            errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED;
+                        } else if (mSensitiveType == 1) {
+                            ignoreMsg = true;
+                        } else if (mSensitiveType == 2) {
+                            String text = message.getContent().getSearchableContent();
+                            for (String word : matched) {
+                                text = text.replace(word, "***");
+                            }
+                            message = message.toBuilder().setContent(message.getContent().toBuilder().setSearchableContent(text).build()).build();
+                        }
+                    }
+                } else {
+                    if(mRemoteSensitiveMessageTypes.contains(message.getContent().getType())) {
+                        final WFCMessage.Message finalMsg = message;
+                        publisher.forwardMessageWithCallback(message, clientID, mRemoteSensitiveServerUrl, new HttpUtils.HttpCallback() {
+                            @Override
+                            public void onSuccess(String content) {
+                                if(StringUtil.isNullOrEmpty(content)) {
+                                    saveAndPublish(fromUser, clientID, finalMsg, requestSourceType);
+                                } else {
+                                    MessagePayload payload = GsonUtil.gson.fromJson(content, MessagePayload.class);
+                                    if (payload != null && payload.getType() > 0) {
+                                        WFCMessage.Message newMsg = finalMsg.toBuilder().setContent(payload.toProtoMessageContent()).build();
+                                        saveAndPublish(fromUser, clientID, newMsg, requestSourceType);
+                                    } else {
+                                        LOG.error("Response content {} from censor is invalid payload, ignore response and send original message", content);
+                                        saveAndPublish(fromUser, clientID, finalMsg, requestSourceType);
+                                    }
+                                }
+                                if(mWaitRemoteSensitiveServerResponse) {
+                                    ByteBuf ackPayload = Unpooled.buffer(21);
+                                    ErrorCode errorCode = ERROR_CODE_SUCCESS;
+                                    ackPayload.writeByte(errorCode.getCode());
+                                    ackPayload.writeLong(messageId);
+                                    ackPayload.writeLong(timestamp);
+                                    callback.onIMHandled(ErrorCode.ERROR_CODE_SUCCESS, ackPayload);
+                                }
+                            }
+
+                            @Override
+                            public void onFailure(int statusCode, String errorMessage) {
+                                ByteBuf ackPayload = null;
+                                ErrorCode errorCode = ERROR_CODE_SUCCESS;
+                                if(statusCode == 403) {
+                                    if(mWaitRemoteSensitiveServerResponse) {
+                                        errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED;
+                                        ackPayload = Unpooled.buffer(1);
+                                        ackPayload.writeByte(errorCode.getCode());
+                                    }
+                                } else {
+                                    LOG.warn("Failed to censor message with status {}, errorMessage {}. Send the original message", statusCode, errorMessage);
+                                    saveAndPublish(fromUser, clientID, finalMsg, requestSourceType);
+
+                                    if(mWaitRemoteSensitiveServerResponse) {
+                                        errorCode = ERROR_CODE_SUCCESS;
+                                        ackPayload = Unpooled.buffer(21);
+                                        ackPayload.writeByte(errorCode.getCode());
+                                        ackPayload.writeLong(messageId);
+                                        ackPayload.writeLong(timestamp);
+                                    }
+                                }
+
+                                if(mWaitRemoteSensitiveServerResponse) {
+                                    callback.onIMHandled(errorCode, ackPayload);
+                                }
+                            }
+                        });
+
+                        if(mWaitRemoteSensitiveServerResponse) {
+                            ackPayload.clear();
+                            return ErrorCode.INVALID_ASYNC_HANDLING;
+                        } else {
+                            ackPayload = ackPayload.capacity(20);
+                            ackPayload.writeLong(messageId);
+                            ackPayload.writeLong(timestamp);
+                            return ErrorCode.ERROR_CODE_SUCCESS;
+                        }
+                    }
+                }
+
+            if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                if(!ignoreMsg) {
+                    saveAndPublish(fromUser, clientID, message, requestSourceType);
+                }
+                ackPayload = ackPayload.capacity(20);
+                ackPayload.writeLong(messageId);
+                ackPayload.writeLong(timestamp);
+            }
+        } else {
+            errorCode = ErrorCode.ERROR_CODE_INVALID_MESSAGE;
+        }
+        return errorCode;
+    }
+
+}
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
+@Handler(IMTopic.SetFriendExtraTopic)
+public class SetFriendExtraHandler extends IMHandler<WFCMessage.StringPair> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.StringPair request, Qos1PublishHandler.IMCallback callback) {
+        long[] heads = new long[1];
+        ErrorCode errorCode = m_messagesStore.setFriendExtraRequest(fromUser, request.getKey(), request.getValue(), heads);
+        if (errorCode == ERROR_CODE_SUCCESS) {
+            publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[0], clientID);
+        }
+
+        return errorCode;
+    }
+}
@@ -15,13 +15,18 @@ import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;

+import java.util.ArrayList;
 import java.util.List;

@Handler(IMTopic.UserSearchTopic)
 public class UserSearchHandler extends IMHandler<WFCMessage.SearchUserRequest> {
    @Override
    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.SearchUserRequest request, Qos1PublishHandler.IMCallback callback) {
-        List<WFCMessage.User> users = m_messagesStore.searchUser(request.getKeyword(), request.getFuzzy(), request.getType(), request.getPage());
+        List<WFCMessage.User> users = new ArrayList<>();
+        ErrorCode errorCode = m_messagesStore.searchUser(fromUser, request.getKeyword(), request.getFuzzy(), request.getType(), request.getPage(), users);
+        if(errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+            return errorCode;
+        }
        WFCMessage.SearchUserResult.Builder builder = WFCMessage.SearchUserResult.newBuilder();
        builder.addAllEntry(users);
        byte[] data = builder.build().toByteArray();
@@ -1832,6 +1832,31 @@ public class DatabaseStore {
        });
    }

+    void updateSessionIp(String uid, String cid, String ip) {
+        mScheduler.execute(()->{
+            Connection connection = null;
+            PreparedStatement statement = null;
+            try {
+                connection = DBUtil.getConnection();
+                String sql = "update t_user_session set _ip = ?  where `_uid` = ? and `_cid` = ?";
+                statement = connection.prepareStatement(sql);
+                int index = 1;
+                statement.setString(index++, ip);
+                statement.setString(index++, uid);
+                statement.setString(index++, cid);
+
+                int c = statement.executeUpdate();
+                LOG.info("Update rows {}", c);
+            } catch (SQLException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+                Utility.printExecption(LOG, e, RDBS_Exception);
+            } finally {
+                DBUtil.closeDB(connection, statement);
+            }
+        });
+    }
+
    void clearMultiEndpoint(String uid, String clientId, int platform) {
        LOG.info("clearMultiEndpoint {}, {}", uid, clientId);
        Connection connection = null;
@@ -1845,6 +1870,10 @@ public class DatabaseStore {
                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_AndroidWearable || platform == ProtoConstants.Platform.Platform_HarmonyWearable) {
+                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
+            } else if(platform == ProtoConstants.Platform.Platform_AndroidTV || platform == ProtoConstants.Platform.Platform_AppleTV || platform == ProtoConstants.Platform.Platform_HarmonyTV) {
+                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 {
                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and `_platform` = ? and `_cid` <> ? and `_deleted` = 0";
            }
@@ -1872,6 +1901,13 @@ public class DatabaseStore {
                statement.setInt(index++, ProtoConstants.Platform.Platform_iPad);
                statement.setInt(index++, ProtoConstants.Platform.Platform_APad);
                statement.setInt(index++, ProtoConstants.Platform.Platform_HarmonyPad);
+            } else if(platform == ProtoConstants.Platform.Platform_AndroidWearable || platform == ProtoConstants.Platform.Platform_HarmonyWearable) {
+                statement.setInt(index++, ProtoConstants.Platform.Platform_AndroidWearable);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_HarmonyWearable);
+            } else if(platform == ProtoConstants.Platform.Platform_AndroidTV || platform == ProtoConstants.Platform.Platform_AppleTV || platform == ProtoConstants.Platform.Platform_HarmonyTV) {
+                statement.setInt(index++, ProtoConstants.Platform.Platform_AndroidTV);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_AppleTV);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_HarmonyTV);
            } else {
                statement.setInt(index++, platform);
            }
@@ -3055,6 +3091,102 @@ public class DatabaseStore {
        return outList;
    }

+    List<WFCMessage.User> getUserInfosByMobile(String mobile, boolean includeDeleted) {
+        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 `_mobile` = ?";
+            if(!includeDeleted) {
+                sql += " and `_deleted` = 0";
+            }
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, mobile);
+
+            rs = statement.executeQuery();
+            while (rs.next()) {
+                WFCMessage.User.Builder builder = WFCMessage.User.newBuilder();
+                int index = 1;
+                String value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setUid(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setName(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setDisplayName(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setPortrait(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setMobile(value);
+
+                int gender = rs.getInt(index++);
+                builder.setGender(gender);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setEmail(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setAddress(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setCompany(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setSocial(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setExtra(value);
+
+                int type = rs.getInt(index++);
+                builder.setType(type);
+
+                int deleted = rs.getInt(index++);
+                builder.setDeleted(deleted);
+
+                long longValue = rs.getLong(index++);
+                if(longValue <= 0)
+                    longValue = 1;
+                builder.setUpdateDt(longValue);
+
+                outList.add(builder.build());
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return outList;
+    }
+
    List<WFCMessage.User> getAllUsers(int count, int offset) {
        Connection connection = null;
        PreparedStatement statement = null;
@@ -3152,6 +3284,97 @@ public class DatabaseStore {
        return outList;
    }

+    List<WFCMessage.Robot> getAllRobots(int count, int offset) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        List<WFCMessage.Robot> outList = new ArrayList<>();
+
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select  `_uid`, `_owner`" +
+                ", `_secret`" +
+                ", `_callback`" +
+                ", `_state`" +
+                ", `_extra`" +
+                ", `_dt` from t_robot limit ? offset ?";
+            statement = connection.prepareStatement(sql);
+
+            int index = 1;
+            statement.setInt(1, count);
+            statement.setInt(2, offset);
+
+            rs = statement.executeQuery();
+            while (rs.next()) {
+                WFCMessage.Robot.Builder builder = WFCMessage.Robot.newBuilder();
+                index = 1;
+                String value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setUid(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setOwner(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setSecret(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setCallback(value);
+
+
+                int state = rs.getInt(index++);
+                builder.setState(state);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setExtra(value);
+
+                long longValue = rs.getLong(index++);
+
+                outList.add(builder.build());
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+
+        return outList;
+    }
+
+    List<String> getUserRobotIds(String userId) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        List<String> outList = new ArrayList<>();
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select _uid from t_robot where _owner = ? and _state = 0";
+            statement = connection.prepareStatement(sql);
+
+            int index = 1;
+            statement.setString(1, userId);
+
+            rs = statement.executeQuery();
+            while (rs.next()) {
+                outList.add(rs.getString(1));
+            }
+        } 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;
@@ -58,6 +58,8 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 import static cn.wildfirechat.common.IMExceptionEvent.EventType.EVENT_CALLBACK_Exception;
 import static cn.wildfirechat.proto.ProtoConstants.ChannelState.*;
@@ -76,8 +78,7 @@ import static io.moquette.BrokerConstants.*;
 import static io.moquette.server.Constants.MAX_CHATROOM_MESSAGE_QUEUE;
 import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
 import static cn.wildfirechat.pojos.MyInfoType.*;
-import static win.liyufan.im.UserSettingScope.kUserSettingAddFriendStrategy;
-import static win.liyufan.im.UserSettingScope.kUserSettingPCOnline;
+import static win.liyufan.im.UserSettingScope.*;

 public class MemoryMessagesStore implements IMessagesStore {
    private static final String MESSAGES_MAP = "messages_map";
@@ -157,6 +158,8 @@ public class MemoryMessagesStore implements IMessagesStore {
    private long mFriendRejectDuration = 30 * 24 * 60 * 60 * 1000;
    private long mFriendRequestExpiration = 7 * 24 * 60 * 60 * 1000;
    private RateLimiter mFriendRateLimiter;
+    private RateLimiter mFriendSearchEmpthMobileRateLimiter;
+    private RateLimiter mFriendSearchRateLimiter;
    private boolean mFriendRobotAutoAccept = true;

    private long mPushExpiredTimes = 604800000L;
@@ -202,6 +205,10 @@ public class MemoryMessagesStore implements IMessagesStore {
    private int mGroupForbiddenClientOperation;
    private int mSyncDataPartSize = 0;
    private boolean keepDisplayNameWhenDestroyUser = true;
+    private boolean keepFullInfoWhenDestroyUser = false;
+    private boolean keepMobileWhenDestroyUser = false;
+    private boolean keepMessagesWhenDestroyUser = false;
+
    private String mRecallForwardUrl = null;

    private boolean mBroadcastTargetFromUserTable = false;
@@ -213,6 +220,8 @@ public class MemoryMessagesStore implements IMessagesStore {
    private boolean mRobotCallbackWithClientInfo = false;
    private boolean mRobotCallbackWithSenderInfo = false;
    private boolean mRobotCallbackWithTargetInfo = false;
+    private boolean mRobotMentionExternalRobot = false;
+    private int mRobotGetUserInfoMask = 0;

    private boolean mChannelCallbackWithClientInfo = false;
    private boolean mChannelCallbackWithSenderInfo = false;
@@ -331,7 +340,7 @@ public class MemoryMessagesStore implements IMessagesStore {
            printMissConfigLog(FRIEND_Disable_NickName_Search, mDisableNicknameSearch + "");
        }
        try {
-            mDisableUserIdSearch = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.FRIEND_Disable_UserId_Search, "true"));
+            mDisableUserIdSearch = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.FRIEND_Disable_UserId_Search, "false"));
        } catch (Exception e) {

        }
@@ -375,6 +384,21 @@ public class MemoryMessagesStore implements IMessagesStore {
            }
        } catch (Exception e) {
        }
+        try {
+            int rateLimit = Integer.parseInt(m_Server.getConfig().getProperty(FRIEND_Search_Mobile_Empty_Rate_Limit, "0"));
+            if(rateLimit > 0) {
+                mFriendSearchEmpthMobileRateLimiter = new RateLimiter(86400, rateLimit);
+            }
+        } catch (Exception e) {
+        }
+
+        try {
+            int rateLimit = Integer.parseInt(m_Server.getConfig().getProperty(FRIEND_Search_Rate_Limit, "0"));
+            if(rateLimit > 0) {
+                mFriendSearchRateLimiter = new RateLimiter(86400, rateLimit);
+            }
+        } catch (Exception e) {
+        }

        try {
            mFriendRobotAutoAccept = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.FRIEND_Request_Robot_Auto_Accept, "true"));
@@ -599,6 +623,17 @@ public class MemoryMessagesStore implements IMessagesStore {
        } catch (Exception e) {

        }
+        try {
+            keepFullInfoWhenDestroyUser = "true".equals(server.getConfig().getProperty(USER_KEEP_FULL_INFO_WHEN_DESTROY));
+        } catch (Exception e) {}
+
+        try {
+            keepMobileWhenDestroyUser = "true".equals(server.getConfig().getProperty(USER_KEEP_MOBILE_WHEN_DESTROY));
+        } catch (Exception e) {}
+
+        try {
+            keepMessagesWhenDestroyUser = "true".equals(server.getConfig().getProperty(USER_KEEP_MESSAGES_WHEN_DESTROY));
+        } catch (Exception e) {}


        try {
@@ -646,6 +681,12 @@ public class MemoryMessagesStore implements IMessagesStore {
        try {
            mRobotCallbackWithTargetInfo = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.ROBOT_Callback_With_Target_Info, "false"));
        } catch (Exception e) {}
+        try {
+            mRobotMentionExternalRobot = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.ROBOT_Mention_External_Robot, "false"));
+        } catch (Exception e) {}
+        try {
+            mRobotGetUserInfoMask = Integer.parseInt(server.getConfig().getProperty(BrokerConstants.ROBOT_Get_User_Info_Mask, "0"));
+        } catch (Exception e) {}

        try {
            mChannelCallbackWithClientInfo = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.CHANNEL_Callback_With_Client_Info, "false"));
@@ -742,13 +783,34 @@ public class MemoryMessagesStore implements IMessagesStore {
        int pullType = ProtoConstants.PullType.Pull_Normal;

        if (type == ProtoConstants.ConversationType.ConversationType_Private) {
-            notifyReceivers.add(fromUser);
-            if(message.getToCount() > 0) {
-                if(message.getToList().contains(message.getConversation().getTarget())) {
-                    notifyReceivers.add(message.getConversation().getTarget());
+            if(mRobotMentionExternalRobot && message.getConversation().getTarget().contains("|")) {
+                String[] ss = message.getConversation().getTarget().split("\\|");
+                notifyReceivers.add(ss[0]);
+                notifyReceivers.add(ss[1]);
+                if(!message.getToList().isEmpty()) {
+                    notifyReceivers.addAll(message.getToList());
+                } else if(!StringUtil.isNullOrEmpty(message.getToUser())) {
+                    notifyReceivers.add(message.getToUser());
                }
            } else {
-                notifyReceivers.add(message.getConversation().getTarget());
+                notifyReceivers.add(fromUser);
+                if (message.getToCount() > 0) {
+                    if (message.getToList().contains(message.getConversation().getTarget())) {
+                        notifyReceivers.add(message.getConversation().getTarget());
+                    }
+                } else {
+                    notifyReceivers.add(message.getConversation().getTarget());
+                }
+            }
+            if (mRobotMentionExternalRobot && message.getContent().getMentionedTargetCount() > 0) {
+                for (String mentioned : message.getContent().getMentionedTargetList()) {
+                    if (!notifyReceivers.contains(mentioned)) {
+                        WFCMessage.User user = getUserInfo(mentioned);
+                        if(user != null && user.getType() == ProtoConstants.UserType.UserType_Robot) {
+                            notifyReceivers.add(mentioned);
+                        }
+                    }
+                }
            }
            pullType = ProtoConstants.PullType.Pull_Normal;
        } else if (type == ProtoConstants.ConversationType.ConversationType_Group) {
@@ -778,6 +840,16 @@ public class MemoryMessagesStore implements IMessagesStore {
                    }
                }
            }
+            if (mRobotMentionExternalRobot && message.getContent().getMentionedTargetCount() > 0) {
+                for (String mentioned : message.getContent().getMentionedTargetList()) {
+                    if (!notifyReceivers.contains(mentioned)) {
+                        WFCMessage.User user = getUserInfo(mentioned);
+                        if(user != null && user.getType() == ProtoConstants.UserType.UserType_Robot) {
+                            notifyReceivers.add(mentioned);
+                        }
+                    }
+                }
+            }
            pullType = ProtoConstants.PullType.Pull_Normal;
        } else if (type == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
            boolean isDirect = !StringUtil.isNullOrEmpty(message.getToUser()) || !message.getToList().isEmpty();
@@ -2365,6 +2437,10 @@ public class MemoryMessagesStore implements IMessagesStore {
            return ErrorCode.ERROR_CODE_NOT_RIGHT;
        }

+        if(newOwner.equals(groupInfo.getOwner())) {
+            return ErrorCode.ERROR_CODE_SUCCESS;
+        }
+
        //check the new owner is in member list? is that necessary?
        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
@@ -2723,8 +2799,9 @@ public class MemoryMessagesStore implements IMessagesStore {
        } finally {
            mWriteLock.unlock();
        }
-
-        databaseStore.clearUserMessage(userId);
+        if(!keepMessagesWhenDestroyUser) {
+            databaseStore.clearUserMessage(userId);
+        }
    }

    @Override
@@ -2953,6 +3030,8 @@ public class MemoryMessagesStore implements IMessagesStore {

        String pcValue = null;
        String padValue = null;
+        String wearableValue = null;
+        String tvValue = null;
        for (MemorySessionStore.Session s : m_Server.getStore().sessionsStore().sessionForUser(session.username)) {
            if (s.getDeleted() != 0 || !m_Server.getConnectionsManager().isConnected(s.getClientID())) {
                continue;
@@ -2970,6 +3049,15 @@ public class MemoryMessagesStore implements IMessagesStore {
                case Platform_HarmonyPad:
                    padValue = System.currentTimeMillis() + "|" + s.getPlatform() + "|" + s.getClientID() + "|" + s.getPhoneName();
                    break;
+                case Platform_AndroidWearable:
+                case Platform_HarmonyWearable:
+                    wearableValue = System.currentTimeMillis() + "|" + s.getPlatform() + "|" + s.getClientID() + "|" + s.getPhoneName();
+                    break;
+                case Platform_AndroidTV:
+                case Platform_AppleTV:
+                case Platform_HarmonyTV:
+                    tvValue = System.currentTimeMillis() + "|" + s.getPlatform() + "|" + s.getClientID() + "|" + s.getPhoneName();
+                    break;
                default:
                    break;
            }
@@ -2984,6 +3072,16 @@ public class MemoryMessagesStore implements IMessagesStore {
        if (!isOnlineValueEqual(padentry, padValue)) {
            updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("Pad").setValue(padValue==null?"":padValue).build(), session.clientID);
        }
+
+        WFCMessage.UserSettingEntry wearableEntry = getUserSetting(session.getUsername(), kUserSettingPCOnline, "Wearable");
+        if (!isOnlineValueEqual(wearableEntry, wearableValue)) {
+            updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("Wearable").setValue(wearableValue==null?"":wearableValue).build(), session.clientID);
+        }
+
+        WFCMessage.UserSettingEntry tvEntry = getUserSetting(session.getUsername(), kUserSettingPCOnline, "TV");
+        if (!isOnlineValueEqual(tvEntry, tvValue)) {
+            updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("TV").setValue(tvValue==null?"":tvValue).build(), session.clientID);
+        }
    }

    @Override
@@ -3102,37 +3200,29 @@ public class MemoryMessagesStore implements IMessagesStore {
        IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
        WFCMessage.User us = mUserMap.get(userId);
        if (us != null) {
-            if (keepDisplayNameWhenDestroyUser) {
-                us = WFCMessage.User.newBuilder()
-                    .setUid(userId)
-                    .setUpdateDt(System.currentTimeMillis())
-                    .setName(userId)
-                    .setDeleted(1)
-                    .clearAddress()
-                    .clearCompany()
-                    .clearEmail()
-                    .clearExtra()
-                    .clearMobile()
-                    .clearPortrait()
-                    .clearSocial()
-                    .build();
+            WFCMessage.User.Builder builder = us.toBuilder().setUpdateDt(System.currentTimeMillis()).setDeleted(1);
+
+            if(keepFullInfoWhenDestroyUser) {
+                if(!keepMobileWhenDestroyUser) {
+                    builder.clearMobile();
+                }
            } else {
-                us = WFCMessage.User.newBuilder()
-                    .setUid(userId)
-                    .setUpdateDt(System.currentTimeMillis())
+                builder.setUid(userId)
                    .setName(userId)
-                    .setDeleted(1)
-                    .clearDisplayName()
                    .clearAddress()
                    .clearCompany()
                    .clearEmail()
                    .clearExtra()
                    .clearMobile()
                    .clearPortrait()
-                    .clearSocial()
-                    .build();
+                    .clearGender()
+                    .clearSocial();
+                if (!keepDisplayNameWhenDestroyUser) {
+                    builder.clearDisplayName();
+                }
            }

+            us = builder.build();
            try {
                databaseStore.updateUser(us);
            } catch (Exception e) {
@@ -3141,8 +3231,8 @@ public class MemoryMessagesStore implements IMessagesStore {
            }
            mUserMap.put(userId, us);
        }
-
    }
+
    @Override
    public void updateUserInfo(WFCMessage.User user) throws Exception {
        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -3182,15 +3272,62 @@ public class MemoryMessagesStore implements IMessagesStore {
        return databaseStore.getUserInfosByEmail(email);
    }

+    @Override
+    public List<WFCMessage.User> getUserInfosByMobile(String mobile, boolean includeDeleted) {
+        return databaseStore.getUserInfosByMobile(mobile, includeDeleted);
+    }
+
    @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 userType, int page) {
+    public List<WFCMessage.Robot> getRobotInfoList(int count, int offset) {
+        return databaseStore.getAllRobots(count, offset);
+    }
+
+    @Override
+    public List<String> getUserRobotIds(String userId) {
+        return databaseStore.getUserRobotIds(userId);
+    }
+
+    // 电话号码校验正则表达式（支持中国大陆手机号和固话）
+    private static final String PHONE_REGEX = "^\\s*" +  // 允许开头空白
+        "(?:" +
+        "(1[0-9])\\d{9}" +
+        "|" +
+        "((0\\d{2,3})|(\\(0\\d{2,3}\\)))" +
+        "[-\\s.]?" +
+        "\\d{7,8}" +
+        "|" +
+        "\\d{7,8}" +
+        ")\\s*$";
+
+    private static final Pattern PHONE_PATTERN = Pattern.compile(PHONE_REGEX);
+    private static final Pattern PHONE_PART_PATTERN = Pattern.compile("^1\\d{0,10}$");
+
+    public static boolean isPhoneNumber(String phone) {
+        if (phone == null || phone.trim().isEmpty()) {
+            return false;
+        }
+        Matcher matcher = PHONE_PATTERN.matcher(phone);
+        return matcher.matches();
+    }
+
+    public static boolean isPhoneNumberPart(String str) {
+        if (str == null || str.trim().isEmpty()) {
+            return false;
+        }
+
+        Matcher matcher = PHONE_PART_PATTERN.matcher(str);
+        return matcher.matches();
+    }
+
+    @Override
+    public ErrorCode searchUser(String userId, String keyword, int searchType, int userType, int page, List<WFCMessage.User> users) {
        if (mDisableSearch) {
-            return new ArrayList<>();
+            return ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
        }

        if (mDisableNicknameSearch && searchType == ProtoConstants.SearchUserType.SearchUserType_General) {
@@ -3206,10 +3343,29 @@ public class MemoryMessagesStore implements IMessagesStore {
        }

        if(mDisableUserIdSearch && searchType == ProtoConstants.SearchUserType.SearchUserType_UserId) {
-            return new ArrayList<>();
+            return ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
        }

-        return databaseStore.searchUserFromDB(keyword, searchType, userType, page);
+        if(mFriendSearchRateLimiter != null && !isPhoneNumberPart(keyword)) {
+            //非电话号码，允许多少次搜索。
+            if(!mFriendSearchRateLimiter.isGranted(userId)) {
+                LOG.error("User {} search user mobile over frequency, keyword {}, searchType {}", userId, keyword, searchType);
+                return ErrorCode.ERROR_CODE_OVER_FREQUENCY;
+            }
+        }
+
+        List<WFCMessage.User> matchedUsers = databaseStore.searchUserFromDB(keyword, searchType, userType, page);
+        if(mFriendSearchEmpthMobileRateLimiter != null && matchedUsers.isEmpty() && isPhoneNumber(keyword)) {
+            //查电话号码为空
+            if(!mFriendSearchEmpthMobileRateLimiter.isGranted(userId)) {
+                LOG.error("User {} search user over frequency, keyword {}, searchType {}", userId, keyword, searchType);
+                return ErrorCode.ERROR_CODE_OVER_FREQUENCY;
+            }
+        }
+
+        users.addAll(matchedUsers);
+
+        return ErrorCode.ERROR_CODE_SUCCESS;
    }

    @Override
@@ -4424,6 +4580,15 @@ public class MemoryMessagesStore implements IMessagesStore {
        }
    }

+    @Override
+    public boolean isLocked(String userId, String clientId) {
+        WFCMessage.UserSettingEntry lockSetting = getUserSetting(userId, UserSettingScopeLockPC, clientId);
+        if(lockSetting != null && "1".equals(lockSetting.getValue())) {
+            return true;
+        }
+        return false;
+    }
+
    @Override
    public boolean getUserGlobalSilent(String userId) {
        Boolean slient = userGlobalSlientMap.get(userId);
@@ -4891,6 +5056,16 @@ public class MemoryMessagesStore implements IMessagesStore {
        return mRobotCallbackWithTargetInfo;
    }

+    @Override
+    public boolean isRobotMentionExternalRobot() {
+        return mRobotMentionExternalRobot;
+    }
+
+    @Override
+    public int getRobotGetUserInfoMask() {
+        return mRobotGetUserInfoMask;
+    }
+
    @Override
    public boolean isChannelCallbackWithClientInfo() {
        return mChannelCallbackWithClientInfo;
@@ -41,6 +41,8 @@ public class MemorySessionStore implements ISessionsStore {
    private boolean supportMultiEndpoint = false;
    private boolean supportMultiPCEndpoint = false;
    private boolean supportMultiPadEndpoint = false;
+    private boolean supportMultiWearableEndpoint = false;
+    private boolean supportMultiTVEndpoint = false;
    private boolean clientSupportKickoff = false;

    public static class Session implements Comparable<Session>{
@@ -61,6 +63,7 @@ public class MemorySessionStore implements ISessionsStore {
        private int deleted;

        private boolean pullHistoryMsg;
+        private String ip;

        public int getDeleted() {
            return deleted;
@@ -92,6 +95,18 @@ public class MemorySessionStore implements ISessionsStore {
            return unReceivedMsgs;
        }

+        public boolean isPcClient() {
+            return platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_LINUX;
+        }
+
+        public boolean isPadClient() {
+            return platform == ProtoConstants.Platform.Platform_iPad || platform == ProtoConstants.Platform.Platform_APad || platform == ProtoConstants.Platform.Platform_HarmonyPad;
+        }
+
+        public boolean isTVClient() {
+            return platform == ProtoConstants.Platform.Platform_AppleTV || platform == ProtoConstants.Platform.Platform_AndroidTV || platform == ProtoConstants.Platform.Platform_HarmonyTV;
+        }
+
        public int getPushType() {
            return pushType;
        }
@@ -159,6 +174,14 @@ public class MemorySessionStore implements ISessionsStore {
            }
        }

+        public String getIp() {
+            return ip;
+        }
+
+        public void setIp(String ip) {
+            this.ip = ip;
+        }
+
        private int pushType;
        private int platform;

@@ -294,6 +317,16 @@ public class MemorySessionStore implements ISessionsStore {
        } catch (Exception e) {
        }

+        try {
+            supportMultiWearableEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_WEARABLE_ENDPOINT, "false"));
+        } catch (Exception e) {
+        }
+
+        try {
+            supportMultiTVEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_TV_ENDPOINT, "false"));
+        } catch (Exception e) {
+        }
+
        try {
            clientSupportKickoff = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_CLIENT_SUPPORT_KICKOFF_EVENT, "false"));
        } catch (Exception e) {
@@ -401,6 +434,11 @@ public class MemorySessionStore implements ISessionsStore {
            && !(platform == ProtoConstants.Platform.Platform_iPad && supportMultiPadEndpoint)
            && !(platform == ProtoConstants.Platform.Platform_APad && supportMultiPadEndpoint)
            && !(platform == ProtoConstants.Platform.Platform_HarmonyPad && supportMultiPadEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_AndroidWearable && supportMultiWearableEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_HarmonyWearable && supportMultiWearableEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_AndroidTV && supportMultiTVEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_AppleTV && supportMultiTVEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_HarmonyTV && supportMultiTVEndpoint)
        ) {
            databaseStore.clearMultiEndpoint(username, clientID, platform);
            if (userSessions.get(username) != null) {
@@ -427,6 +465,14 @@ public class MemorySessionStore implements ISessionsStore {
                            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 if(platform == ProtoConstants.Platform.Platform_AndroidWearable || platform == ProtoConstants.Platform.Platform_HarmonyWearable) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_AndroidWearable || s.getPlatform() == ProtoConstants.Platform.Platform_HarmonyWearable) {
+                                remove = true;
+                            }
+                        } else if(platform == ProtoConstants.Platform.Platform_AndroidTV || platform == ProtoConstants.Platform.Platform_AppleTV || platform == ProtoConstants.Platform.Platform_HarmonyTV) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_AndroidTV || s.getPlatform() == ProtoConstants.Platform.Platform_AppleTV || s.getPlatform() == ProtoConstants.Platform.Platform_HarmonyTV) {
+                                remove = true;
+                            }
                        } else { //web, microapp
                            if (s.getPlatform() ==platform) {
                                remove = true;
@@ -544,6 +590,15 @@ public class MemorySessionStore implements ISessionsStore {
        return session.clientSession;
    }

+    @Override
+    public void updateSessionIp(String username, String clientID, String ip) {
+        Session session = getSession(clientID);
+        if(session != null && session.getDeleted() == 0) {
+            session.setIp(ip);
+            databaseStore.updateSessionIp(username, clientID, ip);
+        }
+    }
+
    @Override
    public Session sessionForClientAndUser(String username, String clientID) {
        Session session = sessions.get(clientID);
@@ -331,6 +331,17 @@ public class Server {
        MediaServerConfig.QINIU_BUCKET_FAVORITE_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_FAVORITE_NAME);
        MediaServerConfig.QINIU_BUCKET_FAVORITE_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_FAVORITE_DOMAIN);

+        MediaServerConfig.QINIU_BUCKET_CUSTOM1_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM1_NAME);
+        MediaServerConfig.QINIU_BUCKET_CUSTOM1_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM1_DOMAIN);
+
+        MediaServerConfig.QINIU_BUCKET_CUSTOM2_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM2_NAME);
+        MediaServerConfig.QINIU_BUCKET_CUSTOM2_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM2_DOMAIN);
+
+        MediaServerConfig.QINIU_BUCKET_CUSTOM3_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM3_NAME);
+        MediaServerConfig.QINIU_BUCKET_CUSTOM3_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_CUSTOM3_DOMAIN);
+
+        MediaServerConfig.QINIU_BUCKET_PAN_NAME = config.getProperty(BrokerConstants.QINIU_BUCKET_PAN_NAME);
+        MediaServerConfig.QINIU_BUCKET_PAN_DOMAIN = config.getProperty(BrokerConstants.QINIU_BUCKET_PAN_DOMAIN);

    	MediaServerConfig.SERVER_IP = getServerIp(config);

@@ -23,7 +23,16 @@ public class MediaServerConfig {
    public static String QINIU_BUCKET_PORTRAIT_DOMAIN;
    public static String QINIU_BUCKET_FAVORITE_NAME;
    public static String QINIU_BUCKET_FAVORITE_DOMAIN;
-    
+    public static String QINIU_BUCKET_CUSTOM1_NAME;
+    public static String QINIU_BUCKET_CUSTOM1_DOMAIN;
+    public static String QINIU_BUCKET_CUSTOM2_NAME;
+    public static String QINIU_BUCKET_CUSTOM2_DOMAIN;
+    public static String QINIU_BUCKET_CUSTOM3_NAME;
+    public static String QINIU_BUCKET_CUSTOM3_DOMAIN;
+    public static String QINIU_BUCKET_PAN_NAME;
+    public static String QINIU_BUCKET_PAN_DOMAIN;
+
+
    public static String SERVER_IP = "localhost";
    public static int HTTP_SERVER_PORT = 8080;
    public static String FILE_STROAGE_ROOT = "fs";
@@ -154,9 +154,12 @@ public interface IMessagesStore {
    WFCMessage.User getUserInfoByName(String name);
    WFCMessage.User getUserInfoByMobile(String mobile);
    List<WFCMessage.User> getUserInfosByEmail(String email);
-    List<WFCMessage.User> searchUser(String keyword, int searchType, int userType, int page);
+    List<WFCMessage.User> getUserInfosByMobile(String mobile, boolean includeDeleted);
+    ErrorCode searchUser(String userId, String keyword, int searchType, int userType, int page, List<WFCMessage.User> users);

    List<WFCMessage.User> getUserInfoList(int count, int offset);
+    List<WFCMessage.Robot> getRobotInfoList(int count, int offset);
+    List<String> getUserRobotIds(String userId);

    boolean updateSystemSetting(int id, String value, String desc);
    SystemSettingPojo getSystemSetting(int id);
@@ -207,6 +210,9 @@ public interface IMessagesStore {
    List<WFCMessage.UserSettingEntry> getUserSetting(String userId, int scope);
    long updateUserSettings(String userId, WFCMessage.ModifyUserSettingReq request, String clientId);
    void clearUserSettings(String userId);
+
+    boolean isLocked(String userId, String clientId);
+
    boolean getUserGlobalSilent(String userId);
    boolean getUserVoipSilent(String userId);

@@ -254,6 +260,8 @@ public interface IMessagesStore {
    boolean isRobotCallbackWithClientInfo();
    boolean isRobotCallbackWithSenderInfo();
    boolean isRobotCallbackWithTargetInfo();
+    boolean isRobotMentionExternalRobot();
+    int getRobotGetUserInfoMask();

    boolean isChannelCallbackWithClientInfo();
    boolean isChannelCallbackWithSenderInfo();
@@ -43,7 +43,7 @@ public interface ISessionsStore {
    ErrorCode loadActiveSession(String username, String clientID);

    ClientSession updateExistSession(String username, String clientID, WFCMessage.RouteRequest endpoint, boolean cleanSession);
-
+    void updateSessionIp(String username, String clientID, String ip);
    Session getSession(String clientID);

    void cleanDuplatedToken(String cid, int pushType, String token, boolean isVoip, String packageName);
@@ -179,6 +179,7 @@ public class MessagesPublisher {
                            message = m_messagesStore.getMessage(messageId);
                        }
                        OutputMessageData outputMessageData = getOutputMessageWithExtraInfo(message, exceptClientId, m_messagesStore.isRobotCallbackWithClientInfo() , m_messagesStore.isRobotCallbackWithSenderInfo(), m_messagesStore.isRobotCallbackWithTargetInfo());
+                        outputMessageData.setToRobotId(robot.getUid());
                        Server.getServer().getCallbackScheduler().execute(() -> {
                            try {
                                HttpUtils.httpJsonPost(robot.getCallback(), GsonUtil.gson.toJson(outputMessageData, OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Robot_Message_Callback);
@@ -230,6 +231,7 @@ public class MessagesPublisher {
                }
            }

+            boolean unreadCountIncreased = false;
            for (Session targetSession : sessions) {
                //超过7天不活跃的用户忽略
                if(System.currentTimeMillis() - targetSession.getLastActiveTime() > m_messagesStore.getPushExpiredTimes()) {
@@ -314,8 +316,9 @@ public class MessagesPublisher {
                    }

                    if (!StringUtil.isNullOrEmpty(pushContent) || messageContentType == 400) {
-                        if (!isConvSilent && (persistFlag & 0x02) > 0) {
+                        if (!isConvSilent && (persistFlag & 0x02) > 0 && !unreadCountIncreased) {
                            m_messagesStore.increaseUnreceivedMsgCount(user);
+                            unreadCountIncreased = true;
                        }
                    }
                }
@@ -284,7 +284,7 @@ public class ProtocolProcessor {
                            sessionstatus = 0;
                        }

-                        userOnlineStatus.sessions.add(new OutputCheckUserOnline.Session(userId, session.getClientID(), session.getPlatform(), sessionstatus, session.getLastActiveTime(), session.getAppName()));
+                        userOnlineStatus.sessions.add(new OutputCheckUserOnline.Session(userId, session.getClientID(), session.getPlatform(), sessionstatus, session.getLastActiveTime(), session.getAppName(), session.getIp()));
                    }

                    HttpUtils.httpJsonPost(mUserOnlineStatusCallback, GsonUtil.gson.toJson(userOnlineStatus), HttpUtils.HttpPostType.POST_TYPE_User_Online_Event_Callback);
@@ -141,7 +141,7 @@ public class Qos1PublishHandler extends QosPublishHandler {
                    status = 0;
                }

-                out.addSession(userId, session.getClientID(), session.getPlatform(), status, session.getLastActiveTime(), session.getAppName());
+                out.addSession(userId, session.getClientID(), session.getPlatform(), status, session.getLastActiveTime(), session.getAppName(), session.getIp());
            }

            callback.onRouteHandled(GsonUtil.gson.toJson(out).getBytes());
@@ -3,18 +3,12 @@ package io.moquette.spi.impl.security;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.spec.InvalidKeySpecException;
 import java.util.Arrays;
-import java.util.Base64;

 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.DESKeySpec;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;

@@ -10,6 +10,7 @@ package win.liyufan.im;

 public interface IMTopic {
 	String SendMessageTopic = "MS";
+    String RobotReplyMessageTopic = "RRM";
    String MultiCastMessageTopic = "MMC";
    String RecallMessageTopic = "MR";
    String RecallMultiCastMessageTopic = "MRMC";
@@ -51,6 +52,7 @@ public interface IMTopic {
    String FriendRequestPullTopic = "FRP";
    String NotifyFriendRequestTopic = "FRN";
    String RriendRequestUnreadSyncTopic = "FRUS";
+    String SetFriendExtraTopic = "FES";

    String DeleteFriendTopic = "FDL";
    String FriendPullTopic = "FP";
@@ -1,9 +1,13 @@
 package win.liyufan.im;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

 public class SensitiveFilter {
+    private static final Logger LOG = LoggerFactory.getLogger(SensitiveFilter.class);
    public enum MatchType {
        MIN_MATCH("最小匹配规则"),MAX_MATCH("最大匹配规则");

@@ -71,6 +75,9 @@ public class SensitiveFilter {
                i=i+sensitiveWordLength-1;
            }
        }
+        if(!sensitiveWords.isEmpty()) {
+            LOG.info("Text {} matched sensitive word {}", originalText, sensitiveWords);
+        }
        return sensitiveWords;
    }

@@ -22,4 +22,5 @@ public interface UserSettingScope {
    int kUserSettingPrivacySearchable = 27;
    int kUserSettingAddFriendStrategy = 28;
    int kUserSettingScopeSyncBadge = 29;
+    int UserSettingScopeLockPC = 30;
 }
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>wildfirechat-parent</artifactId>
        <groupId>cn.wildfirechat</groupId>
-        <version>1.3.8</version>
+        <version>1.4.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -1,5 +1,12 @@
 package cn.wildfirechat.common;

+/**
+ * API路径接口
+ * <p>
+ * 定义了野火IM服务器所有管理接口的API路径。
+ * 包括聊天室、敏感词、域、用户、好友、黑名单、消息、群组、会议、频道等模块的接口路径。
+ * </p>
+ */
 public interface APIPath {
    String Create_Chatroom = "/admin/chatroom/create";
    String Chatroom_Destroy = "/admin/chatroom/del";
@@ -21,6 +28,7 @@ public interface APIPath {
    String Get_Domain = "/admin/domain/get";
    String Destroy_Domain = "/admin/domain/destroy";
    String List_Domain = "/admin/domain/list";
+    String Ping_Domain = "/admin/domain/ping";

    String Create_User = "/admin/user/create";
    String Update_User = "/admin/user/update";
@@ -35,8 +43,11 @@ public interface APIPath {
    String User_Get_Info = "/admin/user/get_info";
    String User_Batch_Get_Infos = "/admin/user/batch_get_infos";
    String User_Get_Email_Info = "/admin/user/get_info_by_email";
+    String User_Get_By_Mobile = "/admin/user/get_info_by_mobile";
    String User_Get_All = "/admin/user/all";
    String User_Get_Robot_Info = "/admin/user/get_robot_info";
+    String User_Get_All_Robots = "/admin/user/get_all_robots";
+    String User_Get_User_Robots = "/admin/user/get_user_robots";
    String User_Get_Blocked_List = "/admin/user/get_blocked_list";
    String User_Check_Block_Status = "/admin/user/check_block_status";
    String User_Get_Online_Status = "/admin/user/onlinestatus";
@@ -79,6 +90,7 @@ public interface APIPath {
    String Msg_Delivery = "/admin/message/delivery";
    String Conversation_Delete = "/admin/conversation/delete";
    String Msg_Clear_By_User = "/admin/message/clear_by_user";
+    String Msg_Import = "/admin/message/import";

    String Create_Group = "/admin/group/create";
    String Group_Dismiss = "/admin/group/del";
@@ -94,6 +106,7 @@ public interface APIPath {
    String Group_Set_Manager = "/admin/group/manager/set";
    String Group_Mute_Member = "/admin/group/manager/mute";
    String Group_Allow_Member = "/admin/group/manager/allow";
+    String Group_Join_Request_Add = "/admin/group/join_request/add";
    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";
@@ -113,6 +126,11 @@ public interface APIPath {
    String Put_System_Setting = "/admin/system/put_setting";
    String GET_CUSTOMER = "/admin/customer";
    String Health = "/admin/health";
+    String Get_Conversation_Files = "/admin/file/conversation_files";
+    String Get_User_Files = "/admin/file/user_files";
+    String Get_Message_File = "/admin/file/message_file";
+
+    String Get_Presigned_Upload_Url = "/admin/oss/get_upload_url";

    String Conference_List = "/admin/conference/list";
    String Conference_Exist = "/admin/conference/exist";
@@ -136,8 +154,11 @@ public interface APIPath {
    String Channel_Application_Get_UserInfo = "/channel/application/get_user_info";

    String Robot_User_Info = "/robot/user_info";
+    String Robot_User_Get_Email_Info = "/robot/user/get_info_by_email";
+    String Robot_User_Batch_Get_Infos = "/robot/user/batch_get_infos";
    String Robot_Get_Profile = "/robot/profile";
    String Robot_Message_Send = "/robot/message/send";
+    String Robot_Message_Reply = "/robot/message/reply";
    String Robot_Message_Recall = "/robot/message/recall";
    String Robot_Message_Update = "/robot/message/update";
    String Robot_Set_Callback = "/robot/set_callback";
@@ -174,4 +195,6 @@ public interface APIPath {
    String Robot_Moments_Update_Profiles_Value = "/robot/moments/profiles/value/push";

    String Robot_Conference_Request = "/robot/conference/request";
+
+    String Robot_Get_Presigned_Upload_Url = "/robot/oss/get_upload_url";
 }
@@ -8,6 +8,25 @@

 package cn.wildfirechat.common;

+/**
+ * 错误码枚举
+ * <p>
+ * 定义了野火IM系统中所有可能的错误码，包括：
+ * <ul>
+ * <li>通用错误（0-5）</li>
+ * <li>认证错误（6-8）</li>
+ * <li>消息错误（9-10）</li>
+ * <li>群组错误（11-12）</li>
+ * <li>用户错误（16-19）</li>
+ * <li>聊天室错误（20）</li>
+ * <li>频道错误（21-25）</li>
+ * <li>会议错误（60-61）</li>
+ * <li>应用错误（70）</li>
+ * <li>密聊错误（81-87）</li>
+ * <li>其他错误（90-255）</li>
+ * </ul>
+ * </p>
+ */
 public enum ErrorCode {
    //General error
    ERROR_CODE_SUCCESS(0, "success"),
@@ -1,6 +1,18 @@
 package cn.wildfirechat.common;

+/**
+ * IM异常事件类
+ * <p>
+ * 用于记录和传递IM系统中的异常事件信息。
+ * </p>
+ */
 public class IMExceptionEvent {
+    /**
+     * 事件类型接口
+     * <p>
+     * 定义了各种异常事件的类型常量。
+     * </p>
+     */
    public interface EventType {
        int RDBS_Exception = 1;
        int MONGO_Exception = 2;
@@ -8,6 +8,13 @@

 package cn.wildfirechat.pojos;

+/**
+ * 会话类
+ * <p>
+ * 表示一个会话对象，包含会话类型、目标ID和线路信息。
+ * 用于标识消息发送或接收的目标会话。
+ * </p>
+ */
 public class Conversation {
    private int type;
    private String target;
@@ -0,0 +1,30 @@
+/*
+ * 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.ArrayList;
+import java.util.List;
+
+public class FilesPojo {
+    public int total;
+    public List<FilePojo> files;
+    public static class FilePojo {
+        public long messageId;
+        public String sender;
+        public int conversationType;
+        public String target;
+        public int line;
+        public String name;
+        public String url;
+        public int size;
+        public int downloadCount;
+        public long timestamp;
+    }
+}
+
@@ -0,0 +1,11 @@
+package cn.wildfirechat.pojos;
+
+public class GetConversationFilesPojo {
+    public int conversationType;
+    public String target;
+    public int line;
+    public String userId;
+    public int offset;
+    public boolean desc;
+    public int count;
+}
@@ -7,6 +7,7 @@ public class GetOnlineUserResult {
        public String userId;
        public String clientId;
        public int platform;
+        public String ip;
    }

    public ArrayList<GetOnlineUserResult.UserClient> userClients;
@@ -0,0 +1,8 @@
+package cn.wildfirechat.pojos;
+
+public class GetUserFilesPojo {
+    public String userId;
+    public int offset;
+    public boolean desc;
+    public int count;
+}
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+import cn.wildfirechat.proto.WFCMessage;
+
+import java.util.List;
+
+public class ImportMessagesData {
+    public static class ImportMessage {
+        public String sender;
+        public Conversation conversation;
+        public MessagePayload payload;
+        public List<String> receivers;
+        public long timestamp;
+    }
+    public List<ImportMessage> messages;
+}
@@ -14,6 +14,12 @@ import io.netty.util.internal.StringUtil;

 import java.util.List;

+/**
+ * 添加群组成员输入参数类
+ * <p>
+ * 封装添加群组成员的输入参数，包括群组ID、成员列表、成员额外信息等。
+ * </p>
+ */
 public class InputAddGroupMember extends InputGroupBase {
    private String group_id;
    private List<PojoGroupMember> members;
@@ -0,0 +1,6 @@
+package cn.wildfirechat.pojos;
+
+public class InputCountOffset {
+    public int count;
+    public int offset;
+}
@@ -14,6 +14,12 @@ import io.netty.util.internal.StringUtil;

 import java.util.List;

+/**
+ * 创建群组输入参数类
+ * <p>
+ * 封装创建群组的输入参数，包括群组信息、成员列表、成员额外信息等。
+ * </p>
+ */
 public class InputCreateGroup extends InputGroupBase {
    private PojoGroup group;
    private String member_extra;
@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+
+/**
+ * 请求预签名上传地址
+ * <p>
+ * 请求封装预签名上传地址，包括：
+ * <ul>
+ * <li>文件名</li>
+ * <li>文件类型</li>
+ * <li>媒体类型</li>
+ * </ul>
+ * </p>
+ */
+public class InputGetPresignedUploadUrl {
+    public String fileName;
+    public String contentType;
+    public int mediaType;
+}
@@ -12,6 +12,7 @@ public class InputGetUserInfo {
    private String userId;
    private String name;
    private String mobile;
+    private boolean includeDeleted;

    public InputGetUserInfo() {
    }
@@ -22,6 +23,13 @@ public class InputGetUserInfo {
        this.mobile = mobile;
    }

+    public InputGetUserInfo(String userId, String name, String mobile, boolean includeDeleted) {
+        this.userId = userId;
+        this.name = name;
+        this.mobile = mobile;
+        this.includeDeleted = includeDeleted;
+    }
+
    public String getMobile() {
        return mobile;
    }
@@ -45,4 +53,12 @@ public class InputGetUserInfo {
    public void setName(String name) {
        this.name = name;
    }
+
+    public boolean isIncludeDeleted() {
+        return includeDeleted;
+    }
+
+    public void setIncludeDeleted(boolean includeDeleted) {
+        this.includeDeleted = includeDeleted;
+    }
 }
@@ -11,6 +11,21 @@ package cn.wildfirechat.pojos;

 import cn.wildfirechat.proto.WFCMessage;

+/**
+ * 用户信息类
+ * <p>
+ * 封装用户的所有信息，包括：
+ * <ul>
+ * <li>用户ID、用户名、显示名称</li>
+ * <li>头像、性别</li>
+ * <li>手机号、邮箱、地址</li>
+ * <li>公司、社交信息</li>
+ * <li>用户类型、删除状态</li>
+ * <li>更新时间</li>
+ * <li>额外扩展信息</li>
+ * </ul>
+ * </p>
+ */
 public class InputOutputUserInfo {
    private String userId;
    private String name;
@@ -25,6 +40,7 @@ public class InputOutputUserInfo {
    private String social;
    private String extra;
    private int type;
+    private int deleted;
    private long updateDt;

    public static InputOutputUserInfo fromPbUser(WFCMessage.User pbUser) {
@@ -42,6 +58,7 @@ public class InputOutputUserInfo {
        inputCreateUser.extra = pbUser.getExtra();
        inputCreateUser.type = pbUser.getType();
        inputCreateUser.updateDt = pbUser.getUpdateDt();
+        inputCreateUser.deleted = pbUser.getDeleted();
        return inputCreateUser;
    }

@@ -77,6 +94,7 @@ public class InputOutputUserInfo {
            newUserBuilder.setExtra(getExtra());
        newUserBuilder.setGender(gender);
        newUserBuilder.setType(type);
+        newUserBuilder.setDeleted(deleted);

        newUserBuilder.setUpdateDt(System.currentTimeMillis());
        return newUserBuilder.build();
@@ -185,4 +203,24 @@ public class InputOutputUserInfo {
    public void setType(int type) {
        this.type = type;
    }
+
+    public int getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(int deleted) {
+        this.deleted = deleted;
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+            "userId='" + userId + '\'' +
+            ", name='" + name + '\'' +
+            ", displayName='" + displayName + '\'' +
+            ", portrait='" + portrait + '\'' +
+            ", mobile='" + mobile + '\'' +
+            ", updateDt=" + updateDt +
+            '}';
+    }
 }
@@ -0,0 +1,5 @@
+package cn.wildfirechat.pojos;
+
+public class LongPojo {
+    public long value;
+}
@@ -16,6 +16,22 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;

+/**
+ * 消息内容负载类
+ * <p>
+ * 封装消息的所有内容信息，包括：
+ * <ul>
+ * <li>消息类型</li>
+ * <li>可搜索内容（文本消息的文本）</li>
+ * <li>推送内容和推送数据</li>
+ * <li>消息内容（二进制数据）</li>
+ * <li>媒体类型和远程URL</li>
+ * <li>持久化标志和过期时间</li>
+ * <li>@提及信息</li>
+ * <li>额外数据</li>
+ * </ul>
+ * </p>
+ */
 public class MessagePayload {
    private int type;
    private String searchableContent;
@@ -20,22 +20,24 @@ public class OutputCheckUserOnline {
        public int status; //0 online, 1 have session offline
        public long lastSeen;
        public String packageName;
+        public String ip;

        public Session() {
        }

-        public Session(String clientId, String userId, int platform, int status, long lastSeen, String packageName) {
+        public Session(String clientId, String userId, int platform, int status, long lastSeen, String packageName, String ip) {
            this.clientId = clientId;
            this.userId = userId;
            this.platform = platform;
            this.status = status;
            this.lastSeen = lastSeen;
            this.packageName = packageName;
+            this.ip = ip;
        }
    }

-    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);
+    public void addSession(String userId, String clientId, int platform, int status, long lastSeen, String packageName, String ip) {
+        Session session = new Session(clientId, userId, platform, status, lastSeen, packageName, ip);
        sessions.add(session);
    }

@@ -0,0 +1,7 @@
+package cn.wildfirechat.pojos;
+
+import java.util.List;
+
+public class OutputGetRobotList {
+    public List<OutputRobot> robotInfoList;
+}
@@ -27,6 +27,8 @@ public class OutputMessageData {
    private PojoGroupInfo targetGroupInfo;
    private OutputGetChannelInfo targetChannelInfo;

+    private String toRobotId;
+
    public String getSender() {
        return sender;
    }
@@ -119,6 +121,14 @@ public class OutputMessageData {
        return fromProtoMessage(protoMessage, null);
    }

+    public String getToRobotId() {
+        return toRobotId;
+    }
+
+    public void setToRobotId(String toRobotId) {
+        this.toRobotId = toRobotId;
+    }
+
    public static OutputMessageData fromProtoMessage(WFCMessage.Message protoMessage, OutputClient fromClient) {
        OutputMessageData data = new OutputMessageData();
        data.messageId = protoMessage.getMessageId();
@@ -0,0 +1,29 @@
+/*
+ * 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;
+
+
+/**
+ * 预签名上传地址
+ * <p>
+ * 封装预签名上传地址，包括：
+ * <ul>
+ * <li>上传地址</li>
+ * <li>备选上传地址</li>
+ * <li>下载地址</li>
+ * <li>类型</li>
+ * </ul>
+ * </p>
+ */
+public class OutputPresignedUploadUrl {
+    public String uploadUrl;
+    public String backupUploadUrl;
+    public String downloadUrl;
+    public int type;
+}
@@ -2,11 +2,8 @@ package cn.wildfirechat.pojos;

 public class PojoConferenceInfo {
    public String roomId;
-    public String serverId;
    public String description;
    public int max_publishers;
-    public int num_publishers;
-    public int bitrate;
    public boolean advance;
    public boolean recording;
 }
@@ -10,6 +10,12 @@ package cn.wildfirechat.pojos;

 import java.util.List;

+/**
+ * 群组对象类
+ * <p>
+ * 封装创建群组时使用的参数，包含群组信息和成员列表。
+ * </p>
+ */
 public class PojoGroup {
    private PojoGroupInfo group_info;
    private List<PojoGroupMember> members;
@@ -8,6 +8,19 @@

 package cn.wildfirechat.pojos;

+/**
+ * 群组信息类
+ * <p>
+ * 封装群组的信息，包括：
+ * <ul>
+ * <li>群组ID、名称、头像、所有者</li>
+ * <li>群组类型、成员数量、最大成员数</li>
+ * <li>群组设置（禁言、加群方式、私聊、可搜索、历史消息）</li>
+ * <li>是否超级群、是否已删除</li>
+ * <li>更新时间</li>
+ * </ul>
+ * </p>
+ */
 public class PojoGroupInfo {
    String target_id;
    String name;
@@ -8,6 +8,19 @@

 package cn.wildfirechat.pojos;

+/**
+ * 群组成员类
+ * <p>
+ * 封装群组成员的信息，包括：
+ * <ul>
+ * <li>成员ID</li>
+ * <li>群组内别名</li>
+ * <li>成员类型</li>
+ * <li>扩展信息</li>
+ * <li>更新时间和创建时间</li>
+ * </ul>
+ * </p>
+ */
 public class PojoGroupMember {
    String member_id;
    String alias;
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+import java.util.List;
+
+public class ReplyMessageData {
+    private long messageUid;
+    private MessagePayload payload;
+    private boolean only2Sender;
+
+    public long getMessageUid() {
+        return messageUid;
+    }
+
+    public void setMessageUid(long messageUid) {
+        this.messageUid = messageUid;
+    }
+
+    public MessagePayload getPayload() {
+        return payload;
+    }
+
+    public void setPayload(MessagePayload payload) {
+        this.payload = payload;
+    }
+
+    public boolean isOnly2Sender() {
+        return only2Sender;
+    }
+
+    public void setOnly2Sender(boolean only2Sender) {
+        this.only2Sender = only2Sender;
+    }
+
+    public static boolean isValide(ReplyMessageData sendMessageData) {
+        if(sendMessageData.messageUid <=0  ||
+            sendMessageData.getPayload() == null) {
+            return false;
+        }
+        return true;
+    }
+}
@@ -11,6 +11,12 @@ package cn.wildfirechat.pojos;
 import cn.wildfirechat.proto.WFCMessage;
 import io.netty.util.internal.StringUtil;

+/**
+ * 发送消息结果类
+ * <p>
+ * 封装发送消息后的返回结果，包含消息UID和时间戳。
+ * </p>
+ */
 public class SendMessageResult {
    private long messageUid;
    private long timestamp;
@@ -0,0 +1,12 @@
+package cn.wildfirechat.pojos.mesh;
+
+import java.util.List;
+
+public class PojoAddJoinGroupRequest {
+    public String domainId;
+    public String operator;
+    public String group_id;
+    public List<String> userIds;
+    public String reason;
+    public String extra;
+}
@@ -0,0 +1,14 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos.mesh;
+
+
+public class PojoDomainPingRequest {
+    public String domainId;
+}
@@ -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.mesh;
+
+
+public class PojoDomainPingResponse {
+    public boolean success;
+    public String errorMessage;
+    public String myDomainName;
+}
@@ -56,7 +56,14 @@ public class ProtoConstants {
        int Platform_Harmony = 10;
        int Platform_HarmonyPad = 11;
        int Platform_HarmonyPC = 12;
-        int Platform_MAX = Platform_HarmonyPC;
+        // 穿戴端 (Wearable)
+        int Platform_AndroidWearable = 13;
+        int Platform_HarmonyWearable = 14;
+        // TV端
+        int Platform_AndroidTV = 15;
+        int Platform_AppleTV = 16;
+        int Platform_HarmonyTV = 17;
+        int Platform_MAX = Platform_HarmonyTV;
    }

    //message NotifyMessage & PullMessageRequest -> type
@@ -67311,6 +67311,641 @@ public final class WFCMessage {
    // @@protoc_insertion_point(class_scope:ApplicationConfigRequest)
  }

+  public interface StringPairOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // required string key = 1;
+    /**
+     * <code>required string key = 1;</code>
+     */
+    boolean hasKey();
+    /**
+     * <code>required string key = 1;</code>
+     */
+    java.lang.String getKey();
+    /**
+     * <code>required string key = 1;</code>
+     */
+    com.google.protobuf.ByteString
+        getKeyBytes();
+
+    // optional string value = 2;
+    /**
+     * <code>optional string value = 2;</code>
+     */
+    boolean hasValue();
+    /**
+     * <code>optional string value = 2;</code>
+     */
+    java.lang.String getValue();
+    /**
+     * <code>optional string value = 2;</code>
+     */
+    com.google.protobuf.ByteString
+        getValueBytes();
+  }
+  /**
+   * Protobuf type {@code StringPair}
+   */
+  public static final class StringPair extends
+      com.google.protobuf.GeneratedMessage
+      implements StringPairOrBuilder {
+    // Use StringPair.newBuilder() to construct.
+    private StringPair(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private StringPair(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final StringPair defaultInstance;
+    public static StringPair getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public StringPair getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private StringPair(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              bitField0_ |= 0x00000001;
+              key_ = input.readBytes();
+              break;
+            }
+            case 18: {
+              bitField0_ |= 0x00000002;
+              value_ = input.readBytes();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return cn.wildfirechat.proto.WFCMessage.internal_static_StringPair_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return cn.wildfirechat.proto.WFCMessage.internal_static_StringPair_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              cn.wildfirechat.proto.WFCMessage.StringPair.class, cn.wildfirechat.proto.WFCMessage.StringPair.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<StringPair> PARSER =
+        new com.google.protobuf.AbstractParser<StringPair>() {
+      public StringPair parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new StringPair(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<StringPair> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // required string key = 1;
+    public static final int KEY_FIELD_NUMBER = 1;
+    private java.lang.Object key_;
+    /**
+     * <code>required string key = 1;</code>
+     */
+    public boolean hasKey() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>required string key = 1;</code>
+     */
+    public java.lang.String getKey() {
+      java.lang.Object ref = key_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          key_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>required string key = 1;</code>
+     */
+    public com.google.protobuf.ByteString
+        getKeyBytes() {
+      java.lang.Object ref = key_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        key_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    // optional string value = 2;
+    public static final int VALUE_FIELD_NUMBER = 2;
+    private java.lang.Object value_;
+    /**
+     * <code>optional string value = 2;</code>
+     */
+    public boolean hasValue() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional string value = 2;</code>
+     */
+    public java.lang.String getValue() {
+      java.lang.Object ref = value_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          value_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string value = 2;</code>
+     */
+    public com.google.protobuf.ByteString
+        getValueBytes() {
+      java.lang.Object ref = value_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        value_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    private void initFields() {
+      key_ = "";
+      value_ = "";
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+
+      if (!hasKey()) {
+        memoizedIsInitialized = 0;
+        return false;
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeBytes(1, getKeyBytes());
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeBytes(2, getValueBytes());
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(1, getKeyBytes());
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(2, getValueBytes());
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSerializedSize = size;
+      return size;
+    }
+
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static cn.wildfirechat.proto.WFCMessage.StringPair parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(cn.wildfirechat.proto.WFCMessage.StringPair prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code StringPair}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements cn.wildfirechat.proto.WFCMessage.StringPairOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return cn.wildfirechat.proto.WFCMessage.internal_static_StringPair_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return cn.wildfirechat.proto.WFCMessage.internal_static_StringPair_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                cn.wildfirechat.proto.WFCMessage.StringPair.class, cn.wildfirechat.proto.WFCMessage.StringPair.Builder.class);
+      }
+
+      // Construct using cn.wildfirechat.proto.WFCMessage.StringPair.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        key_ = "";
+        bitField0_ = (bitField0_ & ~0x00000001);
+        value_ = "";
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return cn.wildfirechat.proto.WFCMessage.internal_static_StringPair_descriptor;
+      }
+
+      public cn.wildfirechat.proto.WFCMessage.StringPair getDefaultInstanceForType() {
+        return cn.wildfirechat.proto.WFCMessage.StringPair.getDefaultInstance();
+      }
+
+      public cn.wildfirechat.proto.WFCMessage.StringPair build() {
+        cn.wildfirechat.proto.WFCMessage.StringPair result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public cn.wildfirechat.proto.WFCMessage.StringPair buildPartial() {
+        cn.wildfirechat.proto.WFCMessage.StringPair result = new cn.wildfirechat.proto.WFCMessage.StringPair(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.key_ = key_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.value_ = value_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof cn.wildfirechat.proto.WFCMessage.StringPair) {
+          return mergeFrom((cn.wildfirechat.proto.WFCMessage.StringPair)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(cn.wildfirechat.proto.WFCMessage.StringPair other) {
+        if (other == cn.wildfirechat.proto.WFCMessage.StringPair.getDefaultInstance()) return this;
+        if (other.hasKey()) {
+          bitField0_ |= 0x00000001;
+          key_ = other.key_;
+          onChanged();
+        }
+        if (other.hasValue()) {
+          bitField0_ |= 0x00000002;
+          value_ = other.value_;
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        if (!hasKey()) {
+          
+          return false;
+        }
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        cn.wildfirechat.proto.WFCMessage.StringPair parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (cn.wildfirechat.proto.WFCMessage.StringPair) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      // required string key = 1;
+      private java.lang.Object key_ = "";
+      /**
+       * <code>required string key = 1;</code>
+       */
+      public boolean hasKey() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>required string key = 1;</code>
+       */
+      public java.lang.String getKey() {
+        java.lang.Object ref = key_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          key_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>required string key = 1;</code>
+       */
+      public com.google.protobuf.ByteString
+          getKeyBytes() {
+        java.lang.Object ref = key_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          key_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>required string key = 1;</code>
+       */
+      public Builder setKey(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        key_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required string key = 1;</code>
+       */
+      public Builder clearKey() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        key_ = getDefaultInstance().getKey();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required string key = 1;</code>
+       */
+      public Builder setKeyBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        key_ = value;
+        onChanged();
+        return this;
+      }
+
+      // optional string value = 2;
+      private java.lang.Object value_ = "";
+      /**
+       * <code>optional string value = 2;</code>
+       */
+      public boolean hasValue() {
+        return ((bitField0_ & 0x00000002) == 0x00000002);
+      }
+      /**
+       * <code>optional string value = 2;</code>
+       */
+      public java.lang.String getValue() {
+        java.lang.Object ref = value_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          value_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string value = 2;</code>
+       */
+      public com.google.protobuf.ByteString
+          getValueBytes() {
+        java.lang.Object ref = value_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          value_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string value = 2;</code>
+       */
+      public Builder setValue(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        value_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string value = 2;</code>
+       */
+      public Builder clearValue() {
+        bitField0_ = (bitField0_ & ~0x00000002);
+        value_ = getDefaultInstance().getValue();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string value = 2;</code>
+       */
+      public Builder setValueBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000002;
+        value_ = value;
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:StringPair)
+    }
+
+    static {
+      defaultInstance = new StringPair(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:StringPair)
+  }
+
  private static com.google.protobuf.Descriptors.Descriptor
    internal_static_AddFriendRequest_descriptor;
  private static
@@ -67691,6 +68326,11 @@ public final class WFCMessage {
  private static
    com.google.protobuf.GeneratedMessage.FieldAccessorTable
      internal_static_ApplicationConfigRequest_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_StringPair_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_StringPair_fieldAccessorTable;

  public static com.google.protobuf.Descriptors.FileDescriptor
      getDescriptor() {
@@ -67877,9 +68517,10 @@ public final class WFCMessage {
      "rget_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\014\n\004host\030\003 \002(" +
      "\t\"o\n\030ApplicationConfigRequest\022\r\n\005appId\030\001" +
      " \002(\t\022\017\n\007appType\030\002 \002(\005\022\021\n\ttimestamp\030\003 \002(\003" +
-      "\022\r\n\005nonce\030\004 \002(\t\022\021\n\tsignature\030\005 \002(\tB/\n\025cn" +
-      ".wildfirechat.protoB\nWFCMessageZ\n./go;pr" +
-      "oto"
+      "\022\r\n\005nonce\030\004 \002(\t\022\021\n\tsignature\030\005 \002(\t\"(\n\nSt" +
+      "ringPair\022\013\n\003key\030\001 \002(\t\022\r\n\005value\030\002 \001(\tB/\n\025" +
+      "cn.wildfirechat.protoB\nWFCMessageZ\n./go;",
+      "proto"
    };
    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -68342,6 +68983,12 @@ public final class WFCMessage {
            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
              internal_static_ApplicationConfigRequest_descriptor,
              new java.lang.String[] { "AppId", "AppType", "Timestamp", "Nonce", "Signature", });
+          internal_static_StringPair_descriptor =
+            getDescriptor().getMessageTypes().get(76);
+          internal_static_StringPair_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_StringPair_descriptor,
+              new java.lang.String[] { "Key", "Value", });
          return null;
        }
      };
@@ -1,32 +0,0 @@
-package com.xiaoleilu.loServer.pojos;
-
-
-public class InputRoute {
-    private String userId;
-    private String token;
-    private String clientId;
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-}
@@ -6,7 +6,7 @@
        <!--<relativePath>../pom.xml</relativePath>-->
        <artifactId>wildfirechat-parent</artifactId>
        <groupId>cn.wildfirechat</groupId>
-        <version>1.3.8</version>
+        <version>1.4.6</version>
    </parent>

    <artifactId>distribution</artifactId>
@@ -167,6 +167,16 @@ robot.callback_with_sender_info false
 ## 机器人回调信息是否带上目标的信息，单聊时是对方用户信息，群聊时是群组信息，频道时是频道信息
 robot.callback_with_target_info false

+## 是否允许@会话外的机器人。如果为true，单聊或者群聊时，可以@不在会话中的机器人。当机器人收到消息后，可以回复消息。
+## 如果为false，不能@不在会话中的机器人。机器人不在会话中时，也不能回复消息。
+robot.mention_external_robot true
+
+## 机器人获取信息允许的字段，可以获取userId/displayName/portrait，其他需要这里配置允许。
+## 第一位(1)是name， 第二位(2)是mobile，第三(4)位是email，第四位(8)是address，第五位(16)是company，第六位(32)是extra，
+## 第七位(64)是updateDt，第八位(128)是gender，第九位(256)是social，第十位(512)是type。
+## 比如允许获取name和email就是5(1+4)，允许获取name和mobile和company和type就是531（1+2+16+512），允许全部是1023(1+2+...+512)
+#robot.get_user_info_mask 1023
+
 ## 频道回调信息是否带上用户clientId和平台类型。
 channel.callback_with_client_info false

@@ -186,8 +196,8 @@ friend.disable_search false
 ##禁止按照昵称搜索用户。
 friend.disable_nick_name_search false

-##禁止按照用户id搜索用户，默认为true。
-friend.disable_user_id_search true
+##禁止按照用户id搜索用户，默认为false。
+friend.disable_user_id_search false

 ##禁止发送好友邀请，通过server api添加好友不受此限制(force参数需要为true)
 friend.disable_friend_request false
@@ -202,7 +212,13 @@ friend.reject_request_duration 2592000000
 friend.request_expiration_duration 604800000

 ##好友请求限制频率，一个用户24小时之内允许请求好友的次数，默认不限频。
-#friend.request_rate_limit 30
+friend.request_rate_limit 30
+
+##如果搜索电话号码，24小时内搜索错误号码几次就不再允许电话号码搜素。防止有人遍历搜索电话号码
+friend.search_mobile_empty_rate_limit 5
+
+##如果搜索用户，24小时内搜索次数。防止有人遍历用户名或者用户ID乱加好友。另外可以禁止ID搜索friend.disable_user_id_search
+friend.search_rate_limit 100

 ##请求添加机器人为好友时，机器人是否自动接受，默认为true
 friend.robot_auto_accept true
@@ -258,6 +274,19 @@ group.enable_mark_deletion true
 ## 注意，修改本配置不会对已经同步的信息产生影响。
 #user.hide_properties 3,4

+## 销毁用户时，用户信息会被清空，deleted字段设置为1，这个开关控制是否保留用户昵称，默认为true。
+user.keep_display_name_when_destroy true
+
+## 销毁用户时deleted字段设置为1，这个开关控制是否保留其他信息，默认是false。
+user.keep_full_info_when_destroy false
+
+## 销毁用户时，如果user.keep_full_info_when_destroy为true，会保留所有信息，这个开关控制是否保留这个用户信息的电话号码，默认为false。
+## 当保留所有信息且保留电话号码时，用户如果再注册会用到原来的UID，能够看到原来用户的消息，需要考虑一下是否让已删除用户再次注册登录看到之前的消息。
+user.keep_mobile_when_destroy false
+
+## 销毁用户时是否保留归属于这个用户的所有消息记录，默认为false。
+user.keep_messages_when_destroy false
+
 # 好友/好友请求/用户设置 这三类数据同步的最大条目数。之前是客户第一次登录时，会把所有的对应数据一次下载到客户端，但如果有特别多的信息，会导致无法同步到客户端，
 # 因此需要分段多次同步，此开关定义了每次同步的数据的条数。此需要客户端支持，客户端SDK在2021.5.25日后支持此功能。如果确认所有客户端都在这个日志之后才可以打开此设置。
 #sync.data_part_size 1000
@@ -311,6 +340,16 @@ qiniu.bucket_portrait_name storage
 qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn
 qiniu.bucket_favorite_name storage
 qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
+## custom的桶是给客户预留的，客户可以上传自己的文件到这3个桶中，野火不会用到这几个桶。如果不需要，可以忽略这几个配置
+qiniu.bucket_custom1_name temp1
+qiniu.bucket_custom1_domain http://temp1.wildfirechat.cn
+qiniu.bucket_custom2_name temp2
+qiniu.bucket_custom2_domain http://temp2.wildfirechat.cn
+qiniu.bucket_custom3_name temp3
+qiniu.bucket_custom3_domain http://temp3.wildfirechat.cn
+## 如果配置网盘服务，需要配置这个
+qiniu.bucket_pan_name pan
+qiniu.bucket_pan_domain http://pan.wildfirechat.cn

 ##媒体类型分类
 #Media_Type_GENERAL = 0,
@@ -343,6 +382,12 @@ server.multi_pc_endpoint false
 ## 是否支持PAD多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PAD端多端登录。
 server.multi_pad_endpoint false

+## 是否支持可穿戴设备多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开可穿戴设备多端登录。
+server.multi_wearable_endpoint false
+
+## 是否支持TV设备多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开TV多端登录。
+server.multi_tv_endpoint false
+
 # 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或pad或web端登录的通知。
 server.multi_platform_notification true

@@ -97,4 +97,4 @@ echo ""
 #JAVA_OPTS="$JAVA_OPTS -Xms2G"


-$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configurationFile="file:$LOG_FILE" -Dlog4j2.formatMsgNoLookups=true -Dcom.mchange.v2.c3p0.cfg.xml="$C3P0_CONF_FILE" -Dhazelcast.configuration=$HZ_CONF_FILE -Dwildfirechat.path="$WILDFIRECHAT_CONFIG_PATH" -cp "$WILDFIRECHAT_HOME/lib/*" cn.wildfirechat.server.Server
+$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -Dlog4j.configurationFile="file:$LOG_FILE" -Dlog4j2.formatMsgNoLookups=true -Dcom.mchange.v2.c3p0.cfg.xml="$C3P0_CONF_FILE" -Dhazelcast.configuration=$HZ_CONF_FILE -Dwildfirechat.path="$WILDFIRECHAT_CONFIG_PATH" -cp "$WILDFIRECHAT_HOME/lib/*" cn.wildfirechat.server.Server
@@ -12,7 +12,7 @@
    <artifactId>wildfirechat-parent</artifactId>

    <packaging>pom</packaging>
-    <version>1.3.8</version>
+    <version>1.4.6</version>
    <name>Wildfire Chat</name>
    <description>Wildfire Chat Server</description>
    <inceptionYear>2019</inceptionYear>
@@ -12,6 +12,62 @@
 11. *** 1.3.8版本添加了server api发送消息的限制，限制消息体最大内容不能超过64KB，如果升级请注意业务系统发送消息大小。***

 # 更新记录
+--------------
+Release note 1.4.6:
+1. 添加网盘存储类型。
+2. 添加可穿戴设备和TV设备类型。
+3. Server SDK添加上传接口。
+4. 解决转移群主给现有群主错误问题。
+
+--------------
+Release note 1.4.5:
+1. 解决删除用户时保留信息错误问题。
+2. Server API获取用户信息时，可以指定是否获取已删除用户。
+3. 好友关系表添加一个索引。
+4. 支持PC端锁定功能。
+
+--------------
+Release note 1.4.4:
+1. Server SDK添加mesh相关修改
+2. 添加设置好友Extra的接口。
+3. 解决创建账户时，没有传昵称使用了账户的问题。
+4. 添加获取用户机器人列表的Server API。
+5. 机器人回调消息中加上目标机器人ID。
+6. 机器人获取用户信息添加配置确定能获取哪些字段。
+
+--------------
+Release note 1.4.3:
+1. 添加内置存储上传文件文件名有效性检查。
+2. 接受好友请求通知的发送者改成接受者发送。
+3. 对象存储添加预留类型供扩展使用。
+4. 同步专业版数据库表格式。
+5. 解决server sdk有轻微内存泄漏的问题。
+
+--------------
+Release note 1.4.2:
+1. 解决部分情况下Server SDK没有解析出文本消息的问题。
+
+--------------
+Release note 1.4.1:
+1. 解决移动端和PAD同时存在时推送计数错误问题。
+2. 添加配置，当销毁用户时是否销毁用户信息和用户的消息。
+3. 添加配置，现在搜索用户的次数。
+
+--------------
+Release note 1.4.0:
+1. 添加对用户IP来源的记录。
+2. 移除无用的plugin，可以在java8环境下编译通过。
+3. Server SDK解决某些Java版本下消息没有注册的问题。
+4. Server SDK解决解析图片缩略图不存在的错误问题。
+5. Server SDK解决发送带引用的消息客户端无法解析的问题。
+
+--------------
+Release note 1.3.9:
+1. 解决server sdk反复初始化内存泄漏的问题。
+2. 群组支持用户@不在群组中的机器人。
+3. 单聊会话支持@机器人。
+4. 机器人支持回复消息，可以回复单聊或者群聊消息。
+
 --------------
 Release note 1.3.8:
 1. 添加限制，server api发送消息，限制消息体不能大于64KB。
@@ -0,0 +1,359 @@
+# 野火IM Server Java SDK
+
+野火IM Server Java SDK 是野火IM服务器的官方 Java 语言 SDK，提供了完整的 Admin API、Robot API 和 Channel API 接口封装。
+
+## 功能特性
+
+- **用户管理**：创建用户、获取用户信息、更新用户信息、封禁/解封用户等
+- **群组管理**：创建群组、添加/移除成员、转让群主、设置管理员等
+- **消息管理**：发送消息、广播消息、撤回消息、删除消息等
+- **好友关系**：添加好友、删除好友、获取好友列表、设置黑名单等
+- **聊天室管理**：创建聊天室、获取聊天室信息、销毁聊天室等
+- **频道管理**：创建频道、订阅/取消订阅、发送频道消息等
+- **机器人服务**：机器人消息收发、用户信息查询、群组管理等
+- **会议管理**：创建会议、查询会议信息、管理参会者等（高级音视频功能）
+- **朋友圈功能**：发布动态、评论、点赞等（需启用朋友圈功能）
+- **敏感词管理**：添加/删除敏感词、检查敏感词等
+
+## 安装
+
+### Maven 依赖
+
+```xml
+<dependencies>
+    <!-- 必需依赖 -->
+    <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <version>2.8.9</version>
+    </dependency>
+    <dependency>
+        <groupId>commons-httpclient</groupId>
+        <artifactId>commons-httpclient</artifactId>
+        <version>3.1</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.5.13</version>
+    </dependency>
+    <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.15</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>2.5.0</version>
+    </dependency>
+    <dependency>
+        <groupId>com.googlecode.json-simple</groupId>
+        <artifactId>json-simple</artifactId>
+        <version>1.1.1</version>
+    </dependency>
+    
+    <!-- SDK JAR (本地路径根据实际情况修改) -->
+    <dependency>
+        <groupId>cn.wildfirechat</groupId>
+        <artifactId>sdk</artifactId>
+        <version>1.2.2</version>
+        <scope>system</scope>
+        <systemPath>${project.basedir}/lib/sdk.jar</systemPath>
+    </dependency>
+    <dependency>
+        <groupId>cn.wildfirechat</groupId>
+        <artifactId>common</artifactId>
+        <version>1.2.2</version>
+        <scope>system</scope>
+        <systemPath>${project.basedir}/lib/common.jar</systemPath>
+    </dependency>
+</dependencies>
+
+<!-- Spring Boot 项目需要添加 includeSystemScope -->
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-maven-plugin</artifactId>
+            <configuration>
+                <includeSystemScope>true</includeSystemScope>
+            </configuration>
+        </plugin>
+    </plugins>
+</build>
+```
+
+### SDK 获取
+
+1. 从源码编译：本项目位于 `server/sdk` 目录
+2. 从发布包获取：在 release 包的 `server_sdk` 目录中
+
+## 快速开始
+
+### Admin 管理 API
+
+```java
+import cn.wildfirechat.sdk.AdminConfig;
+import cn.wildfirechat.sdk.UserAdmin;
+import cn.wildfirechat.sdk.MessageAdmin;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.Conversation;
+import cn.wildfirechat.sdk.messagecontent.TextMessageContent;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.sdk.model.IMResult;
+
+public class QuickStart {
+    public static void main(String[] args) throws Exception {
+        // 初始化配置
+        AdminConfig.initAdmin("http://localhost:18080", "123456");
+        
+        // 创建用户
+        InputOutputUserInfo user = new InputOutputUserInfo();
+        user.setUserId("user1");
+        user.setName("user1");
+        user.setDisplayName("Test User");
+        user.setMobile("13900000000");
+        
+        IMResult<OutputCreateUser> result = UserAdmin.createUser(user);
+        if (result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("创建用户成功: " + result.getResult().getUserId());
+        }
+        
+        // 获取用户 Token
+        IMResult<OutputGetIMTokenData> tokenResult = UserAdmin.getUserToken(
+            "user1", 
+            "client1", 
+            ProtoConstants.Platform.Platform_Android
+        );
+        if (tokenResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("Token: " + tokenResult.getResult().getToken());
+        }
+        
+        // 发送消息
+        Conversation conversation = new Conversation();
+        conversation.setType(ProtoConstants.ConversationType.ConversationType_Private);
+        conversation.setTarget("user2");
+        conversation.setLine(0);
+        
+        TextMessageContent content = new TextMessageContent("Hello, World!");
+        MessagePayload payload = content.encode();
+        
+        IMResult<SendMessageResult> msgResult = MessageAdmin.sendMessage("user1", conversation, payload);
+        if (msgResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("消息发送成功，ID: " + msgResult.getResult().getMessageUid());
+        }
+    }
+}
+```
+
+### Robot 机器人服务
+
+```java
+import cn.wildfirechat.sdk.RobotService;
+import cn.wildfirechat.sdk.messagecontent.TextMessageContent;
+
+public class RobotExample {
+    public static void main(String[] args) throws Exception {
+        // 初始化机器人服务
+        RobotService robot = new RobotService("http://localhost", "robot1", "123456");
+        
+        // 获取机器人信息
+        IMResult<OutputRobot> profile = robot.getProfile();
+        if (profile.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("机器人名称: " + profile.getResult().getDisplayName());
+        }
+        
+        // 发送消息给用户
+        TextMessageContent content = new TextMessageContent("Hello from robot!");
+        IMResult<SendMessageResult> result = robot.sendMessage("user1", content);
+        if (result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("机器人消息发送成功");
+        }
+        
+        // 获取用户信息
+        IMResult<OutputUserInfo> userInfo = robot.getUserInfo("user1");
+        if (userInfo.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("用户显示名: " + userInfo.getResult().getDisplayName());
+        }
+    }
+}
+```
+
+### Channel 频道服务
+
+```java
+import cn.wildfirechat.sdk.ChannelServiceApi;
+import cn.wildfirechat.sdk.messagecontent.TextMessageContent;
+
+public class ChannelExample {
+    public static void main(String[] args) throws Exception {
+        // 初始化频道服务
+        ChannelServiceApi channel = new ChannelServiceApi("http://localhost", "channel1", "secret");
+        
+        // 发送广播消息给订阅者
+        TextMessageContent content = new TextMessageContent("Channel broadcast message");
+        IMResult<SendMessageResult> result = channel.broadcastMessage(content);
+        if (result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("频道广播消息发送成功");
+        }
+        
+        // 用户订阅频道
+        IMResult<Void> subscribeResult = channel.subscribe("user1");
+        if (subscribeResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("订阅成功");
+        }
+        
+        // 获取频道订阅者（商业版功能）
+        IMResult<OutputStringList> subscribers = channel.getSubscriberList();
+        if (subscribers.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("订阅者数量: " + subscribers.getResult().getList().size());
+        }
+    }
+}
+```
+
+## 运行测试
+
+SDK 提供了完整的测试示例 `Main.java`：
+
+```bash
+# 编译
+mvn compile
+
+# 运行测试（使用默认配置）
+mvn exec:java -Dexec.mainClass="cn.wildfirechat.sdk.Main"
+
+# 运行测试（自定义配置）
+mvn exec:java -Dexec.mainClass="cn.wildfirechat.sdk.Main" \
+    -Dexec.args="http://your-server:18080 your-secret http://your-server false false"
+```
+
+### 命令行参数
+
+```
+Usage: java -jar sdk.jar adminUrl adminSecret imUrl commercialServer advanceVoip
+
+参数说明:
+  adminUrl         - 管理API地址，如 http://localhost:18080
+  adminSecret      - 管理员密钥
+  imUrl            - IM服务地址（机器人/频道使用），如 http://localhost
+  commercialServer - 是否为商业版服务器 (true/false)
+  advanceVoip      - 是否启用高级音视频功能 (true/false)
+```
+
+## 项目结构
+
+```
+sdk/
+├── src/main/java/cn/wildfirechat/
+│   ├── sdk/
+│   │   ├── AdminConfig.java          # 配置类
+│   │   ├── UserAdmin.java            # 用户管理
+│   │   ├── GroupAdmin.java           # 群组管理
+│   │   ├── MessageAdmin.java         # 消息管理
+│   │   ├── RelationAdmin.java        # 好友关系管理
+│   │   ├── ChatroomAdmin.java        # 聊天室管理
+│   │   ├── ChannelAdmin.java         # 频道管理
+│   │   ├── GeneralAdmin.java         # 通用管理
+│   │   ├── SensitiveAdmin.java       # 敏感词管理
+│   │   ├── ConferenceAdmin.java      # 会议管理
+│   │   ├── MomentsAdmin.java         # 朋友圈管理
+│   │   ├── RobotService.java         # 机器人服务
+│   │   ├── ChannelServiceApi.java    # 频道服务API
+│   │   ├── MeshAdmin.java            # Mesh分布式管理
+│   │   └── Main.java                 # 测试主程序
+│   │   └── messagecontent/           # 消息内容类
+│   │       ├── MessageContent.java
+│   │       ├── TextMessageContent.java
+│   │       ├── ImageMessageContent.java
+│   │       ├── SoundMessageContent.java
+│   │       ├── VideoMessageContent.java
+│   │       ├── FileMessageContent.java
+│   │       └── ...
+│   ├── common/                       # 公共模块（依赖）
+│   └── proto/                        # 协议常量
+└── pom.xml                           # Maven配置
+```
+
+## 主要 API 说明
+
+### 用户管理 (UserAdmin)
+
+| 方法 | 说明 |
+|------|------|
+| `createUser()` | 创建用户 |
+| `getUserByName()` | 按用户名获取用户 |
+| `getUserByMobile()` | 按手机号获取用户 |
+| `getUserByUserId()` | 按用户ID获取用户 |
+| `updateUserInfo()` | 更新用户信息 |
+| `getUserToken()` | 获取用户IM Token |
+| `updateUserBlockStatus()` | 封禁/解封用户 |
+| `checkUserOnlineStatus()` | 检查用户在线状态 |
+
+### 群组管理 (GroupAdmin)
+
+| 方法 | 说明 |
+|------|------|
+| `createGroup()` | 创建群组 |
+| `getGroupInfo()` | 获取群组信息 |
+| `addGroupMembers()` | 添加群成员 |
+| `kickoffGroupMembers()` | 踢出群成员 |
+| `transferGroup()` | 转让群主 |
+| `dismissGroup()` | 解散群组 |
+
+### 消息管理 (MessageAdmin)
+
+| 方法 | 说明 |
+|------|------|
+| `sendMessage()` | 发送消息 |
+| `broadcastMessage()` | 广播消息 |
+| `multicastMessage()` | 群发消息 |
+| `recallMessage()` | 撤回消息 |
+| `deleteMessage()` | 删除消息 |
+
+### 好友关系 (RelationAdmin)
+
+| 方法 | 说明 |
+|------|------|
+| `setUserFriend()` | 设置好友关系 |
+| `getFriendList()` | 获取好友列表 |
+| `setUserBlacklist()` | 设置黑名单 |
+| `getUserBlacklist()` | 获取黑名单列表 |
+
+## 接口文档
+
+- [Admin API 文档](https://docs.wildfirechat.cn/server/admin_api/) - 服务端管理接口，包括用户、群组、消息、频道等管理功能
+- [Robot API 文档](https://docs.wildfirechat.cn/server/robot_api/) - 机器人服务接口，用于开发机器人应用
+- [Channel API 文档](https://docs.wildfirechat.cn/server/channel_api/) - 频道服务接口，用于开发公众号/频道应用
+- [IM 开发文档](https://docs.wildfirechat.cn/) - 野火IM完整开发文档
+
+## 其他语言 SDK
+
+| 语言 | GitHub                                                           | Gitee(码云) |
+|------|------------------------------------------------------------------|-------------|
+| Java SDK | [GitHub](https://github.com/wildfirechat/server/tree/master/sdk) | [Gitee](https://gitee.com/wfchat/im-server/tree/wildfirechat/sdk) |
+| Python SDK | [GitHub](https://github.com/wildfirechat/server-sdk-python)  | [Gitee](https://gitee.com/wfchat/im-server/server-sdk-python) |
+| Go SDK | [GitHub](https://github.com/wildfirechat/server-sdk-go)          | [Gitee](https://gitee.com/wfchat/server-sdk-go) |
+| Node.js SDK | [GitHub](https://github.com/wildfirechat/server-sdk.js)          | [Gitee](https://gitee.com/wfchat/server-sdk.js) |
+
+## 相关链接
+
+- [野火IM 官网](https://wildfirechat.cn/)
+- [在线文档](https://docs.wildfirechat.cn/)
+- [服务端源码 - GitHub](https://github.com/wildfirechat/server) | [Gitee](https://gitee.com/wfchat/im-server)
+- [应用服务源码 - GitHub](https://github.com/wildfirechat/app-server) | [Gitee](https://gitee.com/wfchat/app-server)
+- [机器人服务源码 - GitHub](https://github.com/wildfirechat/robot-server) | [Gitee](https://gitee.com/wfchat/robot-server)
+- [推送服务源码 - GitHub](https://github.com/wildfirechat/push-server) | [Gitee](https://gitee.com/wfchat/push-server)
+- [论坛交流](https://bbs.wildfirechat.cn/)
+
+## 注意事项
+
+1. **Admin API** 使用 18080 端口，具有超级管理权限，理论上不应对外开放，也不应让非内部服务知悉密钥。
+2. **Robot API** 和 **Channel API** 使用 IM 服务的公开端口（默认 80），第三方可以使用机器人或频道与 IM 系统进行对接。
+3. 商业版服务器支持更多高级功能，如在线用户统计、设备管理等。
+4. 高级音视频功能需要单独启用，支持会议管理相关 API。
+
+## 许可证
+
+本项目采用与野火IM相同的许可证。
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>wildfirechat-parent</artifactId>
        <groupId>cn.wildfirechat</groupId>
-        <version>1.3.8</version>
+        <version>1.4.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -68,6 +68,12 @@
            <version>4.5.13</version>
        </dependency>

+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+
        <dependency>
            <groupId>commons-codec</groupId>
            <artifactId>commons-codec</artifactId>
@@ -2,7 +2,22 @@ package cn.wildfirechat.sdk;

 import cn.wildfirechat.sdk.utilities.AdminHttpUtils;

+/**
+ * 管理员配置类
+ * <p>
+ * 用于初始化管理员SDK的配置，包括IM服务器URL和密钥。
+ * 在使用任何Admin功能之前，必须先调用initAdmin方法进行初始化。
+ * </p>
+ */
 public class AdminConfig {
+    /**
+     * 初始化管理员配置
+     * <p>
+     * 在使用任何Admin功能之前，必须先调用此方法进行初始化。
+     * </p>
+     * @param url IM服务器地址，例如: http://your-im-server.com
+     * @param secret 管理员密钥，在服务器配置中设置
+     */
    public static void initAdmin(String url, String secret) {
        AdminHttpUtils.init(url, secret);
    }
@@ -5,36 +5,87 @@ import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.sdk.model.IMResult;
 import cn.wildfirechat.sdk.utilities.AdminHttpUtils;

+/**
+ * 频道管理类
+ * <p>
+ * 提供频道管理相关的功能，包括：
+ * <ul>
+ * <li>创建和销毁频道</li>
+ * <li>获取频道信息</li>
+ * <li>用户订阅/取消订阅频道</li>
+ * <li>检查用户是否订阅频道</li>
+ * </ul>
+ * </p>
+ */
 public class ChannelAdmin {
+    /**
+     * 创建频道
+     * @param inputCreateChannel 频道创建信息
+     * @return 创建结果，包含频道ID
+     * @throws Exception 请求失败时抛出异常
+     */
    public static IMResult<OutputCreateChannel> createChannel(InputCreateChannel inputCreateChannel) throws Exception {
        String path = APIPath.Create_Channel;
        return AdminHttpUtils.httpJsonPost(path, inputCreateChannel, OutputCreateChannel.class);
    }

+    /**
+     * 销毁频道
+     * @param channelId 频道ID
+     * @return 销毁结果
+     * @throws Exception 请求失败时抛出异常
+     */
    public static IMResult<Void> destroyChannel(String channelId) throws Exception {
        String path = APIPath.Destroy_Channel;
        InputChannelId inputChannelId = new InputChannelId(channelId);
        return AdminHttpUtils.httpJsonPost(path, inputChannelId, Void.class);
    }

+    /**
+     * 获取频道信息
+     * @param channelId 频道ID
+     * @return 频道信息
+     * @throws Exception 请求失败时抛出异常
+     */
    public static IMResult<OutputGetChannelInfo> getChannelInfo(String channelId) throws Exception {
        String path = APIPath.Get_Channel_Info;
        InputChannelId inputChannelId = new InputChannelId(channelId);
        return AdminHttpUtils.httpJsonPost(path, inputChannelId, OutputGetChannelInfo.class);
    }

+    /**
+     * 订阅频道
+     * @param channelId 频道ID
+     * @param userId 用户ID
+     * @return 订阅结果
+     * @throws Exception 请求失败时抛出异常
+     */
    public static IMResult<Void> subscribeChannel(String channelId, String userId) throws Exception {
        String path = APIPath.Subscribe_Channel;
        InputSubscribeChannel input = new InputSubscribeChannel(channelId, userId, 1);
        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
    }

+    /**
+     * 取消订阅频道
+     * @param channelId 频道ID
+     * @param userId 用户ID
+     * @return 取消订阅结果
+     * @throws Exception 请求失败时抛出异常
+     */
    public static IMResult<Void> unsubscribeChannel(String channelId, String userId) throws Exception {
        String path = APIPath.Subscribe_Channel;
        InputSubscribeChannel input = new InputSubscribeChannel(channelId, userId, 0);
        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
    }

+    /**
+     * 检查用户是否订阅了频道
+     * @param userId 用户ID
+     * @param channelId 频道ID
+     * @return true-已订阅，false-未订阅
+     * @throws Exception 请求失败时抛出异常
+     */
    public static IMResult<OutputBooleanValue> isUserSubscribedChannel(String userId, String channelId) throws Exception {
        String path = APIPath.Check_User_Subscribe_Channel;
        InputSubscribeChannel input = new InputSubscribeChannel(channelId, userId, 0);
@@ -9,36 +9,81 @@ import cn.wildfirechat.sdk.utilities.ChannelHttpUtils;
 import com.google.gson.Gson;
 import org.apache.commons.codec.digest.DigestUtils;

+import java.io.Closeable;
+import java.io.IOException;
 import java.util.List;

 import static cn.wildfirechat.proto.ProtoConstants.ApplicationType.ApplicationType_Channel;

-//仅专业版支持，社区版不支持
-public class ChannelServiceApi {
+/**
+ * 频道服务类（仅专业版支持，社区版不支持）
+ * <p>
+ * 提供频道相关的功能，包括：
+ * <ul>
+ * <li>获取用户信息</li>
+ * <li>修改频道信息</li>
+ * <li>发送和撤回消息</li>
+ * <li>用户订阅管理</li>
+ * <li>订阅者列表查询</li>
+ * </ul>
+ * </p>
+ */
+public class ChannelServiceApi implements Closeable {
    private final ChannelHttpUtils channelHttpUtils;

+    /**
+     * 创建频道服务实例
+     * @param imurl IM服务器地址
+     * @param channelId 频道ID
+     * @param secret 频道密钥
+     */
    public ChannelServiceApi(String imurl, String channelId, String secret) {
        channelHttpUtils = new ChannelHttpUtils(imurl, channelId, secret);
    }

+    /**
+     * 根据用户ID获取用户信息
+     * @param userId 用户ID
+     * @return 用户信息
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<InputOutputUserInfo> getUserInfo(String userId) throws Exception {
        String path = APIPath.Channel_User_Info;
        InputGetUserInfo getUserInfo = new InputGetUserInfo(userId, null, null);
        return channelHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
    }

+    /**
+     * 根据用户名获取用户信息
+     * @param userName 用户名
+     * @return 用户信息
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<InputOutputUserInfo> getUserInfoByName(String userName) throws Exception {
        String path = APIPath.Channel_User_Info;
        InputGetUserInfo getUserInfo = new InputGetUserInfo(null, userName, null);
        return channelHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
    }

+    /**
+     * 根据手机号获取用户信息
+     * @param mobile 手机号
+     * @return 用户信息
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<InputOutputUserInfo> getUserInfoByMobile(String mobile) throws Exception {
        String path = APIPath.Channel_User_Info;
        InputGetUserInfo getUserInfo = new InputGetUserInfo(null, null, mobile);
        return channelHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
    }

+    /**
+     * 修改频道信息
+     * @param type 修改类型，参考{@link cn.wildfirechat.proto.ProtoConstants.ModifyChannelInfoType}
+     * @param value 修改的值
+     * @return 操作结果
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<Void> modifyChannelInfo(/*ProtoConstants.ModifyChannelInfoType*/int type, String value) throws Exception {
        String path = APIPath.Channel_Update_Profile;
        InputModifyChannelInfo modifyChannelInfo = new InputModifyChannelInfo();
@@ -47,16 +92,35 @@ public class ChannelServiceApi {
        return channelHttpUtils.httpJsonPost(path, modifyChannelInfo, Void.class);
    }

+    /**
+     * 获取频道信息
+     * @return 频道信息
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<OutputGetChannelInfo> getChannelInfo() throws Exception {
        String path = APIPath.Channel_Get_Profile;
        return channelHttpUtils.httpJsonPost(path, null, OutputGetChannelInfo.class);
    }

+    /**
+     * 修改频道菜单
+     * @param menus 菜单列表
+     * @return 操作结果
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<Void> modifyChannelMenu(List<PojoChannelMenu> menus) throws Exception {
        String menuStr = new Gson().toJson(menus);
        return modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Menu, menuStr);
    }

+    /**
+     * 发送频道消息
+     * @param line 线路
+     * @param targets 目标用户ID列表
+     * @param payload 消息内容
+     * @return 发送结果
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<SendMessageResult> sendMessage(int line, List<String> targets, MessagePayload payload) throws Exception {
        String path = APIPath.Channel_Message_Send;
        SendChannelMessageData messageData = new SendChannelMessageData();
@@ -66,7 +130,12 @@ public class ChannelServiceApi {
        return channelHttpUtils.httpJsonPost(path, messageData, SendMessageResult.class);
    }

-    //仅专业版支持
+    /**
+     * 撤回频道消息
+     * @param messageUid 消息UID
+     * @return 操作结果，返回被撤回消息的UID
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<String> recallMessage(long messageUid) throws Exception {
        String path = APIPath.Channel_Msg_Recall;
        RecallMessageData messageData = new RecallMessageData();
@@ -74,7 +143,13 @@ public class ChannelServiceApi {
        return channelHttpUtils.httpJsonPost(path, messageData, String.class);
    }

-    //仅专业版支持
+    /**
+     * 重新发布频道消息
+     * @param messageUid 消息UID
+     * @param targets 目标用户ID列表
+     * @return 操作结果
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<Void> republishMessage(long messageUid, List<String> targets) throws Exception {
        String path = APIPath.Channel_Msg_Republish;
        RepublishChannelMessageData messageData = new RepublishChannelMessageData();
@@ -83,6 +158,12 @@ public class ChannelServiceApi {
        return channelHttpUtils.httpJsonPost(path, messageData, Void.class);
    }

+    /**
+     * 订阅频道
+     * @param userId 用户ID
+     * @return 操作结果
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<Void> subscribe(String userId) throws Exception {
        String path = APIPath.Channel_Subscribe;
        InputChannelSubscribe input = new InputChannelSubscribe();
@@ -91,6 +172,12 @@ public class ChannelServiceApi {
        return channelHttpUtils.httpJsonPost(path, input, Void.class);
    }

+    /**
+     * 取消订阅频道
+     * @param userId 用户ID
+     * @return 操作结果
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<Void> unsubscribe(String userId) throws Exception {
        String path = APIPath.Channel_Subscribe;
        InputChannelSubscribe input = new InputChannelSubscribe();
@@ -99,17 +186,34 @@ public class ChannelServiceApi {
        return channelHttpUtils.httpJsonPost(path, input, Void.class);
    }

+    /**
+     * 获取频道订阅者列表
+     * @return 订阅者用户ID列表
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<OutputStringList> getSubscriberList() throws Exception {
        String path = APIPath.Channel_Subscriber_List;
        return channelHttpUtils.httpJsonPost(path, null, OutputStringList.class);
    }

+    /**
+     * 判断用户是否订阅了频道
+     * @param userId 用户ID
+     * @return 是否订阅
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<Boolean> isSubscriber(String userId) throws Exception {
        String path = APIPath.Channel_Is_Subscriber;
        InputUserId input = new InputUserId(userId);
        return channelHttpUtils.httpJsonPost(path, input, Boolean.class);
    }

+    /**
+     * 通过授权码获取应用用户信息
+     * @param authCode 授权码
+     * @return 应用用户信息
+     * @throws Exception 请求失败时抛出异常
+     */
    public IMResult<OutputApplicationUserInfo> applicationGetUserInfo(String authCode) throws Exception {
        String path = APIPath.Channel_Application_Get_UserInfo;
        InputApplicationGetUserInfo input = new InputApplicationGetUserInfo();
@@ -117,6 +221,11 @@ public class ChannelServiceApi {
        return channelHttpUtils.httpJsonPost(path, input, OutputApplicationUserInfo.class);
    }

+    /**
+     * 获取应用签名配置
+     * <p>用于客户端接入时的签名验证</p>
+     * @return 应用签名配置数据
+     */
    public OutputApplicationConfigData getApplicationSignature() {
        int nonce = (int)(Math.random() * 100000 + 3);
        long timestamp = System.currentTimeMillis()/1000;
@@ -131,4 +240,12 @@ public class ChannelServiceApi {
        return configData;
    }

+    /**
+     * 关闭服务，释放资源
+     * @throws IOException 关闭时发生IO异常
+     */
+    @Override
+    public void close() throws IOException {
+        channelHttpUtils.close();
+    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
heavyrian2012	776c9e26c6	机器人API添加根据邮箱获取用户信息和批量获取用户信息的接口	2026-04-29 15:31:59 +08:00
heavyrian2012	c7f7ce949e	机器人和频道api，请求错误时，result应该为空	2026-04-26 09:42:22 +08:00
heavyrian2012	07b1de4ae3	添加注释	2026-04-20 08:19:38 +08:00
heavyrian2012	7e87f9d6ab	机器人更新消息内容添加distribute接口	2026-04-19 20:06:53 +08:00
heavyrian2012	da781180a7	解决业务系统不限制手机号码重复时，根据手机号码获取用户列表的问题	2026-04-10 21:53:24 +08:00
heavyrian2012	f1b62ad64a	同步专业版数据库	2026-04-10 21:41:49 +08:00
heavyrian2012	576fcf3e77	添加获取所有机器人的接口	2026-04-05 11:28:46 +08:00
heavyrian2012	33f2124352	同步专业版IM服务SDK	2026-03-31 15:57:29 +08:00
heavyrian2012	15701e9943	version and release note	2026-03-25 10:04:24 +08:00
heavyrian2012	dc5687319a	转移群组时判断是否已经是群主	2026-03-25 10:01:15 +08:00
heavyrian2012	3eef24bdb9	添加server sdk readme	2026-03-15 10:30:00 +08:00
heavyrian2012	be5a24a6fd	update readme	2026-03-13 13:02:17 +08:00
heavyrian2012	6537b7e009	getPresignedUploadUrl公开	2026-03-11 16:15:47 +08:00
heavyrian2012	92471db413	添加SDK上传功能	2026-03-11 16:11:13 +08:00
heavyrian2012	6626237c80	支持可穿戴设备和TV端	2026-03-06 19:15:22 +08:00
heavyrian2012	c98507d9a0	sdk测试方法中添加更多的测试例	2026-03-04 19:16:35 +08:00
heavyrian2012	d8adaf7e88	启动脚本里添加utf8参数	2026-02-28 21:33:38 +08:00
imndx	45d40e2389	update readme	2026-02-27 10:03:30 +08:00
heavyrian2012	33de0f3e43	添加网盘对象存储	2026-02-26 14:20:02 +08:00
heavyrian2012	a9300e8ecc	version and release note	2026-02-24 10:50:22 +08:00
heavyrian2012	368388e7bd	fix build error	2026-02-24 10:40:02 +08:00
heavyrian2012	969de83e1f	只有在重新登录的时候清除锁定	2026-02-24 10:37:21 +08:00
heavyrian2012	8f74e54c88	添加锁定PC的设置，当离线时自动解除	2026-02-23 11:50:32 +08:00
heavyrian2012	efd9d5519f	敏感词命中时日志打印出命中的敏感词。	2026-02-09 17:41:33 +08:00
heavyrian2012	97b6ccb910	好友关系表添加索引	2026-02-08 11:02:16 +08:00
heavyrian2012	c51f523d6e	添加注释	2026-02-04 10:39:34 +08:00
heavyrian2012	298ce69db7	调整文件目录	2026-02-04 09:07:20 +08:00
heavyrian2012	15c2d8f59e	update	2026-02-04 09:02:45 +08:00
heavyrian2012	8322134e18	1，解决删除用户保留信息时错误问题；2，server api获取用户信息时，可以指定获取包含被删除用户。	2026-02-03 19:51:03 +08:00
heavyrian2012	52b624f25e	update version and release note	2026-02-03 11:30:46 +08:00
heavyrian2012	d90bab53ad	添加配置在机器人获取用户信息时指定获取字段	2026-02-03 11:24:28 +08:00
heavyrian2012	4d60231c8c	1，添加获取用户机器人列表ID的接口。 2，机器人回调消息中添加回调的机器人ID。 3，mesh服务添加加群申请相关接口	2026-02-02 13:48:04 +08:00
heavyrian2012	d08d6f0c49	解决创建用户没有传昵称参数时使用了账户的问题	2026-01-27 20:30:02 +08:00
heavyrian2012	effa30b546	添加修改好友extra接口	2026-01-26 13:09:22 +08:00
heavyrian2012	0f688ff1df	mesh发布消息时添加messageId参数	2026-01-25 11:24:48 +08:00
heavyrian2012	daa4767ed8	update version and release note	2026-01-20 10:35:22 +08:00
heavyrian2012	44a916892b	解决server sdk有内存泄漏的问题	2026-01-20 10:30:28 +08:00
heavyrian2012	51dd94d3a7	同步专业版IM服务数据库	2026-01-08 15:57:52 +08:00
heavyrian2012	2609a4251c	同步专业版Server SDK	2025-12-31 22:15:34 +08:00
heavyrian2012	7d36775c27	添加客户预留对象存储文件类型	2025-12-25 16:02:38 +08:00
heavyrian2012	6c9df5c071	接受好友请求后发的通知的发送者改为接受者发送	2025-12-17 09:38:55 +08:00
heavyrian2012	2f9c4e028c	解决上传文件中的逻辑问题	2025-12-02 14:46:00 +08:00
heavyrian2012	a9b83a14ed	update readme	2025-12-01 15:07:15 +08:00
heavyrian2012	919b81139d	update version and release note	2025-11-30 19:25:45 +08:00
heavyrian2012	52959a5e63	解决有些平台解析文本消息解析不出来的问题	2025-11-30 19:13:13 +08:00
heavyrian2012	31dad28fde	update version and release note	2025-11-23 14:02:19 +08:00
heavyrian2012	3094089658	添加搜索限频配置	2025-11-23 13:59:11 +08:00
heavyrian2012	24d24fe1e9	添加配置当销毁用户时是否销毁用户信息和消息	2025-11-22 23:02:56 +08:00
heavyrian2012	47039f53b2	群组成员表添加一个索引	2025-11-20 11:51:17 +08:00
heavyrian2012	554243d553	解决移动平台多端未收消息计数重复的问题	2025-11-20 11:41:54 +08:00
heavyrian2012	b65282f8e2	更新readme	2025-11-13 22:36:41 +08:00
heavyrian2012	a5f64df2de	update version and release note	2025-11-09 11:42:48 +08:00
heavyrian2012	c7f1ea57dc	解决某些平台SDK内置消息没有注册的问题	2025-11-06 18:31:12 +08:00
heavyrian2012	c9b2de076d	默认用户ID搜索用户功能开启	2025-10-31 07:31:57 +08:00
heavyrian2012	552fadaa87	记录客户端来源IP地址	2025-10-26 16:57:33 +08:00
heavyrian2012	765572db36	移除掉无用的编译plugin，解决java8编译错误问题	2025-10-13 09:57:32 +08:00
heavyrian2012	a5f194b385	server api测试代码默认为社区版	2025-10-13 09:56:56 +08:00
heavyrian2012	c74cd7e290	解决server sdk解析图片消息不带缩略图解析错误问题	2025-09-29 20:39:12 +08:00
heavyrian2012	70cf65f0c0	解决Server SDK发送引用消息客户端无法正确解析的问题	2025-09-20 09:41:29 +08:00
heavyrian2012	3bb23f92c4	update version and release note	2025-09-07 09:44:42 +08:00
heavyrian2012	804c12845e	fix error	2025-09-06 23:33:35 +08:00
heavyrian2012	fe15a32499	添加开关是否开启允许@不在会话中的机器人	2025-09-06 23:29:09 +08:00
heavyrian2012	06d168935d	支持@不在群组中的机器人和单人会话支持@机器人，支持机器人回复。	2025-09-06 21:36:29 +08:00
heavyrian2012	c1984d27b3	同步专业版SDK	2025-09-05 20:53:32 +08:00
heavyrian2012	29ef46b7a0	解决机器人和频道sdk检查端口错误提示的问题	2025-09-05 20:53:12 +08:00
heavyrian2012	0bdff3fd89	同步专业版server sdk	2025-08-30 10:18:34 +08:00
heavyrian2012	cd03583dab	解决server sdk反复初始化时内存泄漏问题	2025-08-25 11:11:12 +08:00
				`@@ -0,0 +1 @@`
				alter table `t_messages` modify column `_target` varchar(129) NOT NULL;
				`@@ -0,0 +1 @@`
				ALTER TABLE `t_user_session` ADD COLUMN `_ip` varchar(40) DEFAULT '';
				`@@ -0,0 +1 @@`
				CREATE INDEX `user_gid_type_index` ON `t_group_member` (`_gid`, `_type`);
				`@@ -0,0 +1 @@`
				alter table t_friend add index `friend_uid_index` (`_friend_uid`);