update version

This reverts commit ae4d8a95ba.

README.md

@@ -7,7 +7,7 @@
 | [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)   |      |
+| [web-chat](https://github.com/wildfirechat/web-chat)          | Web平台的Demo, [体验地址](http://web.wildfirechat.net)   |      |
 | [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)     | 应用服务端                                          |      |
@@ -16,7 +16,7 @@
 | [docs](https://github.com/wildfirechat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明          |      | |                                            |
 
 # server
-本工程为野火IM 社区版IM服务软件。野火IM作为一个通用的即时通讯解决方案，可以集成到各种应用中。请阅读[docs](http://docs.wildfirechat.cn)或下载服务器[发布版本](https://github.com/wildfirechat/server/releases)
+本工程为野火IM 社区版IM服务软件。野火IM作为一个通用的即时通讯解决方案，可以集成到各种应用中。请阅读[docs](http://docs.wildfirechat.net)或下载服务器[发布版本](https://github.com/wildfirechat/server/releases)
 
 
 开发一套IM系统真的很艰辛，请路过的朋友们给点个star，支持我们坚持下去🙏🙏🙏🙏🙏
@@ -73,6 +73,7 @@
 ## 升级说明
 1. 从0.42 版本增加了群成员数限制，默认为2000。如果您从之前的版本升级到这个版本或以后，需要注意到群成员数的限制。升级之后超出限制的群不受影响，但不能继续加人，如果您想修改默认值，可以在升级版本之后，修改t_setting表，把默认的大小改为您期望的人数。另外修改t_group表，把已经存在的群组max_member_count改成您期望的，然后重启。
 2. 0.46和0.47版本升级到0.48及以后版本时，可能会提示flyway migrate 38错误，请执行 [修复脚本](https://github.com/wildfirechat/server/blob/wildfirechat/flyway_repaire_migrate_38.sql) 进行修复。0.46和0.47版本之外的版本不会出现此问题。
+3. 从0.54之前版本升级到0.54及以后版本时，会提示flyway migrate错误。因为0.54版本删除了sql脚本中默认敏感词的内容，flyway checksum失败。请执行```update flyway_schema_history set checksum = 0 where script = 'V17__add_default_sensitive_word.sql';```来修复。
 
 ## 特别感谢
 1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来，处理MQTT相关业务。

broker/config/wildfirechat.conf

@@ -35,6 +35,11 @@ local_port 80
 ##是否使用内置DB。0使用mysql；1使用h2db；2使用mysql+mongodb。社区版只支持0和1，专业版支持2
 embed.db 1
 
+## 是否自动清理历史消息记录，当为true时，IM服务会定时扫描t_messages_x和t_user_messages_x表，清除掉3年前的历史消息。
+## 如果不开启自动清理，需要手动清理t_messages_x和t_user_messages_x表内的历史数据，保存数据不能超过3年。
+## 使用mongodb时次开关无效（因为mongodb设置了消息过期时间，会自动清理）。
+db.auto_clean_history_messages true
+
 ##服务器管理接口密钥
 http.admin.secret_key 123456
 
@@ -107,12 +112,17 @@ chatroom.participant_idle_time 900000
 chatroom.rejoin_when_active true
 
 ## 是否允许客户端发送操作群的自定义群通知消息
-group.allow_client_custom_operation_notification false
+group.allow_client_custom_operation_notification true
 
 ## 当群成员退出或者被移除时，是否同时给管理员和相关人员发送显式通知消息。
 ## 0 不发送，1 退群时发送，2 踢人时发送，3 退群和踢人时都发送。
 group.visible_quit_or_kickoff_notification 0
 
+## 隐藏用户信息属性类型，2是性别，3是电话号码，4是邮箱，5是地址，6是公司信息，7是社交账号，8是Extra信息。当需要隐藏多个时以英文逗号分开;
+## 本配置是为了提高安全性，避免把对应信息同步到客户端，这样就能防止程序被破解从而拿到用户关键信息。仅对客户端有效，server api不受影响。
+## 注意，修改本配置不会对已经同步的信息产生影响。
+#user.hide_properties 3,4,5
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************
@@ -203,6 +213,8 @@ push.ios.server.address http://localhost:8085/ios/push
 ##消息转发地址
 ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
 #message.forward.url http://localhost:8888/im_event/message
+##需要转发的消息类型，当有多个时以英文逗号分割。如果转发所有消息，请注释掉配置或者设置为空
+#message.forward.types 1,2,3
 
 ##设备信息转发地址
 ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
@@ -231,5 +243,16 @@ push.ios.server.address http://localhost:8085/ios/push
 #*********************************************************************
 # Sensitive configuration
 #*********************************************************************
-##文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***；3 记录并继续发送
+## 内置文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***；3 记录并继续发送
 sensitive.filter.type 0
+
+## 如果内置敏感词库无法满足您的需求，可以自己开发部署敏感词审核服务。配置如下地址和消息类型，IM服务会把指定消息类型的消息回调到指定地址
+## 审核服务返回状态码200表示继续发送，如果需要替换内容，返回状态码200并且内容为替换后的内容。返回403表示不允许发送。其它错误继续发送。
+## 独立审核服务地址，IM服务会post SendMessageData。如果需要修改消息内容，返回 MessagePayload。请参考应用服务中 "/message/censor" Mapping.
+#sensitive.remote_server_url http://192.168.3.202:8888/message/censor
+## 需要进行敏感词审核的消息类型，当有多个时以英文逗号分割
+#sensitive.remote_sensitive_message_type 1,2,3
+## 如果远程审核服务返回403，返回给发送端发送失败还是成功？实际上这个值影响发送响应是否等待审核结果，当为false时，消息发送给审核服务就立即返回
+## 成功给客户端。当为true时，消息发送给审核服务，等待审核结果，如果结果为继续发送就返回给客户端为成功，结果为禁止发送就返回失败给客户端。
+## 客户端操作的超时一般为10s左右，且考虑到复杂的网络情况，建议处理时间不要超过3s。建议这个值为false。
+#sensitive.remote_fail_when_matched false

broker/migrate/h2/V36__alter_channel_status_column.sql

@@ -0,0 +1 @@
+alter table `t_channel` modify column `_status` int(11) NOT NULL DEFAULT 0;

broker/migrate/h2/V37__add_user_messages_mid_index.sql

@@ -0,0 +1 @@
+alter table `t_user_messages` ADD INDEX `user_messages_mid_index` ( `_mid`);

broker/migrate/mysql/V41__alter_channel_status_column.sql

@@ -0,0 +1 @@
+alter table `t_channel` modify column `_status` int(11) NOT NULL DEFAULT 0;

broker/migrate/mysql/V42__add_user_messages_mid_index.sql

@@ -0,0 +1,129 @@
+alter table `t_user_messages` add INDEX `user_messages_mid_index` ( `_mid` );
+alter table `t_user_messages_0` add INDEX `user_messages0_mid_index` ( `_mid` );
+alter table `t_user_messages_1` add INDEX `user_messages1_mid_index` ( `_mid` );
+alter table `t_user_messages_2` add INDEX `user_messages2_mid_index` ( `_mid` );
+alter table `t_user_messages_3` add INDEX `user_messages3_mid_index` ( `_mid` );
+alter table `t_user_messages_4` add INDEX `user_messages4_mid_index` ( `_mid` );
+alter table `t_user_messages_5` add INDEX `user_messages5_mid_index` ( `_mid` );
+alter table `t_user_messages_6` add INDEX `user_messages6_mid_index` ( `_mid` );
+alter table `t_user_messages_7` add INDEX `user_messages7_mid_index` ( `_mid` );
+alter table `t_user_messages_8` add INDEX `user_messages8_mid_index` ( `_mid` );
+alter table `t_user_messages_9` add INDEX `user_messages9_mid_index` ( `_mid` );
+alter table `t_user_messages_10` add INDEX `user_messages10_mid_index` ( `_mid` );
+alter table `t_user_messages_11` add INDEX `user_messages11_mid_index` ( `_mid` );
+alter table `t_user_messages_12` add INDEX `user_messages12_mid_index` ( `_mid` );
+alter table `t_user_messages_13` add INDEX `user_messages13_mid_index` ( `_mid` );
+alter table `t_user_messages_14` add INDEX `user_messages14_mid_index` ( `_mid` );
+alter table `t_user_messages_15` add INDEX `user_messages15_mid_index` ( `_mid` );
+alter table `t_user_messages_16` add INDEX `user_messages16_mid_index` ( `_mid` );
+alter table `t_user_messages_17` add INDEX `user_messages17_mid_index` ( `_mid` );
+alter table `t_user_messages_18` add INDEX `user_messages18_mid_index` ( `_mid` );
+alter table `t_user_messages_19` add INDEX `user_messages19_mid_index` ( `_mid` );
+alter table `t_user_messages_20` add INDEX `user_messages20_mid_index` ( `_mid` );
+alter table `t_user_messages_21` add INDEX `user_messages21_mid_index` ( `_mid` );
+alter table `t_user_messages_22` add INDEX `user_messages22_mid_index` ( `_mid` );
+alter table `t_user_messages_23` add INDEX `user_messages23_mid_index` ( `_mid` );
+alter table `t_user_messages_24` add INDEX `user_messages24_mid_index` ( `_mid` );
+alter table `t_user_messages_25` add INDEX `user_messages25_mid_index` ( `_mid` );
+alter table `t_user_messages_26` add INDEX `user_messages26_mid_index` ( `_mid` );
+alter table `t_user_messages_27` add INDEX `user_messages27_mid_index` ( `_mid` );
+alter table `t_user_messages_28` add INDEX `user_messages28_mid_index` ( `_mid` );
+alter table `t_user_messages_29` add INDEX `user_messages29_mid_index` ( `_mid` );
+alter table `t_user_messages_30` add INDEX `user_messages30_mid_index` ( `_mid` );
+alter table `t_user_messages_31` add INDEX `user_messages31_mid_index` ( `_mid` );
+alter table `t_user_messages_32` add INDEX `user_messages32_mid_index` ( `_mid` );
+alter table `t_user_messages_33` add INDEX `user_messages33_mid_index` ( `_mid` );
+alter table `t_user_messages_34` add INDEX `user_messages34_mid_index` ( `_mid` );
+alter table `t_user_messages_35` add INDEX `user_messages35_mid_index` ( `_mid` );
+alter table `t_user_messages_36` add INDEX `user_messages36_mid_index` ( `_mid` );
+alter table `t_user_messages_37` add INDEX `user_messages37_mid_index` ( `_mid` );
+alter table `t_user_messages_38` add INDEX `user_messages38_mid_index` ( `_mid` );
+alter table `t_user_messages_39` add INDEX `user_messages39_mid_index` ( `_mid` );
+alter table `t_user_messages_40` add INDEX `user_messages40_mid_index` ( `_mid` );
+alter table `t_user_messages_41` add INDEX `user_messages41_mid_index` ( `_mid` );
+alter table `t_user_messages_42` add INDEX `user_messages42_mid_index` ( `_mid` );
+alter table `t_user_messages_43` add INDEX `user_messages43_mid_index` ( `_mid` );
+alter table `t_user_messages_44` add INDEX `user_messages44_mid_index` ( `_mid` );
+alter table `t_user_messages_45` add INDEX `user_messages45_mid_index` ( `_mid` );
+alter table `t_user_messages_46` add INDEX `user_messages46_mid_index` ( `_mid` );
+alter table `t_user_messages_47` add INDEX `user_messages47_mid_index` ( `_mid` );
+alter table `t_user_messages_48` add INDEX `user_messages48_mid_index` ( `_mid` );
+alter table `t_user_messages_49` add INDEX `user_messages49_mid_index` ( `_mid` );
+alter table `t_user_messages_50` add INDEX `user_messages50_mid_index` ( `_mid` );
+alter table `t_user_messages_51` add INDEX `user_messages51_mid_index` ( `_mid` );
+alter table `t_user_messages_52` add INDEX `user_messages52_mid_index` ( `_mid` );
+alter table `t_user_messages_53` add INDEX `user_messages53_mid_index` ( `_mid` );
+alter table `t_user_messages_54` add INDEX `user_messages54_mid_index` ( `_mid` );
+alter table `t_user_messages_55` add INDEX `user_messages55_mid_index` ( `_mid` );
+alter table `t_user_messages_56` add INDEX `user_messages56_mid_index` ( `_mid` );
+alter table `t_user_messages_57` add INDEX `user_messages57_mid_index` ( `_mid` );
+alter table `t_user_messages_58` add INDEX `user_messages58_mid_index` ( `_mid` );
+alter table `t_user_messages_59` add INDEX `user_messages59_mid_index` ( `_mid` );
+alter table `t_user_messages_60` add INDEX `user_messages60_mid_index` ( `_mid` );
+alter table `t_user_messages_61` add INDEX `user_messages61_mid_index` ( `_mid` );
+alter table `t_user_messages_62` add INDEX `user_messages62_mid_index` ( `_mid` );
+alter table `t_user_messages_63` add INDEX `user_messages63_mid_index` ( `_mid` );
+alter table `t_user_messages_64` add INDEX `user_messages64_mid_index` ( `_mid` );
+alter table `t_user_messages_65` add INDEX `user_messages65_mid_index` ( `_mid` );
+alter table `t_user_messages_66` add INDEX `user_messages66_mid_index` ( `_mid` );
+alter table `t_user_messages_67` add INDEX `user_messages67_mid_index` ( `_mid` );
+alter table `t_user_messages_68` add INDEX `user_messages68_mid_index` ( `_mid` );
+alter table `t_user_messages_69` add INDEX `user_messages69_mid_index` ( `_mid` );
+alter table `t_user_messages_70` add INDEX `user_messages70_mid_index` ( `_mid` );
+alter table `t_user_messages_71` add INDEX `user_messages71_mid_index` ( `_mid` );
+alter table `t_user_messages_72` add INDEX `user_messages72_mid_index` ( `_mid` );
+alter table `t_user_messages_73` add INDEX `user_messages73_mid_index` ( `_mid` );
+alter table `t_user_messages_74` add INDEX `user_messages74_mid_index` ( `_mid` );
+alter table `t_user_messages_75` add INDEX `user_messages75_mid_index` ( `_mid` );
+alter table `t_user_messages_76` add INDEX `user_messages76_mid_index` ( `_mid` );
+alter table `t_user_messages_77` add INDEX `user_messages77_mid_index` ( `_mid` );
+alter table `t_user_messages_78` add INDEX `user_messages78_mid_index` ( `_mid` );
+alter table `t_user_messages_79` add INDEX `user_messages79_mid_index` ( `_mid` );
+alter table `t_user_messages_80` add INDEX `user_messages80_mid_index` ( `_mid` );
+alter table `t_user_messages_81` add INDEX `user_messages81_mid_index` ( `_mid` );
+alter table `t_user_messages_82` add INDEX `user_messages82_mid_index` ( `_mid` );
+alter table `t_user_messages_83` add INDEX `user_messages83_mid_index` ( `_mid` );
+alter table `t_user_messages_84` add INDEX `user_messages84_mid_index` ( `_mid` );
+alter table `t_user_messages_85` add INDEX `user_messages85_mid_index` ( `_mid` );
+alter table `t_user_messages_86` add INDEX `user_messages86_mid_index` ( `_mid` );
+alter table `t_user_messages_87` add INDEX `user_messages87_mid_index` ( `_mid` );
+alter table `t_user_messages_88` add INDEX `user_messages88_mid_index` ( `_mid` );
+alter table `t_user_messages_89` add INDEX `user_messages89_mid_index` ( `_mid` );
+alter table `t_user_messages_90` add INDEX `user_messages90_mid_index` ( `_mid` );
+alter table `t_user_messages_91` add INDEX `user_messages91_mid_index` ( `_mid` );
+alter table `t_user_messages_92` add INDEX `user_messages92_mid_index` ( `_mid` );
+alter table `t_user_messages_93` add INDEX `user_messages93_mid_index` ( `_mid` );
+alter table `t_user_messages_94` add INDEX `user_messages94_mid_index` ( `_mid` );
+alter table `t_user_messages_95` add INDEX `user_messages95_mid_index` ( `_mid` );
+alter table `t_user_messages_96` add INDEX `user_messages96_mid_index` ( `_mid` );
+alter table `t_user_messages_97` add INDEX `user_messages97_mid_index` ( `_mid` );
+alter table `t_user_messages_98` add INDEX `user_messages98_mid_index` ( `_mid` );
+alter table `t_user_messages_99` add INDEX `user_messages99_mid_index` ( `_mid` );
+alter table `t_user_messages_100` add INDEX `user_messages100_mid_index` ( `_mid` );
+alter table `t_user_messages_101` add INDEX `user_messages101_mid_index` ( `_mid` );
+alter table `t_user_messages_102` add INDEX `user_messages102_mid_index` ( `_mid` );
+alter table `t_user_messages_103` add INDEX `user_messages103_mid_index` ( `_mid` );
+alter table `t_user_messages_104` add INDEX `user_messages104_mid_index` ( `_mid` );
+alter table `t_user_messages_105` add INDEX `user_messages105_mid_index` ( `_mid` );
+alter table `t_user_messages_106` add INDEX `user_messages106_mid_index` ( `_mid` );
+alter table `t_user_messages_107` add INDEX `user_messages107_mid_index` ( `_mid` );
+alter table `t_user_messages_108` add INDEX `user_messages108_mid_index` ( `_mid` );
+alter table `t_user_messages_109` add INDEX `user_messages109_mid_index` ( `_mid` );
+alter table `t_user_messages_110` add INDEX `user_messages110_mid_index` ( `_mid` );
+alter table `t_user_messages_111` add INDEX `user_messages111_mid_index` ( `_mid` );
+alter table `t_user_messages_112` add INDEX `user_messages112_mid_index` ( `_mid` );
+alter table `t_user_messages_113` add INDEX `user_messages113_mid_index` ( `_mid` );
+alter table `t_user_messages_114` add INDEX `user_messages114_mid_index` ( `_mid` );
+alter table `t_user_messages_115` add INDEX `user_messages115_mid_index` ( `_mid` );
+alter table `t_user_messages_116` add INDEX `user_messages116_mid_index` ( `_mid` );
+alter table `t_user_messages_117` add INDEX `user_messages117_mid_index` ( `_mid` );
+alter table `t_user_messages_118` add INDEX `user_messages118_mid_index` ( `_mid` );
+alter table `t_user_messages_119` add INDEX `user_messages119_mid_index` ( `_mid` );
+alter table `t_user_messages_120` add INDEX `user_messages120_mid_index` ( `_mid` );
+alter table `t_user_messages_121` add INDEX `user_messages121_mid_index` ( `_mid` );
+alter table `t_user_messages_122` add INDEX `user_messages122_mid_index` ( `_mid` );
+alter table `t_user_messages_123` add INDEX `user_messages123_mid_index` ( `_mid` );
+alter table `t_user_messages_124` add INDEX `user_messages124_mid_index` ( `_mid` );
+alter table `t_user_messages_125` add INDEX `user_messages125_mid_index` ( `_mid` );
+alter table `t_user_messages_126` add INDEX `user_messages126_mid_index` ( `_mid` );
+alter table `t_user_messages_127` add INDEX `user_messages127_mid_index` ( `_mid` );

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.51</version>
+        <version>0.54</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>

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

@@ -43,7 +43,16 @@ public class PushMessage {
         this.cntType = messageContentType;
         this.serverTime = serverTime;
         this.unReceivedMsg = unReceivedMsg;
-        this.pushMessageType = (cntType == 400 ? PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_INVITE : (cntType == 402 ? PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_BYE : PushServer.PushMessageType.PUSH_MESSAGE_TYPE_NORMAL));
+        if (cntType == 400) {
+            this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_INVITE;
+        } else if(cntType == 402) {
+            this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_BYE;
+        } else if(cntType == 401) {
+            this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_ANSWER;
+        } else {
+            this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_NORMAL;
+        }
+
         this.mentionedType = mentionedType;
         this.isHiddenDetail = isHiddenDetail;
         this.language = language;

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

@@ -34,6 +34,7 @@ public class PushServer {
         int PUSH_MESSAGE_TYPE_VOIP_INVITE = 1;
         int PUSH_MESSAGE_TYPE_VOIP_BYE = 2;
         int PUSH_MESSAGE_TYPE_FRIEND_REQUEST = 3;
+        int PUSH_MESSAGE_TYPE_VOIP_ANSWER = 4;
     }
 
     private static PushServer INSTANCE = new PushServer();

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

@@ -80,9 +80,12 @@ public class LoFileServer {
 			
 			channel = b.bind(port).sync().channel();
 			Logger.info("***** Welcome To LoServer on port [{}], startting spend {}ms *****", port, DateUtil.spendMs(start));
-		} finally {
-
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+            Logger.error("端口 {} 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", port, port);
+            System.out.println("端口 " + port + " 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + port);
+            System.exit(-1);
+        }
 	}
     public void shutdown() {
         if (this.channel != null) {

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

@@ -62,6 +62,7 @@ public class LoServer {
 
         registerAllAction();
 
+        int bindingPort = port;
 		try {
 			final ServerBootstrap b = new ServerBootstrap();
             final ServerBootstrap adminB = new ServerBootstrap();
@@ -87,6 +88,7 @@ public class LoServer {
 			channel = b.bind(port).sync().channel();
 
 
+            bindingPort = adminPort;
             adminB.group(bossGroup, workerGroup)
                 .channel(NioServerSocketChannel.class)
                 .option(ChannelOption.SO_BACKLOG, 10240) // 服务端可连接队列大小
@@ -108,10 +110,14 @@ public class LoServer {
 
             adminChannel = adminB.bind(adminPort).sync().channel();
 			Logger.info("***** Welcome To LoServer on port [{},{}], startting spend {}ms *****", port, adminPort, DateUtil.spendMs(start));
-		} finally {
-
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+            Logger.error("端口 {} 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", bindingPort, bindingPort);
+            System.out.println("端口 " + bindingPort + " 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + bindingPort);
+            System.exit(-1);
+        }
 	}
+
     public void shutdown() {
         if (this.channel!= null) {
             this.channel.close();

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

@@ -110,7 +110,7 @@ public class FileAction extends Action {
 
 		// 路径安全检查
         String path = httpPath.substring(0, httpPath.lastIndexOf("/"));
-		if (path.contains("/.") || path.contains("./") || path.charAt(0) == '.' || path.charAt(path.length() - 1) == '.' || ReUtil.isMatch(INSECURE_URI, path)) {
+		if (path.contains("/.") || path.contains("./") || ReUtil.isMatch(INSECURE_URI, path)) {
 			return null;
 		}
 

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

@@ -0,0 +1,52 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
+import cn.wildfirechat.pojos.StringPairPojo;
+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;
+
+@Route(APIPath.User_Kickoff_Client)
+@HttpMethod("POST")
+public class KickoffUserClientAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            StringPairPojo pojo = getRequestBody(request.getNettyRequest(), StringPairPojo.class);
+            if (pojo != null && !StringUtil.isNullOrEmpty(pojo.getFirst())) {
+                sessionsStore.kickoffUserClient(pojo.getFirst(), pojo.getSecond());
+                sendResponse(response, ErrorCode.ERROR_CODE_SUCCESS, null);
+            } 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/RelationGetAction.java

@@ -0,0 +1,61 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.InputUserId;
+import cn.wildfirechat.pojos.OutputStringList;
+import cn.wildfirechat.pojos.RelationPojo;
+import cn.wildfirechat.pojos.StringPairPojo;
+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.Comparator;
+import java.util.List;
+
+@Route(APIPath.Relation_Get)
+@HttpMethod("POST")
+public class RelationGetAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            StringPairPojo input = getRequestBody(request.getNettyRequest(), StringPairPojo.class);
+            FriendData data = messagesStore.getFriendData(input.getFirst(), input.getSecond());
+
+            RelationPojo out = new RelationPojo();
+            out.userId = input.getFirst();
+            out.targetId = input.getSecond();
+            if(data != null ) {
+                out.isFriend = data.getState() == 0;
+                out.isBlacked = data.getBlacked() == 1;
+                out.alias = data.getAlias();
+                out.extra = data.getExtra();
+            }
+
+            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/robot/AddGroupMemberAction.java

@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputAddGroupMember;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+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.Robot_Group_Member_Add)
+@HttpMethod("POST")
+public class AddGroupMemberAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputAddGroupMember inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputAddGroupMember.class);
+            inputAddGroupMember.setOperator(robot.getUid());
+            if (inputAddGroupMember.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.AddGroupMemberTopic, 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);
+                        };
+                    }
+                }, false);
+                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/robot/CreateGroupAction.java

@@ -0,0 +1,95 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputCreateGroup;
+import cn.wildfirechat.pojos.OutputCreateGroupResult;
+import cn.wildfirechat.pojos.PojoGroupInfo;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+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.Robot_Create_Group)
+@HttpMethod("POST")
+public class CreateGroupAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputCreateGroup inputCreateGroup = getRequestBody(request.getNettyRequest(), InputCreateGroup.class);
+            inputCreateGroup.setOperator(robot.getUid());
+            inputCreateGroup.getGroup().getGroup_info().setOwner(robot.getUid());
+            if (inputCreateGroup.isValide()) {
+                PojoGroupInfo group_info = inputCreateGroup.getGroup().getGroup_info();
+                WFCMessage.CreateGroupRequest createGroupRequest = inputCreateGroup.toProtoGroupRequest();
+                RPCCenter.getInstance().sendRequest(inputCreateGroup.getOperator(), null, IMTopic.CreateGroupTopic, createGroupRequest.toByteArray(), inputCreateGroup.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) {
+                            byte[] data = new byte[byteBuf.readableBytes()];
+                            byteBuf.readBytes(data);
+                            String groupId = new String(data);
+                            sendResponse(response, null, new OutputCreateGroupResult(groupId));
+                        } 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);
+                        };
+                    }
+                }, false);
+                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/robot/DeleteCallbackAction.java

@@ -0,0 +1,41 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.RobotCallbackPojo;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Robot_Delete_Callback)
+@HttpMethod("POST")
+public class DeleteCallbackAction extends RobotAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            if(!StringUtil.isNullOrEmpty(robot.getCallback())) {
+                robot = robot.toBuilder().clearCallback().setState(0).build();
+                messagesStore.addRobot(robot);
+            }
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok();
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputDismissGroup;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+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.Robot_Group_Dismiss)
+@HttpMethod("POST")
+public class DismissGroupAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputDismissGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputDismissGroup.class);
+            inputDismissGroup.setOperator(robot.getUid());
+            if (inputDismissGroup.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputDismissGroup.getOperator(), null, IMTopic.DismissGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), inputDismissGroup.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);
+                        };
+                    }
+                }, false);
+                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/robot/GetCallbackAction.java

