version 0.92

Bump mysql-connector-java from 8.0.19 to 8.0.28 in /broker

README.md

@@ -1,54 +1,66 @@
-## 野火IM解决方案
+# 野火IM解决方案
+野火IM是专业级的即时通讯和实时音视频整体解决方案，由北京野火无限网络科技有限公司维护和支持。
 
-野火IM是专业级即时通讯和实时音视频整体解决方案，由北京野火无限网络科技有限公司维护和支持。
+## 功能特性
+* 极致地硬件利用率，IM服务最低128M内存即可运行，上不封顶。
+* 协议先进，采用MQTT+Protobuf组合，流量和性能极致优化。
+* 性能强大，专业版IM服务支持百万在线和集群部署。
+* 部署运维简单，依赖服务少，稍加配置一键启动。
+* 安全加密。网络连接AES加密。客户端数据库SqlCipher加密。安全无小事。
+* 全平台客户端，四端同时在线（移动端，pc端，web端和小程序端），数据和状态多端完美同步。
+* 支持国产化。支持国产化操作系统、国产化芯片和国产操作系统。支持国密加密。
+* 客户端使用微信[mars](https://github.com/tencent/mars)连接库，野火IM可能是最适应中国网络国情的即时通讯服务。
+* 支持加速点加速，即可用于全球应用，也可用于政企内外双网复杂的网络环境。
+* 支持阅读回执和在线状态功能，适用于办公环境。
+* 音视频多种解决方案，丰俭由人，可自由选择。
+* 高级音视频功能强大，支持9人以上的群组视频通话，支持1080P视频，支持会议模式，支持百人以上会议，支持服务器端录制。
+* 全私有部署，可不依赖任何第三方服务，完全内网部署。
+* 功能齐全，涵盖所有常见即时通讯功能。另外具有强大的可扩展能力。Demo成熟完善，基本可以做到开箱即用，也可把SDK嵌入其它应用。
+* 拥有应用开放平台，可以开发和创建自建应用，扩展您的工作台。
+* API丰富，方便与其它服务系统的对接。
+* 拥有机器人和频道功能。
 
-主要特性有：私有部署安全可靠，性能强大，功能齐全，全平台支持，开源率高，部署运维简单，二次开发友好，方便与第三方系统对接或者嵌入现有系统中。详细情况请参考[在线文档](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服务。                                                                                |
+| [android-chat](https://github.com/wildfirechat/android-chat) | [android-chat](https://gitee.com/wfchat/android-chat) | 野火IM Android SDK源码和App源码。
+| [ios-chat](https://github.com/wildfirechat/ios-chat)         | [ios-chat](https://gitee.com/wfchat/ios-chat)         | 野火IM iOS SDK源码和App源码。
+| [pc-chat](https://github.com/wildfirechat/vue-pc-chat)       | [pc-chat](https://gitee.com/wfchat/vue-pc-chat)       | 基于[Electron](https://electronjs.org/)的PC 端，支持Windows、Mac、Linux（包括国产化linux系统和CPU）。                                       |
+| [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平台原生插件                           |  
+| [flutter_imclient](https://github.com/wildfirechat/flutter_imclient)           | [flutter_imclient](https://gitee.com/wfchat/flutter_imclient)           | Flutter平台原生插件                           |  
+| [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)        | 说明                                                                                      | 备注                                           |
-| ------------------------------------------------------------ | ----------------------------------------------------- | ----------------------------------------------------------------------------------------- | ---------------------------------------------- |
-| [android-chat](https://github.com/wildfirechat/android-chat) | [android-chat](https://gitee.com/wfchat/android-chat) | 野火IM Android SDK源码和App源码                                                           | 可以很方便地进行二次开发，或集成到现有应用当中 |
-| [ios-chat](https://github.com/wildfirechat/ios-chat)         | [ios-chat](https://gitee.com/wfchat/ios-chat)         | 野火IM iOS SDK源码和App源码                                                               | 可以很方便地进行二次开发，或集成到现有应用当中 |
-| [pc-chat](https://github.com/wildfirechat/pc-chat)           | [pc-chat](https://gitee.com/wfchat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用                                   |                                                |
-| [web-chat](https://github.com/wildfirechat/web-chat)         | [web-chat](https://gitee.com/wfchat/web-chat)         | Web平台的Demo, [体验地址](http://web.wildfirechat.cn)                                     |                                                |
-| [wx-chat](https://github.com/wildfirechat/wx-chat)           | [wx-chat](https://gitee.com/wfchat/wx-chat)           | 微信小程序平台的Demo                                                                      |                                                |
-| [server](https://github.com/wildfirechat/server)             | [server](https://gitee.com/wfchat/server)             | IM server                                                                                 |                                                |
-| [app server](https://github.com/wildfirechat/app_server)     | [app server](https://gitee.com/wfchat/app_server)     | 应用服务端                                                                                |                                                |
-| [robot_server](https://github.com/wildfirechat/robot_server) | [robot_server](https://gitee.com/wfchat/robot_server) | 机器人服务端                                                                              |                                                |
-| [push_server](https://github.com/wildfirechat/push_server)   | [push_server](https://gitee.com/wfchat/push_server)   | 推送服务器                                                                                |                                                |
-| [docs](https://github.com/wildfirechat/docs)                 | [docs](https://gitee.com/wfchat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明，[在线查看](https://docs.wildfirechat.cn/) |                                                |  |
+## 野火开发文档
+[在线文档](https://docs.wildfirechat.cn/)
 
-
-# server
-本工程为野火IM 社区版IM服务软件。野火IM作为一个通用的即时通讯解决方案，既可以直接使用，也可以集成到各种应用中。
-
-
-开发一套IM系统真的很艰辛，请路过的朋友们给点个star，支持我们坚持下去🙏🙏🙏🙏🙏
-
-### 联系我们
-
-> 商务合作请优先采用邮箱和我们联系。技术问题请到[野火IM论坛](http://bbs.wildfirechat.cn/)发帖交流
-
-1. heavyrain.lee  邮箱: heavyrain.lee@wildfirechat.cn  微信：wildfirechat
-2. imndx  邮箱: imndx@wildfirechat.cn  微信：wfchat
-
-### 问题交流
-
-1. 如果大家发现bug，请在GitHub提issue
-2. 其他问题，请到[野火IM论坛](http://bbs.wildfirechat.cn/)进行交流学习
-3. 微信公众号
-
-<img src="http://static.wildfirechat.cn/wx_wfc_qrcode.jpg" width = 50% height = 50% />
-
-> 强烈建议关注我们的公众号。我们有新版本发布或者有重大更新会通过公众号通知大家，另外我们也会不定期的发布一些关于野火IM的技术介绍。
-
-#### 体验Demo
-我们提供了体验demo，请使用微信扫码下载安装体验
+## 野火Demo
+请使用微信扫码下载安装体验野火IM移动客户端
 
 ![野火IM](http://static.wildfirechat.cn/download_qrcode.png)
 
-#### 应用截图
+Web客户端点击[这里](https://web.wildfirechat.cn)
+
+PC客户端点[这里](https://github.com/wildfirechat/vue-pc-chat/releases)下载安装。
+
+小程序客户端请用微信扫码
+
+![野火IM](http://static.wildfirechat.net/wx.jpg)
+
+
+## 应用截图
 ![ios-demo](http://static.wildfirechat.cn/ios-demo.gif)
 
 <img src="http://static.wildfirechat.cn/ios-message-view.png" width = 50% height = 50% />
@@ -71,16 +83,49 @@
 
 <img src="http://static.wildfirechat.cn/ios-voip-view.png" width = 50% height = 50% />
 
+
 ## 编译
-在安装JDK1.8以上及maven的前提下，在命令行中执行```mvn clean compile package```，生成的目标文件在```./distribution/target/distribution-xxxx-bundle-tar.tar.gz```
+在安装JDK1.8以上及maven的前提下，在命令行中执行```mvn clean package```，生成的目标文件在```./distribution/target/distribution-xxxx-bundle-tar.tar.gz```
 > 由于使用了一个git的maven插件，如果本地没有git信息就会编译出错，请使用```git clone```的方法下载代码，或者下载压缩包解压后在根目录创建```.git```的空目录。建议用```git clone```的方式下载代码。
 
+## 配置
+解压```distribution-xxxx-bundle-tar.tar.gz```，修改解压出来的```config```目录下的```wildfirechat.conf```。修改如下部分：
+1. 修改```server.ip```为您的服务器的公网IP，或者域名。如果用域名需要做好域名解析。
+2. 可以阅读配置文件注释和文档，对其它配置项进行调整。
+
+## 运行
+在程序目录运行如下命令：
+```
+./bin/wildfirechat.sh
+```
+
+## 验证
+1. 在浏览器中输入地址 ```http://${ip}/api/version```可以看到返回一个json文件。
+2. 部署[应用服务](应用服务)，配置和编译[Android客户端](https://github.com/wildfirechat/android-chat)和[iOS客户端](https://github.com/wildfirechat/ios-chat)进行验证。详情可参考[快速开始](https://docs.wildfirechat.cn/quick_start/)。
+
 ## 升级说明
 1. 从0.42 版本增加了群成员数限制，默认为2000。如果您从之前的版本升级到这个版本或以后，需要注意到群成员数的限制。升级之后超出限制的群不受影响，但不能继续加人，如果您想修改默认值，可以在升级版本之后，修改t_setting表，把默认的大小改为您期望的人数。另外修改t_group表，把已经存在的群组max_member_count改成您期望的，然后重启。
 2. 0.46和0.47版本升级到0.48及以后版本时，可能会提示flyway migrate 38错误，请执行 [修复脚本](https://github.com/wildfirechat/server/blob/wildfirechat/flyway_repaire_migrate_38.sql) 进行修复。0.46和0.47版本之外的版本不会出现此问题。
 3. 从0.54之前版本升级到0.54及以后版本时，会提示flyway migrate错误。因为0.54版本删除了sql脚本中默认敏感词的内容，flyway checksum失败。请执行```update flyway_schema_history set checksum = 0 where script = 'V17__add_default_sensitive_word.sql';```来修复。
 4. 从0.59之前的版本升级到之后的版本执行数据库升级时间比较长，请耐心等待提示运行成功，避免中途中断。
 
+
+## 联系我们
+
+商务合作请使用如下邮箱和微信联系：
+
+邮箱: support@wildfirechat.cn  微信1：wfchat 微信2：wildfirechat
+
+## 问题交流
+
+1. 如果大家发现bug，请在GitHub提issue；如果有需求也请给我们提issue。
+2. 其他问题，请到[野火IM论坛](http://bbs.wildfirechat.cn/)进行交流学习
+3. 关注我们的公众号。我们有新版本发布或者有重大更新会通过公众号通知大家，另外我们也会不定期的发布一些关于野火IM的技术介绍。
+
+<img src="http://static.wildfirechat.cn/wx_wfc_qrcode.jpg" width = 50% height = 50% />
+
+> 我们有研发工程师轮流值班处理issue和论坛，一般简单问题几个小时就会回复一遍，疑难Bug的修改和新需求的开发我们也会尽快解决。
+
 ## 特别感谢
 1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来，处理MQTT相关业务。
 2. [loServer](https://github.com/looly/loServer) 本项目使用loServer处理HTTP相关业务。

broker/config/wildfirechat.conf

@@ -26,8 +26,8 @@ http.admin.port 18080
 ##节点ID，当集群部署时，一定不能有重复。
 node_id 1
 
-##绑定IP，保持不变即可
-host 0.0.0.0
+##绑定IP，不要打开，除非有特殊需求才可以打开
+#host 0.0.0.0
 
 ##本地绑定端口
 local_port 80
@@ -38,6 +38,7 @@ embed.db 1
 
 ## 是否自动清理历史消息记录，当为true时，IM服务会定时扫描t_messages_x和t_user_messages_x表，清除掉3年前的历史消息。
 ## 如果不开启自动清理，需要手动清理t_messages_x和t_user_messages_x表内的历史数据，保存数据不能超过3年。
+## 如果需要消息保存更长时间，可以把临近销毁的消息转储到别的数据库，客户端在拉取不到服务器消息时，再去转储的数据库拉取。
 ## 使用mongodb时次开关无效（因为mongodb设置了消息过期时间，会自动清理，仅专业版支持mongodb）。
 db.auto_clean_history_messages true
 
@@ -56,10 +57,13 @@ token.key testim
 ##token.expire_time 2592000000
 
 ##首次登录，是否接收之前的历史消息。
-##0 不接收历史消息，只接收5分钟以内的消息，由于服务器没有保存已经收取记录，所以如果有超过5分钟之前未收取的消息也不会收取下拉；
+##0 不接收历史消息，只接收${message.compensate_time_limit}毫秒以内的消息，由于服务器没有保存已经收取记录，所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉；
 ##1接收，会接收 message.max_queue 配置的条数的历史消息
 message.roaming 0
 
+## 消息补偿时限，当${message.roaming}为0时，会同步时限以内且小于${message.max_queue}的消息，默认时限为5分钟。当${message.roaming}为1时，会接收 message.max_queue 配置的条数的历史消息。
+message.compensate_time_limit 300000
+
 ##是否开启拉取远程历史消息。如果为1，客户端在会话内如果本地消息读取完了，可以下拉继续加载在服务器上的该会话的消息；如果为0则不能。
 message.remote_history_message 0
 
@@ -108,6 +112,14 @@ message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
 ## 当为true时，不转发server api发送的消息；当为false时，转发server api发送的消息。
 message.no_forward_admin_message false
 
+## 消息转发功能开启时，转发信息是否带上用户clientId和平台类型。
+message.forward_with_client_info false
+
+## 机器人回调信息是否带上用户clientId和平台类型。
+robot.callback_with_client_info false
+
+## 频道回调信息是否带上用户clientId和平台类型。
+channel.callback_with_client_info false
 
 ##禁止搜索用户
 friend.disable_search false
@@ -157,6 +169,9 @@ group.visible_quit_or_kickoff_notification 0
 ## 注意，修改本配置不会对已经同步的信息产生影响。
 #user.hide_properties 3,4,5
 
+## 销毁用户时，用户信息会被清空，deleted字段设置为1，这个开关控制是否保留用户昵称，默认为true。
+user.keep_display_name_when_destroy true
+
 # 好友/好友请求/用户设置 这三类数据同步的最大条目数。之前是客户第一次登录时，会把所有的对应数据一次下载到客户端，但如果有特别多的信息，会导致无法同步到客户端，
 # 因此需要分段多次同步，此开关定义了每次同步的数据的条数。此需要客户端支持，客户端SDK在2021.5.25日后支持此功能。如果确认所有客户端都在这个日志之后才可以打开此设置。
 #sync.data_part_size 1000
@@ -235,6 +250,9 @@ local.media.storage.root media
 # 建议使用false
 server.multi_endpoint false
 
+## 是否支持PC多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PC端多端登录。
+server.multi_pc_endpoint false
+
 # 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
 server.multi_platform_notification true
 

broker/migrate/h2/V42__create_secret_chat_table.sql

@@ -0,0 +1,13 @@
+
+DROP TABLE IF EXISTS `t_secret_chat`;
+CREATE TABLE `t_secret_chat` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NOT NULL,
+  `_from` varchar(64) DEFAULT '',
+  `_from_cid` varchar(64) DEFAULT '',
+  `_to` varchar(64) DEFAULT '',
+  `_to_cid` varchar(64) DEFAULT '',
+  `_state` tinyint NOT NULL DEFAULT 0,
+  `_dt` bigint(20) NOT NULL,
+  UNIQUE INDEX `secret_chat_uid_index` (`_uid` DESC)
+);

broker/migrate/h2/V43__add_message_table_conversation_index.sql

@@ -0,0 +1 @@
+alter table `t_messages` add INDEX `messages_conv_index` ( `_type`, `_target`, `_line`);

broker/migrate/h2/V44__add_channel_listener_table_member_index.sql

@@ -0,0 +1 @@
+alter table `t_channel_listener` add INDEX `channel_mid_index` ( `_mid`);

broker/migrate/h2/V45__add_channel_menu_column.sql

@@ -0,0 +1 @@
+alter table `t_channel` add column `_menu` BLOB DEFAULT NULL;

broker/migrate/mysql/V49__create_secret_chat_table.sql

@@ -0,0 +1,16 @@
+
+DROP TABLE IF EXISTS `t_secret_chat`;
+CREATE TABLE `t_secret_chat` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_uid` varchar(64) NOT NULL,
+  `_from` varchar(64) DEFAULT '',
+  `_from_cid` varchar(64) DEFAULT '',
+  `_to` varchar(64) DEFAULT '',
+  `_to_cid` varchar(64) DEFAULT '',
+  `_state` tinyint NOT NULL DEFAULT 0,
+  `_dt` bigint(20) NOT NULL,
+  UNIQUE INDEX `secret_chat_uid_index` (`_uid` DESC)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_bin;

broker/migrate/mysql/V50__add_message_table_conversation_index.sql

@@ -0,0 +1,37 @@
+alter table `t_messages` add INDEX `messages_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_0` add INDEX `messages0_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_1` add INDEX `messages1_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_2` add INDEX `messages2_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_3` add INDEX `messages3_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_4` add INDEX `messages4_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_5` add INDEX `messages5_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_6` add INDEX `messages6_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_7` add INDEX `messages7_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_8` add INDEX `messages8_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_9` add INDEX `messages9_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_10` add INDEX `messages10_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_11` add INDEX `messages11_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_12` add INDEX `messages12_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_13` add INDEX `messages13_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_14` add INDEX `messages14_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_15` add INDEX `messages15_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_16` add INDEX `messages16_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_17` add INDEX `messages17_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_18` add INDEX `messages18_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_19` add INDEX `messages19_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_20` add INDEX `messages20_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_21` add INDEX `messages21_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_22` add INDEX `messages22_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_23` add INDEX `messages23_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_24` add INDEX `messages24_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_25` add INDEX `messages25_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_26` add INDEX `messages26_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_27` add INDEX `messages27_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_28` add INDEX `messages28_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_29` add INDEX `messages29_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_30` add INDEX `messages30_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_31` add INDEX `messages31_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_32` add INDEX `messages32_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_33` add INDEX `messages33_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_34` add INDEX `messages34_conv_index` (`_type`, `_target`, `_line`);
+alter table `t_messages_35` add INDEX `messages35_conv_index` (`_type`, `_target`, `_line`);

broker/migrate/mysql/V51__add_channel_listener_table_member_index.sql

@@ -0,0 +1 @@
+alter table `t_channel_listener` add INDEX `channel_mid_index` (`_mid`);

broker/migrate/mysql/V52__add_channel_menu_column.sql

@@ -0,0 +1 @@
+alter table `t_channel` add column `_menu` BLOB DEFAULT NULL;

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.86</version>
+        <version>0.92</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -27,18 +27,18 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.1</version>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.17.1</version>
+            <version>2.17.2</version>
         </dependency>
         <!--用于与slf4j保持桥接-->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.17.1</version>
+            <version>2.17.2</version>
         </dependency>
         <!-- slf4j核心包-->
         <dependency>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.19</version>
+            <version>8.0.28</version>
         </dependency>
 
         <dependency>

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

@@ -34,6 +34,10 @@ abstract public class AdminAction extends Action {
         SECRET_KEY = secretKey;
     }
 
+    public static String getSecretKey() {
+        return SECRET_KEY;
+    }
+
     public static void setNoCheckTime(String noCheckTime) {
         try {
             NO_CHECK_TIME = Boolean.parseBoolean(noCheckTime);

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

@@ -0,0 +1,58 @@
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputApplicationGetUserInfo;
+import cn.wildfirechat.pojos.OutputApplicationUserInfo;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.hazelcast.util.StringUtil;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+@Route(APIPath.User_Application_Get_UserInfo)
+@HttpMethod("POST")
+public class ApplicationGetUserInfoAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputApplicationGetUserInfo inputUserToken = getRequestBody(request.getNettyRequest(), InputApplicationGetUserInfo.class);
+
+            RestResult result;
+            if (inputUserToken == null || StringUtil.isNullOrEmpty(inputUserToken.getAuthCode())) {
+                result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+            } else {
+                String userId = messagesStore.verifyApplicationAuthCode(inputUserToken.getAuthCode(), "admin", ProtoConstants.ApplicationType.ApplicationType_Admin);
+                if(userId != null) {
+                    OutputApplicationUserInfo outputVerifyApplicationUser = new OutputApplicationUserInfo();
+                    outputVerifyApplicationUser.setUserId(userId);
+                    WFCMessage.User user = messagesStore.getUserInfo(userId);
+                    if(user != null) {
+                        outputVerifyApplicationUser.setDisplayName(user.getDisplayName());
+                        outputVerifyApplicationUser.setPortraitUrl(user.getPortrait());
+                    }
+                    result = RestResult.ok(outputVerifyApplicationUser);
+                } else {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_TOKEN_ERROR);
+                }
+            }
+
+            response.setStatus(HttpResponseStatus.OK);
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}
+

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

@@ -0,0 +1,56 @@
+/*
+ * 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.InputMessageUid;
+import cn.wildfirechat.pojos.OutputMessageData;
+import cn.wildfirechat.pojos.RecallMessageData;
+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.Msg_GetOne)
+@HttpMethod("POST")
+public class GetMessageAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputMessageUid inputMessageUid = getRequestBody(request.getNettyRequest(), InputMessageUid.class);
+            if (inputMessageUid != null && inputMessageUid.messageUid > 0) {
+                RestResult result;
+                WFCMessage.Message msg = messagesStore.getMessage(inputMessageUid.messageUid);
+                if(msg == null) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    result = RestResult.ok(OutputMessageData.fromProtoMessage(msg));
+                }
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.InputRobotId;
+import cn.wildfirechat.pojos.OutputRobot;
+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_Robot_Info)
+@HttpMethod("POST")
+public class GetRobotAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputRobotId inputUserId = getRequestBody(request.getNettyRequest(), InputRobotId.class);
+            if (inputUserId != null
+                && (!StringUtil.isNullOrEmpty(inputUserId.getRobotId()))) {
+
+                WFCMessage.User user = messagesStore.getUserInfo(inputUserId.getRobotId());
+                WFCMessage.Robot robot = messagesStore.getRobot(inputUserId.getRobotId());
+
+                RestResult result;
+                if (user == null || robot == null) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    OutputRobot outputRobot = new OutputRobot();
+                    outputRobot.fromUser(user);
+                    outputRobot.fromRobot(robot, true);
+                    result = RestResult.ok(outputRobot);
+                }
+
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,59 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.channel;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputApplicationGetUserInfo;
+import cn.wildfirechat.pojos.OutputApplicationUserInfo;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Channel_Application_Get_UserInfo)
+@HttpMethod("POST")
+public class ApplicationGetUserInfoAction extends ChannelAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputApplicationGetUserInfo inputUserToken = getRequestBody(request.getNettyRequest(), InputApplicationGetUserInfo.class);
+            RestResult result;
+            if (inputUserToken == null || StringUtil.isNullOrEmpty(inputUserToken.getAuthCode())) {
+                result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+            } else {
+                String userId = messagesStore.verifyApplicationAuthCode(inputUserToken.getAuthCode(), channelInfo.getTargetId(), ProtoConstants.ApplicationType.ApplicationType_Channel);
+                if(userId != null) {
+                    OutputApplicationUserInfo outputVerifyApplicationUser = new OutputApplicationUserInfo();
+                    outputVerifyApplicationUser.setUserId(userId);
+                    WFCMessage.User user = messagesStore.getUserInfo(userId);
+                    if(user != null) {
+                        outputVerifyApplicationUser.setDisplayName(user.getDisplayName());
+                        outputVerifyApplicationUser.setPortraitUrl(user.getPortrait());
+                    }
+                    result = RestResult.ok(outputVerifyApplicationUser);
+                } else {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_APPLICATION_TOKEN_ERROR_OR_TIMEOUT);
+                }
+            }
+
+            response.setStatus(HttpResponseStatus.OK);
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,59 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputApplicationGetUserInfo;
+import cn.wildfirechat.pojos.OutputApplicationUserInfo;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Robot_Application_Get_UserInfo)
+@HttpMethod("POST")
+public class ApplicationGetUserInfoAction extends RobotAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputApplicationGetUserInfo inputUserToken = getRequestBody(request.getNettyRequest(), InputApplicationGetUserInfo.class);
+            RestResult result;
+            if (inputUserToken == null || StringUtil.isNullOrEmpty(inputUserToken.getAuthCode())) {
+                result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+            } else {
+                String userId = messagesStore.verifyApplicationAuthCode(inputUserToken.getAuthCode(), robot.getUid(), ProtoConstants.ApplicationType.ApplicationType_Robot);
+                if(userId != null) {
+                    OutputApplicationUserInfo outputVerifyApplicationUser = new OutputApplicationUserInfo();
+                    outputVerifyApplicationUser.setUserId(userId);
+                    WFCMessage.User user = messagesStore.getUserInfo(userId);
+                    if(user != null) {
+                        outputVerifyApplicationUser.setDisplayName(user.getDisplayName());
+                        outputVerifyApplicationUser.setPortraitUrl(user.getPortrait());
+                    }
+                    result = RestResult.ok(outputVerifyApplicationUser);
+                } else {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_APPLICATION_TOKEN_ERROR_OR_TIMEOUT);
+                }
+            }
+
+            response.setStatus(HttpResponseStatus.OK);
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputRobot;
+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.Robot_Get_Profile)
+@HttpMethod("POST")
+public class GetProfileAction extends RobotAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            WFCMessage.User user = messagesStore.getUserInfo(robot.getUid());
+            RestResult result;
+            if (user == null) {
+                result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+            } else {
+                OutputRobot outputRobot = new OutputRobot();
+                outputRobot.fromUser(user);
+                outputRobot.fromRobot(robot, false);
+                result = RestResult.ok(outputRobot);
+            }
+            setResponseContent(result, response);
+        }
+        return true;
+    }
+}

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

@@ -125,11 +125,13 @@ 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_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";
 
     public static final String MESSAGE_ROAMING = "message.roaming";
+    public static final String MESSAGE_Compensate_Time_Limit = "message.compensate_time_limit";
     public static final String MESSAGE_Remote_History_Message = "message.remote_history_message";
     public static final String MESSAGE_Remote_Chatroom_History_Message = "message.chatroom_remote_history_message";
 
@@ -141,6 +143,10 @@ public final class BrokerConstants {
 
     public static final String MESSAGE_NO_Forward_Admin_Message = "message.no_forward_admin_message";
 
+    public static final String MESSAGE_Forward_With_Client_Info = "message.forward_with_client_info";
+    public static final String ROBOT_Callback_With_Client_Info = "robot.callback_with_client_info";
+    public static final String CHANNEL_Callback_With_Client_Info = "channel.callback_with_client_info";
+
     public static final String FRIEND_Disable_Search = "friend.disable_search";
     public static final String FRIEND_Disable_NickName_Search = "friend.disable_nick_name_search";
     public static final String FRIEND_Disable_Friend_Request = "friend.disable_friend_request";
@@ -160,6 +166,8 @@ public final class BrokerConstants {
     public static final String GROUP_Visible_Quit_Kickoff_Notification = "group.visible_quit_or_kickoff_notification";
 
     public static final String USER_HIDE_PROPERTIES = "user.hide_properties";
+    public static final String USER_KEEP_DISPLAY_NAME_WHEN_DESTROY = "user.keep_display_name_when_destroy";
+
     public static final String SYNC_Data_Part_Size = "sync.data_part_size";
 
     public static final String MESSAGES_FORBIDDEN_CLIENT_SEND_TYPES = "message.forbidden_client_send_types";

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

@@ -27,8 +27,6 @@ public class ChannelListenMember extends IMHandler<WFCMessage.ListenChannel> {
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingListenedChannels).setKey(request.getChannelId()).setValue(request.getListen() > 0 ? "1" : "0").build();
             mServer.onApiMessage(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, requestSourceType);
-
-            publisher.notifyChannelListenStatusChanged(m_messagesStore.getChannelInfo(request.getChannelId()), fromUser, request.getListen() > 0);
         }
         return errorCode;
     }

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

@@ -0,0 +1,28 @@
+/*
+ * 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.ApplicationConfigRequestTopic)
+public class ConfigApplicationHandler extends IMHandler<WFCMessage.ApplicationConfigRequest> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.ApplicationConfigRequest request, Qos1PublishHandler.IMCallback callback) {
+        ErrorCode errorCode = m_messagesStore.configApplication(request.getAppId(), request.getAppType(), request.getTimestamp(), request.getNonce(), request.getSignature());
+        return errorCode;
+    }
+}
+

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

@@ -21,6 +21,9 @@ import win.liyufan.im.IMTopic;
 public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.CreateGroupRequest request, Qos1PublishHandler.IMCallback callback) {
+        if(request.getGroup().getGroupInfo().getType() < 0 || request.getGroup().getGroupInfo().getType() > 2) {
+            return ErrorCode.ERROR_CODE_INVALID_DATA;
+        }
 
         if (!StringUtil.isNullOrEmpty(request.getGroup().getGroupInfo().getTargetId())) {
             WFCMessage.GroupInfo existGroupInfo = m_messagesStore.getGroupInfo(request.getGroup().getGroupInfo().getTargetId());

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

@@ -19,11 +19,11 @@ import static win.liyufan.im.IMTopic.PutUserSettingTopic;
 import static win.liyufan.im.UserSettingScope.kUserSettingMyChannels;
 
 @Handler(value = IMTopic.DestroyChannelInfoTopic)
-public class DistroyChannelHandler extends GroupHandler<WFCMessage.IDBuf> {
+public class DestroyChannelHandler extends GroupHandler<WFCMessage.IDBuf> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
         boolean isAdmin = requestSourceType == ProtoConstants.RequestSourceType.Request_From_Admin;
-        ErrorCode errorCode = m_messagesStore.distoryChannel(fromUser, request.getId(), isAdmin);
+        ErrorCode errorCode = m_messagesStore.destroyChannel(fromUser, request.getId(), isAdmin);
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingMyChannels).setKey(request.getId()).setValue("0").build();
             mServer.onApiMessage(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, requestSourceType);

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

@@ -11,9 +11,7 @@ package io.moquette.imhandler;
 import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
-import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.impl.Qos1PublishHandler;
-import io.moquette.spi.impl.security.TokenAuthenticator;
 import io.netty.buffer.ByteBuf;
 import win.liyufan.im.IMTopic;
 
@@ -30,7 +28,7 @@ public class DestroyUserHandler extends IMHandler<WFCMessage.IDBuf> {
                 m_messagesStore.clearUserFriend(fromUser);
                 m_messagesStore.clearUserGroups(fromUser);
                 m_messagesStore.clearUserChannels(fromUser);
-                m_messagesStore.destoryUser(fromUser);
+                m_messagesStore.destroyUser(fromUser);
 
                 m_messagesStore.destroyRobot(fromUser);
             });

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

@@ -0,0 +1,33 @@
+/*
+ * 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.GetApplicationTokenRequestTopic)
+public class GetApplicationTokenHandler extends IMHandler<WFCMessage.AuthCodeRequest> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.AuthCodeRequest request, Qos1PublishHandler.IMCallback callback) {
+        String authCode = m_messagesStore.getApplicationAuthCode(fromUser, request.getTargetId(), request.getType(), request.getHost());
+        if(authCode != null) {
+            byte[] data = WFCMessage.IDBuf.newBuilder().setId(authCode).build().toByteArray();
+            ackPayload.ensureWritable(data.length).writeBytes(data);
+            return ERROR_CODE_SUCCESS;
+        }
+        return ErrorCode.INVALID_PARAMETER;
+
+    }
+}

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

@@ -166,14 +166,6 @@ abstract public class IMHandler<T> {
     public ErrorCode preAction(String clientID, String fromUser, String topic, Qos1PublishHandler.IMCallback callback, ProtoConstants.RequestSourceType requestSourceType) {
         LOG.info("imHandler fromUser={}, clientId={}, topic={}", fromUser, clientID, topic);
         if(requestSourceType == ProtoConstants.RequestSourceType.Request_From_User && !mLimitCounter.isGranted(clientID + fromUser + topic)) {
-            ByteBuf ackPayload = Unpooled.buffer();
-            ackPayload.ensureWritable(1).writeByte(ERROR_CODE_OVER_FREQUENCY.getCode());
-            try {
-                callback.onIMHandled(ERROR_CODE_OVER_FREQUENCY, ackPayload);
-            } catch (Exception e) {
-                e.printStackTrace();
-                Utility.printExecption(LOG, e);
-            }
             return ErrorCode.ERROR_CODE_OVER_FREQUENCY;
         }
         return ErrorCode.ERROR_CODE_SUCCESS;

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

@@ -34,7 +34,7 @@ public class RecallMessageHandler extends IMHandler<WFCMessage.INT64Buf> {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
-        publish(fromUser, clientID, message, requestSourceType);
+        publish(message.getFromUser(), clientID, message, requestSourceType);
 
         return errorCode;
     }

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

@@ -9,11 +9,13 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.pojos.OutputClient;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.hazelcast.util.StringUtil;
 import io.moquette.BrokerConstants;
+import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
@@ -171,12 +173,20 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             }
             message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).build();
 
+            OutputClient outputClient = null;
+            if(m_messagesStore.isForwardMessageWithClientInfo() && requestSourceType == ProtoConstants.RequestSourceType.Request_From_User && !StringUtil.isNullOrEmpty(clientID)) {
+                MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
+                if(session != null && session.getUsername().equals(fromUser)) {
+                    outputClient = new OutputClient(session.getPlatform(), clientID);
+                }
+            }
+
             if (!StringUtil.isNullOrEmpty(mForwardUrl) && (mForwardMessageTypes.isEmpty() || mForwardMessageTypes.contains(message.getContent().getType())) && !(isAdmin && mNoForwardAdminMessage)) {
-                publisher.forwardMessage(message, mForwardUrl);
+                publisher.forwardMessage(message, mForwardUrl, outputClient);
             }
 
             if(!StringUtil.isNullOrEmpty(mMentionForwardUrl) && message.hasContent() && message.getContent().getMentionedType() != 0 && !(isAdmin && mNoForwardAdminMessage)) {
-                publisher.forwardMessage(message, mMentionForwardUrl);
+                publisher.forwardMessage(message, mMentionForwardUrl, outputClient);
             }
 
             if (!isAdmin) {

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

@@ -994,7 +994,7 @@ public class DatabaseStore {
             }
             sb.append(")");
 
-            sb.append(" and _scope = 6 and _key = ?");
+            sb.append(" and _scope in (5,6,26) and _key = ?");
 
             statement = connection.prepareStatement(sb.toString());
             int index = 1;
@@ -1142,23 +1142,21 @@ public class DatabaseStore {
         try {
             connection = DBUtil.getConnection();
 
-            StringBuilder sb = new StringBuilder("delete from t_user_setting where _scope in (1,3,5,7) and _uid in (");
+            StringBuilder sb = new StringBuilder("delete from t_user_setting where _scope in (1,3,5,6,7,19) and _uid in (");
             for (int i = 0; i < users.size(); i++) {
                 sb.append("?");
                 if (i != users.size() - 1) {
                     sb.append(",");
                 }
             }
-            sb.append(") and _key like '1-_-");
-            sb.append(groupId);
-            sb.append("'");
-
+            sb.append(") and _key like ?");
 
             statement = connection.prepareStatement(sb.toString());
             int index = 1;
             for (String userId:users) {
                 statement.setString(index++, userId);
             }
+            statement.setString(index++, "1-_-" + groupId);
 
             int count = statement.executeUpdate();
             LOG.info("Update rows {}", count);
@@ -2974,7 +2972,8 @@ public class DatabaseStore {
                     ", `_secret`" +
                     ", `_callback`" +
                     ", `_automatic`" +
-                    ", `_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
+                    ", `_menu`" +
+                    ", `_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
                     " ON DUPLICATE KEY UPDATE `_name`=?" +
                     ", `_portrait`=?" +
                     ", `_owner`=?" +
@@ -2984,12 +2983,20 @@ public class DatabaseStore {
                     ", `_secret`=?" +
                     ", `_callback`=?" +
                     ", `_automatic`=?" +
+                    ", `_menu`=?" +
                     ", `_dt`=?";
 
                 statement = connection.prepareStatement(sql);
 
-                int index = 1;
+                WFCMessage.ChannelMenuList.Builder builder = WFCMessage.ChannelMenuList.newBuilder();
+                if (!channelInfo.getMenuList().isEmpty()) {
+                    for (WFCMessage.ChannelMenu menuBtn:channelInfo.getMenuList()) {
+                        builder.addMenu(menuBtn);
+                    }
+                }
+                byte[] menuBytes = builder.build().toByteArray();
 
+                int index = 1;
                 statement.setString(index++, channelInfo.getTargetId());
                 statement.setString(index++, channelInfo.getName());
                 statement.setString(index++, channelInfo.getPortrait());
@@ -3000,6 +3007,7 @@ public class DatabaseStore {
                 statement.setString(index++, channelInfo.getSecret());
                 statement.setString(index++, channelInfo.getCallback());
                 statement.setInt(index++, channelInfo.getAutomatic());
+                statement.setBytes(index++, menuBytes);
                 statement.setLong(index++, channelInfo.getUpdateDt() == 0 ? System.currentTimeMillis() : channelInfo.getUpdateDt());
 
                 statement.setString(index++, channelInfo.getName());
@@ -3011,6 +3019,7 @@ public class DatabaseStore {
                 statement.setString(index++, channelInfo.getSecret());
                 statement.setString(index++, channelInfo.getCallback());
                 statement.setInt(index++, channelInfo.getAutomatic());
+                statement.setBytes(index++, menuBytes);
                 statement.setLong(index++, channelInfo.getUpdateDt() == 0 ? System.currentTimeMillis() : channelInfo.getUpdateDt());
 
                 int count = statement.executeUpdate();
@@ -3063,6 +3072,7 @@ public class DatabaseStore {
                 ", `_secret`" +
                 ", `_callback`" +
                 ", `_automatic`" +
+                ", `_menu`" +
                 ", `_dt` from t_channel  where `_cid` = ?";
 
             statement = connection.prepareStatement(sql);
@@ -3113,6 +3123,21 @@ public class DatabaseStore {
                 intValue = rs.getInt(index++);
                 builder.setAutomatic(intValue);
 
+                try {
+                    byte[] bytes = null;
+                    Blob blob = rs.getBlob(index++);
+                    if (blob != null) {
+                        bytes = toByteArray(blob.getBinaryStream());
+                    }
+
+                    WFCMessage.ChannelMenuList menuButtonList = WFCMessage.ChannelMenuList.parseFrom(bytes);
+                    if (menuButtonList.getMenuCount() > 0) {
+                        builder.addAllMenu(menuButtonList.getMenuList());
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+
                 long longValue = rs.getLong(index++);
                 builder.setUpdateDt(longValue);
 
@@ -3334,6 +3359,57 @@ public class DatabaseStore {
         });
     }
 
+    List<String> getUserChannels(String userId) {
+        List<String> out = new ArrayList<>();
+
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select _cid from t_channel_listener where _mid = ?";
+            statement = connection.prepareStatement(sql);
+
+            int index = 1;
+            statement.setString(index++, userId);
+
+            rs = statement.executeQuery();
+            while (rs.next()) {
+                String value = rs.getString(1);
+                if (!StringUtil.isNullOrEmpty(value)) {
+                    out.add(value);
+                }
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return out;
+    }
+
+    void clearChannelListener(final String channelId) {
+        LOG.info("Database remove channel {}", channelId);
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "delete from t_channel_listener where _cid=?";
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, channelId);
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
     public Set<String> getSensitiveWord() {
         Connection connection = null;
         PreparedStatement statement = null;

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

@@ -23,6 +23,7 @@ import com.google.gson.Gson;
 import com.google.protobuf.ByteString;
 import com.hazelcast.core.*;
 import com.hazelcast.util.StringUtil;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.model.FriendData;
 import cn.wildfirechat.common.ErrorCode;
 import io.moquette.BrokerConstants;
@@ -31,14 +32,18 @@ import io.moquette.server.Constants;
 import io.moquette.server.Server;
 import io.moquette.spi.IMatchingCondition;
 import io.moquette.spi.IMessagesStore;
+import io.moquette.spi.impl.security.AES;
 import io.moquette.spi.security.Tokenor;
 import io.moquette.spi.impl.subscriptions.Topic;
 import io.netty.handler.codec.mqtt.MqttVersion;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import win.liyufan.im.*;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -91,6 +96,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     private static final String CHANNEL_LISTENERS = "channel_listeners";
 
     private static boolean IS_MESSAGE_ROAMING = true;
+    private static long msgCompensateTimeLimit = 300000;
 
     private static boolean IS_MESSAGE_REMOTE_HISTORY_MESSAGE = true;
     private static boolean IS_CHATROOM_MESSAGE_REMOTE_HISTORY_MESSAGE = true;
@@ -160,6 +166,11 @@ public class MemoryMessagesStore implements IMessagesStore {
     private boolean mGroupAllowRobotCustomOperationNotification;
     private int mGroupVisibleQuitKickoffNotification;
     private int mSyncDataPartSize = 0;
+    private boolean keepDisplayNameWhenDestroyUser = true;
+
+    private boolean mForwardMessageWithClientInfo = false;
+    private boolean mRobotCallbackWithClientInfo = false;
+    private boolean mChannelCallbackWithClientInfo = false;
 
     private Set<Integer> mUserHideProperties = new HashSet<>();
 
@@ -168,6 +179,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         this.databaseStore = databaseStore;
 
         IS_MESSAGE_ROAMING = "1".equals(m_Server.getConfig().getProperty(MESSAGE_ROAMING));
+        try {
+            msgCompensateTimeLimit = Long.parseLong(m_Server.getConfig().getProperty(MESSAGE_Compensate_Time_Limit, "300000"));
+        } catch (NumberFormatException e) {
+
+        }
         IS_MESSAGE_REMOTE_HISTORY_MESSAGE = "1".equals(m_Server.getConfig().getProperty(MESSAGE_Remote_History_Message));
         IS_CHATROOM_MESSAGE_REMOTE_HISTORY_MESSAGE = "1".equals(m_Server.getConfig().getProperty(MESSAGE_Remote_Chatroom_History_Message, "1"));
         Constants.MAX_MESSAGE_QUEUE = Integer.parseInt(m_Server.getConfig().getProperty(MESSAGE_Max_Queue));
@@ -418,6 +434,11 @@ public class MemoryMessagesStore implements IMessagesStore {
             mSyncDataPartSize = Integer.parseInt(server.getConfig().getProperty(SYNC_Data_Part_Size, "0"));
         } catch (Exception e) {
 
+        }
+        try {
+            keepDisplayNameWhenDestroyUser = Boolean.parseBoolean(server.getConfig().getProperty(USER_KEEP_DISPLAY_NAME_WHEN_DESTROY, "true"));
+        } catch (Exception e) {
+
         }
 
 
@@ -436,6 +457,21 @@ public class MemoryMessagesStore implements IMessagesStore {
             e.printStackTrace();
         }
 
+        try {
+            mForwardMessageWithClientInfo = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.MESSAGE_Forward_With_Client_Info, "false"));
+        } catch (Exception e) {
+
+        }
+        try {
+            mRobotCallbackWithClientInfo = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.ROBOT_Callback_With_Client_Info, "false"));
+        } catch (Exception e) {
+
+        }
+        try {
+            mChannelCallbackWithClientInfo = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.CHANNEL_Callback_With_Client_Info, "false"));
+        } catch (Exception e) {
+
+        }
 
     }
 
@@ -558,8 +594,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             if (channelInfo != null) {
                 if (channelInfo.getOwner().equals(fromUser)) {
                     if(requestSourceType == ProtoConstants.RequestSourceType.Request_From_Channel
-                        && !StringUtil.isNullOrEmpty(channelInfo.getCallback())
-                        && channelInfo.getAutomatic() == 1) {
+                        && channelInfo.getAutomatic() != 0) {
                         LOG.info("Channel api message not send to the owner when automatic");
                     } else {
                         notifyReceivers.add(fromUser);
@@ -589,8 +624,10 @@ public class MemoryMessagesStore implements IMessagesStore {
                     }
                 } else {
                     notifyReceivers.add(fromUser);
-                    if (StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) {
+                    if (channelInfo.getAutomatic() == 0) {
                         notifyReceivers.add(channelInfo.getOwner());
+                    } else {
+                        LOG.info("Channel api message not send to the owner when automatic");
                     }
                 }
             } else {
@@ -708,7 +745,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                             }
                         }
 
-                        if (noRoaming && (System.currentTimeMillis() - bundle.getMessage().getServerTimestamp() > 5 * 60 * 1000)) {
+                        if (noRoaming && (System.currentTimeMillis() - bundle.getMessage().getServerTimestamp() > msgCompensateTimeLimit)) {
                             continue;
                         }
 
@@ -1269,11 +1306,31 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
+        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
+
+        ArrayList<String> existMemberIds = new ArrayList<>();
+        for (WFCMessage.GroupMember member : members) {
+            if (member.getType() != GroupMemberType_Removed) {
+                existMemberIds.add(member.getMemberId());
+            }
+        }
+
         long updateDt = System.currentTimeMillis();
 
         List<WFCMessage.GroupMember> tmp = new ArrayList<>();
-        ArrayList<String> newInviteUsers = new ArrayList<>();
+        int newMemberCount = 0;
         for (WFCMessage.GroupMember member : memberList) {
+            if (existMemberIds.contains(member.getMemberId()) && member.getType() != GroupMemberType_Removed) {
+                if(!isAdmin)
+                    continue;
+            } else {
+                newMemberCount++;
+            }
+
             WFCMessage.GroupMember.Builder builder = member.toBuilder();
             builder.setUpdateDt(updateDt).setCreateDt(updateDt);
             if (member.getMemberId().equals(groupInfo.getOwner())) {
@@ -1293,29 +1350,23 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
             member = builder.build();
             tmp.add(member);
-            newInviteUsers.add(member.getMemberId());
             updateDt++;
         }
         memberList = tmp;
 
-        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
-        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
-        if (members == null || members.size() == 0) {
-            members = loadGroupMemberFromDB(hzInstance, groupId);
-        }
-
-        if (maxCount != Integer.MAX_VALUE) {
-            int existCount = 0;
-            for (WFCMessage.GroupMember member : members) {
-                if (member.getType() != GroupMemberType_Removed) {
-                    existCount++;
-                }
+        if (memberList.size() == 0) {
+            if (!isAdmin) {
+                return ErrorCode.ERROR_CODE_ALREADY_IN_GROUP;
+            } else {
+                return ErrorCode.ERROR_CODE_SUCCESS;
             }
-            if (existCount + newInviteUsers.size() > maxCount) {
+        } else {
+            if (existMemberIds.size() + newMemberCount > maxCount) {
                 return ErrorCode.ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT;
             }
         }
 
+
         databaseStore.persistGroupMember(groupId, memberList, true);
         databaseStore.updateGroupMemberCountDt(groupId);
 
@@ -2487,25 +2538,41 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public void destoryUser(String userId) {
+    public void destroyUser(String userId) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
         WFCMessage.User us = mUserMap.get(userId);
         if (us != null) {
-            us = WFCMessage.User.newBuilder()
-                .setUid(userId)
-                .setUpdateDt(System.currentTimeMillis())
-                .setName(userId)
-                .setDeleted(1)
-                .clearDisplayName()
-                .clearAddress()
-                .clearCompany()
-                .clearEmail()
-                .clearExtra()
-                .clearMobile()
-                .clearPortrait()
-                .clearSocial()
-                .build();
+            if (keepDisplayNameWhenDestroyUser) {
+                us = WFCMessage.User.newBuilder()
+                    .setUid(userId)
+                    .setUpdateDt(System.currentTimeMillis())
+                    .setName(userId)
+                    .setDeleted(1)
+                    .clearAddress()
+                    .clearCompany()
+                    .clearEmail()
+                    .clearExtra()
+                    .clearMobile()
+                    .clearPortrait()
+                    .clearSocial()
+                    .build();
+            } else {
+                us = WFCMessage.User.newBuilder()
+                    .setUid(userId)
+                    .setUpdateDt(System.currentTimeMillis())
+                    .setName(userId)
+                    .setDeleted(1)
+                    .clearDisplayName()
+                    .clearAddress()
+                    .clearCompany()
+                    .clearEmail()
+                    .clearExtra()
+                    .clearMobile()
+                    .clearPortrait()
+                    .clearSocial()
+                    .build();
+            }
 
             try {
                 databaseStore.updateUser(us);
@@ -3279,6 +3346,156 @@ public class MemoryMessagesStore implements IMessagesStore {
         return true;
     }
 
+    private String ensureSecretLength(String secret) {
+        while ( secret.length() < 16) {
+            secret += "w";
+            secret += secret;
+        }
+        return secret;
+    }
+
+
+    @Override
+    public String getApplicationAuthCode(String fromUser, String applicationId, int type, String host) {
+        String secret = null;
+        if(type == ProtoConstants.ApplicationType.ApplicationType_Robot) {
+            WFCMessage.Robot robotData = getRobot(applicationId);
+            if(robotData != null && !StringUtil.isNullOrEmpty(robotData.getCallback()) && !StringUtil.isNullOrEmpty(robotData.getSecret())) {
+                try {
+                    URL url = new URL(robotData.getCallback());
+                    if(url.getHost().equals(host)) {
+                        secret = robotData.getSecret();
+                    } else {
+                        LOG.warn("get application auth code error, request host is not the same host with callback host");
+                    }
+                } catch (MalformedURLException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                String errorReason;
+                if(robotData == null) {
+                    errorReason = "Robot not exist.";
+                } else if(StringUtil.isNullOrEmpty(robotData.getCallback())) {
+                    errorReason = "Robot no callback address";
+                } else {
+                    errorReason = "Robot no secret";
+                }
+                LOG.warn("get application auth code error, reason {}", errorReason);
+            }
+        } else if(type == ProtoConstants.ApplicationType.ApplicationType_Channel) {
+            WFCMessage.ChannelInfo channelData = getChannelInfo(applicationId);
+            if(channelData != null && !StringUtil.isNullOrEmpty(channelData.getCallback()) && !StringUtil.isNullOrEmpty(channelData.getSecret())) {
+                try {
+                    URL url = new URL(channelData.getCallback());
+                    if(url.getHost().equals(host)) {
+                        secret = channelData.getSecret();
+                    } else {
+                        LOG.warn("get application auth code error, request host is not the same host with callback host");
+                    }
+                } catch (MalformedURLException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                String errorReason;
+                if(channelData == null) {
+                    errorReason = "Channel not exist.";
+                } else if(StringUtil.isNullOrEmpty(channelData.getCallback())) {
+                    errorReason = "Channel no callback address";
+                } else {
+                    errorReason = "Channel no secret";
+                }
+                LOG.warn("get application auth code error, reason {}", errorReason);
+            }
+        } else if(type == ProtoConstants.ApplicationType.ApplicationType_Admin) {
+            secret = AdminAction.getSecretKey();
+            applicationId = "wfadmin";
+        }
+
+        if(!StringUtil.isNullOrEmpty(secret)) {
+            secret = ensureSecretLength(secret);
+            byte[] token = AES.AESEncrypt(fromUser + "?|?" + System.currentTimeMillis() + "?|?" + applicationId + "?|?" + type, secret);
+            return new String(Base64.getEncoder().encode(token));
+        }
+
+        return null;
+    }
+
+    @Override
+    public String verifyApplicationAuthCode(String authCode, String applicationId, int type) {
+        String secret = null;
+        if(type == ProtoConstants.ApplicationType.ApplicationType_Robot) {
+            WFCMessage.Robot robotData = getRobot(applicationId);
+            if(robotData != null && !StringUtil.isNullOrEmpty(robotData.getCallback()) && !StringUtil.isNullOrEmpty(robotData.getSecret())) {
+                secret = robotData.getSecret();
+            }
+        } else if(type == ProtoConstants.ApplicationType.ApplicationType_Channel) {
+            WFCMessage.ChannelInfo channelData = getChannelInfo(applicationId);
+            if(channelData != null && !StringUtil.isNullOrEmpty(channelData.getCallback()) && !StringUtil.isNullOrEmpty(channelData.getSecret())) {
+                secret = channelData.getSecret();
+            }
+        } else if(type == ProtoConstants.ApplicationType.ApplicationType_Admin) {
+            secret = AdminAction.getSecretKey();
+            applicationId = "wfadmin";
+        }
+
+        secret = ensureSecretLength(secret);
+
+        byte[] data = Base64.getDecoder().decode(authCode);
+        data = AES.AESDecrypt(data, secret, true);
+
+        if (data == null || data.length == 0) {
+            return null;
+        } else {
+            String str = new String(data);
+            String[] strArr = str.split("\\?\\|\\?");
+            if (strArr.length == 4) {
+                if (applicationId.equals(strArr[2])) {
+                    long timestamp= Long.parseLong(strArr[1]);
+                    if(System.currentTimeMillis() - timestamp > 60*1000) {
+                        return null;
+                    }
+                    return strArr[0];
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public ErrorCode configApplication(String appId, int appType, long timestamp, String nonce, String signature) {
+        String secret;
+        if(System.currentTimeMillis()/1000 - timestamp > 300) {
+            return ErrorCode.ERROR_CODE_SIGN_EXPIRED;
+        }
+
+        if(appType == ProtoConstants.ApplicationType.ApplicationType_Robot) {
+            WFCMessage.Robot robotData = getRobot(appId);
+            if(robotData != null) {
+                secret = robotData.getSecret();
+            } else {
+                return ErrorCode.ERROR_CODE_NOT_EXIST;
+            }
+        } else if(appType == ProtoConstants.ApplicationType.ApplicationType_Channel) {
+            WFCMessage.ChannelInfo channelData = getChannelInfo(appId);
+            if(channelData != null) {
+                secret = channelData.getSecret();
+            } else {
+                return ErrorCode.ERROR_CODE_NOT_EXIST;
+            }
+        } else {
+            LOG.error("Config application type only support 0 or 1");
+            return ErrorCode.INVALID_PARAMETER;
+        }
+
+        String str = nonce + "|" + appId + "|" + timestamp + "|" + secret;
+        String sign = DigestUtils.sha1Hex(str);
+        if(sign.equals(signature)) {
+            return ErrorCode.ERROR_CODE_SUCCESS;
+        }
+
+        return ErrorCode.ERROR_CODE_AUTH_FAILURE;
+    }
+
     @Override
     public boolean isNewFriendWelcomeMessage() {
         return mFriendNewWelcomeMessage;
@@ -3629,7 +3846,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public void clearUserChannels(String userId) {
-
+        databaseStore.getUserChannels(userId).forEach(s -> listenChannel(userId, s, false));
     }
 
 
@@ -3671,9 +3888,15 @@ public class MemoryMessagesStore implements IMessagesStore {
                 e.printStackTrace();
                 Utility.printExecption(LOG, e);
             }
+        } else if(modifyType == Modify_Channel_Menu) {
+            OutputGetChannelInfo.OutputMenuList outputMenuButtons = new Gson().fromJson(value, OutputGetChannelInfo.OutputMenuList.class);
+            if (!outputMenuButtons.isEmpty()) {
+                for (OutputGetChannelInfo.OutputMenu outputMenuButton : outputMenuButtons) {
+                    newInfoBuilder.addMenu(outputMenuButton.toPbInfo());
+                }
+            }
         }
 
-
         newInfoBuilder.setUpdateDt(System.currentTimeMillis());
         mIMap.put(channelId, newInfoBuilder.build());
         callbackChannelInfoUpdateEvent(operator, channelId, Channel_Event_Update);
@@ -3709,7 +3932,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode distoryChannel(String operator, String channelId, boolean isAdmin) {
+    public ErrorCode destroyChannel(String operator, String channelId, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.ChannelInfo> mIMap = hzInstance.getMap(CHANNELS);
 
@@ -3729,6 +3952,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         newInfoBuilder.setStatus(oldInfo.getStatus() | Channel_State_Mask_Deleted);
         newInfoBuilder.setUpdateDt(System.currentTimeMillis());
         mIMap.put(channelId, newInfoBuilder.build());
+        databaseStore.clearChannelListener(channelId);
+        hzInstance.getMultiMap(CHANNEL_LISTENERS).remove(channelId);
 
         callbackChannelInfoUpdateEvent(operator, channelId, Channel_Event_Destroy);
         return ErrorCode.ERROR_CODE_SUCCESS;
@@ -3746,18 +3971,18 @@ public class MemoryMessagesStore implements IMessagesStore {
         IMap<String, WFCMessage.ChannelInfo> mIMap = hzInstance.getMap(CHANNELS);
         WFCMessage.ChannelInfo channelInfo = mIMap.get(channelId);
         if(channelInfo != null && (channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Private) > 0) {
-            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+            return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
-        getChannelListener(channelId);
-
-        if (listen) {
-            listeners.put(channelId, operator);
-        } else {
-            listeners.remove(channelId, operator);
+        try {
+            mWriteLock.lock();
+            databaseStore.updateChannelListener(channelId, operator, listen);
+            listeners.remove(channelId);
+        } finally {
+            mWriteLock.unlock();
         }
-        databaseStore.updateChannelListener(channelId, operator, listen);
-
+        
+        IMHandler.getPublisher().notifyChannelListenStatusChanged(channelInfo, operator, listen);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -3766,9 +3991,14 @@ public class MemoryMessagesStore implements IMessagesStore {
         MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
         Collection<String> result = listeners.get(channelId);
         if (result.isEmpty()) {
-            result = databaseStore.getChannelListener(channelId);
-            for (String userId : result) {
-                listeners.put(channelId, userId);
+            try {
+                mWriteLock.lock();
+                result = databaseStore.getChannelListener(channelId);
+                for (String userId : result) {
+                    listeners.put(channelId, userId);
+                }
+            } finally {
+                mWriteLock.unlock();
             }
         }
         return result;
@@ -3797,12 +4027,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         Collection<String> channelMembers = getChannelListener(channelId);
-        if (channelMembers == null) {
-            return false;
-        }
-
-        Collection<String> chatroomMembers = getChannelListener(channelId);
-        if (chatroomMembers == null || !chatroomMembers.contains(user)) {
+        if (channelMembers == null || !channelMembers.contains(user)) {
             return false;
         }
 
@@ -3828,12 +4053,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public Collection<String> getChannelSubscriber(String channelId) {
-        MultiMap<String, String> channelMembers = m_Server.getHazelcastInstance().getMultiMap(CHANNEL_LISTENERS);
-        if (channelMembers == null) {
-            return new ArrayList<>();
-        }
-
-        return channelMembers.get(channelId);
+        return getChannelListener(channelId);
     }
 
     @Override
@@ -3893,6 +4113,20 @@ public class MemoryMessagesStore implements IMessagesStore {
         return mGroupVisibleQuitKickoffNotification;
     }
 
+    @Override
+    public boolean isForwardMessageWithClientInfo() {
+        return mForwardMessageWithClientInfo;
+    }
+
+    @Override
+    public boolean isRobotCallbackWithClientInfo() {
+        return mRobotCallbackWithClientInfo;
+    }
+
+    @Override
+    public boolean isChannelCallbackWithClientInfo() {
+        return mChannelCallbackWithClientInfo;
+    }
 
     @Override
     public List<Integer> getClientForbiddenSendTypes() {

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

@@ -39,6 +39,7 @@ public class MemorySessionStore implements ISessionsStore {
     private static final Logger LOG = LoggerFactory.getLogger(MemorySessionStore.class);
 
     private boolean supportMultiEndpoint = false;
+    private boolean supportMultiPCEndpoint = false;
     private boolean clientSupportKickoff = false;
 
     public static class Session implements Comparable<Session>{
@@ -287,6 +288,11 @@ public class MemorySessionStore implements ISessionsStore {
             Utility.printExecption(LOG, e);
         }
 
+        try {
+            supportMultiPCEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_PC_ENDPOINT, "false"));
+        } catch (Exception e) {
+        }
+
         try {
             clientSupportKickoff = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_CLIENT_SUPPORT_KICKOFF_EVENT, "false"));
         } catch (Exception e) {
@@ -385,7 +391,12 @@ public class MemorySessionStore implements ISessionsStore {
         }
         databaseStore.clearMultiUser(username, clientID);
 
-        if (!supportMultiEndpoint && platform > 0) {
+        if (!supportMultiEndpoint
+            && platform > 0
+            && !(platform == ProtoConstants.Platform.Platform_Windows && supportMultiPCEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_LINUX && supportMultiPCEndpoint)
+            && !(platform == ProtoConstants.Platform.Platform_OSX && supportMultiPCEndpoint)
+        ) {
             databaseStore.clearMultiEndpoint(username, clientID, platform);
             if (userSessions.get(username) != null) {
                 Iterator<String> it = userSessions.get(username).iterator();
@@ -751,10 +762,12 @@ public class MemorySessionStore implements ISessionsStore {
     public void disableSession(String userId, String clientId) {
         Session session = sessions.get(clientId);
         if (session != null && session.getDeleted() == 0 && (userId == null || session.getUsername().equals(userId))) {
-            databaseStore.updateSessionDeleted(session.getUsername(), clientId, 1);
-            ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(session.username);
-            sessionSet.remove(clientId);
-            sessions.remove(clientId);
+            mServer.getProcessor().processOffline(session, true, () -> {
+                databaseStore.updateSessionDeleted(session.getUsername(), clientId, 1);
+                ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(session.username);
+                sessionSet.remove(clientId);
+                sessions.remove(clientId);
+            });
         }
     }
 
@@ -772,23 +785,25 @@ public class MemorySessionStore implements ISessionsStore {
             return;
         }
 
-        ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(session.username);
-        sessionSet.remove(clientID);
+        mServer.getProcessor().processOffline(session, true, () -> {
+            ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(session.username);
+            sessionSet.remove(clientID);
 
-        // remove also the messages stored of type QoS1/2
-        LOG.info("Removing stored messages with QoS 1 and 2. ClientId={}", clientID);
+            // remove also the messages stored of type QoS1/2
+            LOG.info("Removing stored messages with QoS 1 and 2. ClientId={}", clientID);
 
-        session.secondPhaseStore.clear();
-        session.outboundFlightMessages.clear();
-        session.inboundFlightMessages.clear();
+            session.secondPhaseStore.clear();
+            session.outboundFlightMessages.clear();
+            session.inboundFlightMessages.clear();
 
-        LOG.info("Wiping existing subscriptions. ClientId={}", clientID);
+            LOG.info("Wiping existing subscriptions. ClientId={}", clientID);
 
-        //remove also the enqueued messages
-        dropQueue(clientID);
+            //remove also the enqueued messages
+            dropQueue(clientID);
 
-        // TODO this missing last step breaks the junit test
-        sessions.remove(clientID);
+            // TODO this missing last step breaks the junit test
+            sessions.remove(clientID);
+        });
     }
     @Override
     public boolean isMultiEndpointSupported() {

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

@@ -369,9 +369,6 @@ public class Server {
     private String getServerIp(IConfig config) {
         String serverIp = config.getProperty(BrokerConstants.SERVER_IP_PROPERTY_NAME);
         if (serverIp == null || serverIp.equals("0.0.0.0")) {
-            String warning = "警告：无效配置，server.ip不能为空，需要配置服务的公网IP地址或者域名才能在公网使用！！！\nIM服务将使用本地地址，只能在局域网内使用！";
-            System.out.println(warning);
-            LOG.error(warning);
             serverIp = Utility.getLocalAddress().getHostAddress();
         }
         return serverIp;

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

@@ -160,7 +160,7 @@ public class NettyAcceptor implements ServerAcceptor {
                                              IConfig props) throws IOException {
         LOG.info("Configuring TCP MQTT transport");
         final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
-        String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
+        String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME, "0.0.0.0");
         String tcpPortProp = props.getProperty(PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
         if (DISABLED_PORT_BIND.equals(tcpPortProp)) {
             LOG.info("Property {} has been set to {}. TCP MQTT will be disabled", BrokerConstants.PORT_PROPERTY_NAME,

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

@@ -150,7 +150,7 @@ public interface IMessagesStore {
 
     ErrorCode updateUserInfo(InputOutputUserInfo userInfo, int flag);
     void addUserInfo(WFCMessage.User user, String password) throws Exception;
-    void destoryUser(String userId);
+    void destroyUser(String userId);
     void updateUserInfo(WFCMessage.User user) throws Exception;
     WFCMessage.User getUserInfo(String userId);
     WFCMessage.User getUserInfoByName(String name);
@@ -193,6 +193,11 @@ public interface IMessagesStore {
 
     boolean checkChatroomParticipantIdelTime(MemorySessionStore.Session session);
 
+
+    String getApplicationAuthCode(String fromUser, String applicationId, int appType, String host);
+    String verifyApplicationAuthCode(String token, String applicationId, int type);
+    ErrorCode configApplication(String appId, int appType, long timestamp, String nonce, String signature);
+
     ErrorCode getUserSettings(String userId, long version, WFCMessage.GetUserSettingResult.Builder builder);
     WFCMessage.UserSettingEntry getUserSetting(String userId, int scope, String key);
     List<WFCMessage.UserSettingEntry> getUserSetting(String userId, int scope);
@@ -209,7 +214,7 @@ public interface IMessagesStore {
     void clearUserChannels(String userId);
     ErrorCode modifyChannelInfo(String operator, String channelId, int modifyType, String value);
     ErrorCode transferChannel(String operator, String channelId, String newOwner);
-    ErrorCode distoryChannel(String operator, String channelId, boolean isAdmin);
+    ErrorCode destroyChannel(String operator, String channelId, boolean isAdmin);
     List<WFCMessage.ChannelInfo> searchChannel(String keyword, boolean buzzy, int page);
     ErrorCode listenChannel(String operator, String channelId, boolean listen);
     WFCMessage.ChannelInfo getChannelInfo(String channelId);
@@ -228,6 +233,10 @@ public interface IMessagesStore {
     boolean isAllowRobotCustomGroupNotification();
     int getVisibleQuitKickoffNotification();
 
+    boolean isForwardMessageWithClientInfo();
+    boolean isRobotCallbackWithClientInfo();
+    boolean isChannelCallbackWithClientInfo();
+
     List<Integer> getClientForbiddenSendTypes();
     List<Integer> getBlackListExceptionTypes();
     List<Integer> getGroupMuteExceptionTypes();

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

@@ -16,6 +16,7 @@
 
 package io.moquette.spi.impl;
 
+import cn.wildfirechat.pojos.OutputClient;
 import cn.wildfirechat.pojos.OutputMessageData;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
@@ -24,7 +25,6 @@ import com.google.gson.Gson;
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.util.StringUtil;
 import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus;
-import cn.wildfirechat.pojos.SendMessageData;
 import com.xiaoleilu.loServer.model.FriendData;
 import io.moquette.persistence.*;
 import io.moquette.persistence.MemorySessionStore.Session;
@@ -176,10 +176,19 @@ public class MessagesPublisher {
                         if (message == null) {
                             message = m_messagesStore.getMessage(messageId);
                         }
+                        OutputClient outputClient = null;
+                        if(m_messagesStore.isRobotCallbackWithClientInfo() && !StringUtil.isNullOrEmpty(exceptClientId)) {
+                            Session session = m_sessionsStore.getSession(exceptClientId);
+                            if(session != null && session.getUsername().equals(sender)) {
+                                outputClient = new OutputClient(session.getPlatform(), exceptClientId);
+                            }
+                        }
+
                         final WFCMessage.Message finalMsg = message;
+                        OutputClient finalOutputClient = outputClient;
                         Server.getServer().getCallbackScheduler().execute(() -> {
                             try {
-                                HttpUtils.httpJsonPost(robot.getCallback(), new Gson().toJson(SendMessageData.fromProtoMessage(finalMsg), SendMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Robot_Message_Callback);
+                                HttpUtils.httpJsonPost(robot.getCallback(), new Gson().toJson(OutputMessageData.fromProtoMessage(finalMsg, finalOutputClient), OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Robot_Message_Callback);
                             } catch (Exception e) {
                                 e.printStackTrace();
                                 Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);
@@ -595,10 +604,19 @@ public class MessagesPublisher {
     public void publish2Receivers(WFCMessage.Message message, Set<String> receivers, String exceptClientId, int pullType) {
         if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
             WFCMessage.ChannelInfo channelInfo = m_messagesStore.getChannelInfo(message.getConversation().getTarget());
-            if (channelInfo != null && !StringUtil.isNullOrEmpty(channelInfo.getCallback())) {
+            if (channelInfo != null && !StringUtil.isNullOrEmpty(channelInfo.getCallback()) && channelInfo.getAutomatic() == 1 && !message.getFromUser().equals(channelInfo.getOwner())) {
+                OutputClient outputClient = null;
+                if(m_messagesStore.isChannelCallbackWithClientInfo() && !StringUtil.isNullOrEmpty(exceptClientId)) {
+                    Session session = m_sessionsStore.getSession(exceptClientId);
+                    if(session != null && session.getUsername().equals(message.getFromUser())) {
+                        outputClient = new OutputClient(session.getPlatform(), exceptClientId);
+                    }
+                }
+
+                OutputClient finalOutputClient = outputClient;
                 Server.getServer().getCallbackScheduler().execute(() -> {
                     try {
-                        HttpUtils.httpJsonPost(channelInfo.getCallback() + "/message", new Gson().toJson(SendMessageData.fromProtoMessage(message), SendMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Channel_Message_Callback);
+                        HttpUtils.httpJsonPost(channelInfo.getCallback() + "/message", new Gson().toJson(OutputMessageData.fromProtoMessage(message, finalOutputClient), OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Channel_Message_Callback);
                     } catch (Exception e) {
                         e.printStackTrace();
                         Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);
@@ -627,8 +645,8 @@ public class MessagesPublisher {
                 pushContent = "[语音]";
             } else if(type == ProtoConstants.ContentType.Video) {
                 pushContent = "[视频]";
-            } else if(type == ProtoConstants.ContentType.RichMedia) {
-                pushContent = "[图文]";
+            } else if(type == ProtoConstants.ContentType.Link) {
+                pushContent = "[链接]";
             } else if(type == ProtoConstants.ContentType.File) {
                 pushContent = "[文件]";
             } else if(type == ProtoConstants.ContentType.Sticker) {
@@ -648,10 +666,10 @@ public class MessagesPublisher {
 
     }
 
-    public void forwardMessage(final WFCMessage.Message message, String forwardUrl) {
+    public void forwardMessage(final WFCMessage.Message message, String forwardUrl, OutputClient outputClient) {
         Server.getServer().getCallbackScheduler().execute(() -> {
             try {
-                HttpUtils.httpJsonPost(forwardUrl, new Gson().toJson(OutputMessageData.fromProtoMessage(message), OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Forward_Message_Callback);
+                HttpUtils.httpJsonPost(forwardUrl, new Gson().toJson(OutputMessageData.fromProtoMessage(message, outputClient), OutputMessageData.class), HttpUtils.HttpPostType.POST_TYPE_Forward_Message_Callback);
             } catch (Exception e) {
                 e.printStackTrace();
                 Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);
@@ -683,7 +701,7 @@ public class MessagesPublisher {
     }
 
     public void notifyChannelListenStatusChanged(WFCMessage.ChannelInfo channelInfo, String user, boolean listen) {
-        if (channelInfo == null || StringUtil.isNullOrEmpty(channelInfo.getCallback())) {
+        if (channelInfo == null || StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) {
             return;
         }
 

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

@@ -620,15 +620,27 @@ public class ProtocolProcessor {
         String username = NettyUtils.userName(channel);
         MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
         if(session != null) {
-            session.refreshLastActiveTime();
-            forwardOnlineStatusEvent(username, clientID, session.getPlatform(), clearSession ? UserOnlineStatus.LOGOUT : UserOnlineStatus.OFFLINE, session.getAppName());
+            processOffline(session, clearSession, () -> {
+                ConnectionDescriptor oldConnDescr = new ConnectionDescriptor(clientID, channel);
+                if(connectionDescriptors.removeConnection(oldConnDescr)) {
+                    m_interceptor.notifyClientConnectionLost(clientID, username);
+                }
+            });
+        } else {
+            ConnectionDescriptor oldConnDescr = new ConnectionDescriptor(clientID, channel);
+            if(connectionDescriptors.removeConnection(oldConnDescr)) {
+                m_interceptor.notifyClientConnectionLost(clientID, username);
+            }
         }
+    }
 
-        ConnectionDescriptor oldConnDescr = new ConnectionDescriptor(clientID, channel);
-        if(connectionDescriptors.removeConnection(oldConnDescr)) {
-            m_interceptor.notifyClientConnectionLost(clientID, username);
-        }
+    public void processOffline(MemorySessionStore.Session session, boolean logout, Runnable runnable) {
         if(session != null) {
+            session.refreshLastActiveTime();
+            forwardOnlineStatusEvent(session.getUsername(), session.getClientID(), session.getPlatform(), logout ? UserOnlineStatus.LOGOUT : UserOnlineStatus.OFFLINE, session.getAppName());
+            if(runnable != null) {
+                runnable.run();
+            }
             m_messagesStore.updateUserOnlineSetting(session, false);
         }
     }

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

@@ -54,7 +54,7 @@ public class DBUtil {
         if (embedDB != null && embedDB.equals("1")) {
             IsEmbedDB = true;
             LOG.info("Use h2 database");
-            String warning = "您正在使用内置h2数据库，建议仅在开发验证或者用户数小于100人时才使用此数据库，其它情况建议使用MySQL。";
+            String warning = "您正在使用h2数据库，建议仅在开发验证或者用户数小于100人时才使用此数据库。正式上线时建议切换到MySQL数据库。";
             System.out.println(warning);
             LOG.warn(warning);
         } else {

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

@@ -83,4 +83,7 @@ public interface IMTopic {
     String KickoffPCClientTopic = "KPCC";
 
     String ClearSessionTopic = "CST";
+
+    String GetApplicationTokenRequestTopic = "ATR";
+    String ApplicationConfigRequestTopic = "ACR";
 }

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.86</version>
+        <version>0.92</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,7 +29,13 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.2</version>
+            <version>2.8.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
         </dependency>
     </dependencies>
 

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

@@ -26,6 +26,7 @@ public interface APIPath {
     String User_Get_Token = "/admin/user/get_token";
     String User_Update_Block_Status = "/admin/user/update_block_status";
     String User_Get_Info = "/admin/user/get_info";
+    String User_Get_Robot_Info = "/admin/user/get_robot_info";
     String User_Get_Blocked_List = "/admin/user/get_blocked_list";
     String User_Check_Block_Status = "/admin/user/check_block_status";
     String User_Get_Online_Status = "/admin/user/onlinestatus";
@@ -34,6 +35,7 @@ public interface APIPath {
     String User_Kickoff_Client = "/admin/user/kickoff_client";
     String User_Online_Count = "/admin/user/online_count";
     String User_Online_List = "/admin/user/online_list";
+    String User_Application_Get_UserInfo = "/admin/user/app_get_user_info";
 
     String Friend_Update_Status = "/admin/friend/status";
     String Friend_Get_List = "/admin/friend/list";
@@ -50,10 +52,13 @@ public interface APIPath {
     String Msg_Recall = "/admin/message/recall";
     String Msg_Delete = "/admin/message/delete";
     String Msg_Update = "/admin/message/update";
+    String Msg_GetOne = "/admin/message/get_one";
     String Msg_Broadcast = "/admin/message/broadcast";
     String Msg_Multicast = "/admin/message/multicast";
     String Msg_RecallBroadCast = "/admin/message/recall_broadcast";
     String Msg_RecallMultiCast = "/admin/message/recall_multicast";
+    String Msg_ConvRead = "/admin/message/conv_read";
+    String Msg_Delivery = "/admin/message/delivery";
 
     String Create_Group = "/admin/group/create";
     String Group_Dismiss = "/admin/group/del";
@@ -90,17 +95,16 @@ public interface APIPath {
     String Channel_Message_Send = "/channel/message/send";
     String Channel_Subscribe = "/channel/subscribe";
     String Channel_Subscriber_List = "/channel/subscriber_list";
+    String Channel_Application_Get_UserInfo = "/channel/application/get_user_info";
 
     String Robot_User_Info = "/robot/user_info";
+    String Robot_Get_Profile = "/robot/profile";
     String Robot_Message_Send = "/robot/message/send";
-
     String Robot_Set_Callback = "/robot/set_callback";
     String Robot_Get_Callback = "/robot/get_callback";
     String Robot_Delete_Callback = "/robot/delete_callback";
     String Robot_Update_Profile = "/robot/update_profile";
-
-    String Robot_Verify_Application_User = "/robot/user/verify";
-
+    String Robot_Application_Get_UserInfo = "/robot/application/get_user_info";
     String Robot_Group_Member_Add = "/robot/group/member/add";
     String Robot_Group_Allow_Member = "/robot/group/manager/allow";
     String Robot_Create_Group = "/robot/group/create";

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

@@ -28,7 +28,8 @@ public enum ErrorCode {
     ERROR_CODE_INVALID_MESSAGE(10, "invalid message"),
 
     //Group error
-    ERROR_CODE_GROUP_ALREADY_EXIST(11, "group aleady exist"),
+    ERROR_CODE_GROUP_ALREADY_EXIST(11, "group already exist"),
+    ERROR_CODE_ALREADY_IN_GROUP(12, "member already in group"),
 
     //user error
     ERROR_CODE_FRIEND_ALREADY_REQUEST(16, "already send request"),
@@ -50,6 +51,18 @@ public enum ErrorCode {
     ERROR_CODE_CONFERENCE_ROOM_NOT_EXIST(60, "conference room not exist"),
     ERROR_CODE_CONFERENCE_SERVICE_NOT_AVAILABLE(61, "conference service not available"),
 
+    ERROR_CODE_APPLICATION_TOKEN_ERROR_OR_TIMEOUT(70, "application token error or timeout"),
+
+    ERROR_CODE_SECRET_CHAT_ACCEPTED_BY_OTHER_CLIENT(81, "secret chat accepted by other client"),
+    ERROR_CODE_SECRET_CHAT_SESSION_NOT_EXIST(82, "secret chat session not exist"),
+    ERROR_CODE_SECRET_CHAT_NOT_SESSION_CLIENT(83, "not secret chat session client"),
+    ERROR_CODE_SECRET_CHAT_SESSION_NOT_READY(84, "secret chat session not ready"),
+    ERROR_CODE_SECRET_CHAT_SESSION_DESTROYED(85, "secret chat session destroyed"),
+    ERROR_CODE_SECRET_CHAT_MO_DISABLED(86, "origin side disable secret chat"),
+    ERROR_CODE_SECRET_CHAT_MT_DISABLED(87, "target side disable secret chat"),
+
+    ERROR_CODE_FUNCTION_DISABLED(220, "function disabled"),
+
     ERROR_CODE_CHANNEL_NO_EXIST(236, "channel no exist"),
     ERROR_CODE_CHANNEL_NO_SECRET(237, "channel no secret"),
     ERROR_CODE_USER_NOT_PREPARED(238, "user not prepared"),

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

@@ -0,0 +1,83 @@
+package cn.wildfirechat.messagecontentbuilder;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import io.netty.util.internal.StringUtil;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.function.Consumer;
+
+public class ArticlesContentBuilder extends MessageContentBuilder{
+    public static class Article {
+        public String id;
+        public String cover;
+        public String title;
+        public String url;
+        public boolean readReport;
+    }
+    public Article topArticle;
+    public List<Article> subArticles;
+
+    public static ArticlesContentBuilder newBuilder(String id, String cover, String title, String url, boolean readReport) {
+        ArticlesContentBuilder builder = new ArticlesContentBuilder();
+        builder.topArticle = new Article();
+        builder.topArticle.id = id;
+        builder.topArticle.cover = cover;
+        builder.topArticle.title = title;
+        builder.topArticle.url = url;
+        builder.topArticle.readReport = readReport;
+        return builder;
+    }
+
+    public ArticlesContentBuilder addSubArticle(String id, String cover, String title, String url, boolean readReport) {
+        Article article = new Article();
+        article.id = id;
+        article.cover = cover;
+        article.title = title;
+        article.url = url;
+        article.readReport = readReport;
+        if(subArticles == null) {
+            subArticles = new ArrayList<>();
+        }
+        subArticles.add(article);
+        return this;
+    }
+
+    private static JSONObject toJSON(Article article) {
+        JSONObject top = new JSONObject();
+        if(!StringUtil.isNullOrEmpty(article.id))
+            top.put("id", article.id);
+        if(!StringUtil.isNullOrEmpty(article.cover))
+            top.put("cover", article.cover);
+        if(!StringUtil.isNullOrEmpty(article.title))
+            top.put("title", article.title);
+        if(!StringUtil.isNullOrEmpty(article.url))
+            top.put("url", article.url);
+        if(article.readReport)
+            top.put("rr", article.readReport);
+        return top;
+    }
+
+    @Override
+    public MessagePayload build() {
+        MessagePayload payload = encodeBase();
+        payload.setType(ProtoConstants.ContentType.Articles);
+        payload.setPersistFlag(ProtoConstants.PersistFlag.Persist_And_Count);
+        payload.setSearchableContent(topArticle.title);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("top", toJSON(topArticle));
+        if(subArticles != null && !subArticles.isEmpty()) {
+            JSONArray jsonArray = new JSONArray();
+            subArticles.forEach(article -> jsonArray.add(toJSON(article)));
+            jsonObject.put("subArticles", jsonArray);
+        }
+
+        payload.setBase64edData(Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes(StandardCharsets.UTF_8)));
+        return payload;
+    }
+}

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

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

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

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

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

@@ -0,0 +1,88 @@
+package cn.wildfirechat.messagecontentbuilder;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import io.netty.util.internal.StringUtil;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+public class RichNotificationContentBuilder extends MessageContentBuilder{
+    private String title;
+    private String desc;
+    private String remark;
+    private JSONArray datas;
+    private String exName;
+    private String exPortrait;
+    private String exUrl;
+    private String appId;
+
+    public static RichNotificationContentBuilder newBuilder(String title, String desc, String exUrl) {
+        RichNotificationContentBuilder builder = new RichNotificationContentBuilder();
+        builder.title = title;
+        builder.desc = desc;
+        builder.exUrl = exUrl;
+        return builder;
+    }
+
+    public RichNotificationContentBuilder remark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+    public RichNotificationContentBuilder exName(String exName) {
+        this.exName = exName;
+        return this;
+    }
+    public RichNotificationContentBuilder exPortrait(String exPortrait) {
+        this.exPortrait = exPortrait;
+        return this;
+    }
+    public RichNotificationContentBuilder appId(String appId) {
+        this.appId = appId;
+        return this;
+    }
+    public RichNotificationContentBuilder addItem(String key, String value) {
+        return addItem(key, value, null);
+    }
+    public RichNotificationContentBuilder addItem(String key, String value, String color) {
+        if(this.datas == null) {
+            this.datas = new JSONArray();
+        }
+        JSONObject item = new JSONObject();
+        item.put("key", key);
+        item.put("value", value == null ? "" : value);
+        if(!StringUtil.isNullOrEmpty(color)) {
+            item.put("color", color);
+        }
+        this.datas.add(item);
+        return this;
+    }
+
+    @Override
+    public MessagePayload build() {
+        MessagePayload payload = encodeBase();
+        payload.setType(ProtoConstants.ContentType.Rich_Notification);
+        payload.setPersistFlag(ProtoConstants.PersistFlag.Persist_And_Count);
+        payload.setPushContent(title);
+        payload.setContent(desc);
+        JSONObject jsonObject = new JSONObject();
+        if(!StringUtil.isNullOrEmpty(remark))
+            jsonObject.put("remark", remark);
+        if(!StringUtil.isNullOrEmpty(exName))
+            jsonObject.put("exName", exName);
+        if(!StringUtil.isNullOrEmpty(exPortrait))
+            jsonObject.put("exPortrait", exPortrait);
+        if(!StringUtil.isNullOrEmpty(exUrl))
+            jsonObject.put("exUrl", exUrl);
+        if(!StringUtil.isNullOrEmpty(appId))
+            jsonObject.put("appId", appId);
+        if(datas != null && !datas.isEmpty())
+            jsonObject.put("datas", datas);
+
+        payload.setBase64edData(Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes(StandardCharsets.UTF_8)));
+
+        return payload;
+    }
+}

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

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

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

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

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

@@ -0,0 +1,53 @@
+package cn.wildfirechat.pojos;
+
+import com.google.gson.Gson;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+public class ArticleContent {
+    public static class Article {
+        public String id;
+        public String cover;
+        public String title;
+        public String url;
+        public boolean rr;
+
+        public Article() {
+        }
+
+        public Article(String id, String cover, String title, String url, boolean rr) {
+            this.id = id;
+            this.cover = cover;
+            this.title = title;
+            this.url = url;
+            this.rr = rr;
+        }
+    }
+    public Article top;
+    public List<Article> subArticles;
+
+    public ArticleContent() {
+    }
+
+    public ArticleContent(String id, String cover, String title, String url, boolean rr) {
+        this.top = new Article(id, cover, title, url, rr);
+    }
+
+    public ArticleContent addSubArticle(String id, String cover, String title, String url, boolean rr)  {
+        if (subArticles == null)
+            subArticles = new ArrayList<>();
+        subArticles.add(new Article(id, cover, title, url, rr));
+        return this;
+    }
+
+    public MessagePayload toPayload() {
+        MessagePayload payload = new MessagePayload();
+        payload.setType(13);
+        payload.setSearchableContent(top.title);
+        payload.setBase64edData(Base64.getEncoder().encodeToString(new Gson().toJson(this).getBytes(StandardCharsets.UTF_8)));
+        return payload;
+    }
+}

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

@@ -3,4 +3,5 @@ package cn.wildfirechat.pojos;
 public class ConferenceJoinEvent {
     public String userId;
     public String roomId;
+    public boolean screenSharing;
 }

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

@@ -3,4 +3,5 @@ package cn.wildfirechat.pojos;
 public class ConferenceLeaveEvent {
     public String userId;
     public String roomId;
+    public boolean screenSharing;
 }

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

@@ -4,4 +4,5 @@ public class ConferencePublishEvent {
     public String userId;
     public boolean video;
     public String roomId;
+    public boolean screenSharing;
 }

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

@@ -3,4 +3,5 @@ package cn.wildfirechat.pojos;
 public class ConferenceUnpublishEvent {
     public String userId;
     public String roomId;
+    public boolean screenSharing;
 }

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

@@ -13,6 +13,15 @@ public class Conversation {
     private String target;
     private int line;
 
+    public Conversation() {
+    }
+
+    public Conversation(int type, String target, int line) {
+        this.type = type;
+        this.target = target;
+        this.line = line;
+    }
+
     public int getType() {
         return type;
     }

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

@@ -18,6 +18,9 @@ public class ForwardDeviceMessageData {
     private int type;
     private byte[] data;
 
+    public ForwardDeviceMessageData() {
+    }
+
     public ForwardDeviceMessageData(String deviceId, int type, byte[] data) {
         this.deviceId = deviceId;
         this.type = type;

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

@@ -31,6 +31,9 @@ public class GroupNotificationBinaryContent {
     //value2(member or something)
     private String m;
 
+    public GroupNotificationBinaryContent() {
+    }
+
     public GroupNotificationBinaryContent(String g, String o, String n, String m) {
         this.g = g;
         this.o = o;

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

@@ -8,14 +8,14 @@
 
 package cn.wildfirechat.pojos;
 
-public class OutputVerifyApplicationUser {
-    private String userId;
+public class InputApplicationGetUserInfo {
+    private String authCode;
 
-    public String getUserId() {
-        return userId;
+    public String getAuthCode() {
+        return authCode;
     }
 
-    public void setUserId(String userId) {
-        this.userId = userId;
+    public void setAuthCode(String authCode) {
+        this.authCode = authCode;
     }
 }

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

@@ -13,6 +13,9 @@ public class InputChatroomMute {
     private String chatroomId;
     private int status;
 
+    public InputChatroomMute() {
+    }
+
     public InputChatroomMute(String chatroomId, int status) {
         this.chatroomId = chatroomId;
         this.status = status;

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

@@ -67,16 +67,18 @@ public class InputCreateGroup extends InputGroupBase {
         }
 
         groupBuilder.setGroupInfo(groupInfoBuilder);
-        for (PojoGroupMember pojoGroupMember : group.getMembers()) {
-            WFCMessage.GroupMember.Builder groupMemberBuilder = WFCMessage.GroupMember.newBuilder().setMemberId(pojoGroupMember.getMember_id());
-            if (!StringUtil.isNullOrEmpty(pojoGroupMember.getAlias())) {
-                groupMemberBuilder.setAlias(pojoGroupMember.getAlias());
+        if(group.getMembers() != null) {
+            for (PojoGroupMember pojoGroupMember : group.getMembers()) {
+                WFCMessage.GroupMember.Builder groupMemberBuilder = WFCMessage.GroupMember.newBuilder().setMemberId(pojoGroupMember.getMember_id());
+                if (!StringUtil.isNullOrEmpty(pojoGroupMember.getAlias())) {
+                    groupMemberBuilder.setAlias(pojoGroupMember.getAlias());
+                }
+                groupMemberBuilder.setType(pojoGroupMember.getType());
+                if (!StringUtil.isNullOrEmpty(pojoGroupMember.getExtra())) {
+                    groupMemberBuilder.setExtra(pojoGroupMember.extra);
+                }
+                groupBuilder.addMembers(groupMemberBuilder);
             }
-            groupMemberBuilder.setType(pojoGroupMember.getType());
-            if(!StringUtil.isNullOrEmpty(pojoGroupMember.getExtra())) {
-                groupMemberBuilder.setExtra(pojoGroupMember.extra);
-            }
-            groupBuilder.addMembers(groupMemberBuilder);
         }
 
         WFCMessage.CreateGroupRequest.Builder createGroupReqBuilder = WFCMessage.CreateGroupRequest.newBuilder();

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

@@ -0,0 +1,58 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+public class InputGetConvReadTime {
+    private String userId;
+    private int conversationType;
+    private String target;
+    private int line;
+
+    public InputGetConvReadTime() {
+    }
+
+    public InputGetConvReadTime(String userId, int conversationType, String target, int line) {
+        this.userId = userId;
+        this.conversationType = conversationType;
+        this.target = target;
+        this.line = line;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public int getConversationType() {
+        return conversationType;
+    }
+
+    public void setConversationType(int conversationType) {
+        this.conversationType = conversationType;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public int getLine() {
+        return line;
+    }
+
+    public void setLine(int line) {
+        this.line = line;
+    }
+}

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

@@ -5,6 +5,9 @@ public class InputGetToken {
     private String clientId;
     private Integer platform;
 
+    public InputGetToken() {
+    }
+
     public InputGetToken(String userId, String clientId, int platform) {
         this.userId = userId;
         this.clientId = clientId;

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

@@ -13,6 +13,9 @@ public class InputGetUserInfo {
     private String name;
     private String mobile;
 
+    public InputGetUserInfo() {
+    }
+
     public InputGetUserInfo(String userId, String name, String mobile) {
         this.userId = userId;
         this.name = name;

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

@@ -0,0 +1,12 @@
+package cn.wildfirechat.pojos;
+
+public class InputMessageUid {
+    public long messageUid;
+
+    public InputMessageUid() {
+    }
+
+    public InputMessageUid(long messageUid) {
+        this.messageUid = messageUid;
+    }
+}

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

@@ -13,6 +13,9 @@ public class InputOutputUserBlockStatus {
     private String userId;
     private int status;
 
+    public InputOutputUserBlockStatus() {
+    }
+
     public InputOutputUserBlockStatus(String userId, int status) {
         this.userId = userId;
         this.status = status;

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

@@ -8,14 +8,14 @@
 
 package cn.wildfirechat.pojos;
 
-public class InputVerifyApplicationUser {
-    private String token;
+public class InputRobotId {
+    private String robotId;
 
-    public String getToken() {
-        return token;
+    public String getRobotId() {
+        return robotId;
     }
 
-    public void setToken(String token) {
-        this.token = token;
+    public void setRobotId(String robotId) {
+        this.robotId = robotId;
     }
 }

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

@@ -11,6 +11,13 @@ package cn.wildfirechat.pojos;
 public class InputUserId {
     private String userId;
 
+    public InputUserId() {
+    }
+
+    public InputUserId(String userId) {
+        this.userId = userId;
+    }
+
     public String getUserId() {
         return userId;
     }

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

@@ -0,0 +1,57 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+public class OutputApplicationConfigData {
+    private String appId;
+    private int appType;
+    private long timestamp;
+    private String nonceStr;
+    private String signature;
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public int getAppType() {
+        return appType;
+    }
+
+    public void setAppType(int appType) {
+        this.appType = appType;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getNonceStr() {
+        return nonceStr;
+    }
+
+    public void setNonceStr(String nonceStr) {
+        this.nonceStr = nonceStr;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+}

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

@@ -0,0 +1,39 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+public class OutputApplicationUserInfo {
+    private String userId;
+    private String displayName;
+    private String portraitUrl;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getPortraitUrl() {
+        return portraitUrl;
+    }
+
+    public void setPortraitUrl(String portraitUrl) {
+        this.portraitUrl = portraitUrl;
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+import java.util.List;
+
+public class OutputClient {
+    private int platform;
+    private String clientId;
+
+    public OutputClient() {
+    }
+
+    public OutputClient(int platform, String clientId) {
+        this.platform = platform;
+        this.clientId = clientId;
+    }
+
+    public int getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(int platform) {
+        this.platform = platform;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+}

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

@@ -13,6 +13,9 @@ public class OutputCreateDevice {
     private String token;
     private String secret;
 
+    public OutputCreateDevice() {
+    }
+
     public OutputCreateDevice(String userId, String token, String secret) {
         this.deviceId = userId;
         this.token = token;

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

@@ -12,6 +12,9 @@ public class OutputCreateRobot {
     private String userId;
     private String secret;
 
+    public OutputCreateRobot() {
+    }
+
     public OutputCreateRobot(String userId, String secret) {
         this.userId = userId;
         this.secret = secret;

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

@@ -12,6 +12,9 @@ public class OutputCreateUser {
     private String userId;
     private String name;
 
+    public OutputCreateUser() {
+    }
+
     public OutputCreateUser(String userId, String name) {
         this.userId = userId;
         this.name = name;

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

@@ -20,6 +20,9 @@ public class OutputDevice {
     private List<String> owners;
     private String extra;
 
+    public OutputDevice() {
+    }
+
     public OutputDevice(String deviceId, String token, String secret) {
         this.deviceId = deviceId;
         this.token = token;

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

@@ -10,8 +10,69 @@ package cn.wildfirechat.pojos;
 
 
 import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class OutputGetChannelInfo {
+    public static class OutputMenu {
+        public String menuId;
+        public String type;
+        public String name;
+        public String key;
+        public String url;
+        public String mediaId;
+        public String articleId;
+        public String appId;
+        public String appPage;
+        public String extra;
+        public List<OutputMenu> subMenus;
+
+        public static OutputMenu fromPbInfo(WFCMessage.ChannelMenu channelMenuMenu) {
+            OutputMenu out = new OutputMenu();
+            out.menuId = channelMenuMenu.getMenuId();
+            out.type = channelMenuMenu.getType();
+            out.name = channelMenuMenu.getName();
+            out.key = channelMenuMenu.getKey();
+            out.url = channelMenuMenu.getUrl();
+            out.mediaId = channelMenuMenu.getMediaId();
+            out.articleId = channelMenuMenu.getArticleId();
+            out.appId = channelMenuMenu.getAppId();
+            out.appPage = channelMenuMenu.getAppPage();
+            out.extra = channelMenuMenu.getExtra();
+            if (channelMenuMenu.getSubMenuCount() > 0) {
+                out.subMenus = new ArrayList<>();
+                for (WFCMessage.ChannelMenu menuMenu : channelMenuMenu.getSubMenuList()) {
+                    out.subMenus.add(fromPbInfo(menuMenu));
+                }
+            }
+            return out;
+        }
+
+        public WFCMessage.ChannelMenu.Builder toPbInfo() {
+            WFCMessage.ChannelMenu.Builder builder = WFCMessage.ChannelMenu.newBuilder();
+            builder.setType(type);
+            builder.setName(name);
+            if (!StringUtil.isNullOrEmpty(menuId)) builder.setMenuId(menuId);
+            if (!StringUtil.isNullOrEmpty(key)) builder.setKey(key);
+            if (!StringUtil.isNullOrEmpty(url)) builder.setUrl(url);
+            if (!StringUtil.isNullOrEmpty(mediaId)) builder.setMediaId(mediaId);
+            if (!StringUtil.isNullOrEmpty(articleId)) builder.setArticleId(articleId);
+            if (!StringUtil.isNullOrEmpty(appId)) builder.setAppId(appId);
+            if (!StringUtil.isNullOrEmpty(appPage)) builder.setAppPage(appPage);
+            if (!StringUtil.isNullOrEmpty(extra)) builder.setExtra(extra);
+            if (subMenus != null && !subMenus.isEmpty()) {
+                subMenus.forEach(menuMenu -> builder.addSubMenu(menuMenu.toPbInfo()));
+            }
+            return builder;
+        }
+    }
+
+    public static class OutputMenuList extends ArrayList<OutputMenu> {
+
+    }
+
     private String channelId;
     private String name;
     private String desc;
@@ -24,7 +85,7 @@ public class OutputGetChannelInfo {
     private String callback;
     private int automatic;
     private String secret;
-
+    public List<OutputMenu> menus;
 
     public String getChannelId() {
         return channelId;
@@ -136,6 +197,13 @@ public class OutputGetChannelInfo {
         out.status = channelInfo.getStatus();;
         out.updateDt = channelInfo.getUpdateDt();
         out.secret = channelInfo.getSecret();
+        if (channelInfo.getMenuCount() > 0) {
+            out.menus = new ArrayList<>();
+            for (WFCMessage.ChannelMenu channelMenuMenu : channelInfo.getMenuList()) {
+                out.menus.add(OutputMenu.fromPbInfo(channelMenuMenu));
+            }
+        }
         return out;
     }
 }
+

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

@@ -14,6 +14,9 @@ public class OutputLoginData {
     private String userId;
     private String token;
 
+    public OutputLoginData() {
+    }
+
     public OutputLoginData(String userId, String token) {
         this.userId = userId;
         this.token = token;

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

@@ -20,6 +20,7 @@ public class OutputMessageData {
     private MessagePayload payload;
     private List<String> toUsers;
     private long timestamp;
+    private OutputClient client;
 
     public String getSender() {
         return sender;
@@ -69,7 +70,19 @@ public class OutputMessageData {
         this.timestamp = timestamp;
     }
 
+    public OutputClient getClient() {
+        return client;
+    }
+
+    public void setClient(OutputClient client) {
+        this.client = client;
+    }
+
     public static OutputMessageData fromProtoMessage(WFCMessage.Message protoMessage) {
+        return fromProtoMessage(protoMessage, null);
+    }
+
+    public static OutputMessageData fromProtoMessage(WFCMessage.Message protoMessage, OutputClient fromClient) {
         OutputMessageData data = new OutputMessageData();
         data.messageId = protoMessage.getMessageId();
         data.sender = protoMessage.getFromUser();
@@ -80,6 +93,7 @@ public class OutputMessageData {
         data.payload = MessagePayload.fromProtoMessageContent(protoMessage.getContent());
         data.timestamp = protoMessage.getServerTimestamp();
         data.toUsers = protoMessage.getToList();
+        data.client = fromClient;
         return data;
     }
 }

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

@@ -13,6 +13,9 @@ public class OutputNotifyChannelSubscribeStatus {
     private String channelId;
     private int status;
 
+    public OutputNotifyChannelSubscribeStatus() {
+    }
+
     public OutputNotifyChannelSubscribeStatus(String userId, String channelId, boolean subscirbed) {
         this.userId = userId;
         this.channelId = channelId;

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

@@ -0,0 +1,184 @@
+package cn.wildfirechat.pojos;
+
+
+import cn.wildfirechat.proto.WFCMessage;
+
+public class OutputRobot {
+    private String userId;
+    private String name;
+    private String password;
+    private String displayName;
+    private String portrait;
+    private int gender;
+    private String mobile;
+    private String email;
+    private String address;
+    private String company;
+    private String social;
+    private String extra;
+    private long updateDt;
+
+    private String owner;
+    private String secret;
+    private String callback;
+    private String robotExtra;
+
+    public String getSocial() {
+        return social;
+    }
+
+    public void setSocial(String social) {
+        this.social = social;
+    }
+
+    public long getUpdateDt() {
+        return updateDt;
+    }
+
+    public void setUpdateDt(long updateDt) {
+        this.updateDt = updateDt;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getPortrait() {
+        return portrait;
+    }
+
+    public void setPortrait(String portrait) {
+        this.portrait = portrait;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+    public int getGender() {
+        return gender;
+    }
+
+    public void setGender(int gender) {
+        this.gender = gender;
+    }
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+    public String getCallback() {
+        return callback;
+    }
+
+    public void setCallback(String callback) {
+        this.callback = callback;
+    }
+
+    public String getRobotExtra() {
+        return robotExtra;
+    }
+
+    public void setRobotExtra(String robotExtra) {
+        this.robotExtra = robotExtra;
+    }
+
+    public void fromUser(WFCMessage.User user) {
+        userId = user.getUid();
+        name = user.getName();
+        displayName = user.getDisplayName();
+        portrait = user.getPortrait();
+        gender = user.getGender();
+        mobile = user.getMobile();
+        email = user.getEmail();
+        address = user.getAddress();
+        company = user.getCompany();
+        social = user.getSocial();
+        extra = user.getExtra();
+        updateDt = user.getUpdateDt();
+    }
+    public void fromRobot(WFCMessage.Robot robot, boolean withSecret) {
+        setOwner(robot.getOwner());
+        if(withSecret) {
+            setSecret(robot.getSecret());
+        }
+        setCallback(robot.getCallback());
+        setRobotExtra(robot.getExtra());
+    }
+}

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

@@ -16,6 +16,9 @@ public class OutputRouteData { ;
     private int shortPort;
     private String secret;
 
+    public OutputRouteData() {
+    }
+
     public OutputRouteData(List<String> serverIPs, int longPort, int shortPort, String secret) {
         this.serverIPs = serverIPs;
         this.longPort = longPort;

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

@@ -0,0 +1,28 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+public class OutputTimestamp {
+    private long timestamp;
+
+    public OutputTimestamp() {
+    }
+
+    public OutputTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}

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

@@ -84,7 +84,60 @@ public class ProtoConstants {
         int File = 5;
         int Video = 6;
         int Sticker = 7;
-        int RichMedia = 8;
+        int Link = 8;
+        int P_TEXT = 9;
+        int Name_Card = 10;
+        int Composited = 11;
+        int Rich_Notification = 12;
+        int Articles = 13;
+        int Enter_Channel_Chat = 71;
+        int Leave_Channel_Chat = 72;
+        int Recall = 80;
+        int Delete = 81;
+        int Tip = 90;
+        int Typing = 91;
+        int Friend_Greeting = 92;
+        int Friend_Added = 93;
+        int PC_Login_Request = 94;
+        int Create_Group = 104;
+        int Add_Group_Member = 105;
+        int Kickoff_Group_Member = 106;
+        int Quit_Group = 107;
+        int Dismiss_Group = 108;
+        int Transfer_Group_Owner = 109;
+        int Change_Group_Name = 110;;
+        int Modify_Group_Alias = 111;
+        int Change_Group_Portrait = 112;
+        int Change_Group_Mute = 113;
+        int Change_Group_JoinType = 114;
+        int Change_Group_PrivateChat = 115;
+        int Change_Group_Searchable = 116;
+        int Set_Group_Manager = 117;
+        int Mute_Group_Member = 118;
+        int Allow_Group_Member = 119;
+        int Kickoff_Group_Member_Visible_Notification = 120;
+        int Quit_Group_Visible_Notification = 121;
+        int Modify_Group_Extra = 122;
+        int Modify_Group_Member_Extra = 123;
+    }
+
+    public interface MessagePersistFlag {
+        int NOT_PERSIST = 0;
+        int PERSIST = 1;
+        int PERSIST_AND_COUNT = 3;
+        int TRANSPARENT = 4;
+    }
+
+    public interface MessageMediaType {
+        int GENERAL = 0;
+        int IMAGE = 1;
+        int VOICE = 2;
+        int VIDEO = 3;
+        int FILE = 4;
+        int PORTRAIT = 5;
+        int FAVORITE = 6;
+        int STICKER = 7;
+        int MOMENTS = 8;
     }
 
     //ModifyGroupInfoRequest -> type
@@ -120,6 +173,7 @@ public class ProtoConstants {
         int Modify_Channel_Secret = 4;
         int Modify_Channel_Callback = 5;
         int Modify_Channel_OnlyCallback = 6;
+        int Modify_Channel_Menu = 7;
     }
 
     //Channel -> status
@@ -230,6 +284,12 @@ public class ProtoConstants {
         Request_From_Channel;
     }
 
+    public interface ApplicationType {
+        int ApplicationType_Robot = 0;
+        int ApplicationType_Channel = 1;
+        int ApplicationType_Admin = 2;
+    }
+
     public static final int MESSAGE_CONTENT_TYPE_CREATE_GROUP = 104;
     public static final int MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER = 105;
     public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER = 106;

distribution/pom.xml

@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.86</version>
+        <version>0.92</version>
     </parent>
 
     <artifactId>distribution</artifactId>
@@ -51,7 +51,7 @@
                     <!--指定"git.properties"文件的存放路径(相对于${project.basedir}的一个路径);-->
                     <generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
                     <!--".git"文件夹未找到时,构建是否失败;若设置true,则构建失败;若设置false,则跳过执行该目标;默认值:true;-->
-                    <failOnNoGitDirectory>true</failOnNoGitDirectory>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
 
                     <!--git描述配置,可选;由JGit提供实现;-->
                     <gitDescribe>

distribution/src/main/assembly/assembly.xml

@@ -24,6 +24,11 @@
             <directory>../broker/config/i18n/</directory>
             <outputDirectory>/config/i18n</outputDirectory>
         </fileSet>
+
+        <fileSet>
+            <directory>src/main/resources/</directory>
+            <outputDirectory>config/</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <files>
@@ -40,32 +45,7 @@
         </file>
 
         <file>
-            <source>src/main/resources/log4j2.xml</source>
-            <outputDirectory>config/</outputDirectory>
-            <destName>log4j2.xml</destName>
-        </file>
-
-        <file>
-            <source>src/main/resources/wildfirechat.conf</source>
-            <outputDirectory>config/</outputDirectory>
-        </file>
-
-        <file>
-            <source>src/main/resources/hazelcast.xml</source>
-            <outputDirectory>config/</outputDirectory>
-        </file>
-        <file>
-            <source>src/main/resources/c3p0-config.xml</source>
-            <outputDirectory>config/</outputDirectory>
-        </file>
-
-        <file>
-            <source>src/main/resources/README.txt</source>
-        </file>
-
-        <file>
-            <source>src/main/resources/git.properties</source>
-            <outputDirectory>config/</outputDirectory>
+            <source>src/main/files/README.txt</source>
         </file>
 
         <file>

distribution/src/main/resources/wildfirechat.conf

@@ -10,10 +10,11 @@
 #（如果您部署云服务器上或者具有独立公网出口的服务器上，请改为对应的公网IP；如果您部署在在内网环境下，在内网使用，这个地方改成内网地址）
 server.ip 0.0.0.0
 
-##原生客户端长链接端口。如果使用4层的反向代理或者类似组件，需要设置长链接保持时间为10分钟。
+##原生客户端长链接端口。如果使用4层的反向代理或者类似组件，需要设置长链接保持时间为10分钟。不支持7层代理。
 port 1883
 
-##客户端短链接端口，客户端固定使用80端口，不要修改此端口。
+##客户端短链接端口，客户端固定使用80端口不能修改。
+##如果是国企事业单位等因为政策原因无法使用80端口，可以联系野火解决。
 http_port 80
 
 #管理端口
@@ -22,8 +23,8 @@ http.admin.port 18080
 ##节点ID，当集群部署时，一定不能有重复。
 node_id 1
 
-##绑定IP，保持不变即可
-host 0.0.0.0
+##绑定IP，不要打开，除非有特殊需求才可以打开
+#host 0.0.0.0
 
 ##本地绑定端口
 local_port 80
@@ -34,6 +35,7 @@ embed.db 1
 
 ## 是否自动清理历史消息记录，当为true时，IM服务会定时扫描t_messages_x和t_user_messages_x表，清除掉3年前的历史消息。
 ## 如果不开启自动清理，需要手动清理t_messages_x和t_user_messages_x表内的历史数据，保存数据不能超过3年。
+## 如果需要消息保存更长时间，可以把临近销毁的消息转储到别的数据库，客户端在拉取不到服务器消息时，再去转储的数据库拉取。
 ## 使用mongodb时次开关无效（因为mongodb设置了消息过期时间，会自动清理，仅专业版支持mongodb）。
 db.auto_clean_history_messages true
 
@@ -51,10 +53,13 @@ token.key testim
 ##token.expire_time 2592000000
 
 ##首次登录，是否接收之前的历史消息。
-##0 不接收历史消息，只接收5分钟以内的消息，由于服务器没有保存已经收取记录，所以如果有超过5分钟之前未收取的消息也不会收取下拉；
+##0 不接收历史消息，只接收${message.compensate_time_limit}毫秒以内的消息，由于服务器没有保存已经收取记录，所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉；
 ##1接收，会接收 message.max_queue 配置的条数的历史消息
 message.roaming 0
 
+## 消息补偿时限，当${message.roaming}为0时，会同步时限以内且小于${message.max_queue}的消息，默认时限为5分钟。当${message.roaming}为1时，会接收 message.max_queue 配置的条数的历史消息。
+message.compensate_time_limit 300000
+
 ##是否开启拉取远程历史消息。如果为1，客户端在会话内如果本地消息读取完了，可以下拉继续加载在服务器上的该会话的消息；如果为0则不能。
 message.remote_history_message 0
 
@@ -103,6 +108,14 @@ message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
 ## 当为true时，不转发server api发送的消息；当为false时，转发server api发送的消息。
 message.no_forward_admin_message false
 
+## 消息转发功能开启时，转发信息是否带上用户clientId和平台类型。
+message.forward_with_client_info false
+
+## 机器人回调信息是否带上用户clientId和平台类型。
+robot.callback_with_client_info false
+
+## 频道回调信息是否带上用户clientId和平台类型。
+channel.callback_with_client_info false
 
 ##禁止搜索用户
 friend.disable_search false
@@ -233,6 +246,9 @@ local.media.storage.root ./media
 # 建议使用false
 server.multi_endpoint false
 
+## 是否支持PC多端登陆，当server.multi_endpoint为true时，此开关无意义，当为false时，可以单独打开PC端多端登录。
+server.multi_pc_endpoint false
+
 # 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
 server.multi_platform_notification true
 

pom.xml

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

sdk/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.86</version>
+        <version>0.92</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.2</version>
+            <version>2.8.9</version>
         </dependency>
 
         <dependency>

sdk/sdk_readme.txt

@@ -9,7 +9,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.2</version>
+			<version>2.8.9</version>
 		</dependency>
 
 		<dependency>

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

@@ -4,33 +4,37 @@ import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.sdk.model.IMResult;
 import cn.wildfirechat.sdk.utilities.ChannelHttpUtils;
+import org.apache.commons.codec.digest.DigestUtils;
 
 import java.util.List;
 
+import static cn.wildfirechat.proto.ProtoConstants.ApplicationType.ApplicationType_Channel;
+import static cn.wildfirechat.proto.ProtoConstants.ApplicationType.ApplicationType_Robot;
+
 //仅专业版支持，社区版不支持
 public class ChannelServiceApi {
-    private final ChannelHttpUtils httpUtils;
+    private final ChannelHttpUtils channelHttpUtils;
 
     public ChannelServiceApi(String imurl, String channelId, String secret) {
-        httpUtils = new ChannelHttpUtils(imurl, channelId, secret);
+        channelHttpUtils = new ChannelHttpUtils(imurl, channelId, secret);
     }
 
     public IMResult<InputOutputUserInfo> getUserInfo(String userId) throws Exception {
         String path = APIPath.Channel_User_Info;
         InputGetUserInfo getUserInfo = new InputGetUserInfo(userId, null, null);
-        return httpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
+        return channelHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
 
     public IMResult<InputOutputUserInfo> getUserInfoByName(String userName) throws Exception {
         String path = APIPath.Channel_User_Info;
         InputGetUserInfo getUserInfo = new InputGetUserInfo(null, userName, null);
-        return httpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
+        return channelHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
 
     public IMResult<InputOutputUserInfo> getUserInfoByMobile(String mobile) throws Exception {
         String path = APIPath.Channel_User_Info;
         InputGetUserInfo getUserInfo = new InputGetUserInfo(null, null, mobile);
-        return httpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
+        return channelHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
 
     public IMResult<Void> modifyChannelInfo(/*ProtoConstants.ModifyChannelInfoType*/int type, String value) throws Exception {
@@ -38,12 +42,12 @@ public class ChannelServiceApi {
         InputModifyChannelInfo modifyChannelInfo = new InputModifyChannelInfo();
         modifyChannelInfo.setType(type);
         modifyChannelInfo.setValue(value);
-        return httpUtils.httpJsonPost(path, modifyChannelInfo, Void.class);
+        return channelHttpUtils.httpJsonPost(path, modifyChannelInfo, Void.class);
     }
 
     public IMResult<OutputGetChannelInfo> getChannelInfo() throws Exception {
         String path = APIPath.Channel_Get_Profile;
-        return httpUtils.httpJsonPost(path, null, OutputGetChannelInfo.class);
+        return channelHttpUtils.httpJsonPost(path, null, OutputGetChannelInfo.class);
     }
 
     public IMResult<SendMessageResult> sendMessage(int line, List<String> targets, MessagePayload payload) throws Exception {
@@ -52,7 +56,7 @@ public class ChannelServiceApi {
         messageData.setLine(0);
         messageData.setTargets(targets);
         messageData.setPayload(payload);
-        return httpUtils.httpJsonPost(path, messageData, SendMessageResult.class);
+        return channelHttpUtils.httpJsonPost(path, messageData, SendMessageResult.class);
     }
 
     public IMResult<Void> subscribe(String userId) throws Exception {
@@ -60,7 +64,7 @@ public class ChannelServiceApi {
         InputChannelSubscribe input = new InputChannelSubscribe();
         input.setTarget(userId);
         input.setSubscribe(1);
-        return httpUtils.httpJsonPost(path, input, Void.class);
+        return channelHttpUtils.httpJsonPost(path, input, Void.class);
     }
 
     public IMResult<Void> unsubscribe(String userId) throws Exception {
@@ -68,12 +72,33 @@ public class ChannelServiceApi {
         InputChannelSubscribe input = new InputChannelSubscribe();
         input.setTarget(userId);
         input.setSubscribe(0);
-        return httpUtils.httpJsonPost(path, input, Void.class);
+        return channelHttpUtils.httpJsonPost(path, input, Void.class);
     }
 
     public IMResult<OutputStringList> getSubscriberList() throws Exception {
         String path = APIPath.Channel_Subscriber_List;
-        return httpUtils.httpJsonPost(path, null, OutputStringList.class);
+        return channelHttpUtils.httpJsonPost(path, null, OutputStringList.class);
+    }
+
+    public IMResult<OutputApplicationUserInfo> applicationGetUserInfo(String authCode) throws Exception {
+        String path = APIPath.Channel_Application_Get_UserInfo;
+        InputApplicationGetUserInfo input = new InputApplicationGetUserInfo();
+        input.setAuthCode(authCode);
+        return channelHttpUtils.httpJsonPost(path, input, OutputApplicationUserInfo.class);
+    }
+
+    public OutputApplicationConfigData getApplicationSignature() {
+        int nonce = (int)(Math.random() * 100000 + 3);
+        long timestamp = System.currentTimeMillis()/1000;
+        String str = nonce + "|" + channelHttpUtils.getChannelId() + "|" + timestamp + "|" + channelHttpUtils.getChannelSecret();
+        String sign = DigestUtils.sha1Hex(str);
+        OutputApplicationConfigData configData = new OutputApplicationConfigData();
+        configData.setAppId(channelHttpUtils.getChannelId());
+        configData.setAppType(ApplicationType_Channel);
+        configData.setTimestamp(timestamp);
+        configData.setNonceStr(nonce+"");
+        configData.setSignature(sign);
+        return configData;
     }
 
 }

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

@@ -1,18 +1,18 @@
 package cn.wildfirechat.sdk;
 
 import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.messagecontentbuilder.RichNotificationContentBuilder;
+import cn.wildfirechat.messagecontentbuilder.TextMessageContentBuilder;
 import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.sdk.model.IMResult;
 import cn.wildfirechat.sdk.utilities.AdminHttpUtils;
 import cn.wildfirechat.sdk.utilities.RobotHttpUtils;
+import com.google.gson.Gson;
 import io.netty.util.internal.StringUtil;
 
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import static cn.wildfirechat.pojos.MyInfoType.Modify_DisplayName;
 import static cn.wildfirechat.proto.ProtoConstants.ChannelState.*;
@@ -95,6 +95,14 @@ public class Main {
             System.exit(-1);
         }
 
+        IMResult<OutputRobot> outputRobotIMResult = UserAdmin.getRobotInfo("robot1");
+        if(outputRobotIMResult != null && outputRobotIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("Get robot success");
+        } else {
+            System.out.println("Get robot failure");
+            System.exit(-1);
+        }
+
         IMResult<Void> destroyResult = UserAdmin.destroyRobot("robot1");
         if(destroyResult != null && destroyResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("success");
@@ -653,13 +661,11 @@ public class Main {
     //***********************************************
     static void testMessage() throws Exception {
         Conversation conversation = new Conversation();
-        conversation.setTarget("user2");
+        conversation.setTarget("ff2");
         conversation.setType(ProtoConstants.ConversationType.ConversationType_Private);
-        MessagePayload payload = new MessagePayload();
-        payload.setType(1);
-        payload.setSearchableContent("hello world");
+        MessagePayload payload = TextMessageContentBuilder.newBuilder("Hello world").build();
 
-        IMResult<SendMessageResult> resultSendMessage = MessageAdmin.sendMessage("user1", conversation, payload, null);
+        IMResult<SendMessageResult> resultSendMessage = MessageAdmin.sendMessage("ff1", conversation, payload, null);
         if (resultSendMessage != null && resultSendMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("send message success");
         } else {
@@ -667,6 +673,31 @@ public class Main {
             System.exit(-1);
         }
 
+        RichNotificationContentBuilder builder = RichNotificationContentBuilder.newBuilder("产品审核通知", "您好，您的SSL证书以审核通过并成功办理，请关注", "https://www.baidu.com")
+            .remark("谢谢惠顾")
+            .exName("证书小助手")
+            .appId("1234567890")
+            .addItem("登陆账户", "野火IM", "#173177")
+            .addItem("产品名称", "域名wildifrechat.cn申请的免费SSL证书", "#173177")
+            .addItem("审核通过", "通过", "#173177")
+            .addItem("说明", "请登陆账户查看处理", "#173177");
+
+
+        resultSendMessage = MessageAdmin.sendMessage("ff1", conversation, builder.build(), null);
+        if (resultSendMessage != null && resultSendMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("send message success");
+        } else {
+            System.out.println("send message failure");
+            System.exit(-1);
+        }
+
+        IMResult<OutputMessageData> outputMessageDataIMResult = MessageAdmin.getMessage(resultSendMessage.result.getMessageUid());
+        if(outputMessageDataIMResult != null && outputMessageDataIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && outputMessageDataIMResult.getResult().getMessageId() == resultSendMessage.getResult().getMessageUid()) {
+            System.out.println("get message success");
+        } else {
+            System.out.println("get message failure");
+            System.exit(-1);
+        }
 
         IMResult<Void> voidIMResult = MessageAdmin.recallMessage("user1", resultSendMessage.getResult().getMessageUid());
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
@@ -717,6 +748,20 @@ public class Main {
             } else {
                 System.out.println("failure");
             }
+
+            IMResult<OutputTimestamp> timestampResult = MessageAdmin.getConversationReadTimestamp("57gqmws2k", new Conversation(0, "admin", 0));
+            if(timestampResult != null && timestampResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("Get conversation read time success");
+            } else {
+                System.out.println("Get conversation read time failure");
+            }
+
+            timestampResult = MessageAdmin.getMessageDelivery("57gqmws2k");
+            if(timestampResult != null && timestampResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("Get message delivery success");
+            } else {
+                System.out.println("Get message delivery failure");
+            }
         }
 
         List<String> multicastReceivers = Arrays.asList("user2", "user3", "user4");
@@ -780,8 +825,8 @@ public class Main {
 
         IMResult<OutputGetChannelInfo> resultGetChannel = GeneralAdmin.getChannelInfo(inputCreateChannel.getTargetId());
         if(resultGetChannel != null && resultGetChannel.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS
-                && resultGetChannel.getResult().getName().equals(channelName)
-                && resultGetChannel.getResult().getOwner().equals(channelOwner)) {
+            && resultGetChannel.getResult().getName().equals(channelName)
+            && resultGetChannel.getResult().getOwner().equals(channelOwner)) {
             System.out.println("success");
         } else {
             System.out.println("get channel failure");
@@ -996,8 +1041,8 @@ public class Main {
         //****  机器人API
         //***********************************************
 
-        IMResult<InputOutputUserInfo> userInfoIMResult = robotService.getProfile(robotId);
-        if(userInfoIMResult != null && userInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+        IMResult<OutputRobot> robotProfileIMResult = robotService.getProfile();
+        if(robotProfileIMResult != null && robotProfileIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("get profile success");
         } else {
             System.out.println("get profile failure");
@@ -1012,8 +1057,8 @@ public class Main {
             System.out.println("modify profile failure");
             System.exit(-1);
         }
-        userInfoIMResult = robotService.getProfile(robotId);
-        if(userInfoIMResult != null && userInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && displayName.equals(userInfoIMResult.getResult().getDisplayName())) {
+        robotProfileIMResult = robotService.getProfile();
+        if(robotProfileIMResult != null && robotProfileIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && displayName.equals(robotProfileIMResult.getResult().getDisplayName())) {
             System.out.println("get profile success");
         } else {
             System.out.println("get profile failure");
@@ -1181,6 +1226,9 @@ public class Main {
                 System.out.println("cancel group manager failure");
                 System.exit(-1);
             }
+
+            OutputApplicationConfigData config = robotService.getApplicationSignature();
+            System.out.println(config);
         }
 
 
@@ -1306,7 +1354,11 @@ public class Main {
         inputCreateChannel.setName("testChannel");
         inputCreateChannel.setOwner("userId1");
         String secret = "channelsecret";
+        String channelId = "channelId123";
         inputCreateChannel.setSecret(secret);
+        inputCreateChannel.setTargetId(channelId);
+        inputCreateChannel.setAuto(1);
+        inputCreateChannel.setCallback("http://192.168.1.81:8088/wf/channelId123");
         inputCreateChannel.setState(Channel_State_Mask_FullInfo | Channel_State_Mask_Unsubscribed_User_Access | Channel_State_Mask_Active_Subscribe | Channel_State_Mask_Message_Unsubscribed);
         IMResult<OutputCreateChannel> resultCreateChannel = GeneralAdmin.createChannel(inputCreateChannel);
         if (resultCreateChannel != null && resultCreateChannel.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
@@ -1318,67 +1370,76 @@ public class Main {
 
 
         //2. 初始化api，注意端口是80，不是18080
-        ChannelServiceApi channelServiceApi = new ChannelServiceApi(IMUrl, resultCreateChannel.getResult().getTargetId(), secret);
+        ChannelServiceApi channelServiceApi = new ChannelServiceApi(IMUrl, channelId, secret);
 
 
-
-        if (commercialServer) {
-            //3. 测试channel api功能
-            IMResult<Void> resultVoid = channelServiceApi.subscribe("userId2");
-            if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-                System.out.println("subscribe success");
-            } else {
-                System.out.println("subscribe failure");
-                System.exit(-1);
-            }
-
-            resultVoid = channelServiceApi.subscribe("userId3");
-            if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-                System.out.println("subscribe done");
-            } else {
-                System.out.println("subscribe failure");
-                System.exit(-1);
-            }
-
-            IMResult<OutputStringList> resultStringList = channelServiceApi.getSubscriberList();
-            if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId2") && resultStringList.getResult().getList().contains("userId3")) {
-                System.out.println("get subscriber done");
-            } else {
-                System.out.println("get subscriber failure");
-                System.exit(-1);
-            }
-
-            resultVoid = channelServiceApi.unsubscribe("userId2");
-            if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-                System.out.println("unsubscriber done");
-            } else {
-                System.out.println("unsubscriber failure");
-                System.exit(-1);
-            }
-
-            resultStringList = channelServiceApi.getSubscriberList();
-            if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId3") && !resultStringList.getResult().getList().contains("userId2")) {
-                System.out.println("get subscriber done");
-            } else {
-                System.out.println("get subscriber failure");
-                System.exit(-1);
-            }
-
-            IMResult<InputOutputUserInfo> resultGetUserInfo1 = channelServiceApi.getUserInfo("userId3");
-            if (resultGetUserInfo1 != null && resultGetUserInfo1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-                System.out.println("get user info success");
-            } else {
-                System.out.println("get user info failure");
-                System.exit(-1);
-            }
+        //3. 测试channel api功能
+        IMResult<Void> resultVoid = channelServiceApi.subscribe("userId2");
+        if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("subscribe success");
+        } else {
+            System.out.println("subscribe failure");
+            System.exit(-1);
         }
 
+        resultVoid = channelServiceApi.subscribe("userId3");
+        if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("subscribe done");
+        } else {
+            System.out.println("subscribe failure");
+            System.exit(-1);
+        }
+
+        IMResult<OutputStringList> resultStringList = channelServiceApi.getSubscriberList();
+        if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId2") && resultStringList.getResult().getList().contains("userId3")) {
+            System.out.println("get subscriber done");
+        } else {
+            System.out.println("get subscriber failure");
+            System.exit(-1);
+        }
+
+        resultVoid = channelServiceApi.unsubscribe("userId2");
+        if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("unsubscriber done");
+        } else {
+            System.out.println("unsubscriber failure");
+            System.exit(-1);
+        }
+
+        resultStringList = channelServiceApi.getSubscriberList();
+        if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId3") && !resultStringList.getResult().getList().contains("userId2")) {
+            System.out.println("get subscriber done");
+        } else {
+            System.out.println("get subscriber failure");
+            System.exit(-1);
+        }
+
+        IMResult<InputOutputUserInfo> resultGetUserInfo1 = channelServiceApi.getUserInfo("userId3");
+        if (resultGetUserInfo1 != null && resultGetUserInfo1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("get user info success");
+        } else {
+            System.out.println("get user info failure");
+            System.exit(-1);
+        }
 
         MessagePayload payload = new MessagePayload();
         payload.setType(1);
         payload.setSearchableContent("hello world");
 
-        IMResult<SendMessageResult> resultSendMessage = channelServiceApi.sendMessage(0, null,payload);
+        IMResult<SendMessageResult> resultSendMessage = channelServiceApi.sendMessage(0, null, payload);
+        if (resultSendMessage != null && resultSendMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("send message to all the subscriber success");
+        } else {
+            System.out.println("send message to all the subscriber  failure");
+            System.exit(-1);
+        }
+
+        ArticleContent articleContent = new ArticleContent("article1", "https://media.wfcoss.cn/channel-assets/20220816/2dd76540daa9444dae44e942aa1c2bbc.png", "这是一个测试文章", "https://mp.weixin.qq.com/s/W6tanLbALd3qqZM8r3MTgA", true);
+        articleContent.addSubArticle("article2", "https://media.wfcoss.cn/channel-assets/20220816/2dd76540daa9444dae44e942aa1c2bbc.png", "这是第二个测试文章", "https://mp.weixin.qq.com/s/W6tanLbALd3qqZM8r3MTgA", false);
+        articleContent.addSubArticle("article3", "https://media.wfcoss.cn/channel-assets/20220816/2dd76540daa9444dae44e942aa1c2bbc.png", "这是第三个测试文章", "https://mp.weixin.qq.com/s/W6tanLbALd3qqZM8r3MTgA", false);
+        payload = articleContent.toPayload();
+
+        resultSendMessage = channelServiceApi.sendMessage(0, null, payload);
         if (resultSendMessage != null && resultSendMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("send message to all the subscriber success");
         } else {
@@ -1396,23 +1457,58 @@ public class Main {
             System.exit(-1);
         }
 
-        if (commercialServer) {
-            IMResult<Void> voidIMResult = channelServiceApi.modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Desc, "this is a test channel, update at:" + new Date().toString());
-            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-                System.out.println("modify channel profile success");
-            } else {
-                System.out.println("modify channel profile failure");
-                System.exit(-1);
-            }
-
-            IMResult<OutputGetChannelInfo> outputGetChannelInfoIMResult = channelServiceApi.getChannelInfo();
-            if (outputGetChannelInfoIMResult != null && outputGetChannelInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-                System.out.println("get channel info success");
-            } else {
-                System.out.println("get channel info failure");
-                System.exit(-1);
-            }
+        IMResult<Void> voidIMResult = channelServiceApi.modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Desc, "this is a test channel, update at:" + new Date().toString());
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("modify channel profile success");
+        } else {
+            System.out.println("modify channel profile failure");
+            System.exit(-1);
         }
+
+        List<OutputGetChannelInfo.OutputMenu> menus = new ArrayList<>();
+        OutputGetChannelInfo.OutputMenu menu1 = new OutputGetChannelInfo.OutputMenu();
+        menu1.menuId = UUID.randomUUID().toString();
+        menu1.type = "view";
+        menu1.name = "一级菜单1";
+        menu1.key = "key1";
+        menu1.url = "http://www.baidu.com";
+        menus.add(menu1);
+
+        OutputGetChannelInfo.OutputMenu menu2 = new OutputGetChannelInfo.OutputMenu();
+        menu2.menuId = UUID.randomUUID().toString();
+        menu2.type = "view";
+        menu2.name = "一级菜单2";
+        menu2.key = "key2";
+        menu2.url = "http://www.sohu.com";
+        menu2.subMenus = new ArrayList<>();
+        menus.add(menu2);
+
+        OutputGetChannelInfo.OutputMenu menu21 = new OutputGetChannelInfo.OutputMenu();
+        menu21.menuId = UUID.randomUUID().toString();
+        menu21.type = "click";
+        menu21.name = "二级菜单21";
+        menu21.key = "key21";
+        menu21.url = "http://www.sohu.com";
+        menu2.subMenus.add(menu21);
+
+        String menuStr = new Gson().toJson(menus);
+        voidIMResult = channelServiceApi.modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Menu, menuStr);
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("modify channel menu success");
+        } else {
+            System.out.println("modify channel menu failure");
+            System.exit(-1);
+        }
+
+        IMResult<OutputGetChannelInfo> outputGetChannelInfoIMResult = channelServiceApi.getChannelInfo();
+        if (outputGetChannelInfoIMResult != null && outputGetChannelInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("get channel info success");
+        } else {
+            System.out.println("get channel info failure");
+            System.exit(-1);
+        }
+        OutputApplicationConfigData config = channelServiceApi.getApplicationSignature();
+        System.out.println(config);
     }
     static void testSensitiveApi() throws Exception {
         List<String> words = Arrays.asList("a","b","c");

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

@@ -19,6 +19,9 @@ public class MessageAdmin {
         messageData.setConv(conversation);
         messageData.setPayload(payload);
         messageData.setToUsers(toUsers);
+        if (payload.getType() == 1 && (payload.getSearchableContent() == null || payload.getSearchableContent().isEmpty())) {
+            System.out.println("Payload错误，Payload格式应该跟客户端消息encode出来的Payload对齐，这样客户端才能正确识别。比如文本消息，文本需要放到searchableContent属性。请与客户端同事确认Payload的格式，或则去 https://gitee.com/wfchat/android-chat/tree/master/client/src/main/java/cn/wildfirechat/message 找到消息encode的实现方法！");
+        }
         return AdminHttpUtils.httpJsonPost(path, messageData, SendMessageResult.class);
     }
 
@@ -48,7 +51,17 @@ public class MessageAdmin {
         return AdminHttpUtils.httpJsonPost(path, updateMessageContentData, Void.class);
     }
 
-
+    /**
+     * 获取单条消息。如果想要更多消息的读取，可以直接读取IM服务的数据库。
+     * @param messageUid
+     * @return
+     * @throws Exception
+     */
+    public static IMResult<OutputMessageData> getMessage(long messageUid) throws Exception {
+        String path = APIPath.Msg_GetOne;
+        InputMessageUid inputMessageUid = new InputMessageUid(messageUid);
+        return AdminHttpUtils.httpJsonPost(path, inputMessageUid, OutputMessageData.class);
+    }
 
     /**
      * 撤回群发或者广播的消息
@@ -93,4 +106,16 @@ public class MessageAdmin {
         messageData.setPayload(payload);
         return AdminHttpUtils.httpJsonPost(path, messageData, MultiMessageResult.class);
     }
+
+    public static IMResult<OutputTimestamp> getConversationReadTimestamp(String userId, Conversation conversation) throws Exception {
+        String path = APIPath.Msg_ConvRead;
+        InputGetConvReadTime input = new InputGetConvReadTime(userId, conversation.getType(), conversation.getTarget(), conversation.getLine());
+        return AdminHttpUtils.httpJsonPost(path, input, OutputTimestamp.class);
+    }
+
+    public static IMResult<OutputTimestamp> getMessageDelivery(String userId) throws Exception {
+        String path = APIPath.Msg_Delivery;
+        InputUserId input = new InputUserId(userId);
+        return AdminHttpUtils.httpJsonPost(path, input, OutputTimestamp.class);
+    }
 }

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

@@ -4,10 +4,12 @@ import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.sdk.model.IMResult;
 import cn.wildfirechat.sdk.utilities.RobotHttpUtils;
-import cn.wildfirechat.sdk.utilities.RobotHttpUtils;
+import org.apache.commons.codec.digest.DigestUtils;
 
 import java.util.List;
 
+import static cn.wildfirechat.proto.ProtoConstants.ApplicationType.ApplicationType_Robot;
+
 public class RobotService {
     private final RobotHttpUtils robotHttpUtils;
 
@@ -59,8 +61,9 @@ public class RobotService {
         return robotHttpUtils.httpJsonPost(path, null, Void.class);
     }
 
-    public IMResult<InputOutputUserInfo> getProfile(String robotId) throws Exception {
-        return getUserInfo(robotId);
+    public IMResult<OutputRobot> getProfile() throws Exception {
+        String path = APIPath.Robot_Get_Profile;
+        return robotHttpUtils.httpJsonPost(path, null, OutputRobot.class);
     }
 
     /*
@@ -214,4 +217,27 @@ public class RobotService {
         input.setNotify_message(notify_message);
         return robotHttpUtils.httpJsonPost(path, input, Void.class);
     }
+
+    public IMResult<OutputApplicationUserInfo> applicationGetUserInfo(String authCode) throws Exception {
+        String path = APIPath.Robot_Application_Get_UserInfo;
+        InputApplicationGetUserInfo input = new InputApplicationGetUserInfo();
+        input.setAuthCode(authCode);
+        return robotHttpUtils.httpJsonPost(path, input, OutputApplicationUserInfo.class);
+    }
+
+    public OutputApplicationConfigData getApplicationSignature() {
+        int nonce = (int)(Math.random() * 100000 + 3);
+        long timestamp = System.currentTimeMillis()/1000;
+        String str = nonce + "|" + robotHttpUtils.getRobotId() + "|" + timestamp + "|" + robotHttpUtils.getRobotSecret();
+        String sign = DigestUtils.sha1Hex(str);
+        OutputApplicationConfigData configData = new OutputApplicationConfigData();
+        configData.setAppId(robotHttpUtils.getRobotId());
+        configData.setAppType(ApplicationType_Robot);
+        configData.setTimestamp(timestamp);
+        configData.setNonceStr(nonce+"");
+        configData.setSignature(sign);
+        return configData;
+    }
+
+
 }

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

@@ -52,6 +52,13 @@ public class UserAdmin {
         return AdminHttpUtils.httpJsonPost(path, inputDestroyUser, Void.class);
     }
 
+    public static IMResult<OutputRobot> getRobotInfo(String robotId) throws Exception {
+        String path = APIPath.User_Get_Robot_Info;
+        InputRobotId getRobotInfo = new InputRobotId();
+        getRobotInfo.setRobotId(robotId);
+        return AdminHttpUtils.httpJsonPost(path, getRobotInfo, OutputRobot.class);
+    }
+
     public static IMResult<OutputGetIMTokenData> getUserToken(String userId, String clientId, int platform) throws Exception {
         String path = APIPath.User_Get_Token;
         InputGetToken getToken = new InputGetToken(userId, clientId, platform);
@@ -129,4 +136,11 @@ public class UserAdmin {
         request.count = count;
         return AdminHttpUtils.httpJsonPost(APIPath.User_Online_List, request, GetOnlineUserResult.class);
     }
+
+    public static IMResult<OutputApplicationUserInfo> applicationGetUserInfo(String authCode) throws Exception {
+        String path = APIPath.User_Application_Get_UserInfo;
+        InputApplicationGetUserInfo input = new InputApplicationGetUserInfo();
+        input.setAuthCode(authCode);
+        return AdminHttpUtils.httpJsonPost(path, input, OutputApplicationUserInfo.class);
+    }
 }

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

@@ -22,7 +22,7 @@ import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 
 
-public class AdminHttpUtils {
+public class AdminHttpUtils extends JsonUtils {
     private static final Logger LOG = LoggerFactory.getLogger(AdminHttpUtils.class);
 
     private static String adminUrl;
@@ -152,17 +152,4 @@ public class AdminHttpUtils {
             }
         }
     }
-
-    private static <T> IMResult<T> fromJsonObject(String content, Class<T> clazz) {
-        Type type = TypeBuilder
-                .newInstance(IMResult.class)
-                .addTypeParam(clazz)
-                .build();
-        return new Gson().fromJson(content, type);
-    }
-
-    private static boolean isNullOrEmpty(String str) {
-        return str == null || str.isEmpty();
-    }
-
 }

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

@@ -21,7 +21,7 @@ import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 
 
-public class ChannelHttpUtils {
+public class ChannelHttpUtils extends JsonUtils {
     private static final Logger LOG = LoggerFactory.getLogger(ChannelHttpUtils.class);
 
     private String imurl;
@@ -103,16 +103,11 @@ public class ChannelHttpUtils {
         }
     }
 
-    private static <T> IMResult<T> fromJsonObject(String content, Class<T> clazz) {
-        Type type = TypeBuilder
-                .newInstance(IMResult.class)
-                .addTypeParam(clazz)
-                .build();
-        return new Gson().fromJson(content, type);
+    public String getChannelId() {
+        return channelId;
     }
 
-    private static boolean isNullOrEmpty(String str) {
-        return str == null || str.isEmpty();
+    public String getChannelSecret() {
+        return channelSecret;
     }
-
 }

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

@@ -0,0 +1,20 @@
+package cn.wildfirechat.sdk.utilities;
+
+import cn.wildfirechat.sdk.model.IMResult;
+import com.google.gson.Gson;
+import ikidou.reflect.TypeBuilder;
+
+public class JsonUtils {
+
+    public static <T> IMResult<T> fromJsonObject(String content, Class<T> clazz) {
+        TypeBuilder builder = TypeBuilder.newInstance(IMResult.class);
+        if (!clazz.equals(Void.class)) {
+            builder.addTypeParam(clazz);
+        }
+        return new Gson().fromJson(content, builder.build());
+    }
+
+    public static boolean isNullOrEmpty(String str) {
+        return str == null || str.isEmpty();
+    }
+}

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

@@ -22,7 +22,7 @@ import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 
 
-public class RobotHttpUtils {
+public class RobotHttpUtils extends JsonUtils {
     private static final Logger LOG = LoggerFactory.getLogger(RobotHttpUtils.class);
 
     private final String url;
@@ -106,16 +106,11 @@ public class RobotHttpUtils {
         }
     }
 
-    private static <T> IMResult<T> fromJsonObject(String content, Class<T> clazz) {
-        Type type = TypeBuilder
-                .newInstance(IMResult.class)
-                .addTypeParam(clazz)
-                .build();
-        return new Gson().fromJson(content, type);
+    public String getRobotId() {
+        return robotId;
     }
 
-    private static boolean isNullOrEmpty(String str) {
-        return str == null || str.isEmpty();
+    public String getRobotSecret() {
+        return robotSecret;
     }
-
 }