diff --git a/server/imserver/asynctaskmgr.cc b/server/imserver/asynctaskmgr.cc index 49a8075..e449453 100644 --- a/server/imserver/asynctaskmgr.cc +++ b/server/imserver/asynctaskmgr.cc @@ -204,6 +204,15 @@ void AsyncTaskMgr::CreateRecommandFriendTask(Player* hum) void AsyncTaskMgr::CreateNewGuildTask(const ss::MFIMMsgConext& context, const cs::CMGuildCreate& msg) { + auto on_ok = + [] (a8::XParams& param, const f8::DataSet* data_set) + { + }; + auto on_error = + [] (a8::XParams& param, int error_code, const std::string& error_msg) + { + }; + CreateGuildTask* task = new CreateGuildTask(); { task->seqid = App::Instance()->NewSeqId(); @@ -219,12 +228,23 @@ void AsyncTaskMgr::CreateNewGuildTask(const ss::MFIMMsgConext& context, const cs DBEngine::Instance()->ExecAsyncScript ( conn_info, - "UPDATE `friend_apply` SET status=%d WHERE target_id='%s' AND sender_id='%s';", + "INSERT INTO `guild`(guild_id, guild_name, guild_lv, guild_exp, guild_badge, guild_declaration, " + " owner_id, creator_id, guild_data, createtime, modifytime)" + "VALUES(%d, '%s', 1, 0, %d, '%s', '%s', '%s', '%s', %d, %d);", { + guild_id, + msg.guild_name(), + msg.guild_badge(), + msg.guild_declaration(), + context.user_info().base_data().account_id(), + context.user_info().base_data().account_id(), + "", + App::Instance()->nowtime, + App::Instance()->nowtime }, a8::XParams(), - nullptr, - nullptr, + on_ok, + on_error, crc32_code ); } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 531f2d0..10e627c 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -313,12 +313,14 @@ message SMGroupRename optional string errmsg = 2; //错误信息 } -//建群 +//建公会 message CMGuildCreate { - optional string guild_name = 1; //群名称 + optional string guild_name = 1; //公会名字 + optional int32 guild_badge = 2; //公会徽标 + optional string guild_declaration = 3; //公会徽标 } -//建群返回 +//建公会返回 message SMGuildCreate { optional int32 errcode = 1; //1:群已存在 2: 你已经有群 diff --git a/sql/relationdb_n.sql b/sql/relationdb_n.sql index 689bee3..2ce8667 100644 --- a/sql/relationdb_n.sql +++ b/sql/relationdb_n.sql @@ -94,12 +94,12 @@ CREATE TABLE `guild` ( `guild_exp` int(11) NOT NULL DEFAULT '0' COMMENT '公会经验', `guild_badge` int(11) NOT NULL DEFAULT '0' COMMENT '公会徽章', `guild_apply_num` int(11) NOT NULL DEFAULT '0' COMMENT '申请人数', - `guld_administers` varchar(255) CHARACTER SET utf8 NOT NULL COMMENT '公会管理员', - `guld_notice` varchar(255) CHARACTER SET utf8 NOT NULL COMMENT '公会公告', - `guld_declaration` varchar(255) CHARACTER SET utf8 NOT NULL COMMENT '公会宣言', + `guild_administers` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '公会管理员', + `guild_notice` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '公会公告', + `guild_declaration` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '公会宣言', `guild_log` mediumblob COMMENT '公会日志', - `owner_id` varchar(255) CHARACTER SET utf8 NOT NULL COMMENT '公会主', - `creator_id` varchar(255) CHARACTER SET utf8 NOT NULL COMMENT '公会创建者', + `owner_id` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '公会主', + `creator_id` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '' COMMENT '公会创建者', `guild_data` mediumblob COMMENT '公会数据', `createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',