Compare commits

...
26 Commits
Author SHA1 Message Date
imhao183 499ee713d6 version to 0.60 2021-04-07 17:34:15 +08:00
imhao183 a6c6cf080c 修正serverapi修改群组信息的错误问题 2021-04-07 17:33:25 +08:00
heavyrain.lee 47c2e26ec3 Update README.md 2021-04-05 10:43:05 +08:00
heavyrain2012 6b264f2c9d version to 0.59 2021-04-05 10:27:06 +08:00
heavyrain2012 705ac341e0 为user message表添加会话信息及索引 2021-04-04 21:17:39 +08:00
heavyrain2012 2c07036364 当群成员被删除后再次加入到群组中,createTime应该会最后一次加入群组的时间 2021-04-03 16:29:01 +08:00
heavyrain2012 1a460f1b29 检查参数的有效性 2021-04-03 14:33:35 +08:00
heavyrain2012 e10b78bb34 优化撤回超市错误提示 2021-04-03 14:29:37 +08:00
heavyrain2012 edd973904a server api修改用户name 2021-04-03 14:29:24 +08:00
heavyrain2012 8ed1ba2f3a Merge branch 'wildfirechat' of https://github.com/wildfirechat/server into wildfirechat 2021-04-03 14:27:20 +08:00
heavyrain2012 6f24579c8e update 2021-04-03 14:27:11 +08:00
imhao183 c7bb49b3f7 修改群组extra消息时,发送通知给客户端 2021-04-02 12:15:11 +08:00
imhao183 d4d467afe2 修正自定义群组无效的问题 2021-04-02 12:04:18 +08:00
imhao183 96f7baece4 内置存储上传文件上限改为200MB 2021-04-02 10:08:03 +08:00
imhao183 2421d02eb8 当server api没有认证信息时,返回没有sign的错误码 2021-03-24 15:13:57 +08:00
imhao183 f6e9af58d4 version to 0.58 2021-03-20 10:56:50 +08:00
heavyrain2012 1dbc5d490e 添加频道控制相关接口 2021-03-20 09:57:38 +08:00
imhao183 f04f4fb087 添加禁言时例外消息类型 2021-03-19 14:33:17 +08:00
imhao183 1c9c77c06b 多人音视频添加成员时推送消息 2021-03-18 18:27:37 +08:00
imhao183 21f766880d update version to 0.57 2021-03-17 09:56:09 +08:00
imhao183 fa7f76ffef 修正群组成员变更时无法同步到客户端的问题 2021-03-17 09:55:08 +08:00
imhao183 d6d3eba8e6 修正拼写错误 2021-03-15 12:22:09 +08:00
imhao183 19bd5e83e5 处理同一个设备多个用户登录的情况 2021-03-11 11:11:19 +08:00
imhao183 2cbbf0a516 优化启动脚本 2021-03-03 18:24:28 +08:00
heavyrain2012 f6e8cd4ca8 update version to 0.55 2021-03-01 18:51:57 +08:00
heavyrain2012 da74b9fa94 添加更新接口 2021-02-24 15:46:46 +08:00
40 changed files with 1403 additions and 68 deletions
+1
View File
@@ -74,6 +74,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';```来修复。
4. 从0.59之前的版本升级到之后的版本执行数据库升级时间比较长,请耐心等待提示运行成功,避免中途中断。
## 特别感谢
1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来,处理MQTT相关业务。
+9
View File
@@ -81,6 +81,15 @@ message.recall_time_limit 120
## 一般用于重要类型消息,比如交易、充值等,禁止客户端发送,仅限于服务器发送,提高安全性。
message.forbidden_client_send_types 3999,4000,4001
## 当禁止发送消息时,允许例外发送的消息。这种一般用户需要被动回应的消息。比如群中被禁言的用户,他无法主动发起音视频,但可以接听未被禁言用户的音视频
## 因为音视频使用了消息作为信令,所以就需要允许发送音视频信令。如果开发了其它场景也需要被动回应消息,可以加在这里。
## 黑名单时允许发送的消息类型
message.blacklist_exception_types 401,402,403,404,405,407,408,410,411
## 群禁言或者聊天室或者频道禁言时允许发送的消息类型
message.group_mute_exception_types 401,402,403,404,405,407,408,410,411
## 用户被全局禁言时允许发送的消息类型
message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
##禁止搜索用户
friend.disable_search false
+4
View File
@@ -0,0 +1,4 @@
alter table `t_user_messages` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages` add column `_target` varchar(129) NOT NULL DEFAULT '';
alter table `t_user_messages` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
+644
View File
@@ -0,0 +1,644 @@
alter table `t_user_messages` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_0` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_0` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_0` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_0` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_1` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_1` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_1` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_1` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_2` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_2` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_2` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_2` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_3` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_3` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_3` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_3` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_4` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_4` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_4` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_4` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_5` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_5` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_5` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_5` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_6` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_6` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_6` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_6` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_7` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_7` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_7` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_7` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_8` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_8` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_8` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_8` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_9` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_9` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_9` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_9` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_10` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_10` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_10` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_10` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_11` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_11` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_11` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_11` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_12` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_12` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_12` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_12` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_13` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_13` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_13` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_13` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_14` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_14` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_14` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_14` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_15` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_15` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_15` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_15` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_16` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_16` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_16` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_16` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_17` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_17` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_17` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_17` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_18` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_18` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_18` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_18` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_19` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_19` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_19` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_19` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_20` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_20` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_20` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_20` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_21` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_21` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_21` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_21` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_22` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_22` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_22` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_22` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_23` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_23` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_23` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_23` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_24` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_24` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_24` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_24` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_25` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_25` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_25` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_25` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_26` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_26` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_26` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_26` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_27` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_27` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_27` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_27` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_28` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_28` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_28` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_28` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_29` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_29` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_29` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_29` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_30` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_30` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_30` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_30` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_31` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_31` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_31` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_31` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_32` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_32` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_32` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_32` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_33` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_33` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_33` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_33` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_34` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_34` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_34` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_34` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_35` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_35` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_35` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_35` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_36` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_36` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_36` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_36` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_37` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_37` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_37` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_37` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_38` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_38` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_38` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_38` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_39` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_39` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_39` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_39` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_40` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_40` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_40` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_40` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_41` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_41` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_41` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_41` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_42` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_42` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_42` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_42` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_43` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_43` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_43` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_43` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_44` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_44` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_44` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_44` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_45` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_45` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_45` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_45` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_46` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_46` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_46` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_46` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_47` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_47` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_47` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_47` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_48` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_48` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_48` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_48` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_49` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_49` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_49` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_49` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_50` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_50` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_50` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_50` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_51` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_51` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_51` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_51` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_52` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_52` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_52` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_52` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_53` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_53` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_53` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_53` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_54` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_54` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_54` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_54` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_55` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_55` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_55` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_55` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_56` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_56` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_56` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_56` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_57` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_57` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_57` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_57` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_58` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_58` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_58` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_58` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_59` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_59` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_59` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_59` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_60` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_60` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_60` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_60` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_61` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_61` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_61` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_61` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_62` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_62` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_62` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_62` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_63` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_63` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_63` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_63` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_64` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_64` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_64` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_64` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_65` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_65` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_65` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_65` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_66` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_66` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_66` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_66` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_67` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_67` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_67` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_67` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_68` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_68` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_68` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_68` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_69` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_69` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_69` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_69` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_70` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_70` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_70` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_70` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_71` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_71` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_71` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_71` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_72` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_72` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_72` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_72` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_73` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_73` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_73` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_73` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_74` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_74` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_74` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_74` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_75` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_75` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_75` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_75` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_76` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_76` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_76` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_76` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_77` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_77` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_77` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_77` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_78` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_78` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_78` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_78` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_79` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_79` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_79` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_79` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_80` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_80` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_80` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_80` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_81` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_81` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_81` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_81` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_82` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_82` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_82` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_82` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_83` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_83` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_83` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_83` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_84` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_84` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_84` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_84` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_85` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_85` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_85` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_85` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_86` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_86` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_86` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_86` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_87` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_87` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_87` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_87` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_88` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_88` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_88` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_88` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_89` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_89` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_89` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_89` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_90` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_90` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_90` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_90` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_91` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_91` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_91` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_91` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_92` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_92` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_92` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_92` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_93` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_93` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_93` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_93` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_94` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_94` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_94` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_94` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_95` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_95` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_95` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_95` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_96` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_96` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_96` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_96` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_97` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_97` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_97` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_97` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_98` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_98` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_98` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_98` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_99` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_99` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_99` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_99` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_100` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_100` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_100` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_100` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_101` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_101` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_101` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_101` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_102` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_102` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_102` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_102` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_103` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_103` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_103` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_103` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_104` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_104` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_104` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_104` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_105` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_105` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_105` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_105` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_106` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_106` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_106` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_106` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_107` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_107` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_107` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_107` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_108` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_108` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_108` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_108` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_109` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_109` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_109` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_109` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_110` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_110` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_110` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_110` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_111` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_111` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_111` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_111` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_112` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_112` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_112` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_112` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_113` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_113` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_113` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_113` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_114` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_114` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_114` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_114` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_115` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_115` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_115` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_115` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_116` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_116` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_116` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_116` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_117` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_117` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_117` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_117` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_118` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_118` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_118` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_118` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_119` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_119` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_119` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_119` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_120` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_120` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_120` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_120` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_121` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_121` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_121` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_121` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_122` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_122` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_122` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_122` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_123` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_123` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_123` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_123` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_124` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_124` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_124` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_124` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_125` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_125` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_125` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_125` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_126` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_126` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_126` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_126` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
alter table `t_user_messages_127` add column `_type` tinyint(4) NOT NULL DEFAULT '0';
alter table `t_user_messages_127` add column `_target` varchar(129) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '';
alter table `t_user_messages_127` add column `_directing` tinyint(1) NOT NULL DEFAULT '0';
alter table `t_user_messages_127` add INDEX `user_messages_conv_index` ( `_uid`, `_type`, `_target`, `_line`, `_mid` desc);
+1 -1
View File
@@ -5,7 +5,7 @@
<relativePath>../</relativePath>
<artifactId>wildfirechat-parent</artifactId>
<groupId>cn.wildfirechat</groupId>
<version>0.54</version>
<version>0.60</version>
</parent>
<artifactId>moquette-broker</artifactId>
@@ -43,7 +43,7 @@ public class PushMessage {
this.cntType = messageContentType;
this.serverTime = serverTime;
this.unReceivedMsg = unReceivedMsg;
if (cntType == 400) {
if (cntType == 400 || cntType == 406) {
this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_INVITE;
} else if(cntType == 402) {
this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_BYE;
@@ -201,7 +201,7 @@ public class UploadFileAction extends Action {
return false;
}
if (remoteFileSize > 50 * 1024 * 1024) {
if (remoteFileSize > 200 * 1024 * 1024) {
logger.warn("file over limite!(" + remoteFileSize + ")");
response.setStatus(HttpResponseStatus.BAD_REQUEST);
response.setContent("file over limite!");
@@ -59,7 +59,7 @@ abstract public class AdminAction extends Action {
}
if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign)) {
return ErrorCode.INVALID_PARAMETER;
return ErrorCode.ERROR_CODE_API_NOT_SIGNED;
}
Long ts;
@@ -68,7 +68,7 @@ abstract public class AdminAction extends Action {
} catch (Exception e) {
e.printStackTrace();
Utility.printExecption(LOG, e);
return ErrorCode.INVALID_PARAMETER;
return ErrorCode.ERROR_CODE_API_NOT_SIGNED;
}
if (!NO_CHECK_TIME && System.currentTimeMillis() - ts > 2 * 60 * 60 * 1000) {
@@ -0,0 +1,65 @@
/*
* This file is part of the Wildfire Chat package.
* (c) Heavyrain2012 <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.common.ErrorCode;
import cn.wildfirechat.common.IMExceptionEvent;
import cn.wildfirechat.pojos.InputOutputUserInfo;
import cn.wildfirechat.pojos.InputUpdateUserInfo;
import cn.wildfirechat.pojos.OutputCreateUser;
import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
import com.xiaoleilu.loServer.annotation.Route;
import com.xiaoleilu.loServer.handler.Request;
import com.xiaoleilu.loServer.handler.Response;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import win.liyufan.im.UUIDGenerator;
import win.liyufan.im.Utility;
@Route(APIPath.Update_User)
@HttpMethod("POST")
public class UpdateUserAction extends AdminAction {
private static final Logger LOG = LoggerFactory.getLogger(UpdateUserAction.class);
@Override
public boolean isTransactionAction() {
return true;
}
@Override
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputUpdateUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputUpdateUserInfo.class);
if (inputCreateUser != null
&& inputCreateUser.userInfo != null
&& !StringUtil.isNullOrEmpty(inputCreateUser.userInfo.getUserId())
&& inputCreateUser.flag > 0) {
ErrorCode errorCode = messagesStore.updateUserInfo(inputCreateUser.userInfo, inputCreateUser.flag);
response.setStatus(HttpResponseStatus.OK);
RestResult result = RestResult.resultOf(errorCode);
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;
}
}
@@ -51,7 +51,7 @@ abstract public class ChannelAction extends Action {
}
if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(cid)) {
return ErrorCode.INVALID_PARAMETER;
return ErrorCode.ERROR_CODE_API_NOT_SIGNED;
}
if (!mLimitCounter.isGranted(cid)) {
@@ -64,7 +64,7 @@ abstract public class ChannelAction extends Action {
} catch (Exception e) {
e.printStackTrace();
Utility.printExecption(LOG, e, IMExceptionEvent.EventType.CHANNEL_API_Exception);
return ErrorCode.INVALID_PARAMETER;
return ErrorCode.ERROR_CODE_API_NOT_SIGNED;
}
if (System.currentTimeMillis() - ts > 2 * 60 * 60 * 1000) {
@@ -0,0 +1,41 @@
/*
* This file is part of the Wildfire Chat package.
* (c) Heavyrain2012 <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
package com.xiaoleilu.loServer.action.channel;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.common.ErrorCode;
import cn.wildfirechat.pojos.InputGetUserInfo;
import cn.wildfirechat.pojos.InputOutputUserInfo;
import cn.wildfirechat.pojos.OutputGetChannelInfo;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
import com.xiaoleilu.loServer.annotation.Route;
import com.xiaoleilu.loServer.handler.Request;
import com.xiaoleilu.loServer.handler.Response;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
@Route(APIPath.Channel_Get_Profile)
@HttpMethod("POST")
public class GetChannelAction extends ChannelAction {
@Override
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
response.setStatus(HttpResponseStatus.OK);
RestResult result = RestResult.ok(OutputGetChannelInfo.fromPbInfo(channelInfo));
response.setContent(new Gson().toJson(result));
}
return true;
}
}
@@ -0,0 +1,46 @@
/*
* This file is part of the Wildfire Chat package.
* (c) Heavyrain2012 <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
package com.xiaoleilu.loServer.action.channel;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.common.ErrorCode;
import cn.wildfirechat.pojos.InputGetUserInfo;
import cn.wildfirechat.pojos.InputOutputUserInfo;
import cn.wildfirechat.pojos.OutputStringList;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
import com.xiaoleilu.loServer.annotation.Route;
import com.xiaoleilu.loServer.handler.Request;
import com.xiaoleilu.loServer.handler.Response;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import java.util.ArrayList;
@Route(APIPath.Channel_Subscriber_List)
@HttpMethod("POST")
public class GetChannelSubscribersAction extends ChannelAction {
@Override
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
OutputStringList outputStringList = new OutputStringList();
outputStringList.setList(new ArrayList<>());
outputStringList.getList().addAll(messagesStore.getChannelSubscriber(channelInfo.getTargetId()));
response.setStatus(HttpResponseStatus.OK);
RestResult result = RestResult.ok(outputStringList);
response.setContent(new Gson().toJson(result));
}
return true;
}
}
@@ -0,0 +1,83 @@
/*
* This file is part of the Wildfire Chat package.
* (c) Heavyrain2012 <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
package com.xiaoleilu.loServer.action.channel;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.common.ErrorCode;
import cn.wildfirechat.pojos.InputGetUserInfo;
import cn.wildfirechat.pojos.InputOutputUserInfo;
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.action.robot.RobotAction;
import com.xiaoleilu.loServer.annotation.HttpMethod;
import com.xiaoleilu.loServer.annotation.Route;
import com.xiaoleilu.loServer.handler.Request;
import com.xiaoleilu.loServer.handler.Response;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
@Route(APIPath.Channel_User_Info)
@HttpMethod("POST")
public class GetUserAction extends ChannelAction {
@Override
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
if (inputUserId != null
&& (!StringUtil.isNullOrEmpty(inputUserId.getUserId()) || !StringUtil.isNullOrEmpty(inputUserId.getName()) || !StringUtil.isNullOrEmpty(inputUserId.getMobile()))) {
WFCMessage.User user = null;
if(!StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
user = messagesStore.getUserInfo(inputUserId.getUserId());
} else if(!StringUtil.isNullOrEmpty(inputUserId.getName())) {
user = messagesStore.getUserInfoByName(inputUserId.getName());
} else if(!StringUtil.isNullOrEmpty(inputUserId.getMobile())) {
user = messagesStore.getUserInfoByMobile(inputUserId.getMobile());
}
response.setStatus(HttpResponseStatus.OK);
RestResult result;
if (user == null || StringUtil.isNullOrEmpty(user.getName())) {
result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
} else {
if (channelInfo.getOwner().equals(inputUserId.getUserId()) ||
messagesStore.checkUserInChannel(user.getUid(), channelInfo.getTargetId())) {
if((channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_FullInfo) > 0) {
result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
} else {
WFCMessage.User outUser = WFCMessage.User.newBuilder().setUid(user.getUid()).setName(user.getName()).setPortrait(user.getPortrait()).setDisplayName(user.getDisplayName()).build();
result = RestResult.ok(InputOutputUserInfo.fromPbUser(outUser));
}
} else {
if((channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Unsubscribed_User_Access) > 0) {
WFCMessage.User outUser = WFCMessage.User.newBuilder().setUid(user.getUid()).setName(user.getName()).setPortrait(user.getPortrait()).setDisplayName(user.getDisplayName()).build();
result = RestResult.ok(InputOutputUserInfo.fromPbUser(outUser));
} else {
result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_RIGHT);
}
}
}
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;
}
}
@@ -0,0 +1,84 @@
/*
* This file is part of the Wildfire Chat package.
* (c) Heavyrain2012 <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
package com.xiaoleilu.loServer.action.channel;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.common.ErrorCode;
import cn.wildfirechat.pojos.InputGetUserInfo;
import cn.wildfirechat.pojos.InputModifyChannelInfo;
import cn.wildfirechat.pojos.InputOutputUserInfo;
import cn.wildfirechat.pojos.SendMessageResult;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
import com.xiaoleilu.loServer.annotation.Route;
import com.xiaoleilu.loServer.handler.Request;
import com.xiaoleilu.loServer.handler.Response;
import io.moquette.persistence.RPCCenter;
import io.moquette.persistence.TargetEntry;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route(APIPath.Channel_Update_Profile)
@HttpMethod("POST")
public class ModifyChannelProfileAction extends ChannelAction {
@Override
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputModifyChannelInfo input = getRequestBody(request.getNettyRequest(), InputModifyChannelInfo.class);
if (input != null) {
WFCMessage.ModifyChannelInfo modifyChannelInfo = WFCMessage.ModifyChannelInfo.newBuilder().setChannelId(channelInfo.getTargetId()).setType(input.getType()).setValue(input.getValue()).build();
RPCCenter.getInstance().sendRequest(channelInfo.getOwner(), null, IMTopic.ModifyChannelInfoTopic, modifyChannelInfo.toByteArray(), channelInfo.getOwner(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
@Override
public void onSuccess(byte[] result) {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
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;
}
}
@@ -0,0 +1,90 @@
/*
* This file is part of the Wildfire Chat package.
* (c) Heavyrain2012 <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
package com.xiaoleilu.loServer.action.channel;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.common.ErrorCode;
import cn.wildfirechat.pojos.InputChannelSubscribe;
import cn.wildfirechat.pojos.InputModifyChannelInfo;
import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.hazelcast.util.StringUtil;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
import com.xiaoleilu.loServer.annotation.Route;
import com.xiaoleilu.loServer.handler.Request;
import com.xiaoleilu.loServer.handler.Response;
import io.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.Channel_Subscribe)
@HttpMethod("POST")
public class SubscriberChannelAction extends ChannelAction {
@Override
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputChannelSubscribe input = getRequestBody(request.getNettyRequest(), InputChannelSubscribe.class);
if (input != null && !StringUtil.isNullOrEmpty(input.getTarget())) {
if(input.getSubscribe() > 0 && (channelInfo.getStatus() & ProtoConstants.ChannelState.Channel_State_Mask_Active_Subscribe) == 0) {
response.setStatus(HttpResponseStatus.OK);
RestResult result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_RIGHT);
response.setContent(new Gson().toJson(result));
return true;
}
WFCMessage.ListenChannel listenChannel = WFCMessage.ListenChannel.newBuilder().setChannelId(channelInfo.getTargetId()).setListen(input.getSubscribe()).build();
RPCCenter.getInstance().sendRequest(input.getTarget(), null, IMTopic.ChannelListenTopic, listenChannel.toByteArray(), input.getTarget(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
@Override
public void onSuccess(byte[] result) {
ByteBuf byteBuf = Unpooled.buffer();
byteBuf.writeBytes(result);
ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
sendResponse(response, null, null);
} else {
sendResponse(response, errorCode, null);
}
}
@Override
public void onError(ErrorCode errorCode) {
sendResponse(response, errorCode, null);
}
@Override
public void onTimeout() {
sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
}
@Override
public Executor getResponseExecutor() {
return command -> {
ctx.executor().execute(command);
};
}
}, true);
return false;
} else {
response.setStatus(HttpResponseStatus.OK);
RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
response.setContent(new Gson().toJson(result));
}
}
return true;
}
}
@@ -55,7 +55,7 @@ abstract public class RobotAction extends Action {
}
if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(rid)) {
return ErrorCode.INVALID_PARAMETER;
return ErrorCode.ERROR_CODE_API_NOT_SIGNED;
}
if (!mLimitCounter.isGranted(rid)) {
@@ -68,7 +68,7 @@ abstract public class RobotAction extends Action {
} catch (Exception e) {
e.printStackTrace();
Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ROBOT_API_Exception);
return ErrorCode.INVALID_PARAMETER;
return ErrorCode.ERROR_CODE_API_NOT_SIGNED;
}
if (System.currentTimeMillis() - ts > 2 * 60 * 60 * 1000) {
@@ -157,6 +157,9 @@ public final class BrokerConstants {
public static final String USER_HIDE_PROPERTIES = "user.hide_properties";
public static final String MESSAGES_FORBIDDEN_CLIENT_SEND_TYPES = "message.forbidden_client_send_types";
public static final String MESSAGES_BLACKLIST_EXCEPTION_TYPES = "message.blacklist_exception_types";
public static final String MESSAGES_GROUP_MUTE_EXCEPTION_TYPES = "message.group_mute_exception_types";
public static final String MESSAGES_GLOBAL_MUTE_EXCEPTION_TYPES = "message.global_mute_exception_types";
public static final String MESSAGES_DISABLE_REMOTE_SEARCH = "message.disable_remote_search";
@@ -44,6 +44,8 @@ public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupI
content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupPrivatechatNotifyContent();
} else if(request.getType() == Modify_Group_Searchable) {
content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupSearchableNotifyContent();
} else if(request.getType() == Modify_Group_Extra) {
content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getValue(), "").getChangeGroupExtraNotifyContent();
}
if (content != null) {
@@ -105,17 +105,21 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
int userStatus = m_messagesStore.getUserStatus(fromUser);
if (userStatus == ProtoConstants.UserStatus.Muted || userStatus == ProtoConstants.UserStatus.Forbidden) {
return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
if(!m_messagesStore.getGlobalMuteExceptionTypes().contains(message.getContent().getType())) {
return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;
}
}
if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Private) {
errorCode = m_messagesStore.isAllowUserMessage(message.getConversation().getTarget(), fromUser);
if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
if (errorCode == ErrorCode.ERROR_CODE_IN_BLACK_LIST && mBlacklistStrategy != ProtoConstants.BlacklistStrategy.Message_Reject) {
ignoreMsg = true;
errorCode = ErrorCode.ERROR_CODE_SUCCESS;
} else {
return errorCode;
if(!m_messagesStore.getBlackListExceptionTypes().contains(message.getContent().getType())) {
errorCode = m_messagesStore.isAllowUserMessage(message.getConversation().getTarget(), fromUser);
if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
if (errorCode == ErrorCode.ERROR_CODE_IN_BLACK_LIST && mBlacklistStrategy != ProtoConstants.BlacklistStrategy.Message_Reject) {
ignoreMsg = true;
errorCode = ErrorCode.ERROR_CODE_SUCCESS;
} else {
return errorCode;
}
}
}
@@ -126,17 +130,23 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
}
if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group ) {
errorCode = m_messagesStore.canSendMessageInGroup(fromUser, message.getConversation().getTarget());
if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
return errorCode;
if(!m_messagesStore.getGroupMuteExceptionTypes().contains(message.getContent().getType())) {
errorCode = m_messagesStore.canSendMessageInGroup(fromUser, message.getConversation().getTarget());
if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
return errorCode;
}
}
} else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
if(!m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
if(!m_messagesStore.getGroupMuteExceptionTypes().contains(message.getContent().getType())) {
if (!m_messagesStore.checkUserClientInChatroom(fromUser, clientID, message.getConversation().getTarget())) {
return ErrorCode.ERROR_CODE_NOT_IN_CHATROOM;
}
}
} else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
if(!m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
if(!m_messagesStore.getGroupMuteExceptionTypes().contains(message.getContent().getType())) {
if (!m_messagesStore.checkUserInChannel(fromUser, message.getConversation().getTarget())) {
return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
}
}
}
}
@@ -1555,6 +1555,35 @@ public class DatabaseStore {
}
}
void clearMultiUser(String uid, String clientId) {
long start = System.currentTimeMillis();
LOG.info("clearMultiUser {}, {}", uid, clientId);
Connection connection = null;
PreparedStatement statement = null;
try {
connection = DBUtil.getConnection();
String sql = "update t_user_session set _deleted = ?, _token = ?, _voip_token = ?, _dt = ? where _cid = ? and _uid <> ? and _deleted = 0";
statement = connection.prepareStatement(sql);
int index = 1;
statement.setInt(index++, 1);
statement.setString(index++, "");
statement.setString(index++, "");
statement.setLong(index++, System.currentTimeMillis());
statement.setString(index++, clientId);
statement.setString(index++, uid);
int count = statement.executeUpdate();
LOG.info("Update rows {}", count);
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Utility.printExecption(LOG, e, RDBS_Exception);
} finally {
DBUtil.closeDB(connection, statement);
}
}
MemorySessionStore.Session createSession(String uid, String clientId, ClientSession clientSession, int platform) {
Connection connection = null;
PreparedStatement statement = null;
@@ -1673,7 +1702,7 @@ public class DatabaseStore {
}
}
void persistGroupMember(final String groupId, final List<WFCMessage.GroupMember> memberList) {
void persistGroupMember(final String groupId, final List<WFCMessage.GroupMember> memberList, boolean updateCreateTime) {
Connection connection = null;
PreparedStatement statement = null;
try {
@@ -1689,6 +1718,9 @@ public class DatabaseStore {
"`_alias` = ?," +
"`_type` = ?," +
"`_dt` = ?";
if(updateCreateTime) {
sql += ", `_create_dt` = ?";
}
statement = connection.prepareStatement(sql);
@@ -1709,14 +1741,17 @@ public class DatabaseStore {
statement.setString(index++, member.getAlias());
statement.setInt(index++, member.getType());
statement.setLong(index++, dt);
if(updateCreateTime) {
statement.setLong(index++, dt);
}
int count = statement.executeUpdate();
LOG.info("Update rows {}", count);
}
connection.commit();
connection.setAutoCommit(true);
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Utility.printExecption(LOG, e, RDBS_Exception);
} finally {
if (connection != null) {
try {
connection.commit();
@@ -1725,9 +1760,6 @@ public class DatabaseStore {
e1.printStackTrace();
}
}
e.printStackTrace();
Utility.printExecption(LOG, e, RDBS_Exception);
} finally {
DBUtil.closeDB(connection, statement);
}
}
@@ -3053,11 +3085,11 @@ public class DatabaseStore {
int count = statement.executeUpdate();
LOG.info("Update rows {}", count);
}
connection.commit();
connection.setAutoCommit(true);
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Utility.printExecption(LOG, e, RDBS_Exception);
} finally {
if (connection != null) {
try {
connection.commit();
@@ -3066,9 +3098,6 @@ public class DatabaseStore {
e1.printStackTrace();
}
}
e.printStackTrace();
Utility.printExecption(LOG, e, RDBS_Exception);
} finally {
DBUtil.closeDB(connection, statement);
}
});
@@ -59,6 +59,7 @@ import static cn.wildfirechat.proto.ProtoConstants.ModifyChannelInfoType.*;
import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.*;
import static cn.wildfirechat.proto.ProtoConstants.PersistFlag.Transparent;
import static cn.wildfirechat.proto.ProtoConstants.Platform.*;
import static cn.wildfirechat.proto.ProtoConstants.UpdateUserInfoMask.*;
import static io.moquette.BrokerConstants.*;
import static io.moquette.server.Constants.MAX_CHATROOM_MESSAGE_QUEUE;
import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
@@ -138,6 +139,9 @@ public class MemoryMessagesStore implements IMessagesStore {
private boolean mChatroomRejoinWhenActive = true;
private List<Integer> mForbiddenClientSendTypes = new ArrayList<>();
private List<Integer> mBlackListExceptionTypes = new ArrayList<>();
private List<Integer> mGroupMuteExceptionTypes = new ArrayList<>();
private List<Integer> mGlobalMuteExceptionTypes = new ArrayList<>();
private long mRecallTimeLimit = 300;
@@ -274,7 +278,48 @@ public class MemoryMessagesStore implements IMessagesStore {
} catch (Exception e) {
}
try {
String strTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_BLACKLIST_EXCEPTION_TYPES);
if(!StringUtil.isNullOrEmpty(strTypes)) {
for (String strType:strTypes.split(",")) {
try {
int type = Integer.parseInt(strType);
mBlackListExceptionTypes.add(type);
} catch (NumberFormatException e) {
}
}
}
} catch (Exception e) {
}
try {
String strTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_GROUP_MUTE_EXCEPTION_TYPES);
if(!StringUtil.isNullOrEmpty(strTypes)) {
for (String strType:strTypes.split(",")) {
try {
int type = Integer.parseInt(strType);
mGroupMuteExceptionTypes.add(type);
} catch (NumberFormatException e) {
}
}
}
} catch (Exception e) {
}
try {
String strTypes = m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_GLOBAL_MUTE_EXCEPTION_TYPES);
if(!StringUtil.isNullOrEmpty(strTypes)) {
for (String strType:strTypes.split(",")) {
try {
int type = Integer.parseInt(strType);
mGlobalMuteExceptionTypes.add(type);
} catch (NumberFormatException e) {
}
}
}
} catch (Exception e) {
}
try {
mGroupInfoUpdateCallback = server.getConfig().getProperty(GROUP_INFO_UPDATE_CALLBACK);
@@ -927,7 +972,7 @@ public class MemoryMessagesStore implements IMessagesStore {
.build();
mIMap.set(groupId, groupInfo);
databaseStore.persistGroupMember(groupId, updatedMemberList);
databaseStore.persistGroupMember(groupId, updatedMemberList, false);
callbackGroupEvent(fromUser, groupInfo.getTargetId(), ProtoConstants.GroupUpdateEventType.Group_Event_Create);
return groupInfo;
@@ -1146,7 +1191,7 @@ public class MemoryMessagesStore implements IMessagesStore {
}
}
databaseStore.persistGroupMember(groupId, memberList);
databaseStore.persistGroupMember(groupId, memberList, true);
databaseStore.updateGroupMemberCountDt(groupId);
groupMembers.remove(groupId);
@@ -1471,7 +1516,7 @@ public class MemoryMessagesStore implements IMessagesStore {
if (member.getMemberId().equals(memberId)) {
groupMembers.remove(groupId, member);
member = member.toBuilder().setAlias(alias).setUpdateDt(updateDt).build();
databaseStore.persistGroupMember(groupId, Arrays.asList(member));
databaseStore.persistGroupMember(groupId, Arrays.asList(member), false);
databaseStore.updateGroupMemberDt(groupId, updateDt);
groupMembers.put(groupId, member);
@@ -1534,8 +1579,6 @@ public class MemoryMessagesStore implements IMessagesStore {
WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
if (groupInfo == null) {
return ErrorCode.ERROR_CODE_NOT_EXIST;
} else if (groupInfo.getMemberUpdateDt() <= maxDt) {
return ErrorCode.ERROR_CODE_NOT_MODIFIED;
}
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
@@ -1630,13 +1673,13 @@ public class MemoryMessagesStore implements IMessagesStore {
if (newOwner.equals(member.getMemberId())) {
groupMembers.remove(groupId, member);
member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).build();
databaseStore.persistGroupMember(groupId, Arrays.asList(member));
databaseStore.persistGroupMember(groupId, Arrays.asList(member), false);
groupMembers.put(groupId, member);
modifyMemeberCount++;
} else if(member.getType() == GroupMemberType_Owner) {
groupMembers.remove(groupId, member);
member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).build();
databaseStore.persistGroupMember(groupId, Arrays.asList(member));
databaseStore.persistGroupMember(groupId, Arrays.asList(member), false);
groupMembers.put(groupId, member);
modifyMemeberCount++;
}
@@ -1674,7 +1717,7 @@ public class MemoryMessagesStore implements IMessagesStore {
if (userList.contains(member.getMemberId())) {
groupMembers.remove(groupId, member);
member = member.toBuilder().setType(type == 0 ? ProtoConstants.GroupMemberType.GroupMemberType_Normal : ProtoConstants.GroupMemberType.GroupMemberType_Manager).setUpdateDt(updateDt).build();
databaseStore.persistGroupMember(groupId, Arrays.asList(member));
databaseStore.persistGroupMember(groupId, Arrays.asList(member), false);
groupMembers.put(groupId, member);
}
}
@@ -2127,6 +2170,63 @@ public class MemoryMessagesStore implements IMessagesStore {
return out;
}
@Override
public ErrorCode updateUserInfo(InputOutputUserInfo userInfo, int flag) {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
WFCMessage.User user = mUserMap.get(userInfo.getUserId());
if(user == null) {
return ErrorCode.ERROR_CODE_NOT_EXIST;
}
WFCMessage.User.Builder builder = user.toBuilder();
if((flag & Update_User_DisplayName) > 0) {
builder.setDisplayName(userInfo.getDisplayName());
}
if((flag & Update_User_Portrait) > 0) {
builder.setPortrait(userInfo.getPortrait());
}
if((flag & Update_User_Gender) > 0) {
builder.setGender(userInfo.getGender());
}
if((flag & Update_User_Mobile) > 0) {
builder.setMobile(userInfo.getMobile());
}
if((flag & Update_User_Email) > 0) {
builder.setEmail(userInfo.getEmail());
}
if((flag & Update_User_Address) > 0) {
builder.setAddress(userInfo.getAddress());
}
if((flag & Update_User_Company) > 0) {
builder.setCompany(userInfo.getCompany());
}
if((flag & Update_User_Social) > 0) {
builder.setSocial(userInfo.getSocial());
}
if((flag & Update_User_Extra) > 0) {
builder.setExtra(userInfo.getExtra());
}
if((flag & Update_User_Name) > 0) {
if(StringUtil.isNullOrEmpty(userInfo.getName())) {
LOG.error("Modify user info failure, name not exist!");
return ErrorCode.INVALID_PARAMETER;
}
builder.setName(userInfo.getName());
}
builder.setUpdateDt(System.currentTimeMillis());
user = builder.build();
try {
databaseStore.updateUser(user);
} catch (Exception e) {
e.printStackTrace();
return ErrorCode.ERROR_CODE_SERVER_ERROR;
}
mUserMap.put(user.getUid(), user);
callbackUserInfoEvent(user);
return ErrorCode.ERROR_CODE_SUCCESS;
}
@Override
public void addUserInfo(WFCMessage.User user, String password) throws Exception {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -3418,6 +3518,21 @@ public class MemoryMessagesStore implements IMessagesStore {
return mForbiddenClientSendTypes;
}
@Override
public List<Integer> getBlackListExceptionTypes() {
return mBlackListExceptionTypes;
}
@Override
public List<Integer> getGroupMuteExceptionTypes() {
return mGroupMuteExceptionTypes;
}
@Override
public List<Integer> getGlobalMuteExceptionTypes() {
return mGlobalMuteExceptionTypes;
}
@Override
public long getMessageHead(String user) {
TreeMap<Long, Long> maps = userMessages.get(user);
@@ -375,7 +375,7 @@ public class MemorySessionStore implements ISessionsStore {
session.setPlatform(platform);
databaseStore.updateSessionPlatform(username, clientID, platform);
}
databaseStore.clearMultiUser(username, clientID);
if (!supportMultiEndpoint && platform > 0) {
databaseStore.clearMultiEndpoint(username, clientID, platform);
@@ -16,6 +16,7 @@
package io.moquette.spi;
import cn.wildfirechat.pojos.InputOutputUserInfo;
import cn.wildfirechat.pojos.SystemSettingPojo;
import cn.wildfirechat.proto.WFCMessage;
import com.xiaoleilu.loServer.model.FriendData;
@@ -142,6 +143,7 @@ public interface IMessagesStore {
int getUserStatus(String userId);
List<InputOutputUserBlockStatus> getUserStatusList();
ErrorCode updateUserInfo(InputOutputUserInfo userInfo, int flag);
void addUserInfo(WFCMessage.User user, String password) throws Exception;
void destoryUser(String userId);
void updateUserInfo(WFCMessage.User user) throws Exception;
@@ -218,6 +220,9 @@ public interface IMessagesStore {
int getVisibleQuitKickoffNotification();
List<Integer> getClientForbiddenSendTypes();
List<Integer> getBlackListExceptionTypes();
List<Integer> getGroupMuteExceptionTypes();
List<Integer> getGlobalMuteExceptionTypes();
long getMessageHead(String user);
long getFriendHead(String user);
@@ -332,7 +332,7 @@ public class MessagesPublisher {
}
}
if ((StringUtil.isNullOrEmpty(pushContent) && messageContentType != 402 && messageContentType != 400 && messageContentType != 401)) {
if ((StringUtil.isNullOrEmpty(pushContent) && messageContentType != 402 && messageContentType != 400 && messageContentType != 401 && messageContentType != 406)) {
LOG.info("push content is empty and contenttype is {}", messageContentType);
continue;
}
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>wildfirechat-parent</artifactId>
<groupId>cn.wildfirechat</groupId>
<version>0.54</version>
<version>0.60</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,6 +17,7 @@ public interface APIPath {
String Sensitive_Query = "/admin/sensitive/query";
String Create_User = "/admin/user/create";
String Update_User = "/admin/user/update";
String Destroy_User = "/admin/user/destroy";
String Create_Robot = "/admin/robot/create";
String CreateOrUpdate_Device = "/admin/device/create";
@@ -40,8 +40,9 @@ public enum ErrorCode {
ERROR_CODE_ALREADY_FRIENDS(23, "already friends"),
ERROR_CODE_RECALL_TIME_EXPIRED(24, "time expired"),
ERROR_CODE_RECALL_TIME_EXPIRED(24, "recall time expired"),
ERROR_CODE_API_NOT_SIGNED(239, "api not signed or sign parameter not completion"),
ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT(240, "group exceed max member count"),
ERROR_CODE_GROUP_MUTED(241, "group is muted"),
ERROR_CODE_SENSITIVE_MATCHED(242, "sensitive matched"),
@@ -160,4 +160,9 @@ public class GroupNotificationBinaryContent {
public WFCMessage.MessageContent getAllowGroupMemberNotifyContent() {
return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_ALLOW_MEMBER);
}
public WFCMessage.MessageContent getChangeGroupExtraNotifyContent() {
return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_MODIFY_GROUP_EXTRA);
}
}
@@ -49,11 +49,21 @@ public class InputModifyGroupInfo extends InputGroupBase {
}
public WFCMessage.ModifyGroupInfoRequest toProtoGroupRequest() {
return WFCMessage.ModifyGroupInfoRequest.newBuilder()
.setGroupId(group_id)
.setType(type)
.setValue(value)
.addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines)
.build();
if(notify_message != null && notify_message.getType() > 0) {
return WFCMessage.ModifyGroupInfoRequest.newBuilder()
.setGroupId(group_id)
.setType(type)
.setValue(value)
.addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines)
.setNotifyContent(notify_message.toProtoMessageContent())
.build();
} else {
return WFCMessage.ModifyGroupInfoRequest.newBuilder()
.setGroupId(group_id)
.setType(type)
.setValue(value)
.addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines)
.build();
}
}
}
@@ -0,0 +1,18 @@
/*
* 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;
public class InputUpdateUserInfo {
//UpdateUserInfoMask
public int flag;
public InputOutputUserInfo userInfo;
}
@@ -201,6 +201,20 @@ public class ProtoConstants {
int Chatroom_Member_Event_Unmute = 4;
}
public interface UpdateUserInfoMask {
int Update_User_DisplayName = 0x01;
int Update_User_Portrait = 0x02;
int Update_User_Gender = 0x04;
int Update_User_Mobile = 0x08;
int Update_User_Email = 0x10;
int Update_User_Address = 0x20;
int Update_User_Company = 0x40;
int Update_User_Social = 0x80;
int Update_User_Extra = 0x100;
int Update_User_Name = 0x200;
}
public static final int MESSAGE_CONTENT_TYPE_CREATE_GROUP = 104;
public static final int MESSAGE_CONTENT_TYPE_ADD_GROUP_MEMBER = 105;
public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER = 106;
@@ -221,5 +235,7 @@ public class ProtoConstants {
public static final int MESSAGE_CONTENT_TYPE_ALLOW_MEMBER = 119;
public static final int MESSAGE_CONTENT_TYPE_KICKOF_GROUP_MEMBER_VISIBLE = 120;
public static final int MESSAGE_CONTENT_TYPE_QUIT_GROUP_VISIBLE = 121;
public static final int MESSAGE_CONTENT_TYPE_MODIFY_GROUP_EXTRA = 122;
}
+1 -1
View File
@@ -6,7 +6,7 @@
<!--<relativePath>../pom.xml</relativePath>-->
<artifactId>wildfirechat-parent</artifactId>
<groupId>cn.wildfirechat</groupId>
<version>0.54</version>
<version>0.60</version>
</parent>
<artifactId>distribution</artifactId>
@@ -76,6 +76,14 @@ message.recall_time_limit 120
## 一般用于重要类型消息,比如交易、充值等,禁止客户端发送,仅限于服务器发送,提高安全性。
message.forbidden_client_send_types 3999,4000,4001
## 当禁止发送消息时,允许例外发送的消息。这种一般用户需要被动回应的消息。比如群中被禁言的用户,他无法主动发起音视频,但可以接听未被禁言用户的音视频
## 因为音视频使用了消息作为信令,所以就需要允许发送音视频信令。如果开发了其它场景也需要被动回应消息,可以加在这里。
## 黑名单时允许发送的消息类型
message.blacklist_exception_types 401,402,403,404,405,407,408,410,411
## 群禁言或者聊天室或者频道禁言时允许发送的消息类型
message.group_mute_exception_types 401,402,403,404,405,407,408,410,411
## 用户被全局禁言时允许发送的消息类型
message.global_mute_exception_types 401,402,403,404,405,407,408,410,411
##禁止搜索用户
friend.disable_search false
@@ -1,12 +1,11 @@
@ECHO OFF
set "CURRENT_DIR=%cd%"
if not "%WILDFIRECHAT_HOME%" == "" goto gotHome
set "WILDFIRECHAT_HOME=%CURRENT_DIR%"
if exist "%WILDFIRECHAT_HOME%\bin\wildfirechat.bat" goto okHome
cd ..
set "WILDFIRECHAT_HOME=%cd%"
cd "%CURRENT_DIR%"
set "CURRENT_DIR=%cd%"
:gotHome
if exist "%WILDFIRECHAT_HOME%\bin\wildfirechat.bat" goto okHome
echo The WILDFIRECHAT_HOME environment variable is not defined correctly
@@ -11,11 +11,14 @@ while [ -h "$PRG" ]; do
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`/"$link"
PRGDIR=`dirname "$PRG"`
cd $PRGDIR
PRG="`pwd`"/"$link"
fi
done
PRGDIR=`dirname "$PRG"`
cd $PRGDIR
cd ..
WILDFIRECHAT_HOME=`pwd`
+1 -1
View File
@@ -12,7 +12,7 @@
<artifactId>wildfirechat-parent</artifactId>
<packaging>pom</packaging>
<version>0.54</version>
<version>0.60</version>
<name>Wildfire Chat</name>
<description>Wildfire Chat Server</description>
<inceptionYear>2019</inceptionYear>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>wildfirechat-parent</artifactId>
<groupId>cn.wildfirechat</groupId>
<version>0.54</version>
<version>0.60</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -134,6 +134,43 @@ public class Main {
System.exit(-1);
}
InputOutputUserInfo updateUserInfo = new InputOutputUserInfo();
updateUserInfo.setUserId(System.currentTimeMillis()+"");
updateUserInfo.setDisplayName("updatedUserName");
updateUserInfo.setPortrait("updatedUserPortrait");
int updateUserFlag = ProtoConstants.UpdateUserInfoMask.Update_User_DisplayName | ProtoConstants.UpdateUserInfoMask.Update_User_Portrait;
IMResult<Void> result = UserAdmin.updateUserInfo(updateUserInfo, updateUserFlag);
if(result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_NOT_EXIST) {
System.out.println("updateUserInfo success");
} else {
System.out.println("updateUserInfo failure");
System.exit(-1);
}
updateUserInfo.setUserId(userInfo.getUserId());
result = UserAdmin.updateUserInfo(updateUserInfo, updateUserFlag);
if(result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
System.out.println("updateUserInfo success");
} else {
System.out.println("updateUserInfo failure");
System.exit(-1);
}
IMResult<InputOutputUserInfo> resultGetUserInfo4 = UserAdmin.getUserByUserId(userInfo.getUserId());
if (resultGetUserInfo4 != null && resultGetUserInfo4.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
if (userInfo.getUserId().equals(resultGetUserInfo4.getResult().getUserId())
&& updateUserInfo.getDisplayName().equals(resultGetUserInfo4.getResult().getDisplayName())
&& updateUserInfo.getPortrait().equals(resultGetUserInfo4.getResult().getPortrait())) {
System.out.println("get user info success");
} else {
System.out.println("get user info by userId failure");
System.exit(-1);
}
} else {
System.out.println("get user info by userId failure");
System.exit(-1);
}
IMResult<OutputGetIMTokenData> resultGetToken = UserAdmin.getUserToken(userInfo.getUserId(), "client111", ProtoConstants.Platform.Platform_Android);
if (resultGetToken != null && resultGetToken.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
System.out.println("get token success: " + resultGetToken.getResult().getToken());
@@ -255,7 +292,7 @@ public class Main {
System.exit(-1);
}
IMResult<Void> result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello", true);
IMResult<Void> result = RelationAdmin.sendFriendRequest("ff1", "ff2", "hello", true);
if (result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
System.out.println("send friend request success");
} else {
@@ -263,7 +300,7 @@ public class Main {
System.exit(-1);
}
result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello2", false);
result = RelationAdmin.sendFriendRequest("ff1", "ff2", "hello2", false);
if (result != null && result.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) {
System.out.println("success");
} else {
@@ -271,7 +308,7 @@ public class Main {
System.exit(-1);
}
result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello3", true);
result = RelationAdmin.sendFriendRequest("ff1", "ff2", "hello3", true);
if (result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
System.out.println("success");
} else {
@@ -1147,8 +1184,6 @@ public class Main {
ChannelServiceApi channelServiceApi = new ChannelServiceApi("http://localhost", resultCreateChannel.getResult().getTargetId(), secret);
if (commercialServer) {
//3. 测试channel api功能
IMResult<Void> resultVoid = channelServiceApi.subscribe("userId2");
if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
@@ -1197,7 +1232,7 @@ public class Main {
System.out.println("get user info failure");
System.exit(-1);
}
}
MessagePayload payload = new MessagePayload();
@@ -56,7 +56,7 @@ public class RelationAdmin {
return AdminHttpUtils.httpJsonPost(path, input, OutputGetAlias.class);
}
public static IMResult<Void> sendFrienRequest(String userId, String targetId, String reason, boolean force) throws Exception {
public static IMResult<Void> sendFriendRequest(String userId, String targetId, String reason, boolean force) throws Exception {
String path = APIPath.Friend_Send_Request;
InputAddFriendRequest input = new InputAddFriendRequest();
input.setUserId(userId);
@@ -29,6 +29,14 @@ public class UserAdmin {
return AdminHttpUtils.httpJsonPost(path, user, OutputCreateUser.class);
}
public static IMResult<Void> updateUserInfo(InputOutputUserInfo user, int/*UpdateUserInfoMask*/ flag) throws Exception {
String path = APIPath.Update_User;
InputUpdateUserInfo updateUserInfo = new InputUpdateUserInfo();
updateUserInfo.flag = flag;
updateUserInfo.userInfo = user;
return AdminHttpUtils.httpJsonPost(path, updateUserInfo, Void.class);
}
public static IMResult<OutputCreateRobot> createRobot(InputCreateRobot robot) throws Exception {
String path = APIPath.Create_Robot;
return AdminHttpUtils.httpJsonPost(path, robot, OutputCreateRobot.class);