diff --git a/database/frienddb_new.sql b/database/frienddb_new.sql index b91480b9..47f34ce2 100644 --- a/database/frienddb_new.sql +++ b/database/frienddb_new.sql @@ -110,7 +110,7 @@ DROP TABLE IF EXISTS `t_guild`; CREATE TABLE `t_guild` ( `idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id', `guild_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '公会id', - `guild_name` varchar(48) NOT NULL, + `guild_name` varchar(48) CHARACTER SET utf8, `owner_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT '公会长', `creator_id` varchar(60) CHARACTER SET utf8 NOT NULL COMMENT '公会创始人', `badge` int(11) DEFAULT '0' COMMENT '公会头像', @@ -126,7 +126,7 @@ CREATE TABLE `t_guild` ( `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', PRIMARY KEY (`idx`), UNIQUE KEY `idx_guild_id` (`guild_id`), - UNIQUE KEY `idx_guild_name_deleted` (`guild_name`, `deleted`), + UNIQUE KEY `idx_guild_name` (`guild_name`), KEY `owner_id` (`owner_id`), KEY `creator_id` (`creator_id`) ) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go index 020fe89c..6ae1949e 100644 --- a/server/imserver_new/guild/guildmgr.go +++ b/server/imserver_new/guild/guildmgr.go @@ -907,6 +907,18 @@ func (this *guildMgr) clearEmptyGuild() { delete(this.idHash, g.guildId) delete(this.nameHash, g.guildName) GetDbLogMgr().GuildClearEmptyStart(g.guildId, g.guildName) + f5.GetJsStyleDb().Update( + constant.FRIEND_DB, + "t_guild_member", + [][]string{ + {"deleted", q5.ToString("1")}, + }, + [][]string{ + {"guild_id", g.guildId}, + }, + func (err error, lastInsertId int64, rowsAffected int64) { + + }) } }