diff --git a/server/imserver/jsondatamgr.cc b/server/imserver/jsondatamgr.cc index a9cae5b..9b49201 100644 --- a/server/imserver/jsondatamgr.cc +++ b/server/imserver/jsondatamgr.cc @@ -76,10 +76,15 @@ std::shared_ptr JsonDataMgr::GetMysqlClusterConf() bool JsonDataMgr::GetRankServerConf(std::string& ip, int& port) { + #if 1 + ip = "127.0.0.1"; + port = 8961; + #else std::shared_ptr rankserver_cluster_conf = GetMasterServerClusterConf(); std::shared_ptr conf = rankserver_cluster_conf->At(0); ip = conf->At("rankserver_ip")->AsXValue().GetString(); port = conf->At("rankserver_ip")->AsXValue(); + #endif return true; } diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 4e4ad96..d7329cb 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -807,7 +807,7 @@ void Player::_CMGuildSearch(f8::MsgHdr& hdr, const cs::CMGuildSearch& msg) respmsg.set_errcode(data.At("errcode")->AsXValue()); respmsg.set_errmsg(data.At("errmsg")->AsXValue()); if (respmsg.errcode() == 0) { - TypeConvert::Convert(*data.At("paging"), respmsg.mutable_paging()); + TypeConvert::Convert(data, respmsg.mutable_paging()); auto guild_list = data.At("guild_list"); for (int i = 0; i < guild_list->Size(); ++i) { auto guild = guild_list->At(i); @@ -859,7 +859,8 @@ void Player::_CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg) params->SetVal("gameid", gameid); f8::HttpClientPool::Instance()->HttpGet ( - a8::XParams(), + a8::XParams() + .SetSender(msg_context), [] (a8::XParams& param, a8::XObject& data) { MsgContext* msg_context = (MsgContext*)param.sender.GetUserData(); @@ -870,7 +871,7 @@ void Player::_CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg) respmsg.set_errcode(data.At("errcode")->AsXValue()); respmsg.set_errmsg(data.At("errmsg")->AsXValue()); if (respmsg.errcode() == 0) { - TypeConvert::Convert(*data.At("paging"), respmsg.mutable_paging()); + TypeConvert::Convert(data, respmsg.mutable_paging()); auto guild_list = data.At("guild_list"); for (int i = 0; i < guild_list->Size(); ++i) { auto guild = guild_list->At(i); diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc index 6744211..ba7225b 100644 --- a/server/rankserver/guildmgr.cc +++ b/server/rankserver/guildmgr.cc @@ -55,7 +55,7 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request) "INSERT INTO `guild`(gameid, guild_id, guild_name, guild_lv, guild_exp, guild_badge, " " guild_apply_num, guild_notice, guild_declaration, guild_log, owner_id, " " owner_name, owner_avatar_url, creator_id, creator_name, creator_avatar_url, " - " guild_data, guild_status, join_unlimited, join_cond1, join_cond2, ,createtime, modifytime)" + " guild_data, guild_status, join_unlimited, join_cond1, join_cond2, createtime, modifytime)" "VALUES(%d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', " " '%s', '%s', '%s', '%s', '%s', " " '%s', %d, %d, %d, %d, %d, %d);", diff --git a/server/rankserver/typeconvert.cc b/server/rankserver/typeconvert.cc index d4211e4..f13878a 100644 --- a/server/rankserver/typeconvert.cc +++ b/server/rankserver/typeconvert.cc @@ -12,7 +12,7 @@ void TypeConvert::Convert(const cs::MFGuildBasic* guild_basic, a8::MutableXObjec xobj->SetVal("guild_exp", guild_basic->guild_exp()); xobj->SetVal("guild_badge", guild_basic->guild_badge()); xobj->SetVal("member_num", guild_basic->member_num()); - xobj->SetVal("guild_declareation", guild_basic->guild_declaration()); + xobj->SetVal("guild_declaration", guild_basic->guild_declaration()); xobj->SetVal("owner_id", guild_basic->owner_id()); xobj->SetVal("owner_name", guild_basic->owner_name()); xobj->SetVal("owner_avatar_url", guild_basic->owner_avatar_url());