@@ -0,0 +1,42 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.RobotCallbackPojo;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Robot_Get_Callback)
+@HttpMethod("POST")
+public class GetCallbackAction extends RobotAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            RobotCallbackPojo out = new RobotCallbackPojo();
+            out.setUrl(robot.getCallback());
+            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/robot/GetGroupInfoAction.java

@@ -0,0 +1,70 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.PojoGroupInfo;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Robot_Group_Get_Info)
+@HttpMethod("POST")
+public class GetGroupInfoAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
+            if (inputGetGroup != null
+                && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) {
+
+                WFCMessage.GroupInfo groupInfo = messagesStore.getGroupInfo(inputGetGroup.getGroupId());
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (groupInfo == null) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    PojoGroupInfo pojoGroupInfo = new PojoGroupInfo();
+                    pojoGroupInfo.setExtra(groupInfo.getExtra());
+                    pojoGroupInfo.setName(groupInfo.getName());
+                    pojoGroupInfo.setOwner(groupInfo.getOwner());
+                    pojoGroupInfo.setPortrait(groupInfo.getPortrait());
+                    pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
+                    pojoGroupInfo.setType(groupInfo.getType());
+                    result = RestResult.ok(pojoGroupInfo);
+                }
+
+                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/robot/GetGroupMembersAction.java

@@ -0,0 +1,90 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.OutputGroupMemberList;
+import cn.wildfirechat.pojos.PojoGroupMember;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+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.List;
+
+@Route(APIPath.Robot_Group_Member_List)
+@HttpMethod("POST")
+public class GetGroupMembersAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetGroup inputGetGroup = getRequestBody(request.getNettyRequest(), InputGetGroup.class);
+            String robotId = robot.getUid();
+            if (inputGetGroup != null
+                && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) {
+
+                List<WFCMessage.GroupMember> members = new ArrayList<>();
+                ErrorCode errorCode = messagesStore.getGroupMembers(null, inputGetGroup.getGroupId(), 0, members);
+
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result;
+                if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                    result = RestResult.resultOf(errorCode);
+                } else {
+                    OutputGroupMemberList out = new OutputGroupMemberList();
+                    out.setMembers(new ArrayList<>());
+                    boolean isInGroup = false;
+                    for (WFCMessage.GroupMember member : members) {
+                        if (member.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Removed) {
+                            continue;
+                        }
+                        if(member.getMemberId().equals(robotId)) {
+                            isInGroup = true;
+                        }
+                        PojoGroupMember pm = new PojoGroupMember();
+                        pm.setMember_id(member.getMemberId());
+                        pm.setAlias(member.getAlias());
+                        pm.setType(member.getType());
+                        out.getMembers().add(pm);
+                    }
+                    if(!isInGroup) {
+                        out.getMembers().clear();
+                    }
+                    result = RestResult.ok(out);
+                }
+
+                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/robot/KickoffGroupMemberAction.java

@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputKickoffGroupMember;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+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.Robot_Group_Member_Kickoff)
+@HttpMethod("POST")
+public class KickoffGroupMemberAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
+            inputKickoffGroupMember.setOperator(robot.getUid());
+            if (inputKickoffGroupMember.isValide()) {
+                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();
+                        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);
+                        };
+                    }
+                }, false);
+                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/robot/ModifyGroupInfoAction.java

@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputModifyGroupInfo;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+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.Robot_Group_Modify_Info)
+@HttpMethod("POST")
+public class ModifyGroupInfoAction extends RobotAction {
+
+    @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);
+            inputAddGroupMember.setOperator(robot.getUid());
+            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);
+                        };
+                    }
+                }, false);
+                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/robot/ModifyGroupMemberAliasAction.java

@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputSetGroupMemberAlias;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+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.Robot_Group_Set_Member_Alias)
+@HttpMethod("POST")
+public class ModifyGroupMemberAliasAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputSetGroupMemberAlias inputSetGroupMemberAlias = getRequestBody(request.getNettyRequest(), InputSetGroupMemberAlias.class);
+            inputSetGroupMemberAlias.setOperator(robot.getUid());
+            if (inputSetGroupMemberAlias.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputSetGroupMemberAlias.getOperator(), null, IMTopic.ModifyGroupMemberAliasTopic, inputSetGroupMemberAlias.toProtoGroupRequest().toByteArray(), inputSetGroupMemberAlias.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);
+                        };
+                    }
+                }, false);
+                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/robot/QuitGroupMemberAction.java

@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputQuitGroup;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+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.Robot_Group_Member_Quit)
+@HttpMethod("POST")
+public class QuitGroupMemberAction extends RobotAction {
+
+    @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);
+            inputQuitGroup.setOperator(robot.getUid());
+            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);
+                        };
+                    }
+                }, false);
+                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/robot/SetCallbackAction.java

@@ -0,0 +1,51 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.RobotCallbackPojo;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+@Route(APIPath.Robot_Set_Callback)
+@HttpMethod("POST")
+public class SetCallbackAction extends RobotAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            RobotCallbackPojo input = getRequestBody(request.getNettyRequest(), RobotCallbackPojo.class);
+            if(!StringUtil.isNullOrEmpty(input.getUrl())) {
+                if(!input.getUrl().equals(robot.getCallback()) && robot.getState() != 1) {
+                    robot = robot.toBuilder().setCallback(input.getUrl()).setState(1).build();
+                    messagesStore.addRobot(robot);
+                }
+
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult 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/robot/TransferGroupAction.java

@@ -0,0 +1,86 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputTransferGroup;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.action.admin.AdminAction;
+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.Robot_Group_Transfer)
+@HttpMethod("POST")
+public class TransferGroupAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputTransferGroup inputDismissGroup = getRequestBody(request.getNettyRequest(), InputTransferGroup.class);
+            inputDismissGroup.setOperator(robot.getUid());
+            if (inputDismissGroup.isValide()) {
+                RPCCenter.getInstance().sendRequest(inputDismissGroup.getOperator(), null, IMTopic.TransferGroupTopic, inputDismissGroup.toProtoGroupRequest().toByteArray(), inputDismissGroup.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);
+                        };
+                    }
+                }, false);
+                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/robot/UpdateProfileAction.java

