version to 0.59

README.md

@@ -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相关业务。

broker/migrate/h2/V38__add_user_messages_conv_info.sql

@@ -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);

broker/migrate/mysql/V43__add_user_messages_conv_info.sql

@@ -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);

broker/pom.xml

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

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

@@ -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!");

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

@@ -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) {

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

@@ -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) {

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

@@ -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) {

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

@@ -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) {

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

@@ -1702,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 {
@@ -1718,6 +1718,9 @@ public class DatabaseStore {
                     "`_alias` = ?," +
                     "`_type` = ?," +
                     "`_dt` = ?";
+                if(updateCreateTime) {
+                    sql += ", `_create_dt` = ?";
+                }
 
                 statement = connection.prepareStatement(sql);
 
@@ -1738,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();
@@ -1754,9 +1760,6 @@ public class DatabaseStore {
                         e1.printStackTrace();
                     }
                 }
-                e.printStackTrace();
-                Utility.printExecption(LOG, e, RDBS_Exception);
-            } finally {
                 DBUtil.closeDB(connection, statement);
             }
     }
@@ -3082,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();
@@ -3095,9 +3098,6 @@ public class DatabaseStore {
                         e1.printStackTrace();
                     }
                 }
-                e.printStackTrace();
-                Utility.printExecption(LOG, e, RDBS_Exception);
-            } finally {
                 DBUtil.closeDB(connection, statement);
             }
         });

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

@@ -972,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;
@@ -1191,7 +1191,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        databaseStore.persistGroupMember(groupId, memberList);
+        databaseStore.persistGroupMember(groupId, memberList, true);
         databaseStore.updateGroupMemberCountDt(groupId);
 
         groupMembers.remove(groupId);
@@ -1516,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);
 
@@ -1673,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++;
             }
@@ -1717,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);
             }
         }
@@ -2206,6 +2206,13 @@ public class MemoryMessagesStore implements IMessagesStore {
         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 {

common/pom.xml

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

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

@@ -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"),

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

@@ -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);
+    }
+
 }

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

@@ -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)
+                .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)
+                .setNotifyContent(notify_message.toProtoMessageContent())
+                .build();
+        }
     }
 }

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

@@ -211,6 +211,7 @@ public class ProtoConstants {
         int Update_User_Company = 0x40;
         int Update_User_Social = 0x80;
         int Update_User_Extra = 0x100;
+        int Update_User_Name = 0x200;
     }
 
 
@@ -234,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;
 }
 

distribution/pom.xml

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

pom.xml

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

sdk/pom.xml

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