update

1，添加黑名单处理策略，发送失败或者忽略掉对方。
2，添加好友再次请求的时间间隔配置和好友请求被拒绝后再次请求的时间间隔配置

.gitignore

@@ -49,8 +49,13 @@ maven-metadata.xml
 /bin/
 broker/config/git.properties
 distribution/src/main/resources/git.properties
+license/target
+server/target
 broker/h2db
 broker/media
 common/target
 server/target
 sdk/target
+moments/target
+monitor
+wildfire_jmeter

README.md

@@ -1,18 +1,19 @@
 ## 野火IM解决方案
 
-野火IM是一套跨平台、全开源的即时通讯解决方案，主要包含以下内容。
+野火IM是一套跨平台、核心功能开源的即时通讯解决方案，主要包含以下内容。
 
-| 仓库                                                         | 说明                                                    | 备注                                           |
-| ------------------------------------------------------------ | ------------------------------------------------------- | ---------------------------------------------- |
-| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android SDK源码和App源码                                      | 可以很方便地进行二次开发，或集成到现有应用当中 |
-| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS SDK源码和App源码                                          | 可以很方便地进行二次开发，或集成到现有应用当中 |
-| [pc-chat](https://github.com/wildfirechat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用 |                                                |
-| [proto](https://github.com/wildfirechat/proto)               | 野火IM的协议栈实现                                      |                                                |
-| [server](https://github.com/wildfirechat/server)             | IM server                                               |                                                |
-| [app server](https://github.com/wildfirechat/app_server)     | 应用服务端                                              |                                                |
-| [robot_server](https://github.com/wildfirechat/robot_server) | 机器人服务端                                            |                                                |
-| [push_server](https://github.com/wildfirechat/push_server)   | 推送服务器                                              |                                                |
-| [docs](https://github.com/wildfirechat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明          |                                                |
+| 仓库                                                         | 说明                                                    | 备注 |
+| ------------------------------------------------------------ | ------------------------------------------------------- | ---- |
+| [android-chat](https://github.com/wildfirechat/android-chat) | 野火IM Android SDK源码和App源码                       |可以很方便地进行二次开发，或集成到现有应用当中      |
+| [ios-chat](https://github.com/wildfirechat/ios-chat)         | 野火IM iOS SDK源码和App源码                            |可以很方便地进行二次开发，或集成到现有应用当中      |
+| [pc-chat](https://github.com/wildfirechat/pc-chat)           | 基于[Electron](https://electronjs.org/)开发的PC平台应用 |      |
+| [web-chat](https://github.com/wildfirechat/web-chat)          | Web平台的Demo, [体验地址](http://web.wildfirechat.cn)   |      |
+| [wx-chat](https://github.com/wildfirechat/wx-chat)           | 微信小程序平台的Demo   |      |
+| [server](https://github.com/wildfirechat/server)             | IM server                                               |      |
+| [app server](https://github.com/wildfirechat/app_server)     | 应用服务端                                          |      |
+| [robot_server](https://github.com/wildfirechat/robot_server) | 机器人服务端                                        |      |
+| [push_server](https://github.com/wildfirechat/push_server)   | 推送服务器                                              |      |
+| [docs](https://github.com/wildfirechat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明          |      | |                                            |
 
 # server
 本工程为野火IM 社区版IM服务软件。野火IM作为一个通用的即时通讯解决方案，可以集成到各种应用中。请阅读[docs](http://docs.wildfirechat.cn)或下载服务器[发布版本](https://github.com/wildfirechat/server/releases)
@@ -20,11 +21,18 @@
 
 开发一套IM系统真的很艰辛，请路过的朋友们给点个star，支持我们坚持下去🙏🙏🙏🙏🙏
 
-
 ### 联系我们
-问题讨论请加群：822762829
 
-微信公众号：
+> 商务合作请优先采用邮箱和我们联系。技术问题请到[野火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% />
 
@@ -35,6 +43,11 @@
 
 ![野火IM](http://static.wildfirechat.cn/download_qrcode.png)
 
+#### 加入野火官方体验交流群
+使用野火IM移动客户端扫码下面二维码（不是使用微信扫码），和野火IM的爱好者一起畅谈野火IM的问题和经验：
+
+![野火IM官方交流群](http://static.wildfirechat.cn/wildfirechat_official_group.jpeg)
+
 #### 应用截图
 ![ios-demo](http://static.wildfirechat.cn/ios-demo.gif)
 
@@ -65,7 +78,7 @@
 
 | 捐赠者 | 商标 | 金额 | 简介 |
 | ----- | ---- | -------- | --- |
-| [SAMOS](http://samos.io) | ![SAMOS](http://static.wildfirechat.cn/SAMOS.png) | 每月2000¥ | 一站式区块链解决方案服务商(http://samos.io) |
+| [SAMOS](http://samos.io) | ![SAMOS](http://static.wildfirechat.cn/SAMOS.png) | 保密 | 一站式区块链解决方案服务商(http://samos.io) |
 
 ## 特别感谢
 1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来，处理MQTT相关业务。

broker/config/hazelcast.xml

@@ -1,3 +1,7 @@
+
+<!--    # 本配置文件为debug使用，修改这里不会在Release包中生效。Release中包含的配置文件在 ${Porject_Path}/distribution/src/main/resources目录下-->
+
+
 <hazelcast
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.hazelcast.com/schema/config

broker/config/wildfirechat.conf

@@ -1,8 +1,17 @@
+#
+#
+# 本配置文件为debug使用，修改这里不会在Release包中生效。Release中包含的配置文件在 ${Porject_Path}/distribution/src/main/resources目录下
+#
+#
+
+
+
 #*********************************************************************
 # Server configuration
 #*********************************************************************
 #服务器的接入IP。给客户端提供是${server.ip}和${http_port}。
-#客户端会从${http_port}端口获取到长链接端口。
+#客户端会从${http_port}端口获取到长链接端口。这个地址一定要改成客户端可以访问到的IP地址
+# （如果您部署云服务器上或者具有独立公网出口的服务器上，请改为对应的公网IP；如果您部署在在内网环境下，在内网使用，这个地方改成内网地址）
 server.ip 0.0.0.0
 
 ##原生客户端长链接端口
@@ -26,7 +35,7 @@ host 0.0.0.0
 ##本地绑定端口
 local_port 80
 
-##是否使用内置DB。0使用mysql；1使用h2db
+##是否使用内置DB。0使用mysql；1使用h2db；2使用mysql+mongodb。社区版只支持0和1，专业版支持2
 embed.db 1
 
 ##服务器管理接口密钥
@@ -34,6 +43,7 @@ http.admin.secret_key 123456
 
 ##服务器API接口参数是否检查时间。当设置为false时，所有的请求会检查时间的有效性；当设置为true时，可以在http.admin.secret_key保持不变的情况下，使用固定的服务API签名
 ##nonce = "76616", timestamp = "1558350862502", sign = "b98f9b0717f59febccf1440067a7f50d9b31bdde"
+##这个地方上线前要改为false
 http.admin.no_check_time true
 
 ##客户端协议栈密钥，需要与客户端协议栈文件libemqq.cc文件中的aes_key值保持一致，16进制byte用逗号分割。这个密钥对安全性帮助不大，客户不要修改
@@ -42,6 +52,37 @@ client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0
 ##用来生产im token的私钥，只在服务器使用，客户端不用。正式使用时为了安全一定要修改这个值，切记切记
 token.key testim
 
+##首次登录，是否接收之前的历史消息。0 不接收；1接收。
+message.roaming 0
+
+##是否开启拉取远程历史消息
+message.remote_history_message 0
+
+##服务器为每个用户缓存的消息数量。这个值改得太大，拉取消息时间变长，另外会占用大量内存。
+message.max_queue 1024
+
+##是否禁止陌生人聊天
+message.disable_stranger_chat false
+
+
+##黑名单处理策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃；
+message.blacklist.strategy 0
+
+##好友请求重复发送的间隔，单位是毫秒，默认是7天，0为不限制
+friend.repeat_request_duration 604800000
+
+##好友请求被拒绝后再次发送的间隔，单位是毫秒，默认是30天，0为不限制
+friend.reject_request_duration 2592000000
+
+##好友请求过期时间，单位是毫秒，默认是7天，0为不限制
+friend.request_expiration_duration 604800000
+
+## 聊天室观众空闲退出时间，单位为毫秒，默认为15分钟，0为永远不退出
+chatroom.participant_idle_time 900000
+
+## 用户向聊天室发送消息，自动加入聊天室
+chatroom.rejoin_when_active true
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************
@@ -86,6 +127,9 @@ qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 # 本地媒体服务器配置。
 local.media.storage.root media
 
+# 是否支持多端登陆
+server.multi_endpoint false
+
 #*********************************************************************
 # Push server configuration
 #*********************************************************************
@@ -94,11 +138,26 @@ push.android.server.address http://localhost:8085/android/push
 ##苹果推送服务器地址
 push.ios.server.address http://localhost:8085/ios/push
 
+#*********************************************************************
+# User online status event callback
+#*********************************************************************
+##用户在线状态事件回调地址
+#user.online_status_callback http://localhost:8888/user/online_event
+
+#*********************************************************************
+# MongoDB configuration
+#*********************************************************************
+#专业版支持，社区版请忽略
+#mongodb.client_uri mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
+#mongodb.client_uri mongodb://host1:27017,host2:27017,host3:27017/wfchat?replicaSet=myReplicaSet
+mongodb.client_uri mongodb://wfc:123456@localhost:27017/wfchat
+mongodb.database wfchat
+mongodb.data_expire_days 1096
 
 #*********************************************************************
 # Sensitive configuration
 #*********************************************************************
-##文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***
+##文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***；3 记录并继续发送
 sensitive.filter.type 0
 
 #*********************************************************************

broker/migrate/h2/V10__create_default_admin.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_type`,`_dt`) values ('admin','admin','系统管理员',3,1);
+

broker/migrate/h2/V11__alter_device_token.sql

@@ -0,0 +1 @@
+ALTER TABLE t_user_session MODIFY _token VARCHAR(240) DEFAULT NULL;

broker/migrate/h2/V12__add_group_control_columns.sql

@@ -0,0 +1,4 @@
+alter table `t_group` add column `_mute` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_join_type` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_private_chat` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_searchable` tinyint NOT NULL DEFAULT 0;

broker/migrate/h2/V13__create_settings_table.sql

@@ -0,0 +1,10 @@
+
+DROP TABLE IF EXISTS `t_settings`;
+CREATE TABLE `t_settings` (
+  `id` int(11) NOT NULL PRIMARY KEY,
+  `value` varchar(64) NOT NULL,
+  `desc` varchar(128) NOT NULL
+);
+
+
+insert into t_settings(`id`, `value`,`desc`) values (1, '3000', '最大群成员数量');

broker/migrate/h2/V14__add_id_for_sensitive_word.sql

@@ -0,0 +1 @@
+alter table `t_sensitiveword` add column `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT;

broker/migrate/h2/V15__alter_voip_token_length.sql

@@ -0,0 +1,3 @@
+alter table `t_user_session` modify column `_voip_token` varchar(240) DEFAULT '';
+
+

broker/migrate/h2/V16__add_friend_blocked.sql

@@ -0,0 +1,2 @@
+alter table t_friend add column `_blacked` tinyint DEFAULT 0;
+update t_friend set `_blacked` = 1 where `_state` = 2;

broker/migrate/h2/V17__add_user_session_token_index.sql

@@ -0,0 +1 @@
+alter table `t_user_session` ADD INDEX `session_token_index` ( `_token` );

broker/migrate/h2/V18__add_friend_request_index.sql

@@ -0,0 +1 @@
+alter table t_friend_request add index `friend_request_uid_index` (`_friend_uid`);

broker/migrate/h2/V19__add_user_session_uid_index.sql

@@ -0,0 +1 @@
+alter table `t_user_session` ADD INDEX `session_uid_index` ( `_uid` );

broker/migrate/h2/V20__user_session_add_deleted.sql

@@ -0,0 +1 @@
+alter table `t_user_session` add column `_deleted` tinyint DEFAULT 0;

broker/migrate/h2/V21__user_add_deleted.sql

@@ -0,0 +1 @@
+alter table `t_user` add column `_deleted` tinyint DEFAULT 0;

broker/migrate/h2/V7__add_createtime_user_group_table.sql

@@ -0,0 +1,2 @@
+alter table t_user add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;
+alter table t_group add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;

broker/migrate/h2/V8__add_content_type_in_messages.sql

@@ -0,0 +1 @@
+alter table `t_messages` add column `_content_type` int(11) NOT NULL DEFAULT '0';

broker/migrate/h2/V9__add_sensitive_messages.sql

@@ -0,0 +1,15 @@
+
+DROP TABLE IF EXISTS `t_sensitive_messages`;
+CREATE TABLE `t_sensitive_messages` (
+  `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `_mid` bigint(20) NOT NULL,
+  `_from` varchar(64) NOT NULL,
+  `_type` tinyint NOT NULL DEFAULT 0,
+  `_target` varchar(64) NOT NULL,
+  `_line` int(11) NOT NULL DEFAULT 0,
+  `_data` BLOB NOT NULL,
+  `_searchable_key` TEXT DEFAULT NULL,
+  `_dt` DATETIME NOT NULL DEFAULT NOW(),
+  `_content_type` int(11) NOT NULL DEFAULT 0,
+  UNIQUE INDEX `sensitive_message_uid_index` (`_mid` ASC)
+);

broker/migrate/mysql/V10__create_default_admin.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_type`,`_dt`) values ('admin','admin','系统管理员',3,1);
+

broker/migrate/mysql/V11__alter_device_token.sql

@@ -0,0 +1 @@
+ALTER TABLE t_user_session MODIFY _token VARCHAR(240) DEFAULT NULL;

broker/migrate/mysql/V12__add_group_control_columns.sql

@@ -0,0 +1,4 @@
+alter table `t_group` add column `_mute` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_join_type` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_private_chat` tinyint NOT NULL DEFAULT 0;
+alter table `t_group` add column `_searchable` tinyint NOT NULL DEFAULT 0;

broker/migrate/mysql/V13__create_session_table.sql

@@ -0,0 +1,14 @@
+
+DROP TABLE IF EXISTS `t_session`;
+CREATE TABLE `t_session` (
+  `row_id` varchar(50) not null primary key,
+  `del_flag` tinyint(1) default 0 null,
+  `create_time` timestamp null,
+  `update_time` timestamp null,
+  `expire_time` timestamp null,
+  `user_id` int null,
+  constraint `t_session_pk_2` unique (`user_id`, `expire_time`)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;

broker/migrate/mysql/V14__alter_createtime_user_group_table.sql

@@ -0,0 +1,2 @@
+alter table t_user MODIFY column `_createTime` DATETIME NOT NULL DEFAULT NOW();
+alter table t_group MODIFY column `_createTime` DATETIME NOT NULL DEFAULT NOW();

broker/migrate/mysql/V15__alter_session_table_time.sql

@@ -0,0 +1,4 @@
+alter table t_session MODIFY column `create_time` DATETIME NOT NULL DEFAULT NOW();
+alter table t_session MODIFY column `update_time` DATETIME NOT NULL DEFAULT NOW();
+alter table t_session MODIFY column `expire_time` DATETIME NOT NULL DEFAULT NOW();
+

broker/migrate/mysql/V16__update_message_dt_gmt8.sql

@@ -0,0 +1,40 @@
+update t_messages_0 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_1 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_2 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_3 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_4 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_5 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_6 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_7 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_8 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_9 set _dt = date_add(_dt, interval 8 hour);
+
+update t_messages_10 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_11 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_12 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_13 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_14 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_15 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_16 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_17 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_18 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_19 set _dt = date_add(_dt, interval 8 hour);
+
+update t_messages_20 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_21 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_22 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_23 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_24 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_25 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_26 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_27 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_28 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_29 set _dt = date_add(_dt, interval 8 hour);
+
+
+update t_messages_30 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_31 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_32 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_33 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_34 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_35 set _dt = date_add(_dt, interval 8 hour);

broker/migrate/mysql/V18__create_settings_table.sql

@@ -0,0 +1,13 @@
+
+DROP TABLE IF EXISTS `t_settings`;
+CREATE TABLE `t_settings` (
+  `id` int(11) NOT NULL PRIMARY KEY,
+  `value` varchar(64) NOT NULL,
+  `desc` varchar(128) NOT NULL default ""
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;
+
+
+insert into t_settings(`id`, `value`,`desc`) values (1, "3000", "最大群成员数量");

broker/migrate/mysql/V19__add_id_for_sensitive_word.sql

@@ -0,0 +1 @@
+alter table `t_sensitiveword` add column `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT;

broker/migrate/mysql/V20__alter_voip_token_length.sql

@@ -0,0 +1,3 @@
+alter table `t_user_session` modify column `_voip_token` varchar(240) DEFAULT '';
+
+

broker/migrate/mysql/V21__add_friend_blocked.sql

@@ -0,0 +1,2 @@
+alter table t_friend add column `_blacked` tinyint DEFAULT 0 COMMENT "0, normal; 1, blacked";
+update t_friend set `_blacked` = 1 where `_state` = 2;

broker/migrate/mysql/V22__add_user_session_token_index.sql

@@ -0,0 +1 @@
+alter table `t_user_session` ADD INDEX `session_token_index` ( `_token` );

broker/migrate/mysql/V23__add_friend_request_index.sql

@@ -0,0 +1 @@
+alter table t_friend_request add index `friend_request_uid_index` (`_friend_uid`);

broker/migrate/mysql/V24__add_user_session_uid_index.sql

@@ -0,0 +1 @@
+alter table `t_user_session` ADD INDEX `session_uid_index` ( `_uid` );

broker/migrate/mysql/V25__user_session_add_deleted.sql

@@ -0,0 +1 @@
+alter table `t_user_session` add column `_deleted` tinyint DEFAULT 0;

broker/migrate/mysql/V26__user_add_deleted.sql

@@ -0,0 +1 @@
+alter table `t_user` add column `_deleted` tinyint DEFAULT 0;

broker/migrate/mysql/V7__add_createtime_user_group_table.sql

@@ -0,0 +1,2 @@
+alter table t_user add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;
+alter table t_group add column `_createTime` TIMESTAMP default CURRENT_TIMESTAMP;

broker/migrate/mysql/V8__add_content_type_in_messages.sql

@@ -0,0 +1,36 @@
+alter table `t_messages_0` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_1` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_2` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_3` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_4` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_5` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_6` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_7` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_8` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_9` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_10` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_11` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_12` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_13` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_14` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_15` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_16` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_17` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_18` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_19` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_20` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_21` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_22` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_23` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_24` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_25` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_26` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_27` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_28` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_29` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_30` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_31` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_32` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_33` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_34` add column `_content_type` int(11) NOT NULL DEFAULT '0';
+alter table `t_messages_35` add column `_content_type` int(11) NOT NULL DEFAULT '0';

broker/migrate/mysql/V9__add_sensitive_messages.sql

@@ -0,0 +1,18 @@
+
+DROP TABLE IF EXISTS `t_sensitive_messages`;
+CREATE TABLE `t_sensitive_messages` (
+    `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `_mid` bigint(20) NOT NULL,
+    `_from` varchar(64) NOT NULL,
+    `_type` tinyint NOT NULL DEFAULT 0,
+    `_target` varchar(64) NOT NULL,
+    `_line` int(11) NOT NULL DEFAULT 0,
+    `_data` BLOB NOT NULL,
+    `_searchable_key` TEXT DEFAULT NULL,
+    `_dt` DATETIME NOT NULL,
+    `_content_type` int(11) NOT NULL DEFAULT '0',
+    INDEX `message_uid_index` (`_mid` DESC)
+  )
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;

broker/nginx/imserver.conf

@@ -9,19 +9,40 @@ server {
     root   html;
     index  index.html index.htm index.php;
 
-    ## send request back to im server ##
-    location /im {
+    location /route {
+        proxy_set_header  Host  $host;
+        proxy_set_header  X-real-ip $remote_addr;
+        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_pass  http://imserver;
     }
 
-    location /route {
+    #社区版需要启用下面一段，专业版不能用
+    location /im {
+        proxy_set_header  Host  $host;
+        proxy_set_header  X-real-ip $remote_addr;
+        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_pass  http://imserver;
     }
 
     location /api {
         proxy_pass  http://imserver;
     }
-    location / {
-        proxy_pass  https://wildfirechat.github.io/docs/;
+
+    location /fs {
+        proxy_pass  http://imserver;
+    }
+
+    location /robot {
+        proxy_set_header  Host  $host;
+        proxy_set_header  X-real-ip $remote_addr;
+        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass  http://imserver;
+    }
+
+    location /channel {
+        proxy_set_header  Host  $host;
+        proxy_set_header  X-real-ip $remote_addr;
+        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass  http://imserver;
     }
 }

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.22</version>
+        <version>0.37</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -31,12 +31,6 @@
             <version>1.7.5</version>
         </dependency>
 
-        <dependency>
-            <groupId>cn.wildfirechat</groupId>
-            <artifactId>client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>cn.wildfirechat</groupId>
             <artifactId>common</artifactId>
@@ -47,7 +41,7 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
+            <version>1.2.17</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
@@ -110,34 +104,11 @@
             <artifactId>netty-transport-native-epoll</artifactId>
             <version>${netty.version}</version>
             <classifier>linux-x86_64</classifier>
-            <!-- 
+            <!--
             <classifier>${os.detected.name}-${os.detected.arch}</classifier>
              -->
         </dependency>
 
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-            <version>3.2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-jvm</artifactId>
-            <version>3.2.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.librato.metrics</groupId>
-            <artifactId>metrics-librato</artifactId>
-            <version>5.1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.bugsnag</groupId>
-            <artifactId>bugsnag</artifactId>
-            <version>[3.0,4.0)</version>
-        </dependency>
-
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
@@ -170,7 +141,7 @@
         <dependency>
             <groupId>com.mchange</groupId>
             <artifactId>c3p0</artifactId>
-            <version>[0.9.5.3,)</version>
+            <version>0.9.5.4</version>
         </dependency>
 
         <!-- needs extra dependencies: objenesis & hamcrest -->
@@ -190,7 +161,7 @@
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-            <version>1.0.2</version>
+            <version>1.2.1</version>
         </dependency>
 
         <dependency>
@@ -256,6 +227,11 @@
             <version>5.2.4</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongo-java-driver</artifactId>
+            <version>3.4.1</version>
+        </dependency>
 
     </dependencies>
 

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

@@ -57,7 +57,7 @@ public class PushServer {
     }
 
     public void pushMessage(PushMessage pushMessage, String deviceId, String pushContent) {
-        LOG.info("try to delivery push diviceId = {}, pushContent", deviceId, pushContent);
+        LOG.info("try to delivery push diviceId = {}, pushContent = {}", deviceId, pushContent);
         executorService.execute(() ->{
                 try {
                     pushMessageInternel(pushMessage, deviceId, pushContent);

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

@@ -21,6 +21,7 @@ import io.netty.handler.codec.http.HttpResponseEncoder;
 import io.netty.handler.stream.ChunkedWriteHandler;
 import com.xiaoleilu.loServer.action.ClassUtil;
 import org.slf4j.LoggerFactory;
+import win.liyufan.im.Utility;
 
 import java.io.IOException;
 
@@ -141,6 +142,7 @@ public class LoServer {
             }
         } catch (IOException e) {
             e.printStackTrace();
+            Utility.printExecption(Logger, e);
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         }

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

@@ -22,6 +22,8 @@ import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import cn.wildfirechat.common.ErrorCode;
 
+import java.nio.charset.StandardCharsets;
+
 import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 /**
@@ -84,7 +86,7 @@ abstract public class Action {
         if (request instanceof FullHttpRequest) {
             FullHttpRequest fullHttpRequest = (FullHttpRequest) request;
             byte[] bytes = Utils.readBytesAndRewind(fullHttpRequest.content());
-            String content = new String(bytes);
+            String content = new String(bytes, StandardCharsets.UTF_8);//contribute by JiaRG from github
             Gson gson = new Gson();
             T t = gson.fromJson(content, cls);
             return t;

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

@@ -0,0 +1,75 @@
+/*
+ * 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;
+
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.MemorySessionStore;
+import io.moquette.spi.security.Tokenor;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+import win.liyufan.im.GitRepositoryState;
+import win.liyufan.im.RateLimiter;
+import win.liyufan.im.Utility;
+
+import java.io.IOException;
+
+@Route("/api/verify_token")
+@HttpMethod("GET")
+public class CheckTokenAction extends Action {
+    private final RateLimiter mLimitCounter = new RateLimiter(10, 1);
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            response.setStatus(HttpResponseStatus.OK);
+            String userId = request.getParam("userId");
+            String clientId = request.getParam("clientId");
+            String token = request.getParam("token");
+
+            String result = "这是个检查token有效性的接口，如果客户端无法连接成功，可以使用这个接口检查token是否正确。\n";
+            result += "使用方法是在浏览器中输入http://imserverip/api/verify_token?userId=${userId}&clientId=${clientId}&token=${token}。\n";
+            result += "例如：http://localhost/api/verify_token?userId=123&clientId=456&token=789。\n";
+            result += "特别注意的是：必须使用正确的clientId，clientId必须是在测试手机上调用im接口获取。不用手机上获取到的clientId也都是不同的，一定不能用错！！！\n\n\n";
+
+            if (StringUtil.isNullOrEmpty(userId)) {
+                result += "错误，userId为空";
+            } else if (StringUtil.isNullOrEmpty(clientId)) {
+                result += "错误，clientId为空";
+            } else if (StringUtil.isNullOrEmpty(token)) {
+                result += "错误，token为空";
+            } else if(!mLimitCounter.isGranted("verify_token")) {
+                result += "接口请求超频！接口限制每10秒只能验证一次！";
+            } else {
+                MemorySessionStore.Session session = sessionsStore.getSession(clientId);
+                if (session == null) {
+                    result += "错误，session不存在。请确认token是从本服务通过getToken接口获取的，另外请确认clientId是否正确";
+                } else if (session.getDeleted() == 1) {
+                    result += "错误，session已经被清除，请确认当前客户没有多端登录或者主动退出";
+                } else if(!session.getUsername().equals(userId)) {
+                    result += "错误，当前客户端的登录用户不是" + userId + "。这一般发生在当前clientId又为其它用户获取过token";
+                } else {
+                    String id = Tokenor.getUserId(token.getBytes());
+                    if (id == null) {
+                        result += "错误，无效的token";
+                    } else if(!id.equals(userId)) {
+                        result += "错误，改token是用户" + id + "的";
+                    } else {
+                        result += "恭喜，您的信息是正确的";
+                    }
+                }
+            }
+            response.setContent(result);
+        }
+        return true;
+    }
+}

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

@@ -35,12 +35,15 @@ import java.util.concurrent.Executor;
 @HttpMethod("POST")
 public class RouteAction extends Action {
     private static final Logger LOG = LoggerFactory.getLogger(RouteAction.class);
+
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
 
             response.setContentType("application/octet-stream");
-            FullHttpRequest fullHttpRequest = (FullHttpRequest)request.getNettyRequest();
+            response.setHeader("Access-Control-Allow-Origin", "*");
+
+            FullHttpRequest fullHttpRequest = (FullHttpRequest) request.getNettyRequest();
             boolean b = false;
             if ("web".equalsIgnoreCase(fullHttpRequest.headers().get("p"))) {
                 b = true;
@@ -54,7 +57,7 @@ public class RouteAction extends Action {
             try {
                 bytes = Base64.getDecoder().decode(str);
             } catch (IllegalArgumentException e) {
-                sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null, base64Response);
+                sendResponse(response, ErrorCode.ERROR_CODE_INVALID_DATA, null, base64Response);
                 return true;
             }
 
@@ -62,7 +65,7 @@ public class RouteAction extends Action {
             byte[] cbytes = Base64.getDecoder().decode(cid);
             cbytes = AES.AESDecrypt(cbytes, "", true);
             if (cbytes == null) {
-                sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null, base64Response);
+                sendResponse(response, ErrorCode.ERROR_CODE_INVALID_DATA, null, base64Response);
                 return true;
             }
             cid = new String(cbytes);
@@ -71,7 +74,7 @@ public class RouteAction extends Action {
             byte[] ubytes = Base64.getDecoder().decode(uid);
             ubytes = AES.AESDecrypt(ubytes, "", true);
             if (ubytes == null) {
-                sendResponse(response, ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH, null, base64Response);
+                sendResponse(response, ErrorCode.ERROR_CODE_INVALID_DATA, null, base64Response);
                 return true;
             }
             uid = new String(ubytes);
@@ -79,7 +82,7 @@ public class RouteAction extends Action {
 
             MemorySessionStore.Session session = sessionsStore.sessionForClientAndUser(uid, cid);
             if (session == null) {
-                ErrorCode errorCode = sessionsStore.createNewSession(uid, cid, true, true);
+                ErrorCode errorCode = sessionsStore.loadActiveSession(uid, cid);
                 if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
                     sendResponse(response, errorCode, null, base64Response);
                     return true;
@@ -144,10 +147,14 @@ public class RouteAction extends Action {
 
     private void sendResponse(Response response, ErrorCode errorCode, byte[] contents, boolean base64Response) {
         response.setStatus(HttpResponseStatus.OK);
-        if(contents == null) {
+        if (contents == null) {
             ByteBuf ackPayload = Unpooled.buffer();
             ackPayload.ensureWritable(1).writeByte(errorCode.getCode());
-            response.setContent(ackPayload);
+            contents = ackPayload.array();
+        }
+        if (base64Response) {
+            byte[] base64Data = Base64.getEncoder().encode(contents);
+            response.setContent(base64Data);
         } else {
             response.setContent(contents);
         }

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

@@ -28,7 +28,7 @@ public class UnknownErrorAction extends Action{
 
     @Override
     public boolean action(Request request, Response response) {
-        response.setStatus(HttpResponseStatus.NOT_FOUND);
+        response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
         return true;
     }
 }

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

@@ -9,6 +9,7 @@
 package com.xiaoleilu.loServer.action.admin;
 
 import com.google.gson.Gson;
+import com.xiaoleilu.loServer.LoServer;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.handler.Request;
@@ -17,9 +18,12 @@ import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import cn.wildfirechat.common.ErrorCode;
+import org.slf4j.LoggerFactory;
 import win.liyufan.im.RateLimiter;
+import win.liyufan.im.Utility;
 
 abstract public class AdminAction extends Action {
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(AdminAction.class);
     private static String SECRET_KEY = "123456";
     private static boolean NO_CHECK_TIME = false;
     private final RateLimiter mLimitCounter = new RateLimiter(10, 500);
@@ -50,8 +54,9 @@ abstract public class AdminAction extends Action {
         Long ts;
         try {
             ts = Long.parseLong(timestamp);
-        } catch (NumberFormatException e) {
+        } catch (Exception e) {
             e.printStackTrace();
+            Utility.printExecption(LOG, e);
             return ErrorCode.INVALID_PARAMETER;
         }
 

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

@@ -0,0 +1,58 @@
+/*
+ * 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.pojos.InputGetAlias;
+import cn.wildfirechat.pojos.InputGetFriendList;
+import cn.wildfirechat.pojos.OutputGetAlias;
+import cn.wildfirechat.pojos.OutputStringList;
+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 com.xiaoleilu.loServer.model.FriendData;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Friend_Get_Alias)
+@HttpMethod("POST")
+public class AliasGetAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetAlias input = getRequestBody(request.getNettyRequest(), InputGetAlias.class);
+            List<FriendData> dataList = messagesStore.getFriendList(input.getOperator(), null, 0);
+            List<String> list = new ArrayList<>();
+            OutputGetAlias out = new OutputGetAlias(input.getOperator(), input.getTargetId());
+
+            for (FriendData data : dataList) {
+                if (data.getFriendUid().equals(input.getTargetId())) {
+                    out.setAlias(data.getAlias());
+                    break;
+                }
+            }
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok(out);
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,49 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetFriendList;
+import cn.wildfirechat.pojos.InputUpdateAlias;
+import cn.wildfirechat.pojos.OutputStringList;
+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 com.xiaoleilu.loServer.model.FriendData;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Friend_Set_Alias)
+@HttpMethod("POST")
+public class AliasPutAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputUpdateAlias input = getRequestBody(request.getNettyRequest(), InputUpdateAlias.class);
+            ErrorCode errorCode = messagesStore.setFriendAliasRequest(input.getOperator(), input.getTargetId(), input.getAlias(), new long[1]);
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.resultOf(errorCode);
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

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

@@ -45,7 +45,7 @@ public class BlockUserAction extends AdminAction {
                 result = RestResult.resultOf(errorCode);
                 response.setContent(new Gson().toJson(result));
 
-                if (inputUserBlock.getStatus() != 0) {
+                if (inputUserBlock.getStatus() == 2) {
                     RPCCenter.getInstance().sendRequest(null, null, RPCCenter.KICKOFF_USER_REQUEST, inputUserBlock.getUserId().getBytes(), inputUserBlock.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null, true);
                 }
 

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

@@ -0,0 +1,98 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.*;
+import cn.wildfirechat.proto.WFCMessage;
+import com.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.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+import win.liyufan.im.IMTopic;
+import win.liyufan.im.UUIDGenerator;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Create_Channel)
+@HttpMethod("POST")
+public class CreateChannelAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputCreateChannel inputCreateChannel = getRequestBody(request.getNettyRequest(), InputCreateChannel.class);
+            if (inputCreateChannel != null
+                && !StringUtil.isNullOrEmpty(inputCreateChannel.getName())
+                && !StringUtil.isNullOrEmpty(inputCreateChannel.getOwner())) {
+
+
+                if(StringUtil.isNullOrEmpty(inputCreateChannel.getTargetId())) {
+                    inputCreateChannel.setTargetId(messagesStore.getShortUUID());
+                }
+
+                RPCCenter.getInstance().sendRequest(inputCreateChannel.getOwner(), null, IMTopic.CreateChannelTopic, inputCreateChannel.toProtoChannelInfo().toByteArray(), inputCreateChannel.getOwner(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            byte[] data = new byte[byteBuf.readableBytes()];
+                            byteBuf.readBytes(data);
+                            String secret = new String(data);
+                            sendResponse(response, null, new OutputCreateChannel(inputCreateChannel.getTargetId(), secret));
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -22,11 +22,15 @@ import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import cn.wildfirechat.common.ErrorCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import win.liyufan.im.UUIDGenerator;
+import win.liyufan.im.Utility;
 
 @Route(APIPath.Create_Robot)
 @HttpMethod("POST")
 public class CreateRobotAction extends AdminAction {
+    private static final Logger LOG = LoggerFactory.getLogger(CreateRobotAction.class);
 
     @Override
     public boolean isTransactionAction() {
@@ -55,7 +59,16 @@ public class CreateRobotAction extends AdminAction {
                 WFCMessage.User newUser = inputCreateRobot.toUser();
 
 
-                messagesStore.addUserInfo(newUser, inputCreateRobot.getPassword());
+                try {
+                    messagesStore.addUserInfo(newUser, inputCreateRobot.getPassword());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    Utility.printExecption(LOG, e);
+                    response.setStatus(HttpResponseStatus.OK);
+                    RestResult result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage());
+                    response.setContent(new Gson().toJson(result));
+                    return true;
+                }
 
                 if (StringUtil.isNullOrEmpty(inputCreateRobot.getOwner())) {
                     inputCreateRobot.setOwner(inputCreateRobot.getUserId());

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

@@ -9,6 +9,7 @@
 package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -22,11 +23,16 @@ import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import cn.wildfirechat.common.ErrorCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import win.liyufan.im.DBUtil;
 import win.liyufan.im.UUIDGenerator;
+import win.liyufan.im.Utility;
 
 @Route(APIPath.Create_User)
 @HttpMethod("POST")
 public class CreateUserAction extends AdminAction {
+    private static final Logger LOG = LoggerFactory.getLogger(CreateUserAction.class);
 
     @Override
     public boolean isTransactionAction() {
@@ -38,7 +44,8 @@ public class CreateUserAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputOutputUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputOutputUserInfo.class);
             if (inputCreateUser != null
-                && !StringUtil.isNullOrEmpty(inputCreateUser.getName())) {
+                && !StringUtil.isNullOrEmpty(inputCreateUser.getName())
+                && (inputCreateUser.getType() == ProtoConstants.UserType.UserType_Normal || inputCreateUser.getType() == ProtoConstants.UserType.UserType_Admin || inputCreateUser.getType() == ProtoConstants.UserType.UserType_Super_Admin)) {
 
                 if(StringUtil.isNullOrEmpty(inputCreateUser.getPassword())) {
                     inputCreateUser.setPassword(UUIDGenerator.getUUID());
@@ -73,9 +80,20 @@ public class CreateUserAction extends AdminAction {
                 if (inputCreateUser.getExtra() != null)
                     newUserBuilder.setExtra(inputCreateUser.getExtra());
 
+                newUserBuilder.setType(inputCreateUser.getType());
                 newUserBuilder.setUpdateDt(System.currentTimeMillis());
 
-                messagesStore.addUserInfo(newUserBuilder.build(), inputCreateUser.getPassword());
+
+                try {
+                    messagesStore.addUserInfo(newUserBuilder.build(), inputCreateUser.getPassword());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    Utility.printExecption(LOG, e);
+                    response.setStatus(HttpResponseStatus.OK);
+                    RestResult result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR, e.getMessage());
+                    response.setContent(new Gson().toJson(result));
+                    return true;
+                }
 
                 response.setStatus(HttpResponseStatus.OK);
                 RestResult result = RestResult.ok(new OutputCreateUser(inputCreateUser.getUserId(), inputCreateUser.getName()));

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

@@ -0,0 +1,97 @@
+/*
+ * 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.InputDestroyUser;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputCreateUser;
+import cn.wildfirechat.pojos.OutputGetIMTokenData;
+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.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+import win.liyufan.im.IMTopic;
+import win.liyufan.im.UUIDGenerator;
+
+import java.util.Base64;
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Destroy_User)
+@HttpMethod("POST")
+public class DestroyUserAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputDestroyUser inputDestroyUser = getRequestBody(request.getNettyRequest(), InputDestroyUser.class);
+            if (inputDestroyUser != null
+                && !StringUtil.isNullOrEmpty(inputDestroyUser.getUserId())) {
+
+                WFCMessage.IDBuf idBuf = WFCMessage.IDBuf.newBuilder().setId(inputDestroyUser.getUserId()).build();
+                RPCCenter.getInstance().sendRequest(inputDestroyUser.getUserId(), null, IMTopic.DestroyUserTopic, idBuf.toByteArray(), inputDestroyUser.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ErrorCode errorCode1 = ErrorCode.fromCode(result[0]);
+                        if (errorCode1 == ErrorCode.ERROR_CODE_SUCCESS) {
+                            //ba errorcode qudiao
+                            byte[] data = new byte[result.length -1];
+                            for (int i = 0; i < data.length; i++) {
+                                data[i] = result[i+1];
+                            }
+                            String token = Base64.getEncoder().encodeToString(data);
+
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode1, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -9,6 +9,7 @@
 package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.OutputStringList;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -36,7 +37,7 @@ public class FriendRelationGetAction extends AdminAction {
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetFriendList inputGetFriendList = getRequestBody(request.getNettyRequest(), InputGetFriendList.class);
-            List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), 0);
+            List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
             List<String> list = new ArrayList<>();
             for (FriendData data : dataList) {
                 if (data.getState() == inputGetFriendList.getStatus()) {
@@ -44,7 +45,7 @@ public class FriendRelationGetAction extends AdminAction {
                 }
             }
             response.setStatus(HttpResponseStatus.OK);
-            RestResult result = RestResult.ok(list);
+            RestResult result = RestResult.ok(new OutputStringList(list));
             response.setContent(new Gson().toJson(result));
         }
         return true;

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

@@ -41,7 +41,7 @@ public class GetIMTokenAction extends AdminAction {
             String userId = input.getUserId();
 
 
-            WFCMessage.GetTokenRequest getTokenRequest = WFCMessage.GetTokenRequest.newBuilder().setUserId(userId).setClientId(input.getClientId()).build();
+            WFCMessage.GetTokenRequest getTokenRequest = WFCMessage.GetTokenRequest.newBuilder().setUserId(userId).setClientId(input.getClientId()).setPlatform(input.getPlatform() == null ? 0 : input.getPlatform()).build();
             RPCCenter.getInstance().sendRequest(userId, input.getClientId(), IMTopic.GetTokenTopic, getTokenRequest.toByteArray(), userId, TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
                 @Override
                 public void onSuccess(byte[] result) {

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

@@ -0,0 +1,61 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.SystemSettingPojo;
+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.Get_System_Setting)
+@HttpMethod("POST")
+public class GetSystemSettingAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return false;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            SystemSettingPojo inputUserId = getRequestBody(request.getNettyRequest(), SystemSettingPojo.class);
+            if (inputUserId != null) {
+                SystemSettingPojo output = messagesStore.getSystemSetting(inputUserId.id);
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (output == null) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    result = RestResult.ok(output);
+                }
+
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserGroupsAction.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.InputGetGroup;
+import cn.wildfirechat.pojos.InputUserId;
+import cn.wildfirechat.pojos.OutputGroupIds;
+import cn.wildfirechat.pojos.PojoGroupInfo;
+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;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+@Route(APIPath.Get_User_Groups)
+@HttpMethod("POST")
+public class GetUserGroupsAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputUserId inputUserId = getRequestBody(request.getNettyRequest(), InputUserId.class);
+            if (inputUserId != null
+                && (!StringUtil.isNullOrEmpty(inputUserId.getUserId()))) {
+
+                Set<String> groupIds = messagesStore.getUserGroupIds(inputUserId.getUserId());
+                response.setStatus(HttpResponseStatus.OK);
+                OutputGroupIds outputGroupIds = new OutputGroupIds();
+                outputGroupIds.setGroupIds(new ArrayList<>(groupIds));
+                RestResult result = RestResult.ok(outputGroupIds);
+
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -42,7 +42,7 @@ public class KickoffGroupMemberAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
             if (inputKickoffGroupMember.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.AddGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), inputKickoffGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), inputKickoffGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
                     @Override
                     public void onSuccess(byte[] result) {
                         ByteBuf byteBuf = Unpooled.buffer();

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

@@ -0,0 +1,85 @@
+/*
+ * 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.InputAddGroupMember;
+import cn.wildfirechat.pojos.InputModifyGroupInfo;
+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.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Modify_Info)
+@HttpMethod("POST")
+public class ModifyGroupInfoAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class);
+            if (inputAddGroupMember.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.ModifyGroupInfoTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), inputAddGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,90 @@
+/*
+ * 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.BroadMessageData;
+import cn.wildfirechat.pojos.BroadMessageResult;
+import cn.wildfirechat.pojos.MultiMessageResult;
+import cn.wildfirechat.pojos.MulticastMessageData;
+import com.google.gson.Gson;
+import com.hazelcast.util.StringUtil;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Msg_Multicast)
+@HttpMethod("POST")
+public class MulticastMessageAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            MulticastMessageData sendMessageData = getRequestBody(request.getNettyRequest(), MulticastMessageData.class);
+            if (MulticastMessageData.isValide(sendMessageData)) {
+                RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.MultiCastMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            long messageId = byteBuf.readLong();
+                            long timestamp = byteBuf.readLong();
+                            sendResponse(response, null, new MultiMessageResult(messageId, timestamp));
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,64 @@
+/*
+ * 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.SystemSettingPojo;
+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.Put_System_Setting)
+@HttpMethod("POST")
+public class PutSystemSettingAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            SystemSettingPojo inputUserId = getRequestBody(request.getNettyRequest(), SystemSettingPojo.class);
+            if (inputUserId != null
+                && (!StringUtil.isNullOrEmpty(inputUserId.value) || !StringUtil.isNullOrEmpty(inputUserId.desc))) {
+
+
+                boolean success = messagesStore.updateSystemSetting(inputUserId.id, inputUserId.value, inputUserId.desc);
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (!success) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_SERVER_ERROR);
+                } else {
+                    result = RestResult.ok();
+                }
+
+                response.setContent(new Gson().toJson(result));
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,85 @@
+/*
+ * 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.InputKickoffGroupMember;
+import cn.wildfirechat.pojos.InputQuitGroup;
+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.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Member_Quit)
+@HttpMethod("POST")
+public class QuitGroupMemberAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputQuitGroup inputQuitGroup = getRequestBody(request.getNettyRequest(), InputQuitGroup.class);
+            if (inputQuitGroup.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputQuitGroup.getOperator(), null, IMTopic.QuitGroupTopic, inputQuitGroup.toProtoGroupRequest().toByteArray(), inputQuitGroup.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,85 @@
+/*
+ * 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.InputAddGroupMember;
+import cn.wildfirechat.pojos.InputSetGroupManager;
+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.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Group_Set_Manager)
+@HttpMethod("POST")
+public class SetGroupManagerAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputSetGroupManager inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputSetGroupManager.class);
+            if (inputAddGroupMember.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.SetGroupManagerTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), inputAddGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] result) {
+                        ByteBuf byteBuf = Unpooled.buffer();
+                        byteBuf.writeBytes(result);
+                        ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                            sendResponse(response, null, null);
+                        } else {
+                            sendResponse(response, errorCode, null);
+                        }
+                    }
+
+                    @Override
+                    public void onError(ErrorCode errorCode) {
+                        sendResponse(response, errorCode, null);
+                    }
+
+                    @Override
+                    public void onTimeout() {
+                        sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                    }
+
+                    @Override
+                    public Executor getResponseExecutor() {
+                        return command -> {
+                            ctx.executor().execute(command);
+                        };
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+        }
+        return true;
+    }
+}

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

@@ -12,6 +12,7 @@ import cn.wildfirechat.proto.WFCMessage;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
 import io.moquette.spi.impl.Utils;
@@ -21,9 +22,12 @@ import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import cn.wildfirechat.common.ErrorCode;
+import org.slf4j.LoggerFactory;
 import win.liyufan.im.RateLimiter;
+import win.liyufan.im.Utility;
 
 abstract public class ChannelAction extends Action {
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(ChannelAction.class);
     private final RateLimiter mLimitCounter = new RateLimiter(10, 200);
     protected WFCMessage.ChannelInfo channelInfo;
 
@@ -45,8 +49,9 @@ abstract public class ChannelAction extends Action {
         Long ts;
         try {
             ts = Long.parseLong(timestamp);
-        } catch (NumberFormatException e) {
+        } catch (Exception e) {
             e.printStackTrace();
+            Utility.printExecption(LOG, e);
             return ErrorCode.INVALID_PARAMETER;
         }
 

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

@@ -10,6 +10,7 @@ package com.xiaoleilu.loServer.action.channel;
 
 
 import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.SendChannelMessageData;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -44,11 +45,15 @@ public class SendMessageAction extends ChannelAction {
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-            SendMessageData sendMessageData = getRequestBody(request.getNettyRequest(), SendMessageData.class);
+            SendChannelMessageData sendChannelMessageData = getRequestBody(request.getNettyRequest(), SendChannelMessageData.class);
+            SendMessageData sendMessageData = new SendMessageData();
             sendMessageData.setConv(new Conversation());
             sendMessageData.getConv().setType(ConversationType_Channel);
             sendMessageData.getConv().setTarget(channelInfo.getTargetId());
+            sendMessageData.getConv().setLine(sendChannelMessageData.getLine());
             sendMessageData.setSender(channelInfo.getOwner());
+            sendMessageData.setPayload(sendChannelMessageData.getPayload());
+            sendMessageData.setToUsers(sendChannelMessageData.getTargets());
             if (SendMessageData.isValide(sendMessageData)) {
                 RPCCenter.getInstance().sendRequest(sendMessageData.getSender(), null, IMTopic.SendMessageTopic, sendMessageData.toProtoMessage().toByteArray(), sendMessageData.getSender(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
                     @Override

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

@@ -14,6 +14,7 @@ import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.action.Action;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
+import io.moquette.imhandler.IMHandler;
 import io.moquette.spi.impl.Utils;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
@@ -21,11 +22,15 @@ import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import cn.wildfirechat.common.ErrorCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import win.liyufan.im.RateLimiter;
+import win.liyufan.im.Utility;
 
 import java.io.UnsupportedEncodingException;
 
 abstract public class RobotAction extends Action {
+    protected static final Logger LOG = LoggerFactory.getLogger(RobotAction.class);
     private final RateLimiter mLimitCounter = new RateLimiter(10, 1000);
 
     protected WFCMessage.Robot robot;
@@ -47,8 +52,9 @@ abstract public class RobotAction extends Action {
         Long ts;
         try {
             ts = Long.parseLong(timestamp);
-        } catch (NumberFormatException e) {
+        } catch (Exception e) {
             e.printStackTrace();
+            Utility.printExecption(LOG, e);
             return ErrorCode.INVALID_PARAMETER;
         }
 
@@ -89,6 +95,7 @@ abstract public class RobotAction extends Action {
                 return t;
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
+                Utility.printExecption(LOG, e);
             }
         }
         return null;

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

@@ -21,10 +21,11 @@ import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import win.liyufan.im.Utility;
 
 /**
  * Action处理单元
- * 
+ *
  * @author Looly
  */
 abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttpRequest> {
@@ -45,12 +46,14 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 		try {
 			//do filter
 			boolean isPass = this.doFilter(request, response);
-			
+
 			if(isPass){
 				//do action
 				this.doAction(ctx, request, response);
 			}
 		} catch (Exception e) {
+		    e.printStackTrace();
+            Utility.printExecption(Logger, e);
 			Action errorAction = ServerSetting.getErrorAction(ServerSetting.MAPPING_ERROR);
 			request.putParam(UnknownErrorAction.ERROR_PARAM_NAME, e);
 			response.setContent(e.toString());
@@ -64,10 +67,10 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
             ctx.fireExceptionCaught(e);
             ctx.close();
 		}
-		
+
 
 	}
-	
+
 	@Override
 	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         super.exceptionCaught(ctx, cause);
@@ -75,7 +78,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
         Channel channel = ctx.channel();
         if(channel.isActive())ctx.close();
 	}
-	
+
 	//---------------------------------------------------------------------------------------- Private method start
 	/**
 	 * 执行过滤
@@ -91,7 +94,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 				return false;
 			}
 		}
-		
+
 		//自定义Path过滤器
 		filter = ServerSetting.getFilter(request.getPath());
 		if(null != filter){
@@ -99,7 +102,7 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 				return false;
 			}
 		}
-		
+
 		return true;
 	}
 
@@ -110,6 +113,10 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 	 * @param response 响应对象
 	 */
 	private void doAction(ChannelHandlerContext ctx, Request request, Response response){
+	    if( "/route".equalsIgnoreCase(request.getPath()) && "OPTIONS".equalsIgnoreCase(request.getMethod())){
+	        handleOptions(ctx, request, response);
+	        return;
+        }
 		Action action;
 		if (isValidePath(request.getPath())) {
             action = ServerSetting.getAction(request.getPath(), request.getMethod().toUpperCase());
@@ -141,4 +148,11 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
         }
 	}
 	//---------------------------------------------------------------------------------------- Private method start
+
+
+    private void handleOptions(ChannelHandlerContext ctx, Request request, Response response){
+	    response.setHeader("Access-Control-Allow-Origin", "*");
+	    response.setHeader("Access-Control-Allow-Headers", "*");
+	    response.send();
+    }
 }

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

@@ -20,6 +20,7 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.util.internal.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +38,7 @@ public class IMActionHandler extends ActionHandler {
 
     @Override
     boolean isValidePath(String path) {
-        if (!path.startsWith("/admin")) {
+        if (!StringUtil.isNullOrEmpty(path) && !path.startsWith("/admin")) {
             return true;
         }
         return false;

broker/src/main/java/com/xiaoleilu/loServer/model/FriendData.java

@@ -15,14 +15,16 @@ public class FriendData implements Serializable {
     private String friendUid;
     private String alias;
     private int state;
+    private int blacked;
     private long timestamp;
 
 
-    public FriendData(String userId, String friendUid, String alias, int state, long timestamp) {
+    public FriendData(String userId, String friendUid, String alias, int state, int blacked, long timestamp) {
         this.userId = userId;
         this.friendUid = friendUid;
         this.alias = alias;
         this.state = state;
+        this.blacked = blacked;
         this.timestamp = timestamp;
     }
 
@@ -61,6 +63,14 @@ public class FriendData implements Serializable {
         this.state = state;
     }
 
+    public int getBlacked() {
+        return blacked;
+    }
+
+    public void setBlacked(int blacked) {
+        this.blacked = blacked;
+    }
+
     public long getTimestamp() {
         return timestamp;
     }

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

@@ -60,13 +60,6 @@ public final class BrokerConstants {
     public static final String NETTY_SO_KEEPALIVE_PROPERTY_NAME = "netty.so_keepalive";
     public static final String NETTY_CHANNEL_TIMEOUT_SECONDS_PROPERTY_NAME = "netty.channel_timeout.seconds";
     public static final String NETTY_EPOLL_PROPERTY_NAME = "netty.epoll";
-    public static final String METRICS_ENABLE_PROPERTY_NAME = "use_metrics";
-    public static final String METRICS_LIBRATO_EMAIL_PROPERTY_NAME = "metrics.librato.email";
-    public static final String METRICS_LIBRATO_TOKEN_PROPERTY_NAME = "metrics.librato.token";
-    public static final String METRICS_LIBRATO_SOURCE_PROPERTY_NAME = "metrics.librato.source";
-
-    public static final String BUGSNAG_ENABLE_PROPERTY_NAME = "use_bugsnag";
-    public static final String BUGSNAG_TOKEN_PROPERTY_NAME = "bugsnag.token";
 
     public static final String STORAGE_CLASS_NAME = "storage_class";
 
@@ -95,6 +88,8 @@ public final class BrokerConstants {
     public static final String PUSH_ANDROID_SERVER_ADDRESS = "push.android.server.address";
     public static final String PUSH_IOS_SERVER_ADDRESS = "push.ios.server.address";
 
+    public static final String USER_ONLINE_STATUS_CALLBACK = "user.online_status_callback";
+
     public static final String HZ_Cluster_Node_External_IP = "node_external_ip";
     public static final String HZ_Cluster_Node_External_Long_Port = "node_external_long_port";
     public static final String HZ_Cluster_Node_External_Short_Port = "node_external_short_port";
@@ -103,7 +98,7 @@ public final class BrokerConstants {
     public static final String HTTP_SERVER_API_NO_CHECK_TIME = "http.admin.no_check_time";
 
     public static final String CLIENT_PROTO_SECRET_KEY = "client.proto.secret_key";
-    public static final String TOKEN_SECRET_KEY = "token.key ";
+    public static final String TOKEN_SECRET_KEY = "token.key";
 
     public static final String EMBED_DB_PROPERTY_NAME = "embed.db";
 
@@ -113,6 +108,26 @@ public final class BrokerConstants {
 
     public static final String MESSAGE_Forward_Url = "message.forward.url";
 
+    public static final String SERVER_MULTI_ENDPOINT = "server.multi_endpoint";
+
+    public static final String MONGODB_Client_URI = "mongodb.client_uri";
+    public static final String MONGODB_Database = "mongodb.database";
+    public static final String MONGODB_Data_Expire_Days = "mongodb.data_expire_days";
+
+    public static final String MESSAGE_ROAMING = "message.roaming";
+    public static final String MESSAGE_Remote_History_Message = "message.remote_history_message";
+
+    public static final String MESSAGE_Max_Queue = "message.max_queue";
+
+    public static final String MESSAGE_Disable_Stranger_Chat = "message.disable_stranger_chat";
+
+    public static final String MESSAGE_Blacklist_Strategy = "message.blacklist.strategy";
+    public static final String FRIEND_Repeat_Request_Duration = "friend.repeat_request_duration";
+    public static final String FRIEND_Reject_Request_Duration = "friend.reject_request_duration";
+    public static final String FRIEND_Request_Expiration_Duration = "friend.request_expiration_duration";
+
+    public static final String CHATROOM_Participant_Idle_Time = "chatroom.participant_idle_time";
+    public static final String CHATROOM_Rejoin_When_Active = "chatroom.rejoin_when_active";
 
 
     private BrokerConstants() {

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

@@ -22,7 +22,7 @@ public class AddGroupMember extends GroupHandler<WFCMessage.AddGroupMemberReques
 
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, request.getGroupId(), request.getAddedMemberList());
+        ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getAddedMemberList());
         if (errorCode == ERROR_CODE_SUCCESS) {
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());

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

@@ -41,7 +41,7 @@ public class CreateChannelHandler extends GroupHandler<WFCMessage.ChannelInfo> {
         if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingMyChannels).setKey(request.getTargetId()).setValue("1").build();
             mServer.internalRpcMsg(fromUser, null, modifyUserSettingReq.toByteArray(), 0, fromUser, PutUserSettingTopic, false);
-            byte[] data = request.getTargetId().getBytes();
+            byte[] data = request.getSecret().getBytes();
             ackPayload.ensureWritable(data.length).writeBytes(data);
             return ErrorCode.ERROR_CODE_SUCCESS;
         } else {

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

@@ -14,10 +14,18 @@ import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
 @Handler(IMTopic.DeleteFriendTopic)
 public class DeleteFriendHandler extends IMHandler<WFCMessage.IDBuf> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
-        return m_messagesStore.deleteFriend(fromUser, request.getId());
+        long[] head = new long[2];
+        ErrorCode errorCode = m_messagesStore.deleteFriend(fromUser, request.getId(), head);
+        if (errorCode == ERROR_CODE_SUCCESS) {
+            publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, head[0]);
+            publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getId(), head[1]);
+        }
+        return errorCode;
     }
 }

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

@@ -0,0 +1,38 @@
+/*
+ * 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.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;
+
+@Handler(IMTopic.DestroyUserTopic)
+public class DestroyUserHandler extends IMHandler<WFCMessage.IDBuf> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
+        if (isAdmin) {
+            mServer.getImBusinessScheduler().execute(()-> {
+                m_sessionsStore.clearUserSession(fromUser);
+                m_messagesStore.clearUserMessages(fromUser);
+                m_messagesStore.clearUserSettings(fromUser);
+                m_messagesStore.clearUserFriend(fromUser);
+                m_messagesStore.clearUserGroups(fromUser);
+                m_messagesStore.clearUserChannels(fromUser);
+                m_messagesStore.destoryUser(fromUser);
+            });
+            return ErrorCode.ERROR_CODE_SUCCESS;
+        } else {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+    }
+}

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

@@ -9,6 +9,7 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.model.FriendData;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
@@ -21,11 +22,15 @@ import java.util.List;
 public class FriendPullHandler extends IMHandler<WFCMessage.Version> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) {
-        List<FriendData> friendDatas = m_messagesStore.getFriendList(fromUser, request.getVersion());
+        List<FriendData> friendDatas = m_messagesStore.getFriendList(fromUser, clientID, request.getVersion());
         WFCMessage.GetFriendsResult.Builder builder = WFCMessage.GetFriendsResult.newBuilder();
         for (FriendData data : friendDatas
             ) {
-            builder.addEntry(WFCMessage.Friend.newBuilder().setState(data.getState()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp()).setAlias(data.getAlias()).build());
+            WFCMessage.Friend.Builder builder1 = WFCMessage.Friend.newBuilder().setState(data.getState()).setBlacked(data.getBlacked()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp());
+            if (!StringUtil.isNullOrEmpty(data.getAlias())) {
+                builder1.setAlias(data.getAlias());
+            }
+            builder.addEntry(builder1.build());
         }
         byte[] data = builder.build().toByteArray();
         ackPayload.ensureWritable(data.length).writeBytes(data);

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

@@ -0,0 +1,86 @@
+/*
+ * 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.WFCMessage;
+import com.qiniu.util.Auth;
+import com.xiaoleilu.loServer.action.UploadFileAction;
+import io.moquette.server.config.MediaServerConfig;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+
+@Handler("GMUT")
+public class GetMediaUploadTokenHandler extends IMHandler<WFCMessage.GetUploadTokenRequest> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetUploadTokenRequest request, Qos1PublishHandler.IMCallback callback) {
+        int type = request.getMediaType();
+
+        String token;
+
+        WFCMessage.GetUploadTokenResult.Builder resultBuilder = WFCMessage.GetUploadTokenResult.newBuilder();
+        if (MediaServerConfig.USER_QINIU) {
+            Auth auth = Auth.create(MediaServerConfig.QINIU_ACCESS_KEY, MediaServerConfig.QINIU_SECRET_KEY);
+
+
+            String bucketName;
+            String bucketDomain;
+            switch (type) {
+                case 0:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
+                    break;
+                case 1:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_IMAGE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_IMAGE_DOMAIN;
+                    break;
+                case 2:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_VOICE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_VOICE_DOMAIN;
+                    break;
+                case 3:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_VIDEO_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_VIDEO_DOMAIN;
+                    break;
+                case 4:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_FILE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_FILE_DOMAIN;
+                    break;
+                case 5:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_PORTRAIT_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_PORTRAIT_DOMAIN;
+                    break;
+                case 6:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_FAVORITE_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_FAVORITE_DOMAIN;
+                    break;
+                default:
+                    bucketName = MediaServerConfig.QINIU_BUCKET_GENERAL_NAME;
+                    bucketDomain = MediaServerConfig.QINIU_BUCKET_GENERAL_DOMAIN;
+                    break;
+            }
+
+            token = auth.uploadToken(bucketName);
+            resultBuilder.setDomain(bucketDomain)
+                .setServer(MediaServerConfig.QINIU_SERVER_URL);
+            resultBuilder.setPort(80);
+        } else {
+            token = UploadFileAction.getToken(type);
+            resultBuilder.setDomain("http://" + MediaServerConfig.SERVER_IP + ":" + MediaServerConfig.HTTP_SERVER_PORT)
+                .setServer(MediaServerConfig.SERVER_IP);
+            resultBuilder.setPort(MediaServerConfig.HTTP_SERVER_PORT);
+        }
+
+        resultBuilder.setToken(token);
+
+        byte[] data = resultBuilder.buildPartial().toByteArray();
+        ackPayload.ensureWritable(data.length).writeBytes(data);
+        return ErrorCode.ERROR_CODE_SUCCESS;
+    }
+}

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

@@ -20,7 +20,7 @@ import win.liyufan.im.IMTopic;
 public class GetTokenHandler extends IMHandler<WFCMessage.GetTokenRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetTokenRequest request, Qos1PublishHandler.IMCallback callback) {
-        MemorySessionStore.Session session = m_sessionsStore.createUserSession(fromUser, clientID);
+        MemorySessionStore.Session session = m_sessionsStore.updateOrCreateUserSession(fromUser, clientID, request.getPlatform());
         TokenAuthenticator authenticator = new TokenAuthenticator();
         String strToken = authenticator.generateToken(fromUser);
         String result = strToken + "|" + session.getSecret() + "|" + session.getDbSecret();

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

@@ -32,7 +32,7 @@ abstract public class GroupHandler<T> extends IMHandler<T> {
             builder.setFromUser(fromUser);
             long messageId = MessageShardingUtil.generateId();
             builder.setMessageId(messageId);
-            saveAndPublish(fromUser, null, builder.build());
+            saveAndPublish(fromUser, null, builder.build(), false);
         }
     }
 

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

@@ -32,7 +32,7 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                 long timestamp = System.currentTimeMillis();
                 builder.setMessageId(messageId);
                 builder.setServerTimestamp(timestamp);
-                saveAndPublish(request.getTargetUid(), null, builder.build());
+                saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
                 WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder().setType(90).setContent("以上是打招呼信息");
                 builder = WFCMessage.Message.newBuilder();
@@ -44,7 +44,7 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
 
                 messageId = MessageShardingUtil.generateId();
                 builder.setMessageId(messageId);
-                saveAndPublish(request.getTargetUid(), null, builder.build());
+                saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
                 contentBuilder.setContent("你们已经成为好友了，现在可以开始聊天了");
                 builder.setContent(contentBuilder);
@@ -52,7 +52,7 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                 builder.setMessageId(messageId);
                 timestamp = System.currentTimeMillis();
                 builder.setServerTimestamp(timestamp);
-                saveAndPublish(request.getTargetUid(), null, builder.build());
+                saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
                 publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
                 publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);

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

@@ -32,6 +32,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -81,11 +83,10 @@ abstract public class IMHandler<T> {
                 }
             }
 
-
             for (Method method : getClass().getDeclaredMethods()
                  ) {
 
-                if (method.getName() == actionName && method.getParameterCount() == 6) {
+                if (method.getName() == actionName && method.getParameterCount() == 6 && !method.getParameterTypes()[4].equals(Object.class)) {
                     dataCls = method.getParameterTypes()[4];
                     break;
                 }
@@ -233,13 +234,22 @@ abstract public class IMHandler<T> {
     public void afterAction(String clientID, String fromUser, String topic, Qos1PublishHandler.IMCallback callback) {
 
     }
+    protected long publish(String username, String clientID, WFCMessage.Message message) {
+        Set<String> notifyReceivers = new LinkedHashSet<>();
 
-    protected long saveAndPublish(String username, String clientID, WFCMessage.Message message) {
+        WFCMessage.Message.Builder messageBuilder = message.toBuilder();
+        int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers, false);
+        mServer.getImBusinessScheduler().execute(() -> this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType));
+        return notifyReceivers.size();
+    }
+
+    protected long saveAndPublish(String username, String clientID, WFCMessage.Message message, boolean ignoreMsg) {
         Set<String> notifyReceivers = new LinkedHashSet<>();
 
         message = m_messagesStore.storeMessage(username, clientID, message);
-        int pullType = m_messagesStore.getNotifyReceivers(username, message, notifyReceivers);
-        this.publisher.publish2Receivers(message, notifyReceivers, clientID, pullType);
+        WFCMessage.Message.Builder messageBuilder = message.toBuilder();
+        int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers, ignoreMsg);
+        mServer.getImBusinessScheduler().execute(() -> this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType));
         return notifyReceivers.size();
     }
 
@@ -249,4 +259,12 @@ abstract public class IMHandler<T> {
         mServer.getImBusinessScheduler().execute(() -> publisher.publish2Receivers(updatedMessage, notifyReceivers, clientID, ProtoConstants.PullType.Pull_Normal));
         return notifyReceivers.size();
     }
+
+    protected long saveAndMulticast(String username, String clientID, WFCMessage.Message message, Collection<String> targets) {
+        Set<String> notifyReceivers = new HashSet<>();
+        notifyReceivers.addAll(targets);
+        WFCMessage.Message updatedMessage = m_messagesStore.storeMessage(username, clientID, message);
+        mServer.getImBusinessScheduler().execute(() -> publisher.publish2Receivers(updatedMessage, notifyReceivers, clientID, ProtoConstants.PullType.Pull_Normal));
+        return notifyReceivers.size();
+    }
 }

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

@@ -24,20 +24,38 @@ public class KickoffGroupMember extends GroupHandler<WFCMessage.RemoveGroupMembe
         WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
         if (groupInfo == null) {
             errorCode = ErrorCode.ERROR_CODE_NOT_EXIST;
-
-        } else if ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
-            && groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {
-
-            //send notify message first, then kickoff the member
-            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
-                sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
-            } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
-                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
-            }
-            errorCode = m_messagesStore.kickoffGroupMembers(fromUser, request.getGroupId(), request.getRemovedMemberList());
         } else {
-            errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
+            boolean isAllow = isAdmin;
+            if (!isAllow) {
+                if (groupInfo.getOwner() != null) {
+                    if (request.getRemovedMemberList().contains(groupInfo.getOwner())) {
+                        return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                    }
+                }
+
+                if (groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {
+                    isAllow = true;
+                }
+            }
+
+            if (!isAllow) {
+                WFCMessage.GroupMember gm = m_messagesStore.getGroupMember(request.getGroupId(), fromUser);
+                if (gm != null && gm.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Manager) {
+                    isAllow = true;
+                }
+            }
+            if (!isAllow && (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)) {
+                errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
+            } else {
+                //send notify message first, then kickoff the member
+                if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+                    sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
+                } else {
+                    WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
+                    sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
+                }
+                errorCode = m_messagesStore.kickoffGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getRemovedMemberList());
+            }
         }
         return errorCode;
     }

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

@@ -8,6 +8,7 @@
 
 package io.moquette.imhandler;
 
+import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
@@ -24,6 +25,13 @@ public class LoadRemoteMessagesHandler extends IMHandler<WFCMessage.LoadRemoteMe
         if (beforeUid == 0) {
             beforeUid = Long.MAX_VALUE;
         }
+
+        if (request.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group) {
+            if (!m_messagesStore.isMemberInGroup(fromUser, request.getConversation().getTarget())) {
+                return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+            }
+        }
+
         WFCMessage.PullMessageResult result = m_messagesStore.loadRemoteMessages(fromUser, request.getConversation(), beforeUid, request.getCount());
         byte[] data = result.toByteArray();
         LOG.info("User {} load message with count({}), payload size({})", fromUser, result.getMessageCount(), data.length);

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

@@ -14,16 +14,15 @@ import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Name;
-import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait;
 import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.*;
 import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
 
 @Handler(value = ModifyGroupInfoTopic)
 public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupInfoRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupInfoRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue());
+        ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue(), isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
@@ -32,7 +31,15 @@ public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupI
                 if (request.getType() == Modify_Group_Name) {
                     content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupNameNotifyContent();
                 } else if(request.getType() == Modify_Group_Portrait) {
-                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getChangeGroupPortraitNotifyContent();
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupPortraitNotifyContent();
+                } else if(request.getType() == Modify_Group_Mute) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupMuteNotifyContent();
+                } else if(request.getType() == Modify_Group_JoinType) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupJointypeNotifyContent();
+                } else if(request.getType() == Modify_Group_PrivateChat) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupPrivatechatNotifyContent();
+                } else if(request.getType() == Modify_Group_Searchable) {
+                    content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupSearchableNotifyContent();
                 }
 
                 if (content != null) {

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

@@ -13,11 +13,18 @@ import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
+import win.liyufan.im.Utility;
 
 @Handler(IMTopic.ModifyMyInfoTopic)
 public class ModifyMyInfoHandler extends IMHandler<WFCMessage.ModifyMyInfoRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyMyInfoRequest request, Qos1PublishHandler.IMCallback callback) {
+        try {
             return m_messagesStore.modifyUserInfo(fromUser, request);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+            return ErrorCode.ERROR_CODE_SERVER_ERROR;
+        }
     }
 }

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

@@ -0,0 +1,57 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
+import io.moquette.BrokerConstants;
+import io.moquette.server.Server;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+import win.liyufan.im.MessageShardingUtil;
+
+import java.util.Set;
+
+import static cn.wildfirechat.proto.ProtoConstants.ContentType.Text;
+import static cn.wildfirechat.proto.ProtoConstants.ConversationType.ConversationType_Private;
+
+@Handler(value = IMTopic.MultiCastMessageTopic)
+public class MultiCastMessageHandler extends IMHandler<WFCMessage.MultiCastMessage> {
+
+
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.MultiCastMessage multiCastMessage, Qos1PublishHandler.IMCallback callback) {
+        ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
+        if (!isAdmin) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
+        long timestamp = System.currentTimeMillis();
+        long messageId = MessageShardingUtil.generateId();
+        WFCMessage.Message message = WFCMessage.Message.newBuilder()
+            .setContent(multiCastMessage.getContent())
+            .setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setType(ConversationType_Private).setLine(multiCastMessage.getLine()).build())
+            .setFromUser(fromUser)
+            .setMessageId(messageId)
+            .setServerTimestamp(timestamp)
+            .build();
+
+        saveAndMulticast(fromUser, clientID, message, multiCastMessage.getToList());
+
+        ackPayload = ackPayload.capacity(20);
+        ackPayload.writeLong(messageId);
+        ackPayload.writeLong(timestamp);
+
+        return errorCode;
+    }
+
+}

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

@@ -20,19 +20,14 @@ import static win.liyufan.im.IMTopic.QuitGroupTopic;
 public class QuitGroupHandler extends GroupHandler<WFCMessage.QuitGroupRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.QuitGroupRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
-        WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
-        if (groupInfo == null) {
-            errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
-        } else {
-            //send notify message first, then quit group
+        ErrorCode errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
+        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
-                sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
-            errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
         }
         return errorCode;
     }

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

@@ -21,7 +21,7 @@ import java.util.Set;
 public class RecallMessageHandler extends IMHandler<WFCMessage.INT64Buf> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.INT64Buf int64Buf, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.recallMessage(int64Buf.getId(), fromUser);
+        ErrorCode errorCode = m_messagesStore.recallMessage(int64Buf.getId(), fromUser, isAdmin);
 
         if(errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
             return errorCode;
@@ -33,7 +33,11 @@ public class RecallMessageHandler extends IMHandler<WFCMessage.INT64Buf> {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
-        m_messagesStore.getNotifyReceivers(fromUser, message, notifyReceivers);
+        publish(fromUser, clientID, message);
+
+
+        //等待客户端实现根据撤回消息更新内容，之后可以删掉这段代码
+        m_messagesStore.getNotifyReceivers(fromUser, message.toBuilder(), notifyReceivers, false);
         this.publisher.publishRecall2Receivers(int64Buf.getId(), fromUser, notifyReceivers, clientID);
 
         return errorCode;

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

@@ -32,7 +32,7 @@ public class RouteHandler extends IMHandler<WFCMessage.RouteRequest> {
         ClientSession clientSession = m_sessionsStore.sessionForClient(clientID);
         boolean isSessionAlreadyStored = clientSession != null;
         if (!isSessionAlreadyStored) {
-            m_sessionsStore.createNewSession(fromUser, clientID, true, true);
+            m_sessionsStore.loadActiveSession(fromUser, clientID);
         } else {
             m_sessionsStore.updateExistSession(fromUser, clientID, request, true);
         }

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

@@ -17,6 +17,7 @@ import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 import win.liyufan.im.MessageShardingUtil;
+import win.liyufan.im.Utility;
 
 import java.util.Set;
 
@@ -26,6 +27,7 @@ import static cn.wildfirechat.proto.ProtoConstants.ContentType.Text;
 public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
     private int mSensitiveType = 0;  //命中敏感词时，0 失败，1 吞掉， 2 敏感词替换成*。
     private String mForwardUrl = null;
+    private int mBlacklistStrategy = 0; //黑名单中时，0失败，1吞掉。
     public SendMessageHandler() {
         super();
 
@@ -38,6 +40,14 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             mSensitiveType = Integer.parseInt(mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Filter_Type));
         } catch (Exception e) {
             e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+
+        try {
+            mBlacklistStrategy = Integer.parseInt(mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Blacklist_Strategy));
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
         }
     }
 
@@ -45,27 +55,47 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Message message, Qos1PublishHandler.IMCallback callback) {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
         if (message != null) {
+            boolean ignoreMsg = false;
             if (!isAdmin) {  //admin do not check the right
+                // 不能在端上直接发送撤回和群通知
+                if (message.getContent().getType() == 80 || (message.getContent().getType() >= 100 && message.getContent().getType() < 200)) {
+                    return ErrorCode.INVALID_PARAMETER;
+                }
                 int userStatus = m_messagesStore.getUserStatus(fromUser);
-                if (userStatus == 1 || userStatus == 2) {
+                if (userStatus == ProtoConstants.UserStatus.Muted || userStatus == ProtoConstants.UserStatus.Forbidden) {
                     return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
                 }
 
                 if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private) {
-                    if (m_messagesStore.isBlacked(message.getConversation().getTarget(), fromUser)) {
-                        return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
+                    errorCode = m_messagesStore.isAllowUserMessage(message.getConversation().getTarget(), fromUser);
+                    if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                        if (errorCode == ErrorCode.ERROR_CODE_IN_BLACK_LIST && mBlacklistStrategy != ProtoConstants.BlacklistStrategy.Message_Reject) {
+                            ignoreMsg = true;
+                            errorCode = ErrorCode.ERROR_CODE_SUCCESS;
+                        } else {
+                            return errorCode;
+                        }
+                    }
+
+                    userStatus = m_messagesStore.getUserStatus(message.getConversation().getTarget());
+                    if (userStatus == ProtoConstants.UserStatus.Forbidden) {
+                        return ErrorCode.ERROR_CODE_USER_FORBIDDEN;
                     }
                 }
 
-
-                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && !m_messagesStore.isMemberInGroup(fromUser, message.getConversation().getTarget())) {
-                    return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
-                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group && m_messagesStore.isForbiddenInGroup(fromUser, message.getConversation().getTarget())) {
-                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
-                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom && !m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
-                    return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
-                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel && !m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
-                    return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+                if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group ) {
+                    errorCode = m_messagesStore.canSendMessageInGroup(fromUser, message.getConversation().getTarget());
+                    if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                        return errorCode;
+                    }
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
+                    if(!m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
+                        return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
+                    }
+                } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
+                    if(!m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
+                        return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+                    }
                 }
             }
 
@@ -77,29 +107,30 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
                 publisher.forwardMessage(message, mForwardUrl);
             }
 
-            boolean ignoreMsg = false;
+
             if (!isAdmin && message.getContent().getType() == Text) {
                 Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent());
                 if (matched != null && !matched.isEmpty()) {
+                    m_messagesStore.storeSensitiveMessage(message);
                     if (mSensitiveType == 0) {
                         errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED;
                     } else if(mSensitiveType == 1) {
                         ignoreMsg = true;
-                    } else {
+                    } else if(mSensitiveType == 2) {
                         String text = message.getContent().getSearchableContent();
                         for (String word : matched) {
                             text = text.replace(word, "***");
                         }
 
                         message = message.toBuilder().setContent(message.getContent().toBuilder().setSearchableContent(text).build()).build();
+                    } else if(mSensitiveType == 3) {
+
                     }
                 }
             }
 
             if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
-                if (!ignoreMsg) {
-                    saveAndPublish(fromUser, clientID, message);
-                }
+                saveAndPublish(fromUser, clientID, message, ignoreMsg);
                 ackPayload = ackPayload.capacity(20);
                 ackPayload.writeLong(messageId);
                 ackPayload.writeLong(timestamp);

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

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

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

@@ -26,12 +26,12 @@ public class UploadDeviceTokenHandler extends IMHandler<WFCMessage.UploadDeviceT
             session.setAppName(request.getAppName());
             if (request.getPlatform() == ProtoConstants.Platform.Platform_iOS && request.getPushType() == 2) {
                 session.setVoipDeviceToken(request.getDeviceToken());
-                session.setPushType(0);//如果有voip token，肯定是生产环境的推送
                 m_sessionsStore.updateSessionToken(session, true);
             } else {
                 session.setDeviceToken(request.getDeviceToken());
                 session.setPushType(request.getPushType());
                 m_sessionsStore.updateSessionToken(session, false);
+                m_sessionsStore.cleanDuplatedToken(session.getClientID(), session.getPushType(), session.getDeviceToken(), false, session.getAppName());
             }
 
             return ErrorCode.ERROR_CODE_SUCCESS;

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

@@ -20,7 +20,7 @@ import java.util.List;
 public class UserSearchHandler extends IMHandler<WFCMessage.SearchUserRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.SearchUserRequest request, Qos1PublishHandler.IMCallback callback) {
-        List<WFCMessage.User> users = m_messagesStore.searchUser(request.getKeyword(), request.getFuzzy() > 0, request.getPage());
+        List<WFCMessage.User> users = m_messagesStore.searchUser(request.getKeyword(), request.getFuzzy(), request.getPage());
         WFCMessage.SearchUserResult.Builder builder = WFCMessage.SearchUserResult.newBuilder();
         builder.addAllEntry(users);
         byte[] data = builder.build().toByteArray();

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

@@ -16,17 +16,20 @@
 
 package io.moquette.persistence;
 
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
+import io.moquette.BrokerConstants;
 import io.moquette.server.Constants;
 import io.moquette.server.Server;
 import io.moquette.spi.ClientSession;
-import io.moquette.spi.IMessagesStore.StoredMessage;
 import io.moquette.spi.ISessionsStore;
-
+import io.moquette.spi.IMessagesStore.StoredMessage;
 import io.netty.handler.codec.mqtt.MqttVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import cn.wildfirechat.common.ErrorCode;
+import win.liyufan.im.Utility;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -35,6 +38,8 @@ public class MemorySessionStore implements ISessionsStore {
     private static int dumy = 1;
     private static final Logger LOG = LoggerFactory.getLogger(MemorySessionStore.class);
 
+    private boolean supportMultiEndpoint = false;
+
     public static class Session implements Comparable<Session>{
         final String clientID;
         String username;
@@ -50,6 +55,16 @@ public class MemorySessionStore implements ISessionsStore {
 
         private volatile int unReceivedMsgs;
 
+        private int deleted;
+
+        public int getDeleted() {
+            return deleted;
+        }
+
+        public void setDeleted(int deleted) {
+            this.deleted = deleted;
+        }
+
         private MqttVersion mqttVersion = MqttVersion.MQTT_3_1_1;
 
         public long getLastActiveTime() {
@@ -130,6 +145,9 @@ public class MemorySessionStore implements ISessionsStore {
 
         public void setUpdateDt(long updateDt) {
             this.updateDt = updateDt;
+            if (this.lastActiveTime == 0) {
+                this.lastActiveTime = updateDt;
+            }
         }
 
         private int pushType;
@@ -248,8 +266,15 @@ public class MemorySessionStore implements ISessionsStore {
     private final Server mServer;
     private final DatabaseStore databaseStore;
     public MemorySessionStore(Server server, DatabaseStore databaseStore) {
-    		mServer = server;
-    		this.databaseStore = databaseStore;
+        mServer = server;
+        this.databaseStore = databaseStore;
+
+        try {
+            supportMultiEndpoint = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.SERVER_MULTI_ENDPOINT));
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
     }
 
     @Override
@@ -261,6 +286,21 @@ public class MemorySessionStore implements ISessionsStore {
         return session;
     }
 
+    @Override
+    public void cleanDuplatedToken(String cid, int pushType, String token, boolean isVoip, String packageName) {
+        if (StringUtil.isNullOrEmpty(token) || isVoip) {
+            return;
+        }
+
+        Iterator<Map.Entry<String, Session>> it = sessions.entrySet().iterator();
+        while (it.hasNext()) {
+            Session session = it.next().getValue();
+            if (!session.getClientID().equals(cid) && (session.pushType == pushType && token.equals(session.deviceToken)) && (!StringUtil.isNullOrEmpty(packageName) && packageName.equals(session.getAppName()))) {
+                session.deviceToken = null;
+            }
+        }
+    }
+
     @Override
     public void initStore() {
     }
@@ -272,18 +312,91 @@ public class MemorySessionStore implements ISessionsStore {
 
     @Override
     public void updateSessionToken(Session session, boolean voip) {
-        databaseStore.updateSessionToken(session.getUsername(), session.getClientID(), voip ? session.getVoipDeviceToken() : session.getDeviceToken(), voip);
+        databaseStore.updateSessionToken(session.getUsername(), session.getClientID(), voip ? session.getVoipDeviceToken() : session.getDeviceToken(), session.getPushType(), voip);
     }
 
     @Override
-    public Session createUserSession(String username, String clientID) {
+    public void clearUserSession(String username) {
+        LOG.info("Fooooooooo <{}>", username);
+
+        databaseStore.clearUserSessions(username);
+
+        ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(username);
+        for (String clientID : sessionSet) {
+            Session s = sessions.remove(clientID);
+            mServer.getProcessor().kickoffSession(s);
+        }
+        userSessions.remove(username);
+    }
+
+    @Override
+    public Session updateOrCreateUserSession(String username, String clientID, int platform) {
         LOG.debug("createUserSession for client <{}>, user <{}>", clientID, username);
 
+        Session session = sessions.get(clientID);
+
+        if (session != null && !session.username.equals(username)) {
+            if (userSessions.get(username) != null) {
+                userSessions.get(username).remove(clientID);
+            }
+        }
         ClientSession clientSession = new ClientSession(clientID, this);
-        Session session = databaseStore.getSession(username, clientID, clientSession);
+        session = databaseStore.getSession(username, clientID, clientSession);
 
         if (session == null) {
-            session = databaseStore.createSession(username, clientID, clientSession);
+            session = databaseStore.createSession(username, clientID, clientSession, platform);
+        }
+        sessions.put(clientID, session);
+
+
+        if (session.getDeleted() > 0) {
+            session.setDeleted(0);
+            databaseStore.updateSessionDeleted(username, clientID, 0);
+        }
+
+        if (session.getPlatform() != platform) {
+            session.setPlatform(platform);
+            databaseStore.updateSessionPlatform(username, clientID, platform);
+        }
+
+
+        if (!supportMultiEndpoint && platform > 0) {
+            databaseStore.clearMultiEndpoint(username, clientID, platform);
+            if (userSessions.get(username) != null) {
+                Iterator<String> it = userSessions.get(username).iterator();
+                while (it.hasNext()) {
+                    String c = it.next();
+                    if (!clientID.equals(c)) {
+                        Session s = sessions.get(c);
+                        if (s == null) {
+                            it.remove();
+                            continue;
+                        }
+
+                        boolean remove = false;
+                        if (platform == ProtoConstants.Platform.Platform_Android || platform == ProtoConstants.Platform.Platform_iOS) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_Android || s.getPlatform() == ProtoConstants.Platform.Platform_iOS) {
+                                remove = true;
+                            }
+                        } else if(platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Windows) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_OSX || s.getPlatform() == ProtoConstants.Platform.Platform_Windows) {
+                                remove = true;
+                            }
+                        } else {
+                            if (s.getPlatform() ==platform) {
+                                remove = true;
+                            }
+                        }
+
+                        if (remove) {
+                            sessions.remove(c);
+                            mServer.getProcessor().kickoffSession(s);
+                            it.remove();
+                        }
+                    }
+                }
+            }
+
         }
 
         return session;
@@ -291,34 +404,29 @@ public class MemorySessionStore implements ISessionsStore {
 
 
     @Override
-    public ErrorCode createNewSession(String username, String clientID, boolean cleanSession, boolean createWhenNoExist) {
+    public ErrorCode loadActiveSession(String username, String clientID) {
         LOG.debug("createNewSession for client <{}>", clientID);
 
         Session session = sessions.get(clientID);
-        if (session != null) {
+
+        if (session != null && session.getDeleted() == 0) {
             LOG.error("already exists a session for client <{}>, bad condition", clientID);
             throw new IllegalArgumentException("Can't create a session with the ID of an already existing" + clientID);
         }
 
+        if (session != null && session.getDeleted() > 0) {
+            return ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH;
+        }
 
         ClientSession clientSession = new ClientSession(clientID, this);
         session = databaseStore.getSession(username, clientID, clientSession);
 
-        if (session == null) {
-            if (!createWhenNoExist) {
-                return ErrorCode.ERROR_CODE_NOT_EXIST;
-            }
-
-            session = databaseStore.createSession(username, clientID, clientSession);
+        if (session == null || session.getDeleted() > 0) {
+            return ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH;
         }
 
         sessions.put(clientID, session);
-        ConcurrentSkipListSet<String> sessionSet = userSessions.get(username);
-        if (sessionSet == null) {
-			sessionSet = new ConcurrentSkipListSet<>();
-			userSessions.put(username, sessionSet);
-		}
-        sessionSet = userSessions.get(username);
+        ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(username);
         sessionSet.add(clientID);
 
         return ErrorCode.ERROR_CODE_SUCCESS;
@@ -342,12 +450,7 @@ public class MemorySessionStore implements ISessionsStore {
         session.setUsername(username);
         sessions.put(clientID, session);
 
-        ConcurrentSkipListSet<String> sessionSet = userSessions.get(username);
-        if (sessionSet == null) {
-            sessionSet = new ConcurrentSkipListSet<>();
-            userSessions.put(username, sessionSet);
-        }
-        sessionSet = userSessions.get(username);
+        ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(username);
         sessionSet.add(clientID);
 
         if (endpoint != null) {
@@ -393,14 +496,26 @@ public class MemorySessionStore implements ISessionsStore {
         }
     }
 
+    private ConcurrentSkipListSet<String> getUserSessionSet(String username) {
+        ConcurrentSkipListSet<String> sessionSet = userSessions.get(username);
+        if (sessionSet == null) {
+            sessionSet = new ConcurrentSkipListSet<String>();
+            List<Session> ss = databaseStore.getUserActivedSessions(username);
+            for (Session s : ss) {
+                sessionSet.add(s.getClientID());
+                sessions.put(s.getClientID(), s);
+            }
+            userSessions.put(username, sessionSet);
+        }
+
+        sessionSet = userSessions.get(username);
+        return sessionSet;
+    }
+
     @Override
     public Collection<Session> sessionForUser(String username) {
-    	ConcurrentSkipListSet<String> sessionSet = userSessions.get(username);
-        if (sessionSet == null) {
-			sessionSet = new ConcurrentSkipListSet<String>();
-			userSessions.put(username, sessionSet);
-		}
-        sessionSet = userSessions.get(username);
+    	ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(username);
+
         ArrayList<Session> out = new ArrayList<>();
         for (String clientId : sessionSet
              ) {
@@ -466,7 +581,9 @@ public class MemorySessionStore implements ISessionsStore {
 
     @Override
     public void dropQueue(String clientID) {
-        sessions.get(clientID).queue.clear();
+        if (sessions.get(clientID) != null) {
+            sessions.get(clientID).queue.clear();
+        }
     }
 
     @Override
@@ -542,12 +659,7 @@ public class MemorySessionStore implements ISessionsStore {
             LOG.error("Can't find the session for client <{}>", clientID);
             return;
         }
-        ConcurrentSkipListSet<String> sessionSet = userSessions.get(session.username);
-        if (sessionSet == null) {
-			sessionSet = new ConcurrentSkipListSet<>();
-			userSessions.put(session.username, sessionSet);
-		}
-        sessionSet = userSessions.get(session.username);
+        ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(session.username);
         sessionSet.remove(clientID);
 
         // remove also the messages stored of type QoS1/2

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

@@ -19,7 +19,7 @@ import java.util.Map;
 public class UserLoader implements MapStore<String, WFCMessage.User> {
     @Override
     public void store(String s, WFCMessage.User user) {
-        getDatabaseStore().updateUser(user);
+//        getDatabaseStore().updateUser(user);
     }
 
     @Override

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

@@ -27,7 +27,7 @@ public class UserStatusLoader implements MapStore<String, Integer> {
 
     @Override
     public void delete(String s) {
-        getDatabaseStore().deleteUser(s);
+        getDatabaseStore().deleteUserStatus(s);
     }
 
     @Override

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

@@ -24,8 +24,10 @@ public final class Constants {
     public static final String ATTR_CLIENTID = "ClientID";
     public static final String CLEAN_SESSION = "cleanSession";
     public static final String KEEP_ALIVE = "keepAlive";
-    public static final int MAX_MESSAGE_QUEUE = 1024; // number of messages
-    public static final int MAX_CHATROOM_MESSAGE_QUEUE = 256; // number of chatroom messages
+
+
+    public static int MAX_MESSAGE_QUEUE = 1024; // number of messages
+    public static int MAX_CHATROOM_MESSAGE_QUEUE = 256; // number of chatroom messages
 
     private Constants() {
     }