@@ -0,0 +1,94 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.IntStringPairPojo;
+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 static cn.wildfirechat.pojos.MyInfoType.*;
+
+@Route(APIPath.Robot_Update_Profile)
+@HttpMethod("POST")
+public class UpdateProfileAction extends RobotAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            IntStringPairPojo input = getRequestBody(request.getNettyRequest(), IntStringPairPojo.class);
+
+            WFCMessage.User.Builder builder = messagesStore.getUserInfo(robot.getUid()).toBuilder();
+            boolean modified = false;
+            switch (input.getIntValue()) {
+                case Modify_DisplayName:
+                    builder.setDisplayName(input.getStrValue());
+                    modified = true;
+                    break;
+                case Modify_Gender:
+                    builder.setGender(Integer.parseInt(input.getStrValue()));
+                    modified = true;
+                    break;
+                case Modify_Portrait:
+                    builder.setPortrait(input.getStrValue());
+                    modified = true;
+                    break;
+                //不允许修改电话号码，如果修改电话号码必须通过admin进行修改
+//              case Modify_Mobile:
+//                    builder.setMobile(input.getStrValue());
+//                    modified = true;
+//                    break;
+                case Modify_Email:
+                    builder.setEmail(input.getStrValue());
+                    modified = true;
+                    break;
+                case Modify_Address:
+                    builder.setAddress(input.getStrValue());
+                    modified = true;
+                    break;
+                case Modify_Company:
+                    builder.setCompany(input.getStrValue());
+                    modified = true;
+                    break;
+                case Modify_Social:
+                    builder.setSocial(input.getStrValue());
+                    modified = true;
+                    break;
+                case Modify_Extra:
+                    builder.setExtra(input.getStrValue());
+                    modified = true;
+                    break;
+                default:
+                    break;
+            }
+
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok();
+            if(modified) {
+                try {
+                    messagesStore.updateUserInfo(builder.build());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    result.setErrorCode(ErrorCode.ERROR_CODE_SERVER_ERROR);
+                }
+            }
+
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

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

@@ -357,8 +357,8 @@ public class Response {
 		final DefaultHttpResponse defaultHttpResponse = new DefaultHttpResponse(httpVersion, status);
 
 		// headers
-		final HttpHeaders httpHeaders = defaultHttpResponse.headers().add(headers);
-
+		HttpHeaders httpHeaders = defaultHttpResponse.headers().add(headers);
+        httpHeaders.set(HttpHeaderNames.CONTENT_TYPE.toString(), contentType);
 		// Cookies
 		for (Cookie cookie : cookies) {
 			httpHeaders.add(HttpHeaderNames.SET_COOKIE.toString(), ServerCookieEncoder.LAX.encode(cookie));

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

@@ -117,10 +117,16 @@ public final class BrokerConstants {
     public static final String TOKEN_EXPIRE_TIME = "token.expire_time";
 
     public static final String EMBED_DB_PROPERTY_NAME = "embed.db";
+    public static final String DB_AUTO_CLEAN_HISTORY_MESSAGES = "db.auto_clean_history_messages";
 
     public static final String SENSITIVE_Filter_Type = "sensitive.filter.type";
 
+    public static final String SENSITIVE_Remote_Server_URL = "sensitive.remote_server_url";
+    public static final String SENSITIVE_Remote_Message_Type = "sensitive.remote_sensitive_message_type";
+    public static final String SENSITIVE_Remote_Fail_When_Matched = "sensitive.remote_fail_when_matched";
+
     public static final String MESSAGE_Forward_Url = "message.forward.url";
+    public static final String MESSAGE_Forward_Types = "message.forward.types";
 
     public static final String SERVER_MULTI_ENDPOINT = "server.multi_endpoint";
     public static final String SERVER_MULTI_PLATFROM_NOTIFICATION = "server.multi_platform_notification";
@@ -148,6 +154,7 @@ public final class BrokerConstants {
     public static final String GROUP_Allow_Client_Custom_Operation_Notification = "group.allow_client_custom_operation_notification";
     public static final String GROUP_Visible_Quit_Kickoff_Notification = "group.visible_quit_or_kickoff_notification";
 
+    public static final String USER_HIDE_PROPERTIES = "user.hide_properties";
 
     public static final String MESSAGES_FORBIDDEN_CLIENT_SEND_TYPES = "message.forbidden_client_send_types";
 

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

@@ -22,7 +22,7 @@ public class GetUserInfoHandler extends IMHandler<WFCMessage.PullUserRequest> {
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) {
         WFCMessage.PullUserResult.Builder resultBuilder = WFCMessage.PullUserResult.newBuilder();
 
-        ErrorCode errorCode = m_messagesStore.getUserInfo(request.getRequestList(), resultBuilder);
+        ErrorCode errorCode = m_messagesStore.getUserInfo(fromUser, request.getRequestList(), resultBuilder);
         if (errorCode == ERROR_CODE_SUCCESS) {
             byte[] data = resultBuilder.build().toByteArray();
             ackPayload.ensureWritable(data.length).writeBytes(data);

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

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

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

@@ -37,7 +37,7 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                         long timestamp = System.currentTimeMillis();
                         builder.setMessageId(messageId);
                         builder.setServerTimestamp(timestamp);
-                        saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+                        saveAndPublish(request.getTargetUid(), null, builder.build());
 
                         MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
                         String language = "zh_CN";
@@ -60,7 +60,7 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
 
                         messageId = MessageShardingUtil.generateId();
                         builder.setMessageId(messageId);
-                        saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+                        saveAndPublish(request.getTargetUid(), null, builder.build());
 
                         if (m_messagesStore.isNewFriendWelcomeMessage()) {
                             contentBuilder.setType(93);
@@ -73,7 +73,7 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                         builder.setMessageId(messageId);
                         timestamp = System.currentTimeMillis();
                         builder.setServerTimestamp(timestamp);
-                        saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+                        saveAndPublish(request.getTargetUid(), null, builder.build());
 
                     } catch (Exception e) {
                         e.printStackTrace();

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

@@ -204,8 +204,9 @@ abstract public class IMHandler<T> {
                         errorCode = ErrorCode.ERROR_CODE_SERVER_ERROR;
                     }
                 }
-
-                response(ackPayload, errorCode, callback);
+                if(errorCode != ErrorCode.INVALID_ASYNC_HANDLING) {
+                    response(ackPayload, errorCode, callback);
+                }
             } else {
                 LOG.error("Handler {} preAction failure", this.getClass().getName());
                 ByteBuf ackPayload = Unpooled.buffer(1);
@@ -236,17 +237,17 @@ abstract public class IMHandler<T> {
         Set<String> notifyReceivers = new LinkedHashSet<>();
 
         WFCMessage.Message.Builder messageBuilder = message.toBuilder();
-        int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers, false);
+        int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers);
         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) {
+    protected long saveAndPublish(String username, String clientID, WFCMessage.Message message) {
         Set<String> notifyReceivers = new LinkedHashSet<>();
 
         message = m_messagesStore.storeMessage(username, clientID, message);
         WFCMessage.Message.Builder messageBuilder = message.toBuilder();
-        int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers, ignoreMsg);
+        int pullType = m_messagesStore.getNotifyReceivers(username, messageBuilder, notifyReceivers);
         mServer.getImBusinessScheduler().execute(() -> this.publisher.publish2Receivers(messageBuilder.build(), notifyReceivers, clientID, pullType));
         return notifyReceivers.size();
     }

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

@@ -10,6 +10,7 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
 import com.hazelcast.core.Member;
+import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.ClientSession;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
@@ -24,6 +25,19 @@ import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_Short_Port;
 public class RouteHandler extends IMHandler<WFCMessage.RouteRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.RouteRequest request, Qos1PublishHandler.IMCallback callback) {
+        MemorySessionStore.Session session = m_sessionsStore.sessionForClientAndUser(fromUser, clientID);
+        if (session == null) {
+            ErrorCode errorCode = m_sessionsStore.loadActiveSession(fromUser, clientID);
+            if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                return errorCode;
+            }
+            session = m_sessionsStore.sessionForClientAndUser(fromUser, clientID);
+        }
+
+        if (session == null || session.getDeleted() > 0) {
+            return ErrorCode.ERROR_CODE_SECRECT_KEY_MISMATCH;
+        }
+
         Member member = mServer.getHazelcastInstance().getCluster().getLocalMember();
         String serverIp = member.getStringAttribute(HZ_Cluster_Node_External_IP);
         String longPort = member.getStringAttribute(HZ_Cluster_Node_External_Long_Port);

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

@@ -8,32 +8,51 @@
 
 package io.moquette.imhandler;
 
+import cn.wildfirechat.pojos.MessagePayload;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
 import com.hazelcast.util.StringUtil;
 import io.moquette.BrokerConstants;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
+import io.netty.buffer.Unpooled;
+import win.liyufan.im.HttpUtils;
 import win.liyufan.im.IMTopic;
 import win.liyufan.im.MessageShardingUtil;
 import win.liyufan.im.Utility;
 
+import java.util.HashSet;
 import java.util.Set;
 
-import static cn.wildfirechat.proto.ProtoConstants.ContentType.Text;
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 @Handler(value = IMTopic.SendMessageTopic)
 public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
     private int mSensitiveType = 0;  //命中敏感词时，0 失败，1 吞掉， 2 敏感词替换成*。
     private String mForwardUrl = null;
+    private Set<Integer> mForwardMessageTypes = new HashSet<>();
     private int mBlacklistStrategy = 0; //黑名单中时，0失败，1吞掉。
+
+    private String mRemoteSensitiveServerUrl = null;
+    private Set<Integer> mRemoteSensitiveMessageTypes;
+    private boolean mWaitRemoteSensitiveServerResponse = false;
+
     public SendMessageHandler() {
         super();
 
         String forwardUrl = mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Forward_Url);
         if (!StringUtil.isNullOrEmpty(forwardUrl)) {
             mForwardUrl = forwardUrl;
+
+            String forwardTypes = mServer.getConfig().getProperty(BrokerConstants.MESSAGE_Forward_Types);
+            if (!StringUtil.isNullOrEmpty(forwardTypes)) {
+                String[] tss = forwardTypes.split(",");
+                for (String ts:tss) {
+                    mForwardMessageTypes.add(Integer.parseInt(ts.trim()));
+                }
+            }
         }
 
         try {
@@ -49,6 +68,24 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             e.printStackTrace();
             Utility.printExecption(LOG, e);
         }
+        try {
+            mRemoteSensitiveServerUrl = mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Remote_Server_URL);
+            if(!StringUtil.isNullOrEmpty(mRemoteSensitiveServerUrl)) {
+                mWaitRemoteSensitiveServerResponse = Boolean.parseBoolean(mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Remote_Fail_When_Matched, "false"));
+                String types = mServer.getConfig().getProperty(BrokerConstants.SENSITIVE_Remote_Message_Type, "");
+                mRemoteSensitiveMessageTypes = new HashSet<>();
+                if(!StringUtil.isNullOrEmpty(types)) {
+                    String[] ts = types.split(",");
+                    for (String t:ts) {
+                        mRemoteSensitiveMessageTypes.add(Integer.parseInt(t.trim()));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+
     }
 
     @Override
@@ -105,7 +142,7 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             }
 
             long timestamp = System.currentTimeMillis();
-            long messageId = 0;
+            final long messageId;
             try {
                 messageId = MessageShardingUtil.generateId();
             } catch (Exception e) {
@@ -114,34 +151,101 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             }
             message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).build();
 
-            if (mForwardUrl != null) {
+            if (mForwardUrl != null && (mForwardMessageTypes.isEmpty() || mForwardMessageTypes.contains(message.getContent().getType()))) {
                 publisher.forwardMessage(message, mForwardUrl);
             }
 
-
             if (!isAdmin) {
-                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 if(mSensitiveType == 2) {
-                        String text = message.getContent().getSearchableContent();
-                        for (String word : matched) {
-                            text = text.replace(word, "***");
+                if(StringUtil.isNullOrEmpty(mRemoteSensitiveServerUrl)) {
+                    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 if (mSensitiveType == 2) {
+                            String text = message.getContent().getSearchableContent();
+                            for (String word : matched) {
+                                text = text.replace(word, "***");
+                            }
+                            message = message.toBuilder().setContent(message.getContent().toBuilder().setSearchableContent(text).build()).build();
                         }
+                    }
+                } else {
+                    if(mRemoteSensitiveMessageTypes.contains(message.getContent().getType())) {
+                        final WFCMessage.Message finalMsg = message;
+                        publisher.forwardMessageWithCallback(message, mRemoteSensitiveServerUrl, new HttpUtils.HttpCallback() {
+                            @Override
+                            public void onSuccess(String content) {
+                                if(StringUtil.isNullOrEmpty(content)) {
+                                    saveAndPublish(fromUser, clientID, finalMsg);
+                                } else {
+                                    MessagePayload payload = new Gson().fromJson(content, MessagePayload.class);
+                                    if (payload != null && payload.getType() > 0) {
+                                        WFCMessage.Message newMsg = finalMsg.toBuilder().setContent(payload.toProtoMessageContent()).build();
+                                        saveAndPublish(fromUser, clientID, newMsg);
+                                    } else {
+                                        LOG.error("Response content {} from censor is invalid payload, ignore response and send original message", content);
+                                        saveAndPublish(fromUser, clientID, finalMsg);
+                                    }
+                                }
+                                if(mWaitRemoteSensitiveServerResponse) {
+                                    ByteBuf ackPayload = Unpooled.buffer(21);
+                                    ErrorCode errorCode = ERROR_CODE_SUCCESS;
+                                    ackPayload.writeByte(errorCode.getCode());
+                                    ackPayload.writeLong(messageId);
+                                    ackPayload.writeLong(timestamp);
+                                    callback.onIMHandled(ErrorCode.ERROR_CODE_SUCCESS, ackPayload);
+                                }
+                            }
 
-                        message = message.toBuilder().setContent(message.getContent().toBuilder().setSearchableContent(text).build()).build();
-                    } else if(mSensitiveType == 3) {
+                            @Override
+                            public void onFailure(int statusCode, String errorMessage) {
+                                ByteBuf ackPayload = null;
+                                ErrorCode errorCode = ERROR_CODE_SUCCESS;
+                                if(statusCode == 403) {
+                                    if(mWaitRemoteSensitiveServerResponse) {
+                                        errorCode = ErrorCode.ERROR_CODE_SENSITIVE_MATCHED;
+                                        ackPayload = Unpooled.buffer(1);
+                                        ackPayload.writeByte(errorCode.getCode());
+                                    }
+                                } else {
+                                    LOG.warn("Failed to censor message with status {}, errorMessage {}. Send the original message", statusCode, errorMessage);
+                                    saveAndPublish(fromUser, clientID, finalMsg);
 
+                                    if(mWaitRemoteSensitiveServerResponse) {
+                                        errorCode = ERROR_CODE_SUCCESS;
+                                        ackPayload = Unpooled.buffer(21);
+                                        ackPayload.writeByte(errorCode.getCode());
+                                        ackPayload.writeLong(messageId);
+                                        ackPayload.writeLong(timestamp);
+                                    }
+                                }
+
+                                if(mWaitRemoteSensitiveServerResponse) {
+                                    callback.onIMHandled(errorCode, ackPayload);
+                                }
+                            }
+                        });
+
+                        if(mWaitRemoteSensitiveServerResponse) {
+                            ackPayload.clear();
+                            return ErrorCode.INVALID_ASYNC_HANDLING;
+                        } else {
+                            ackPayload = ackPayload.capacity(20);
+                            ackPayload.writeLong(messageId);
+                            ackPayload.writeLong(timestamp);
+                            return ErrorCode.ERROR_CODE_SUCCESS;
+                        }
                     }
                 }
             }
 
             if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
-                saveAndPublish(fromUser, clientID, message, ignoreMsg);
+                if(!ignoreMsg) {
+                    saveAndPublish(fromUser, clientID, message);
+                }
                 ackPayload = ackPayload.capacity(20);
                 ackPayload.writeLong(messageId);
                 ackPayload.writeLong(timestamp);

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

@@ -1136,7 +1136,6 @@ public class DatabaseStore {
                 "`_type` = ?," +
                 "`_extra` = ?," +
                 "`_dt` = ?," +
-                "`_member_count` = ?," +
                 "`_mute` = ?" +
                 ", `_join_type` = ?" +
                 ", `_private_chat` = ?" +
@@ -1167,7 +1166,6 @@ public class DatabaseStore {
             statement.setInt(index++, groupInfo.getType());
             statement.setString(index++, groupInfo.getExtra());
             statement.setLong(index++, groupInfo.getUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
-            statement.setInt(index++, groupInfo.getMemberCount());
             statement.setInt(index++, groupInfo.getMute());
             statement.setInt(index++, groupInfo.getJoinType());
             statement.setInt(index++, groupInfo.getPrivateChat());
@@ -1605,12 +1603,10 @@ public class DatabaseStore {
         ResultSet rs = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `_gid` from t_group_member where `_mid` = ? and `_type` <> ?";
+            String sql = "select `_gid` from t_group_member where `_mid` = ? and `_type` <> 4";
             statement = connection.prepareStatement(sql);
 
             statement.setString(1, userId);
-            statement.setInt(2, ProtoConstants.GroupMemberType.GroupMemberType_Removed);
-
 
             rs = statement.executeQuery();
             Set<String> out = new HashSet<>();
@@ -1628,25 +1624,17 @@ public class DatabaseStore {
         }
         return null;
     }
-    void updateGroupMemberCountDt(final String groupId, final int count, final long dt) {
+
+    void updateGroupMemberDt(final String groupId, final long dt) {
         Connection connection = null;
         PreparedStatement statement = null;
         try {
             connection = DBUtil.getConnection();
 
-            String sql ;
-
-            if (count >= 0) {
-                sql = "update t_group set `_member_count` = ?, `_member_dt` = ? , `_dt` = ? where `_gid` = ?";
-            } else {
-                sql = "update t_group set `_member_dt` = ?, `_dt` = ? where `_gid` = ?";
-            }
+            String sql = "update t_group set `_member_dt` = ?, `_dt` = ? where `_gid` = ?";
             statement = connection.prepareStatement(sql);
 
             int index = 1;
-            if (count >=0) {
-                statement.setInt(index++, count);
-            }
             statement.setLong(index++, dt);
             statement.setLong(index++, dt);
             statement.setString(index++, groupId);
@@ -1662,6 +1650,29 @@ public class DatabaseStore {
         }
     }
 
+    void updateGroupMemberCountDt(final String groupId) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+
+            String sql = "update t_group set `_member_count` = (select count(*) from t_group_member where `_gid` = ? and `_type` <> 4 limit 1), `_dt` = ?, `_member_dt` = `_member_dt` + 1 where `_gid` = ?";
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, groupId);
+            statement.setLong(2, System.currentTimeMillis());
+            statement.setString(3, groupId);
+
+            int c = statement.executeUpdate();
+            LOG.info("Update rows {}", c);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
     void persistGroupMember(final String groupId, final List<WFCMessage.GroupMember> memberList) {
             Connection connection = null;
             PreparedStatement statement = null;
@@ -1724,11 +1735,8 @@ public class DatabaseStore {
     int removeGroupMember(String groupId, List<String> groupMembers) {
         Connection connection = null;
         PreparedStatement statement = null;
-        PreparedStatement statement2 = null;
         try {
             connection = DBUtil.getConnection();
-            connection.setAutoCommit(false);
-
             StringBuilder sqlBuilder = new StringBuilder("update t_group_member set `_type` = ?, `_dt` = ? where `_mid` in (");
             for (int i = 0; i < groupMembers.size(); i++) {
                 sqlBuilder.append("?");
@@ -1737,9 +1745,7 @@ public class DatabaseStore {
                 }
             }
             sqlBuilder.append(")");
-
             sqlBuilder.append(" and _gid = ?");
-
             statement = connection.prepareStatement(sqlBuilder.toString());
 
             int index = 1;
@@ -1751,36 +1757,14 @@ public class DatabaseStore {
                 statement.setString(index++, memberId);
             }
             statement.setString(index++, groupId);
-
             int count = statement.executeUpdate();
             LOG.info("Update rows {}", count);
-
-            String sql = "update t_group set `_member_count` = `_member_count` - ?, `_member_dt` = ? , `_dt` = ? where `_gid` = ?";
-
-            statement2 = connection.prepareStatement(sql);
-            index = 1;
-            statement2.setInt(index++, count);
-            statement2.setLong(index++, current);
-            statement2.setLong(index++, current);
-            statement2.setString(index++, groupId);
-            statement2.executeUpdate();
-            connection.commit();
-            connection.setAutoCommit(true);
         } catch (SQLException e) {
             // TODO Auto-generated catch block
-            if (connection != null) {
-                try {
-                    connection.commit();
-                    connection.setAutoCommit(true);
-                } catch (SQLException e1) {
-                    e1.printStackTrace();
-                }
-            }
             e.printStackTrace();
             Utility.printExecption(LOG, e, RDBS_Exception);
         } finally {
             DBUtil.closeDB(connection, statement);
-            DBUtil.closeDB(connection, statement2);
         }
         return 0;
     }

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

@@ -16,7 +16,6 @@
 
 package io.moquette.persistence;
 
-import cn.wildfirechat.common.IMExceptionEvent;
 import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
@@ -63,7 +62,7 @@ import static cn.wildfirechat.proto.ProtoConstants.Platform.*;
 import static io.moquette.BrokerConstants.*;
 import static io.moquette.server.Constants.MAX_CHATROOM_MESSAGE_QUEUE;
 import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
-import static win.liyufan.im.MyInfoType.*;
+import static cn.wildfirechat.pojos.MyInfoType.*;
 import static win.liyufan.im.UserSettingScope.kUserSettingPCOnline;
 
 public class MemoryMessagesStore implements IMessagesStore {
@@ -152,6 +151,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     private boolean mGroupAllowClientCustomOperationNotification;
     private int mGroupVisibleQuitKickoffNotification;
 
+    private Set<Integer> mUserHideProperties = new HashSet<>();
+
     MemoryMessagesStore(Server server, DatabaseStore databaseStore) {
         m_Server = server;
         this.databaseStore = databaseStore;
@@ -330,6 +331,22 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
 
+        try {
+            String userHideStr = server.getConfig().getProperty(USER_HIDE_PROPERTIES);
+            if(!StringUtil.isNullOrEmpty(userHideStr)) {
+                String[] proStrs = userHideStr.split(",");
+                for (String proStr:proStrs) {
+                    int value = Integer.parseInt(proStr);
+                    if(value > 1 && value < 9) {
+                        mUserHideProperties.add(value);
+                    }
+                }
+            }
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+
+
     }
 
     private void printMissConfigLog(String config, String defaultValue) {
@@ -389,24 +406,12 @@ public class MemoryMessagesStore implements IMessagesStore {
 
 
     @Override
-    public int getNotifyReceivers(String fromUser, WFCMessage.Message.Builder messageBuilder, Set<String> notifyReceivers, boolean ignoreMsg) {
+    public int getNotifyReceivers(String fromUser, WFCMessage.Message.Builder messageBuilder, Set<String> notifyReceivers) {
         WFCMessage.Message message = messageBuilder.build();
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         int type = message.getConversation().getType();
         int pullType = ProtoConstants.PullType.Pull_Normal;
 
-        if (ignoreMsg) {
-            if (type == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
-                pullType = ProtoConstants.PullType.Pull_ChatRoom;
-            }
-
-//            if (message.getContent().getPersistFlag() != Transparent) {
-                notifyReceivers.add(fromUser);
-//            }
-            return pullType;
-        }
-
-
         if (type == ProtoConstants.ConversationType.ConversationType_Private) {
             notifyReceivers.add(fromUser);
             notifyReceivers.add(message.getConversation().getTarget());
@@ -890,9 +895,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
+        boolean hasOwnerMember = false;
         for (WFCMessage.GroupMember member : memberList) {
             if (member.getMemberId().equals(owner)) {
                 member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
+                hasOwnerMember = true;
             } else {
                 member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).build();
             }
@@ -901,6 +908,12 @@ public class MemoryMessagesStore implements IMessagesStore {
             dt++;
         }
 
+        if(!hasOwnerMember && !StringUtil.isNullOrEmpty(owner)) {
+            WFCMessage.GroupMember member = WFCMessage.GroupMember.newBuilder().setMemberId(owner).setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
+            groupMembers.put(groupId, member);
+            updatedMemberList.add(member);
+        }
+
         groupInfo = groupInfo.toBuilder()
             .setTargetId(groupId)
             .setName(groupInfo.getName())
@@ -909,7 +922,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             .setExtra(groupInfo.getExtra())
             .setUpdateDt(dt)
             .setMemberUpdateDt(dt)
-            .setMemberCount(memberList.size())
+            .setMemberCount(updatedMemberList.size())
             .setOwner(owner)
             .build();
 
@@ -1133,26 +1146,11 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        for (WFCMessage.GroupMember member : members) {
-            if (newInviteUsers.contains(member.getMemberId())) {
-                groupMembers.remove(groupId, member);
-            }
-        }
-
-        for (WFCMessage.GroupMember member : memberList) {
-            groupMembers.put(groupId, member);
-        }
-
-        int count = 0;
-        for (WFCMessage.GroupMember member : groupMembers.get(groupId)) {
-            if (member.getType() != GroupMemberType_Removed) {
-                count++;
-            }
-        }
-
-        mIMap.put(groupId, groupInfo.toBuilder().setMemberUpdateDt(updateDt).setUpdateDt(updateDt).setMemberCount(count).build());
         databaseStore.persistGroupMember(groupId, memberList);
-        databaseStore.updateGroupMemberCountDt(groupId, count, updateDt);
+        databaseStore.updateGroupMemberCountDt(groupId);
+
+        groupMembers.remove(groupId);
+        mIMap.evict(groupId);
 
         List<String> memberIds = new ArrayList<>();
         for (WFCMessage.GroupMember member : memberList) {
@@ -1178,12 +1176,12 @@ public class MemoryMessagesStore implements IMessagesStore {
     void removeGroupMember(String groupId, List<String> memberIds) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         databaseStore.removeGroupMember(groupId, memberIds);
+        databaseStore.updateGroupMemberCountDt(groupId);
 
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
         groupMembers.remove(groupId);
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
         mIMap.evict(groupId);
-
     }
 
     void removeFavGroup(String groupId, List<String> memberIds) {
@@ -1371,8 +1369,6 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-
-
         WFCMessage.GroupInfo.Builder newInfoBuilder = oldInfo.toBuilder();
 
         if (modifyType == Modify_Group_Name)
@@ -1394,7 +1390,8 @@ public class MemoryMessagesStore implements IMessagesStore {
 
 
         newInfoBuilder.setUpdateDt(System.currentTimeMillis());
-        mIMap.put(groupId, newInfoBuilder.build());
+        databaseStore.persistGroupInfo(newInfoBuilder.build());
+        mIMap.evict(groupId);
 
         if (modifyType == Modify_Group_Mute) {
             if (newInfoBuilder.getMute() > 0) {
@@ -1475,7 +1472,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 groupMembers.remove(groupId, member);
                 member = member.toBuilder().setAlias(alias).setUpdateDt(updateDt).build();
                 databaseStore.persistGroupMember(groupId, Arrays.asList(member));
-                databaseStore.updateGroupMemberCountDt(groupId, -1, updateDt);
+                databaseStore.updateGroupMemberDt(groupId, updateDt);
                 groupMembers.put(groupId, member);
 
                 mIMap.set(groupId, groupInfo.toBuilder().setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build());
@@ -1679,11 +1676,10 @@ public class MemoryMessagesStore implements IMessagesStore {
                 member = member.toBuilder().setType(type == 0 ? ProtoConstants.GroupMemberType.GroupMemberType_Normal : ProtoConstants.GroupMemberType.GroupMemberType_Manager).setUpdateDt(updateDt).build();
                 databaseStore.persistGroupMember(groupId, Arrays.asList(member));
                 groupMembers.put(groupId, member);
-//                userList.remove(member.getMemberId());
             }
         }
-
-        mIMap.put(groupId, groupInfo.toBuilder().setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build());
+        databaseStore.persistGroupInfo(groupInfo.toBuilder().setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build());
+        mIMap.evict(groupId);
 
         callbackGroupMemberEvent(operator, groupId, userList, ProtoConstants.GroupMemberUpdateEventType.Group_Member_Event_Type_Update, (type == 0 ? ProtoConstants.GroupMemberType.GroupMemberType_Normal : ProtoConstants.GroupMemberType.GroupMemberType_Manager) + "");
         return ErrorCode.ERROR_CODE_SUCCESS;
@@ -1909,7 +1905,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
 
     @Override
-    public ErrorCode getUserInfo(List<WFCMessage.UserRequest> requestList, WFCMessage.PullUserResult.Builder builder) {
+    public ErrorCode getUserInfo(String fromUser, List<WFCMessage.UserRequest> requestList, WFCMessage.PullUserResult.Builder builder) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
 
@@ -1931,6 +1927,27 @@ public class MemoryMessagesStore implements IMessagesStore {
             } else {
                 LOG.debug("Get user info, user {}  userDt {} : request {}",request.getUid(), user.getUpdateDt(), request.getUpdateDt());
                 if (user.getUpdateDt() > request.getUpdateDt()) {
+                    if(!mUserHideProperties.isEmpty() && !user.getUid().equals(fromUser)) {
+                        WFCMessage.User.Builder userBuilder = user.toBuilder();
+                        for (Integer i:mUserHideProperties) {
+                            if(i == Modify_Gender) {
+                                userBuilder.clearGender();
+                            } else if(i == Modify_Mobile) {
+                                userBuilder.clearMobile();
+                            } else if(i == Modify_Email) {
+                                userBuilder.clearEmail();
+                            } else if(i == Modify_Address) {
+                                userBuilder.clearAddress();
+                            } else if(i == Modify_Company) {
+                                userBuilder.clearCompany();
+                            } else if(i == Modify_Social) {
+                                userBuilder.clearSocial();
+                            } else if(i == Modify_Extra) {
+                                userBuilder.clearExtra();
+                            }
+                        }
+                        user = userBuilder.build();
+                    }
                     resultBuilder.setUser(user);
                     resultBuilder.setCode(ProtoConstants.UserResultCode.Success);
                 } else {
@@ -1979,10 +1996,11 @@ public class MemoryMessagesStore implements IMessagesStore {
                     builder.setPortrait(entry.getValue());
                     modified = true;
                     break;
-                case Modify_Mobile:
-                    builder.setMobile(entry.getValue());
-                    modified = true;
-                    break;
+                //禁止客户端直接修改电话号码，只能通过admin api来修改
+//                case Modify_Mobile:
+//                    builder.setMobile(entry.getValue());
+//                    modified = true;
+//                    break;
                 case Modify_Email:
                     builder.setEmail(entry.getValue());
                     modified = true;
@@ -2140,6 +2158,15 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
     }
+    @Override
+    public void updateUserInfo(WFCMessage.User user) throws Exception {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
+        if(mUserMap.get(user.getUid()) != null) {
+            databaseStore.updateUser(user);
+            mUserMap.put(user.getUid(), user);
+        }
+    }
 
     @Override
     public WFCMessage.User getUserInfo(String userId) {

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

@@ -419,6 +419,34 @@ public class MemorySessionStore implements ISessionsStore {
         return session;
     }
 
+    @Override
+    public void kickoffUserClient(String username, String cid) {
+        List<String> clientIds = new ArrayList<>();
+        if(StringUtil.isNullOrEmpty(cid)) {
+            ConcurrentSkipListSet<String> sessionSet = getUserSessionSet(username);
+            clientIds.addAll(sessionSet);
+        } else {
+            clientIds.add(cid);
+        }
+
+        for (String clientID: clientIds) {
+            Session session = sessions.get(clientID);
+            if(session == null) {
+                ClientSession clientSession = new ClientSession(clientID, this);
+                session = databaseStore.getSession(username, clientID, clientSession);
+                if (session == null || session.getDeleted() > 0) {
+                    continue;
+                }
+                sessions.put(clientID, session);
+            }
+
+            if (session.getDeleted() == 0) {
+                session.setDeleted(1);
+                databaseStore.updateSessionDeleted(username, clientID, 1);
+                mServer.getProcessor().kickoffSession(session);
+            }
+        }
+    }
 
     @Override
     public ErrorCode loadActiveSession(String username, String clientID) {

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

@@ -436,6 +436,7 @@ public class Server {
         System.out.println("Server will flush data to db before shutting down, please wait 5 seconds!");
         LOG.info("Unbinding server from the configured ports");
         m_shutdowning = true;
+        DBUtil.SystemExiting = true;
 
         m_acceptor.close();
         LOG.trace("Stopping MQTT protocol processor");

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

@@ -149,12 +149,10 @@ public class NettyAcceptor implements ServerAcceptor {
         } catch (InterruptedException ex) {
             LOG.error("An interruptedException was caught while initializing server. Protocol={}", protocol, ex);
         } catch (Exception e) {
-            if(e instanceof BindException) {
-                e.printStackTrace();
-                LOG.error("端口 {} 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", port, port);
-                System.out.println("端口 " + port + " 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + port);
-            }
-            throw e;
+            e.printStackTrace();
+            LOG.error("端口 {} 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", port, port);
+            System.out.println("端口 " + port + " 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + port);
+            System.exit(-1);
         }
     }
 

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

@@ -100,7 +100,7 @@ public interface IMessagesStore {
     DatabaseStore getDatabaseStore();
     WFCMessage.Message storeMessage(String fromUser, String fromClientId, WFCMessage.Message message);
     void storeSensitiveMessage(WFCMessage.Message message);
-	int getNotifyReceivers(String fromUser, WFCMessage.Message.Builder message, Set<String> notifyReceivers, boolean ignoreMsg);
+	int getNotifyReceivers(String fromUser, WFCMessage.Message.Builder message, Set<String> notifyReceivers);
     Set<String> getAllEnds();
     WFCMessage.PullMessageResult fetchMessage(String user, String exceptClientId, long fromMessageId, int pullType);
     WFCMessage.PullMessageResult loadRemoteMessages(String user, WFCMessage.Conversation conversation, long beforeUid, int count);
@@ -131,7 +131,9 @@ public interface IMessagesStore {
 
     WFCMessage.Robot getRobot(String robotId);
     void addRobot(WFCMessage.Robot robot);
-    ErrorCode getUserInfo(List<WFCMessage.UserRequest> requestList, WFCMessage.PullUserResult.Builder builder);
+
+    ErrorCode getUserInfo(String fromUser, List<WFCMessage.UserRequest> requestList, WFCMessage.PullUserResult.Builder builder);
+
     ErrorCode modifyUserInfo(String userId, WFCMessage.ModifyMyInfoRequest request) throws Exception;
 
     void updateUserOnlineSetting(MemorySessionStore.Session session, boolean online);
@@ -142,6 +144,7 @@ public interface IMessagesStore {
 
     void addUserInfo(WFCMessage.User user, String password) throws Exception;
     void destoryUser(String userId);
+    void updateUserInfo(WFCMessage.User user) throws Exception;
     WFCMessage.User getUserInfo(String userId);
     WFCMessage.User getUserInfoByName(String name);
     WFCMessage.User getUserInfoByMobile(String mobile);

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

@@ -51,6 +51,8 @@ public interface ISessionsStore {
     void updateSessionToken(Session session, boolean voip);
 
     void clearUserSession(String username);
+
+    void kickoffUserClient(String userId, String clientId);
     /**
      * @param clientID
      *            the client owning the session.

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

@@ -332,7 +332,7 @@ public class MessagesPublisher {
                         }
                     }
 
-                    if ((StringUtil.isNullOrEmpty(pushContent) && messageContentType != 402 && messageContentType != 400)) {
+                    if ((StringUtil.isNullOrEmpty(pushContent) && messageContentType != 402 && messageContentType != 400 && messageContentType != 401)) {
                         LOG.info("push content is empty and contenttype is {}", messageContentType);
                         continue;
                     }
@@ -624,6 +624,29 @@ public class MessagesPublisher {
         });
     }
 
+    public void forwardMessageWithCallback(final WFCMessage.Message message, String forwardUrl, HttpUtils.HttpCallback callback) {
+        try {
+            HttpUtils.httpJsonPost(forwardUrl, new Gson().toJson(OutputMessageData.fromProtoMessage(message), OutputMessageData.class), new HttpUtils.HttpCallback() {
+                @Override
+                public void onSuccess(String content) {
+                    Server.getServer().getImBusinessScheduler().execute(()->{
+                        callback.onSuccess(content);
+                    });
+                }
+
+                @Override
+                public void onFailure(int statusCode, String errorMessage) {
+                    Server.getServer().getImBusinessScheduler().execute(()->{
+                        callback.onFailure(statusCode, errorMessage);
+                    });
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);
+        }
+    }
+
     public void notifyChannelListenStatusChanged(WFCMessage.ChannelInfo channelInfo, String user, boolean listen) {
         if (channelInfo == null || StringUtil.isNullOrEmpty(channelInfo.getCallback())) {
             return;

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

@@ -188,8 +188,7 @@ public class ProtocolProcessor {
         String clientId = payload.clientIdentifier();
         LOG.info("Processing CONNECT message. CId={}, username={}", clientId, payload.userName());
 
-        if (msg.variableHeader().version() < MqttVersion.MQTT_3_1_1.protocolLevel() ||
-                msg.variableHeader().version() >= MqttVersion.Wildfire_Max.protocolLevel()) {
+        if (msg.variableHeader().version() < MqttVersion.MQTT_3_1_1.protocolLevel()) {
             MqttConnAckMessage badProto = connAck(CONNECTION_REFUSED_UNACCEPTABLE_PROTOCOL_VERSION);
 
             LOG.error("MQTT protocol version is not valid. CId={}", clientId);

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

@@ -16,12 +16,10 @@
 
 package io.moquette.spi.impl;
 
+import static cn.wildfirechat.common.ErrorCode.*;
 import static io.moquette.spi.impl.Utils.readBytesAndRewind;
 import static io.netty.handler.codec.mqtt.MqttMessageIdVariableHeader.from;
 import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;
-import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
-import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
-import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -256,6 +254,13 @@ public class Qos1PublishHandler extends QosPublishHandler {
         String imtopic = topic.getTopic();
         ByteBuf payload = msg.payload();
         byte[] payloadContent = readBytesAndRewind(payload);
+        if(payloadContent.length == 0) {
+            ByteBuf ackPayload = Unpooled.buffer();
+            ackPayload.ensureWritable(1).writeByte(ERROR_CODE_INVALID_DATA.getCode());
+            sendPubAck(clientID, messageID, ackPayload, ERROR_CODE_INVALID_DATA);
+            return;
+        }
+        
         MemorySessionStore.Session session = m_sessionStore.getSession(clientID);
         payloadContent = AES.AESDecrypt(payloadContent, session.getSecret(), true);
         imHandler(clientID, username, imtopic, payloadContent, (errorCode, ackPayload) -> sendPubAck(clientID, messageID, ackPayload, errorCode), false);

broker/src/main/java/io/netty/handler/codec/mqtt/MqttVersion.java

@@ -27,7 +27,7 @@ public enum MqttVersion {
     MQTT_3_1_1("MQTT", (byte) 4),
     Wildfire_1("MQTT", (byte) 5),
     Wildfire_2("MQTT", (byte) 6),
-    Wildfire_Max("MQTT", (byte) 7);
+    Wildfire_Future("MQTT", (byte) 7);
 
     private final String name;
     private final byte level;
@@ -59,6 +59,9 @@ public enum MqttVersion {
                 }
             }
         }
+        if(protocolLevel > Wildfire_Future.level) {
+            return Wildfire_Future;
+        }
         throw new MqttUnacceptableProtocolVersionException(protocolName + "is unknown protocol name");
     }
 
@@ -68,6 +71,9 @@ public enum MqttVersion {
                 return mv;
             }
         }
+        if(protocolLevel > Wildfire_Future.level) {
+            return Wildfire_Future;
+        }
         throw new MqttUnacceptableProtocolVersionException(protocolLevel + "is unknown protocol level");
     }
 }

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

@@ -14,6 +14,8 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.sql.*;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import com.hazelcast.util.StringUtil;
@@ -27,6 +29,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.ConcurrentHashMap;
 
+import static cn.wildfirechat.common.IMExceptionEvent.EventType.RDBS_Exception;
+
 public class DBUtil {
     private static final Logger LOG = LoggerFactory.getLogger(DBUtil.class);
     private static ComboPooledDataSource comboPooledDataSource = null;
@@ -39,118 +43,226 @@ public class DBUtil {
         }
     };
 
-        public static boolean IsEmbedDB = false;
+    public static boolean IsEmbedDB = false;
+    public static boolean SystemExiting = false;
+    public static boolean ClearDBDebugMode = false;
 
-        public static void init(IConfig config) {
-            String embedDB = config.getProperty(BrokerConstants.EMBED_DB_PROPERTY_NAME);
-            if (embedDB != null && embedDB.equals("1")) {
-                IsEmbedDB = true;
-                LOG.info("Use h2 database");
+    public static void init(IConfig config) {
+        String embedDB = config.getProperty(BrokerConstants.EMBED_DB_PROPERTY_NAME);
+        boolean autoCleanMsgs = "true".equals(config.getProperty(BrokerConstants.DB_AUTO_CLEAN_HISTORY_MESSAGES));
+        if (embedDB != null && embedDB.equals("1")) {
+            IsEmbedDB = true;
+            LOG.info("Use h2 database");
+        } else {
+            IsEmbedDB = false;
+            LOG.info("Use mysql database");
+        }
+
+        if (comboPooledDataSource == null) {
+            String migrateLocation;
+            if (IsEmbedDB) {
+                migrateLocation = "filesystem:./migrate/h2";
+                comboPooledDataSource = new ComboPooledDataSource();
+
+                comboPooledDataSource.setJdbcUrl( "jdbc:h2:./h2db/wfchat;AUTO_SERVER=TRUE;MODE=MySQL" );
+                comboPooledDataSource.setUser("SA");
+                comboPooledDataSource.setPassword("SA");
+                comboPooledDataSource.setMinPoolSize(5);
+                comboPooledDataSource.setAcquireIncrement(5);
+                comboPooledDataSource.setMaxPoolSize(20);
+
+                comboPooledDataSource.setIdleConnectionTestPeriod(60 * 5);
+                comboPooledDataSource.setMinPoolSize(3);
+                comboPooledDataSource.setInitialPoolSize(3);
+
+                try {
+                    comboPooledDataSource.setDriverClass( "org.h2.Driver" ); //loads the jdbc driver
+                } catch (PropertyVetoException e) {
+                    e.printStackTrace();
+                    Utility.printExecption(LOG, e);
+                    System.exit(-1);
+                }
             } else {
-                IsEmbedDB = false;
-                LOG.info("Use mysql database");
-            }
+                migrateLocation = "filesystem:./migrate/mysql";
+                comboPooledDataSource = new ComboPooledDataSource("mysql");
+                try {
+                    String url01 = comboPooledDataSource.getJdbcUrl().substring(0,comboPooledDataSource.getJdbcUrl().indexOf("?"));
+                    String datasourceName = url01.substring(url01.lastIndexOf("/")+1);
+                    // 连接已经存在的数据库，如：mysql
+                    String jdbc = comboPooledDataSource.getJdbcUrl().replace(datasourceName, "");
+                    Connection connection = DriverManager.getConnection(jdbc, comboPooledDataSource.getUser(), comboPooledDataSource.getPassword());
+                    Statement statement = connection.createStatement();
 
-            if (comboPooledDataSource == null) {
-                String migrateLocation;
-                if (IsEmbedDB) {
-                    migrateLocation = "filesystem:./migrate/h2";
-                    comboPooledDataSource = new ComboPooledDataSource();
-
-                    comboPooledDataSource.setJdbcUrl( "jdbc:h2:./h2db/wfchat;AUTO_SERVER=TRUE;MODE=MySQL" );
-                    comboPooledDataSource.setUser("SA");
-                    comboPooledDataSource.setPassword("SA");
-                    comboPooledDataSource.setMinPoolSize(5);
-                    comboPooledDataSource.setAcquireIncrement(5);
-                    comboPooledDataSource.setMaxPoolSize(20);
-
-                    comboPooledDataSource.setIdleConnectionTestPeriod(60 * 5);
-                    comboPooledDataSource.setMinPoolSize(3);
-                    comboPooledDataSource.setInitialPoolSize(3);
-
-                    try {
-                        comboPooledDataSource.setDriverClass( "org.h2.Driver" ); //loads the jdbc driver
-                    } catch (PropertyVetoException e) {
-                        e.printStackTrace();
-                        Utility.printExecption(LOG, e);
-                        System.exit(-1);
-                    }
-                } else {
-                    migrateLocation = "filesystem:./migrate/mysql";
-                    comboPooledDataSource = new ComboPooledDataSource("mysql");
-                    try {
-                        String url01 = comboPooledDataSource.getJdbcUrl().substring(0,comboPooledDataSource.getJdbcUrl().indexOf("?"));
-                        String datasourceName = url01.substring(url01.lastIndexOf("/")+1);
-                        // 连接已经存在的数据库，如：mysql
-                        String jdbc = comboPooledDataSource.getJdbcUrl().replace(datasourceName, "");
-                        Connection connection = DriverManager.getConnection(jdbc, comboPooledDataSource.getUser(), comboPooledDataSource.getPassword());
-                        Statement statement = connection.createStatement();
-
-                        // 创建数据库
-                        statement.executeUpdate("CREATE DATABASE IF NOT EXISTS `" + datasourceName + "` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;");
-
-                        statement.close();
-                        connection.close();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        System.exit(-1);
-                    }
+                    // 创建数据库
+                    statement.executeUpdate("CREATE DATABASE IF NOT EXISTS `" + datasourceName + "` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;");
 
+                    statement.close();
+                    connection.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    System.exit(-1);
                 }
-                Flyway flyway = Flyway.configure().dataSource(comboPooledDataSource).locations(migrateLocation).baselineOnMigrate(true).load();
-                flyway.migrate();
+
+            }
+            Flyway flyway = Flyway.configure().dataSource(comboPooledDataSource).locations(migrateLocation).baselineOnMigrate(true).load();
+            flyway.migrate();
+
+            if(autoCleanMsgs) {
+                cleanHistoryMsg();
+            }
+        }
+    }
+
+    private static void cleanHistoryMsg() {
+        new Thread(()->{
+            long usedTime = 0;
+            while (true) {
+                if(SystemExiting) {
+                    break;
+                }
+                try {
+                    long sleepTime;
+                    if(ClearDBDebugMode) {
+                        sleepTime = 60 * 1000 - usedTime;
+                    } else {
+                        sleepTime = 60 * 60 * 1000 - usedTime;
+                    }
+                    if(sleepTime < 0) {
+                        sleepTime = 5 * 1000;
+                    }
+
+                    Thread.sleep(sleepTime);
+                    LOG.info("Start clean history messages");
+
+                    if(SystemExiting) {
+                        break;
+                    }
+                    long start = System.currentTimeMillis();
+                    if(IsEmbedDB) {
+                        clearH2DB();
+                    } else {
+                        clearMySQL();
+                    }
+                    usedTime = System.currentTimeMillis() - start;
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }).start();
+    }
+    private static boolean sleep() {
+        if(SystemExiting)
+            return true;
+
+        try {
+            if(ClearDBDebugMode) {
+                Thread.sleep(500);
+            } else {
+                Thread.sleep(10000);
+            }
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return SystemExiting;
+    }
+
+    private static long getMaxMidNeedClean() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        cal.add(Calendar.YEAR, -3);
+        cal.add(Calendar.DATE, 1);
+        return MessageShardingUtil.getMsgIdFromTimestamp(cal.getTimeInMillis());
+    }
+
+    private static void clearH2DB() {
+        clearOneTable("t_user_messages");
+        if(sleep()) {
+            return;
+        }
+        clearOneTable("t_messages");
+    }
+
+    private static void clearMySQL() {
+        for (int i = 0; i < 128; i++) {
+            clearOneTable("t_user_messages_" + i);
+            if(sleep()) {
+                return;
             }
         }
 
-        private static List<String> getCreateSql() {
-            List<String> out = new ArrayList<>();
-            try{
-                BufferedReader br = new BufferedReader(new FileReader("h2/create_table.sql"));//构造一个BufferedReader类来读取文件
-                String s = null;
-                StringBuilder result = new StringBuilder();
-                while((s = br.readLine())!=null) {
-                    result.append(s);
-                    if (s.contains(";")) {
-                        out.add(result.toString());
-                        result = new StringBuilder();
-                    }
-                }
-                br.close();
-            }catch(Exception e){
-                e.printStackTrace();
-                Utility.printExecption(LOG, e);
-            }
-            return out;
+        String msgTableName = MessageShardingUtil.getMessageTable(MessageShardingUtil.getMsgIdFromTimestamp(System.currentTimeMillis()));
+        clearOneTable(msgTableName);
+    }
+
+    private static void clearOneTable(String tableName) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        long mid = getMaxMidNeedClean();
+
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "delete from " + tableName + " where _mid <= " + mid;
+            statement = connection.prepareStatement(sql);
+            int count = statement.executeUpdate();
+            LOG.info("Delete history message {} rows", count);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
         }
-        //从数据源中获取数据库的连接
-        public static Connection getConnection() throws SQLException {
-            long threadId = Thread.currentThread().getId();
+    }
 
-            if (map.get(threadId) != null) {
-                LOG.error("error here!!!! DB connection not close correctly");
-            }
-            map.put(threadId, Thread.currentThread().getStackTrace().toString());
-            Connection connection = transactionConnection.get();
-            if (connection != null) {
-                LOG.debug("Thread {} get db connection {}", threadId, connection);
-                return connection;
+    private static List<String> getCreateSql() {
+        List<String> out = new ArrayList<>();
+        try{
+            BufferedReader br = new BufferedReader(new FileReader("h2/create_table.sql"));//构造一个BufferedReader类来读取文件
+            String s = null;
+            StringBuilder result = new StringBuilder();
+            while((s = br.readLine())!=null) {
+                result.append(s);
+                if (s.contains(";")) {
+                    out.add(result.toString());
+                    result = new StringBuilder();
+                }
             }
+            br.close();
+        }catch(Exception e){
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+        return out;
+    }
+    //从数据源中获取数据库的连接
+    public static Connection getConnection() throws SQLException {
+        long threadId = Thread.currentThread().getId();
 
-            connection = comboPooledDataSource.getConnection();
+        if (map.get(threadId) != null) {
+            LOG.error("error here!!!! DB connection not close correctly");
+        }
+        map.put(threadId, Thread.currentThread().getStackTrace().toString());
+        Connection connection = transactionConnection.get();
+        if (connection != null) {
             LOG.debug("Thread {} get db connection {}", threadId, connection);
             return connection;
         }
 
-        public static void beginTransaction() {
-            try {
-                Connection connection = getConnection();
-                connection.setAutoCommit(false);
-                transactionConnection.set(connection);
-            } catch (SQLException e) {
-                e.printStackTrace();
-                Utility.printExecption(LOG, e);
-            }
+        connection = comboPooledDataSource.getConnection();
+        LOG.debug("Thread {} get db connection {}", threadId, connection);
+        return connection;
+    }
+
+    public static void beginTransaction() {
+        try {
+            Connection connection = getConnection();
+            connection.setAutoCommit(false);
+            transactionConnection.set(connection);
+        } catch (SQLException e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
         }
+    }
 
     public static void commit() {
         try {
@@ -180,57 +292,57 @@ public class DBUtil {
         }
     }
 
-        //释放资源，将数据库连接还给数据库连接池
-        public static void closeDB(Connection conn,PreparedStatement ps,ResultSet rs) {
-            LOG.debug("Thread {} release db connection {}", Thread.currentThread().getId(), conn);
-            try {
-                if (rs!=null) {
-                    rs.close();
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                Utility.printExecption(LOG, e);
-            }
-
-            try {
-                if (ps!=null) {
-                    ps.close();
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                Utility.printExecption(LOG, e);
-            }
-
-            try {
-                if (conn!=null && transactionConnection.get() != conn) {
-                    conn.close();
-                    map.remove(Thread.currentThread().getId());
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                Utility.printExecption(LOG, e);
+    //释放资源，将数据库连接还给数据库连接池
+    public static void closeDB(Connection conn,PreparedStatement ps,ResultSet rs) {
+        LOG.debug("Thread {} release db connection {}", Thread.currentThread().getId(), conn);
+        try {
+            if (rs!=null) {
+                rs.close();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
         }
-        //释放资源，将数据库连接还给数据库连接池
-        public static void closeDB(Connection conn, PreparedStatement ps) {
-            LOG.debug("Thread {} release db connection {}", Thread.currentThread().getId(), conn);
-             try {
-                if (ps!=null) {
-                    ps.close();
-                }
-            } catch (SQLException e) {
-                e.printStackTrace();
-                 Utility.printExecption(LOG, e);
-            }
 
-            try {
-                if (conn!=null && transactionConnection.get() != conn) {
-                    conn.close();
-                    map.remove(Thread.currentThread().getId());
-                }
-            } catch (SQLException e) {
-                e.printStackTrace();
-                Utility.printExecption(LOG, e);
+        try {
+            if (ps!=null) {
+                ps.close();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
         }
+
+        try {
+            if (conn!=null && transactionConnection.get() != conn) {
+                conn.close();
+                map.remove(Thread.currentThread().getId());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+    }
+    //释放资源，将数据库连接还给数据库连接池
+    public static void closeDB(Connection conn, PreparedStatement ps) {
+        LOG.debug("Thread {} release db connection {}", Thread.currentThread().getId(), conn);
+        try {
+            if (ps!=null) {
+                ps.close();
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+
+        try {
+            if (conn!=null && transactionConnection.get() != conn) {
+                conn.close();
+                map.remove(Thread.currentThread().getId());
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        }
+    }
 }

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

@@ -30,9 +30,19 @@ public class HttpUtils {
     private static final Logger LOG = LoggerFactory.getLogger(HttpUtils.class);
     public static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
     static private OkHttpClient client = new OkHttpClient();
+    public interface HttpCallback {
+        void onSuccess(String content);
+        void onFailure(int statusCode, String errorMessage);
+    }
 
-    public static void httpJsonPost(final String url, final String jsonStr){
-        LOG.info("POST to {} with data {}", url, jsonStr);
+    public static void httpJsonPost(final String url, final String jsonStr) {
+        httpJsonPost(url, jsonStr, null);
+    }
+
+    public static void httpJsonPost(final String url, final String jsonStr, final  HttpCallback httpCallback) {
+        //消息推送内容为 {"sender":"uCGUxUaa","senderName":"杨","convType":0,"target":"usq7v7UU","targetName":"鞋子","userId":"usq7v7UU","line":0,"cntType":400,"serverTime":1610590766485,"pushMessageType":1,"pushType":2,"pushContent":"","pushData":"","unReceivedMsg":1,"mentionedType":0,"packageName":"cn.wildfirechat.chat","deviceToken":"AFoieP9P6u6CccIkRK23gRwUJWKqSkdiqnb-6gC1kL7Wv-9XNoEYBPU7VsINU_q8_WTKfafe35qWu7ya7Z-NmgOTX9XVW3A3zd6ilh--quj6ccINXRvVnh8QmI9QQ","isHiddenDetail":false,"language":"zh"}
+        //推送信息只打印前100个字符，防止敏感信息打印到日志中去。
+        LOG.info("POST to {} with data {}...", url, jsonStr.substring(0, Math.min(jsonStr.length(), 100)));
         if (StringUtil.isNullOrEmpty(url)) {
             LOG.error("http post failure with empty url");
             return;
@@ -48,12 +58,27 @@ public class HttpUtils {
             public void onFailure(Call call, IOException e) {
                 e.printStackTrace();
                 LOG.info("POST to {} with data {} failure", url, jsonStr);
+                if(httpCallback != null) {
+                    httpCallback.onFailure(-1, e.getMessage());
+                }
             }
 
             @Override
             public void onResponse(Call call, Response response) throws IOException {
                 LOG.info("POST to {} success with response: {}", url, response.body());
                 try {
+                    if(httpCallback != null) {
+                        int code = response.code();
+                        if(code == 200) {
+                            if(response.body() != null && response.body().contentLength() > 0) {
+                                httpCallback.onSuccess(response.body().string());
+                            } else {
+                                httpCallback.onSuccess(null);
+                            }
+                        } else {
+                            httpCallback.onFailure(code, response.message());
+                        }
+                    }
                     if (response.body() != null) {
                         response.body().close();
                     }

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

@@ -101,6 +101,26 @@ public class MessageShardingUtil {
         year %= 3;
         return "t_messages_" + (year * 12 + month);
     }
+    static Calendar getCalendarFromMessageId(long mid) {
+        Calendar calendar = Calendar.getInstance();
+        if (mid != Long.MAX_VALUE && mid != 0) {
+            mid >>= (nodeIdWidth + rotateIdWidth);
+            Date date = new Date(mid + T201801010000);
+            calendar.setTime(date);
+        } else {
+            Date date = new Date(System.currentTimeMillis());
+            calendar.setTime(date);
+        }
+        return calendar;
+    }
+    public static long getMsgIdFromTimestamp(long timestamp) {
+        long id = timestamp - T201801010000;
+
+        id <<= rotateIdWidth;
+        id <<= nodeIdWidth;
+
+        return id;
+    }
 
     public static String getPreviousMessageTable(long mid) {
         return getMessageTable(mid, -1);

common/pom.xml

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

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

@@ -28,7 +28,9 @@ public interface APIPath {
     String User_Get_Blocked_List = "/admin/user/get_blocked_list";
     String User_Check_Block_Status = "/admin/user/check_block_status";
     String User_Get_Online_Status = "/admin/user/onlinestatus";
-
+    String User_Put_Setting = "/admin/user/put_setting";
+    String User_Get_Setting = "/admin/user/get_setting";
+    String User_Kickoff_Client = "/admin/user/kickoff_client";
 
     String Friend_Update_Status = "/admin/friend/status";
     String Friend_Get_List = "/admin/friend/list";
@@ -38,6 +40,7 @@ public interface APIPath {
     String Friend_Set_Alias = "/admin/friend/set_alias";
     String Friend_Send_Request = "/admin/friend/send_request";
     String Friend_Get_Requests = "/admin/friend/get_requests";
+    String Relation_Get = "/admin/relation/get";
 
     String Msg_Send = "/admin/message/send";
     String Msg_Recall = "/admin/message/recall";
@@ -75,4 +78,25 @@ public interface APIPath {
 
     String Robot_User_Info = "/robot/user_info";
     String Robot_Message_Send = "/robot/message/send";
+
+    String Robot_Set_Callback = "/robot/set_callback";
+    String Robot_Get_Callback = "/robot/get_callback";
+    String Robot_Delete_Callback = "/robot/delete_callback";
+    String Robot_Update_Profile = "/robot/update_profile";
+
+    String Robot_Verify_Application_User = "/robot/user/verify";
+
+    String Robot_Group_Member_Add = "/robot/group/member/add";
+    String Robot_Group_Allow_Member = "/robot/group/manager/allow";
+    String Robot_Create_Group = "/robot/group/create";
+    String Robot_Group_Dismiss = "/robot/group/del";
+    String Robot_Group_Get_Info = "/robot/group/get_info";
+    String Robot_Group_Member_List = "/robot/group/member/list";
+    String Robot_Group_Member_Kickoff = "/robot/group/member/del";
+    String Robot_Group_Modify_Info = "/robot/group/modify";
+    String Robot_Group_Set_Member_Alias = "/robot/group/member/set_alias";
+    String Robot_Group_Mute_Member = "/robot/group/manager/mute";
+    String Robot_Group_Member_Quit = "/robot/group/member/quit";
+    String Robot_Group_Transfer = "/robot/group/transfer";
+    String Robot_Group_Set_Manager = "/robot/group/manager/set";
 }

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

@@ -54,6 +54,7 @@ public enum ErrorCode {
     ERROR_CODE_TIMEOUT(249, "timeout"),
     ERROR_CODE_OVER_FREQUENCY(250, "over frequency"),
     INVALID_PARAMETER(251, "Invalid parameter"),
+    INVALID_ASYNC_HANDLING(252, "Async handling"),
     ERROR_CODE_NOT_EXIST(253, "not exist"),
     ERROR_CODE_NOT_IMPLEMENT(254, "not implement"),
 

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

@@ -0,0 +1,38 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+public class IntStringPairPojo {
+    private int intValue;
+    private String strValue;
+
+    public IntStringPairPojo() {
+    }
+
+    public IntStringPairPojo(int intValue, String strValue) {
+        this.intValue = intValue;
+        this.strValue = strValue;
+    }
+
+    public int getIntValue() {
+        return intValue;
+    }
+
+    public void setIntValue(int intValue) {
+        this.intValue = intValue;
+    }
+
+    public String getStrValue() {
+        return strValue;
+    }
+
+    public void setStrValue(String strValue) {
+        this.strValue = strValue;
+    }
+}

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

@@ -6,7 +6,7 @@
  * file that was distributed with this source code.
  */
 
-package win.liyufan.im;
+package cn.wildfirechat.pojos;
 
 public interface MyInfoType {
     int Modify_DisplayName = 0;

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

@@ -0,0 +1,10 @@
+package cn.wildfirechat.pojos;
+
+public class RelationPojo {
+    public String userId;
+    public String targetId;
+    public boolean isFriend;
+    public boolean isBlacked;
+    public String alias;
+    public String extra;
+}

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

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

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

@@ -0,0 +1,38 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+public class StringPairPojo {
+    private String first;
+    private String second;
+
+    public StringPairPojo() {
+    }
+
+    public StringPairPojo(String first, String second) {
+        this.first = first;
+        this.second = second;
+    }
+
+    public String getFirst() {
+        return first;
+    }
+
+    public void setFirst(String first) {
+        this.first = first;
+    }
+
+    public String getSecond() {
+        return second;
+    }
+
+    public void setSecond(String second) {
+        this.second = second;
+    }
+}

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

@@ -0,0 +1,61 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+import cn.wildfirechat.proto.WFCMessage;
+import io.netty.util.internal.StringUtil;
+
+public class UserSettingPojo {
+    private String userId;
+    private int scope;
+    private String key;
+    private String value;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public int getScope() {
+        return scope;
+    }
+
+    public void setScope(int scope) {
+        this.scope = scope;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+    public WFCMessage.ModifyUserSettingReq toProtoRequest() {
+        WFCMessage.ModifyUserSettingReq.Builder builder = WFCMessage.ModifyUserSettingReq.newBuilder();
+        builder.setScope(scope);
+        if (!StringUtil.isNullOrEmpty(key))
+            builder.setKey(key);
+        if(!StringUtil.isNullOrEmpty(value))
+            builder.setValue(value);
+
+        return builder.build();
+    }
+}

distribution/pom.xml

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

distribution/src/main/resources/wildfirechat.conf

@@ -10,7 +10,7 @@
 # （如果您部署云服务器上或者具有独立公网出口的服务器上，请改为对应的公网IP；如果您部署在在内网环境下，在内网使用，这个地方改成内网地址）
 server.ip 0.0.0.0
 
-##原生客户端长链接端口
+##原生客户端长链接端口。如果使用4层的反向代理或者类似组件，需要设置长链接保持时间为10分钟。
 port 1883
 
 ##客户端短链接端口
@@ -31,6 +31,11 @@ local_port 80
 ##是否使用内置DB。0使用mysql；1使用h2db；2使用mysql+mongodb。社区版只支持0和1，专业版支持2
 embed.db 1
 
+## 是否自动清理历史消息记录，当为true时，IM服务会定时扫描t_messages_x和t_user_messages_x表，清除掉3年前的历史消息。
+## 如果不开启自动清理，需要手动清理t_messages_x和t_user_messages_x表内的历史数据，保存数据不能超过3年。
+## 使用mongodb时次开关无效（因为mongodb设置了消息过期时间，会自动清理）。
+db.auto_clean_history_messages true
+
 ##服务器管理接口密钥
 http.admin.secret_key 123456
 
@@ -102,13 +107,18 @@ chatroom.participant_idle_time 900000
 chatroom.rejoin_when_active true
 
 ## 是否允许客户端发送操作群的自定义群通知消息
-group.allow_client_custom_operation_notification false
+group.allow_client_custom_operation_notification true
 
 ## 当群成员退出或者被移除时，是否同时给管理员和相关人员发送显式通知消息。
 ## 0 不发送，1 退群时发送，2 踢人时发送，3 退群和踢人时都发送。
 ## 如果应用需要退群或者踢人不通知普通成员，请设置此参数为3，然后修改客户端踢人或退群消息的flag为not_presist。
 group.visible_quit_or_kickoff_notification 0
 
+## 隐藏用户信息属性类型，2是性别，3是电话号码，4是邮箱，5是地址，6是公司信息，7是社交账号，8是Extra信息。当需要隐藏多个时以英文逗号分开;
+## 本配置是为了提高安全性，避免把对应信息同步到客户端，这样就能防止程序被破解从而拿到用户关键信息。仅对客户端有效，server api不受影响。
+## 注意，修改本配置不会对已经同步的信息产生影响。
+#user.hide_properties 3,4
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************
@@ -202,6 +212,8 @@ push.ios.server.address http://localhost:8085/ios/push
 ##消息转发地址
 ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
 #message.forward.url http://localhost:8087/im_event/message
+##需要转发的消息类型，当有多个时以英文逗号分割。如果转发所有消息，请注释掉配置或者设置为空
+#message.forward.types 1,2,3
 
 ##设备信息转发地址
 ##注意回调是单线程回调，接收服务必须在同一内网，且异步处理快速返回，否则会有延迟问题！！
@@ -240,5 +252,16 @@ push.ios.server.address http://localhost:8085/ios/push
 #*********************************************************************
 # Sensitive configuration
 #*********************************************************************
-##文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***
+## 内置文本敏感词过滤处理方法，0 发送失败；1 发送成功但消息被服务器直接丢弃；2 命中的敏感词被替换成***；3 记录并继续发送
 sensitive.filter.type 0
+
+## 如果内置敏感词库无法满足您的需求，可以自己开发部署敏感词审核服务。配置如下地址和消息类型，IM服务会把指定消息类型的消息回调到指定地址
+## 审核服务返回状态码200表示继续发送，如果需要替换内容，返回状态码200并且内容为替换后的内容。返回403表示不允许发送。其它错误继续发送。
+## 独立审核服务地址，IM服务会post SendMessageData。如果需要修改消息内容，返回 MessagePayload。请参考应用服务中 "/message/censor" Mapping.
+#sensitive.remote_server_url http://192.168.3.202:8888/message/censor
+## 需要进行敏感词审核的消息类型，当有多个时以英文逗号分割
+#sensitive.remote_sensitive_message_type 1,2,3
+## 如果远程审核服务返回403，返回给发送端发送失败还是成功？实际上这个值影响发送响应是否等待审核结果，当为false时，消息发送给审核服务就立即返回
+## 成功给客户端。当为true时，消息发送给审核服务，等待审核结果，如果结果为继续发送就返回给客户端为成功，结果为禁止发送就返回失败给客户端。
+## 客户端操作的超时一般为10s左右，且考虑到复杂的网络情况，建议处理时间不要超过3s。建议这个值为false。
+#sensitive.remote_fail_when_matched false

docker/Dockerfile

@@ -0,0 +1,19 @@
+FROM openjdk:8-jre-alpine
+
+ADD ../distribution/target/distribution-*-bundle-tar.tar.gz /opt/im-server/
+
+RUN sed -i 's/#JAVA_OPTS="$JAVA_OPTS -Xmx128M"/JAVA_OPTS="$JAVA_OPTS -Xmx$JVM_XMX"/g' /opt/im-server/bin/wildfirechat.sh
+RUN sed -i 's/#JAVA_OPTS="$JAVA_OPTS -Xms128M"/JAVA_OPTS="$JAVA_OPTS -Xms$JVM_XMS"/g' /opt/im-server/bin/wildfirechat.sh
+
+WORKDIR /opt/im-server
+
+VOLUME /opt/im-server/config
+VOLUME /opt/im-server/logs
+
+EXPOSE 80/tcp 1883/tcp 8083/tcp 8084/tcp 18080/tcp
+
+ENV JVM_XMX 256M
+ENV JVM_XMS 256M
+
+
+CMD ./bin/wildfirechat.sh

docker/README.md

@@ -0,0 +1,19 @@
+# 野火IM服务docker使用说明
+
+## 编译镜像
+首先需要先编译应用服务，在项目根目录下使用下面命令编译
+```
+mvn clean package
+```
+
+然后进入到docker目录下，编译镜像
+```
+sudo docker build -t wildfire_im .
+```
+
+## 运行
+配置：
+运行需要手动指定配置目录，这样不用重新打包镜像。手动指定配置目录的方法如下，其中$PATH_TO_CONFIG为im配置目录，模版为```distribution/src/main/resources```目录:
+```
+sudo docker run -it -v $PATH_TO_CONFIG:/opt/im-server/config -v $PATH_TO_LOGS:/opt/im-server/logs -e JVM_XMX=256M -e JVM_XMS=256M -p 80:80 -p 1883:1883 -p 8083:8083 -p 8084:8084 -p 18080:18080 wildfire_im
+```

pom.xml

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

sdk/pom.xml

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

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

@@ -27,4 +27,40 @@ public class GeneralAdmin {
         return AdminHttpUtils.httpJsonPost(path, inputCreateChannel, OutputCreateChannel.class);
     }
 
+    //以下仅专业版支持
+    public static IMResult<Void> setConversationTop(String userId, int conversationType, String target, int line, boolean isTop) throws Exception {
+        String key = conversationType + "-" + line + "-" + target;
+        String value = isTop?"1":"0";
+        return setUserSetting(userId, 3, key, value);
+    }
+
+    public static IMResult<Boolean> getConversationTop(String userId, int conversationType, String target, int line) throws Exception {
+        String key = conversationType + "-" + line + "-" + target;
+        IMResult<UserSettingPojo> result = getUserSetting(userId, 3, key);
+        IMResult<Boolean> out = new IMResult<Boolean>();
+        out.code = result.code;
+        out.msg = result.msg;
+        out.result = result.result != null && "1".equals(result.result.getValue());
+        return out;
+    }
+
+
+    private static IMResult<UserSettingPojo> getUserSetting(String userId, int scope, String key) throws Exception {
+        String path = APIPath.User_Get_Setting;
+        UserSettingPojo pojo = new UserSettingPojo();
+        pojo.setUserId(userId);
+        pojo.setScope(scope);
+        pojo.setKey(key);
+        return AdminHttpUtils.httpJsonPost(path, pojo, UserSettingPojo.class);
+    }
+
+    private static IMResult<Void> setUserSetting(String userId, int scope, String key, String value) throws Exception {
+        String path = APIPath.User_Put_Setting;
+        UserSettingPojo pojo = new UserSettingPojo();
+        pojo.setUserId(userId);
+        pojo.setScope(scope);
+        pojo.setKey(key);
+        pojo.setValue(value);
+        return AdminHttpUtils.httpJsonPost(path, pojo, Void.class);
+    }
 }

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

@@ -14,6 +14,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import static cn.wildfirechat.pojos.MyInfoType.Modify_DisplayName;
 import static cn.wildfirechat.proto.ProtoConstants.SystemSettingType.Group_Max_Member_Count;
 
 public class Main {
@@ -330,17 +331,25 @@ public class Main {
         String alias = "hello" + System.currentTimeMillis();
         IMResult<Void> updateFriendAlias = RelationAdmin.updateFriendAlias("ff1", "ff2", alias);
         if (updateFriendAlias != null && updateFriendAlias.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("update friend status success");
+            System.out.println("update friend alias success");
         } else {
-            System.out.println("update friend status failure");
+            System.out.println("update friend alias failure");
             System.exit(-1);
         }
 
         IMResult<OutputGetAlias> getFriendAlias = RelationAdmin.getFriendAlias("ff1", "ff2");
         if (getFriendAlias != null && getFriendAlias.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && getFriendAlias.getResult().getAlias().equals(alias)) {
-            System.out.println("update friend status success");
+            System.out.println("get friend alias success");
         } else {
-            System.out.println("update friend status failure");
+            System.out.println("get friend alias failure");
+            System.exit(-1);
+        }
+
+        IMResult<RelationPojo> getRelation = RelationAdmin.getRelation("ff1", "ff2");
+        if (getRelation != null && getRelation.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("get friend relation success");
+        } else {
+            System.out.println("get friend relation failure");
             System.exit(-1);
         }
     }
@@ -356,6 +365,7 @@ public class Main {
         groupInfo.setOwner("user1");
         groupInfo.setName("test_group");
         groupInfo.setExtra("hello extra");
+        groupInfo.setType(2);
         groupInfo.setPortrait("http://portrait");
         List<PojoGroupMember> members = new ArrayList<>();
         PojoGroupMember member1 = new PojoGroupMember();
@@ -647,8 +657,8 @@ public class Main {
             System.exit(-1);
         }
     }
-    static void testChatroom() throws Exception {
 
+    static void testChatroom() throws Exception {
         String chatroomId = "chatroomId1";
         String chatroomTitle = "TESTCHATROM";
         String chatroomDesc = "this is a test chatroom";
@@ -704,111 +714,171 @@ public class Main {
         }
 
         //下面仅专业版支持
-        /*
-        //设置用户聊天室黑名单。0正常；1禁言；2禁止加入。
-        IMResult<Void> voidIMResult1 = ChatroomAdmin.setChatroomBlacklist("chatroom1", "oto9o9__", 1);
-        if (voidIMResult1 != null && voidIMResult1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("add chatroom black success");
-        } else {
-            System.out.println("add chatroom black failure");
-            System.exit(-1);
-        }
-
-        //获取聊天室黑名单
-        IMResult<OutputChatroomBlackInfos> blackInfos = ChatroomAdmin.getChatroomBlacklist("chatroom1");
-        if (blackInfos != null && blackInfos.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !blackInfos.getResult().infos.isEmpty()) {
-            boolean success = false;
-            for (OutputChatroomBlackInfos.OutputChatroomBlackInfo info : blackInfos.getResult().infos) {
-                if (info.userId.equals("oto9o9__")) {
-                    success = true;
-                    break;
-                }
-            }
-            if (success) {
+        if(commercialServer) {
+            //设置用户聊天室黑名单。0正常；1禁言；2禁止加入。
+            IMResult<Void> voidIMResult1 = ChatroomAdmin.setChatroomBlacklist("chatroom1", "oto9o9__", 1);
+            if (voidIMResult1 != null && voidIMResult1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
                 System.out.println("add chatroom black success");
             } else {
                 System.out.println("add chatroom black failure");
                 System.exit(-1);
             }
-        } else {
-            System.out.println("add chatroom black failure");
-            System.exit(-1);
-        }
 
-        //取消用户聊天室黑名单。0正常；1禁言；2禁止加入。
-        voidIMResult1 = ChatroomAdmin.setChatroomBlacklist("chatroom1", "oto9o9__", 0);
-        if (voidIMResult1 != null && voidIMResult1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("remove chatroom black success");
-        } else {
-            System.out.println("remove chatroom black failure");
-            System.exit(-1);
-        }
-
-        //获取聊天室黑名单
-        blackInfos = ChatroomAdmin.getChatroomBlacklist("chatroom1");
-        if (blackInfos != null && blackInfos.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            boolean success = true;
-            for (OutputChatroomBlackInfos.OutputChatroomBlackInfo info : blackInfos.getResult().infos) {
-                if (info.userId.equals("oto9o9__")) {
-                    success = false;
-                    break;
+            //获取聊天室黑名单
+            IMResult<OutputChatroomBlackInfos> blackInfos = ChatroomAdmin.getChatroomBlacklist("chatroom1");
+            if (blackInfos != null && blackInfos.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !blackInfos.getResult().infos.isEmpty()) {
+                boolean success = false;
+                for (OutputChatroomBlackInfos.OutputChatroomBlackInfo info : blackInfos.getResult().infos) {
+                    if (info.userId.equals("oto9o9__")) {
+                        success = true;
+                        break;
+                    }
                 }
+                if (success) {
+                    System.out.println("add chatroom black success");
+                } else {
+                    System.out.println("add chatroom black failure");
+                    System.exit(-1);
+                }
+            } else {
+                System.out.println("add chatroom black failure");
+                System.exit(-1);
             }
-            if (success) {
+
+            //取消用户聊天室黑名单。0正常；1禁言；2禁止加入。
+            voidIMResult1 = ChatroomAdmin.setChatroomBlacklist("chatroom1", "oto9o9__", 0);
+            if (voidIMResult1 != null && voidIMResult1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
                 System.out.println("remove chatroom black success");
             } else {
                 System.out.println("remove chatroom black failure");
                 System.exit(-1);
             }
-        } else {
-            System.out.println("remove chatroom black failure");
-            System.exit(-1);
-        }
 
-        //设置聊天室管理员
-        IMResult<Void> voidIMResult2 = ChatroomAdmin.setChatroomManager("chatroom1", "UserId1", 1);
-        if (voidIMResult2 != null && voidIMResult2.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("add chatroom manager success");
-        } else {
-            System.out.println("add chatroom black failure");
-            System.exit(-1);
-        }
+            //获取聊天室黑名单
+            blackInfos = ChatroomAdmin.getChatroomBlacklist("chatroom1");
+            if (blackInfos != null && blackInfos.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                boolean success = true;
+                for (OutputChatroomBlackInfos.OutputChatroomBlackInfo info : blackInfos.getResult().infos) {
+                    if (info.userId.equals("oto9o9__")) {
+                        success = false;
+                        break;
+                    }
+                }
+                if (success) {
+                    System.out.println("remove chatroom black success");
+                } else {
+                    System.out.println("remove chatroom black failure");
+                    System.exit(-1);
+                }
+            } else {
+                System.out.println("remove chatroom black failure");
+                System.exit(-1);
+            }
 
-        //获取聊天室管理员
-        IMResult<OutputStringList> managers = ChatroomAdmin.getChatroomManagerList("chatroom1");
-        if (managers != null && managers.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !managers.getResult().getList().isEmpty() && managers.getResult().getList().contains("UserId1")) {
+            //设置聊天室管理员
+            IMResult<Void> voidIMResult2 = ChatroomAdmin.setChatroomManager("chatroom1", "UserId1", 1);
+            if (voidIMResult2 != null && voidIMResult2.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("add chatroom manager success");
+            } else {
+                System.out.println("add chatroom black failure");
+                System.exit(-1);
+            }
+
+            //获取聊天室管理员
+            IMResult<OutputStringList> managers = ChatroomAdmin.getChatroomManagerList("chatroom1");
+            if (managers != null && managers.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !managers.getResult().getList().isEmpty() && managers.getResult().getList().contains("UserId1")) {
                 System.out.println("add chatroom black success");
-        } else {
-            System.out.println("add chatroom black failure");
-            System.exit(-1);
+            } else {
+                System.out.println("add chatroom black failure");
+                System.exit(-1);
+            }
+
+            //取消聊天室管理员
+            IMResult<Void> voidIMResult3 = ChatroomAdmin.setChatroomManager("chatroom1", "UserId1", 0);
+            if (voidIMResult3 != null && voidIMResult3.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("add chatroom manager success");
+            } else {
+                System.out.println("add chatroom black failure");
+                System.exit(-1);
+            }
+
+            //获取聊天室管理员
+            IMResult<OutputStringList> managers2 = ChatroomAdmin.getChatroomManagerList("chatroom1");
+            if (managers2 != null && managers2.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !managers2.getResult().getList().contains("UserId1")) {
+                System.out.println("add chatroom black success");
+            } else {
+                System.out.println("add chatroom black failure");
+                System.exit(-1);
+            }
         }
-
-        //取消聊天室管理员
-        IMResult<Void> voidIMResult3 = ChatroomAdmin.setChatroomManager("chatroom1", "UserId1", 0);
-        if (voidIMResult3 != null && voidIMResult3.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("add chatroom manager success");
-        } else {
-            System.out.println("add chatroom black failure");
-            System.exit(-1);
-        }
-
-        //获取聊天室管理员
-        IMResult<OutputStringList> managers2 = ChatroomAdmin.getChatroomManagerList("chatroom1");
-        if (managers2 != null && managers2.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !managers2.getResult().getList().contains("UserId1")) {
-            System.out.println("add chatroom black success");
-        } else {
-            System.out.println("add chatroom black failure");
-            System.exit(-1);
-        }*/
-
     }
 
     static void testRobot() throws Exception {
-        //初始化机器人API
-        RobotHttpUtils.init("http://localhost", "robot1", "123456");
+        //初始化机器人API，注意端口是80，不是18080
+        String robotId = "robot1";
+        RobotHttpUtils.init("http://localhost", robotId, "123456");
+
         //***********************************************
         //****  机器人API
         //***********************************************
+
+        IMResult<InputOutputUserInfo> userInfoIMResult = RobotService.getProfile(robotId);
+        if(userInfoIMResult != null && userInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("get profile success");
+        } else {
+            System.out.println("get profile failure");
+            System.exit(-1);
+        }
+
+        String displayName = "testrobot"+System.currentTimeMillis();
+        IMResult<Void> voidIMResult1 = RobotService.updateProfile(Modify_DisplayName, displayName);
+        if(voidIMResult1 != null && voidIMResult1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("modify profile success");
+        } else {
+            System.out.println("modify profile failure");
+            System.exit(-1);
+        }
+        userInfoIMResult = RobotService.getProfile(robotId);
+        if(userInfoIMResult != null && userInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && displayName.equals(userInfoIMResult.getResult().getDisplayName())) {
+            System.out.println("get profile success");
+        } else {
+            System.out.println("get profile failure");
+            System.exit(-1);
+        }
+
+        String robotCallback = "http://hellow123";
+        voidIMResult1 = RobotService.setCallback(robotCallback);
+        if(voidIMResult1 != null && voidIMResult1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("set callback success");
+        } else {
+            System.out.println("set callback failure");
+            System.exit(-1);
+        }
+
+        IMResult<RobotCallbackPojo> callbackPojoIMResult = RobotService.getCallback();
+        if(callbackPojoIMResult != null && callbackPojoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && robotCallback.equals(callbackPojoIMResult.getResult().getUrl())) {
+            System.out.println("get callback success");
+        } else {
+            System.out.println("get callback failure");
+            System.exit(-1);
+        }
+
+        voidIMResult1 = RobotService.deleteCallback();
+        if(voidIMResult1 != null && voidIMResult1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("delete callback success");
+        } else {
+            System.out.println("delete callback failure");
+            System.exit(-1);
+        }
+
+        callbackPojoIMResult = RobotService.getCallback();
+        if(callbackPojoIMResult != null && callbackPojoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && StringUtil.isNullOrEmpty(callbackPojoIMResult.getResult().getUrl())) {
+            System.out.println("get callback success");
+        } else {
+            System.out.println("get callback failure");
+            System.exit(-1);
+        }
+
         Conversation conversation = new Conversation();
         conversation.setTarget("user2");
         conversation.setType(ProtoConstants.ConversationType.ConversationType_Private);
@@ -831,6 +901,182 @@ public class Main {
             System.out.println("robot get user info by userId failure");
             System.exit(-1);
         }
+
+        String groupId = "robot_group" + System.currentTimeMillis();
+        PojoGroupInfo groupInfo = new PojoGroupInfo();
+        groupInfo.setTarget_id(groupId);
+        groupInfo.setName("test_group");
+        groupInfo.setType(2);
+        groupInfo.setExtra("hello extra");
+        groupInfo.setPortrait("http://portrait");
+        List<PojoGroupMember> members = new ArrayList<>();
+
+        PojoGroupMember member1 = new PojoGroupMember();
+        member1.setMember_id("user1");
+        members.add(member1);
+
+        PojoGroupMember member2 = new PojoGroupMember();
+        member2.setMember_id("user2");
+        members.add(member2);
+
+        PojoGroupMember member3 = new PojoGroupMember();
+        member3.setMember_id("user3");
+        members.add(member3);
+
+        IMResult<OutputCreateGroupResult> resultCreateGroup = RobotService.createGroup(groupInfo, members, null, null);
+        if (resultCreateGroup != null && resultCreateGroup.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("create group success");
+        } else {
+            System.out.println("create group failure");
+            System.exit(-1);
+        }
+
+        IMResult<PojoGroupInfo> resultGetGroupInfo = RobotService.getGroupInfo(groupInfo.getTarget_id());
+        if (resultGetGroupInfo != null && resultGetGroupInfo.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            if (groupInfo.getExtra().equals(resultGetGroupInfo.getResult().getExtra())
+                && groupInfo.getName().equals(resultGetGroupInfo.getResult().getName())
+                && robotId.equals(resultGetGroupInfo.getResult().getOwner())) {
+                System.out.println("get group success");
+            } else {
+                System.out.println("group info is not expected");
+                System.exit(-1);
+            }
+        } else {
+            System.out.println("create group failure");
+            System.exit(-1);
+        }
+
+        IMResult<Void> voidIMResult = RobotService.modifyGroupInfo(groupInfo.getTarget_id(), ProtoConstants.ModifyGroupInfoType.Modify_Group_Name,"HelloWorld", null, null);
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("modify group success");
+        } else {
+            System.out.println("modify group failure");
+            System.exit(-1);
+        }
+
+
+        IMResult<OutputGroupMemberList> resultGetMembers = RobotService.getGroupMembers(groupInfo.getTarget_id());
+        if (resultGetMembers != null && resultGetMembers.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("get group member success");
+        } else {
+            System.out.println("create group failure");
+            System.exit(-1);
+        }
+
+        PojoGroupMember m = new PojoGroupMember();
+        m.setMember_id("user1");
+        m.setAlias("hello user1");
+
+        voidIMResult = RobotService.addGroupMembers(groupInfo.getTarget_id(), Arrays.asList(m), null, null);
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("add group member success");
+        } else {
+            System.out.println("add group member failure");
+            System.exit(-1);
+        }
+
+        voidIMResult = RobotService.kickoffGroupMembers(groupInfo.getTarget_id(), Arrays.asList("user3"), null, null);
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("kickoff group member success");
+        } else {
+            System.out.println("kickoff group member failure");
+            System.exit(-1);
+        }
+
+        voidIMResult = RobotService.setGroupMemberAlias(groupInfo.getTarget_id(), "user3", "test user3", null, null);
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("set group member alias success");
+        } else {
+            System.out.println("set group member alias failure");
+            System.exit(-1);
+        }
+
+        if(commercialServer) {
+            voidIMResult = RobotService.setGroupManager(groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), true, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("set group manager success");
+            } else {
+                System.out.println("set group manager failure");
+                System.exit(-1);
+            }
+
+            voidIMResult = RobotService.setGroupManager(groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), false, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("cancel group manager success");
+            } else {
+                System.out.println("cancel group manager failure");
+                System.exit(-1);
+            }
+        }
+
+
+
+        //仅专业版支持
+        if (commercialServer) {
+            //开启群成员禁言
+            voidIMResult = RobotService.muteGroupMember(groupInfo.getTarget_id(), Arrays.asList("user5"), true, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("mute group member success");
+            } else {
+                System.out.println("mute group member failure");
+                System.exit(-1);
+            }
+            //关闭群成员禁言
+            voidIMResult = RobotService.muteGroupMember(groupInfo.getTarget_id(), Arrays.asList("user5"), false, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("unmute group member success");
+            } else {
+                System.out.println("unmute group member failure");
+                System.exit(-1);
+            }
+
+            //开启群成员白名单，当群全局禁言时，白名单用户可以发言
+            voidIMResult = RobotService.allowGroupMember(groupInfo.getTarget_id(), Arrays.asList("user5"), true, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("allow group member success");
+            } else {
+                System.out.println("allow group member failure");
+                System.exit(-1);
+            }
+
+            //关闭群成员白名单
+            voidIMResult = RobotService.allowGroupMember(groupInfo.getTarget_id(), Arrays.asList("user5"), false, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("unallow group member success");
+            } else {
+                System.out.println("unallow group member failure");
+                System.exit(-1);
+            }
+        }
+        voidIMResult = RobotService.transferGroup(groupInfo.getTarget_id(), "user2", null, null);
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("transfer success");
+        } else {
+            System.out.println("create group failure");
+            System.exit(-1);
+        }
+
+        resultGetGroupInfo = RobotService.getGroupInfo(groupInfo.getTarget_id());
+        if (resultGetGroupInfo != null && resultGetGroupInfo.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            if ("user2".equals(resultGetGroupInfo.getResult().getOwner())) {
+                groupInfo.setOwner("user2");
+            } else {
+                System.out.println("group info is not expected");
+                System.exit(-1);
+            }
+        } else {
+            System.out.println("create group failure");
+            System.exit(-1);
+        }
+
+        voidIMResult = RobotService.quitGroup(groupInfo.getTarget_id(), null, null);
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("quit group success");
+        } else {
+            System.out.println("quit group failure");
+            System.exit(-1);
+        }
+
     }
 
     //***测试频道API功能，仅专业版支持***
@@ -887,6 +1133,7 @@ public class Main {
         inputCreateChannel.setOwner("userId1");
         String secret = "channelsecret";
         inputCreateChannel.setSecret(secret);
+        inputCreateChannel.setState(0xff);
         IMResult<OutputCreateChannel> resultCreateChannel = GeneralAdmin.createChannel(inputCreateChannel);
         if (resultCreateChannel != null && resultCreateChannel.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("create channel success");
@@ -896,7 +1143,7 @@ public class Main {
         }
 
 
-        //2. 初始化api
+        //2. 初始化api，注意端口是80，不是18080
         ChannelServiceApi channelServiceApi = new ChannelServiceApi("http://localhost", resultCreateChannel.getResult().getTargetId(), secret);
 
 
@@ -986,9 +1233,9 @@ public class Main {
 
             IMResult<OutputGetChannelInfo> outputGetChannelInfoIMResult = channelServiceApi.getChannelInfo();
             if (outputGetChannelInfoIMResult != null && outputGetChannelInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-                System.out.println("destroy user success");
+                System.out.println("get channel info success");
             } else {
-                System.out.println("destroy user failure");
+                System.out.println("get channel info failure");
                 System.exit(-1);
             }
         }

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

@@ -65,4 +65,10 @@ public class RelationAdmin {
         input.setForce(force);
         return AdminHttpUtils.httpJsonPost(path, input, Void.class);
     }
+
+    public static IMResult<RelationPojo> getRelation(String userId, String targetId) throws Exception {
+        String path = APIPath.Relation_Get;
+        StringPairPojo input = new StringPairPojo(userId, targetId);
+        return AdminHttpUtils.httpJsonPost(path, input, RelationPojo.class);
+    }
 }

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

@@ -3,8 +3,10 @@ package cn.wildfirechat.sdk;
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.sdk.model.IMResult;
-import cn.wildfirechat.sdk.utilities.AdminHttpUtils;
 import cn.wildfirechat.sdk.utilities.RobotHttpUtils;
+import cn.wildfirechat.sdk.utilities.RobotHttpUtils;
+
+import java.util.List;
 
 public class RobotService {
     public static IMResult<SendMessageResult> sendMessage(String sender, Conversation conversation, MessagePayload payload) throws Exception {
@@ -33,4 +35,166 @@ public class RobotService {
         InputGetUserInfo getUserInfo = new InputGetUserInfo(null, userName, null);
         return RobotHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
+
+    public static IMResult<Void> setCallback(String url) throws Exception {
+        String path = APIPath.Robot_Set_Callback;
+        RobotCallbackPojo pojo = new RobotCallbackPojo();
+        pojo.setUrl(url);
+        return RobotHttpUtils.httpJsonPost(path, pojo, Void.class);
+    }
+    
+    public static IMResult<RobotCallbackPojo> getCallback() throws Exception {
+        String path = APIPath.Robot_Get_Callback;
+        return RobotHttpUtils.httpJsonPost(path, null, RobotCallbackPojo.class);
+    }
+
+    public static IMResult<Void> deleteCallback() throws Exception {
+        String path = APIPath.Robot_Delete_Callback;
+        return RobotHttpUtils.httpJsonPost(path, null, Void.class);
+    }
+
+    public static IMResult<InputOutputUserInfo> getProfile(String robotId) throws Exception {
+        return getUserInfo(robotId);
+    }
+
+    /*
+    type可选范围为MyInfoType，注意不能修改电话号码，如果要修改电话号码请使用adminapi进行修改
+     */
+    public static IMResult<Void> updateProfile(int/*MyInfoType*/ type, String value) throws Exception {
+        String path = APIPath.Robot_Update_Profile;
+        IntStringPairPojo pojo = new IntStringPairPojo(type, value);
+        return RobotHttpUtils.httpJsonPost(path, pojo, Void.class);
+    }
+
+    public static IMResult<OutputCreateGroupResult> createGroup(PojoGroupInfo group_info, List<PojoGroupMember> members, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Create_Group;
+        PojoGroup pojoGroup = new PojoGroup();
+        pojoGroup.setGroup_info(group_info);
+        pojoGroup.setMembers(members);
+        InputCreateGroup createGroup = new InputCreateGroup();
+        createGroup.setGroup(pojoGroup);
+        createGroup.setTo_lines(to_lines);
+        createGroup.setNotify_message(notify_message);
+
+        return RobotHttpUtils.httpJsonPost(path, createGroup, OutputCreateGroupResult.class);
+    }
+
+    public static IMResult<PojoGroupInfo> getGroupInfo(String groupId) throws Exception {
+        String path = APIPath.Robot_Group_Get_Info;
+        InputGetGroup input = new InputGetGroup();
+        input.setGroupId(groupId);
+
+        return RobotHttpUtils.httpJsonPost(path, input, PojoGroupInfo.class);
+    }
+
+    public static IMResult<Void> dismissGroup(String groupId, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Dismiss;
+        InputDismissGroup dismissGroup = new InputDismissGroup();
+        dismissGroup.setGroup_id(groupId);
+        dismissGroup.setTo_lines(to_lines);
+        dismissGroup.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, dismissGroup, Void.class);
+    }
+
+    public static IMResult<Void> transferGroup(String groupId, String newOwner, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Transfer;
+        InputTransferGroup transferGroup = new InputTransferGroup();
+        transferGroup.setGroup_id(groupId);
+        transferGroup.setNew_owner(newOwner);
+        transferGroup.setTo_lines(to_lines);
+        transferGroup.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, transferGroup, Void.class);
+    }
+
+    public static IMResult<Void> modifyGroupInfo(String groupId, /*ModifyGroupInfoType*/int type, String value, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Modify_Info;
+        InputModifyGroupInfo modifyGroupInfo = new InputModifyGroupInfo();
+        modifyGroupInfo.setGroup_id(groupId);
+        modifyGroupInfo.setTo_lines(to_lines);
+        modifyGroupInfo.setType(type);
+        modifyGroupInfo.setValue(value);
+        modifyGroupInfo.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, modifyGroupInfo, Void.class);
+    }
+
+
+    public static IMResult<OutputGroupMemberList> getGroupMembers(String groupId) throws Exception {
+        String path = APIPath.Robot_Group_Member_List;
+        InputGetGroup input = new InputGetGroup();
+        input.setGroupId(groupId);
+        return RobotHttpUtils.httpJsonPost(path, input, OutputGroupMemberList.class);
+    }
+
+    public static IMResult<Void> addGroupMembers(String groupId, List<PojoGroupMember> groupMembers, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Member_Add;
+        InputAddGroupMember addGroupMember = new InputAddGroupMember();
+        addGroupMember.setGroup_id(groupId);
+        addGroupMember.setMembers(groupMembers);
+        addGroupMember.setTo_lines(to_lines);
+        addGroupMember.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
+    }
+
+    public static IMResult<Void> setGroupManager(String groupId, List<String> groupMemberIds, boolean isManager, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Set_Manager;
+        InputSetGroupManager addGroupMember = new InputSetGroupManager();
+        addGroupMember.setGroup_id(groupId);
+        addGroupMember.setMembers(groupMemberIds);
+        addGroupMember.setIs_manager(isManager);
+        addGroupMember.setTo_lines(to_lines);
+        addGroupMember.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
+    }
+
+    public static IMResult<Void> muteGroupMember(String groupId, List<String> groupMemberIds, boolean isMute, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Mute_Member;
+        InputMuteGroupMember addGroupMember = new InputMuteGroupMember();
+        addGroupMember.setGroup_id(groupId);
+        addGroupMember.setMembers(groupMemberIds);
+        addGroupMember.setIs_manager(isMute);
+        addGroupMember.setTo_lines(to_lines);
+        addGroupMember.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
+    }
+
+    public static IMResult<Void> allowGroupMember(String groupId, List<String> groupMemberIds, boolean isAllow, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Allow_Member;
+        InputMuteGroupMember addGroupMember = new InputMuteGroupMember();
+        addGroupMember.setGroup_id(groupId);
+        addGroupMember.setMembers(groupMemberIds);
+        addGroupMember.setIs_manager(isAllow);
+        addGroupMember.setTo_lines(to_lines);
+        addGroupMember.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
+    }
+
+    public static IMResult<Void> kickoffGroupMembers(String groupId, List<String> groupMemberIds, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Member_Kickoff;
+        InputKickoffGroupMember kickoffGroupMember = new InputKickoffGroupMember();
+        kickoffGroupMember.setGroup_id(groupId);
+        kickoffGroupMember.setMembers(groupMemberIds);
+        kickoffGroupMember.setTo_lines(to_lines);
+        kickoffGroupMember.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, kickoffGroupMember, Void.class);
+    }
+
+    public static IMResult<Void> quitGroup(String groupId, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Member_Quit;
+        InputQuitGroup quitGroup = new InputQuitGroup();
+        quitGroup.setGroup_id(groupId);
+        quitGroup.setTo_lines(to_lines);
+        quitGroup.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, quitGroup, Void.class);
+    }
+
+    public static IMResult<Void> setGroupMemberAlias(String groupId, String memberId, String alias, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Robot_Group_Set_Member_Alias;
+        InputSetGroupMemberAlias input = new InputSetGroupMemberAlias();
+        input.setGroup_id(groupId);
+        input.setMemberId(memberId);
+        input.setAlias(alias);
+        input.setTo_lines(to_lines);
+        input.setNotify_message(notify_message);
+        return RobotHttpUtils.httpJsonPost(path, input, Void.class);
+    }
 }

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

@@ -63,6 +63,15 @@ public class UserAdmin {
         return AdminHttpUtils.httpJsonPost(path, getUserInfo, OutputCheckUserOnline.class);
     }
 
+    /* 强迫用户下线，需要用户重新获取token才能进行连接。
+    userId必须有效，clientId可以为空，当为空时，踢下线说有客户端，当不为空时仅踢掉对应客户端。
+     */
+    public static IMResult<Void> kickoffUserClient(String userId, String clientId) throws Exception {
+        String path = APIPath.User_Kickoff_Client;
+        StringPairPojo pojo = new StringPairPojo(userId, clientId);
+        return AdminHttpUtils.httpJsonPost(path, pojo, Void.class);
+    }
+
     public static IMResult<Void> destroyUser(String userId) throws Exception {
         String path = APIPath.Destroy_User;
         InputDestroyUser inputDestroyUser = new InputDestroyUser();

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

@@ -3,6 +3,7 @@ package cn.wildfirechat.sdk.utilities;
 import cn.wildfirechat.sdk.model.IMResult;
 import com.google.gson.Gson;
 import ikidou.reflect.TypeBuilder;
+import io.netty.util.internal.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -63,10 +64,12 @@ public class RobotHttpUtils {
             }
             LOG.info("http request content: {}", jsonStr);
 
-            StringEntity entity = new StringEntity(jsonStr, Charset.forName("UTF-8"));
-            entity.setContentEncoding("UTF-8");
-            entity.setContentType("application/json");
-            post.setEntity(entity);
+            if(!StringUtil.isNullOrEmpty(jsonStr)) {
+                StringEntity entity = new StringEntity(jsonStr, Charset.forName("UTF-8"));
+                entity.setContentEncoding("UTF-8");
+                entity.setContentType("application/json");
+                post.setEntity(entity);
+            }
             HttpResponse response = httpClient.execute(post);
 
             int statusCode = response.getStatusLine().getStatusCode();