server/relation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-10-09 13:44:47 +08:00
parent 2cac3902c1
commit d5e0c114d4
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/imserver/guild.h
View File

@ -32,6 +32,7 @@ public:
long long GuildId() { return guild_id_; } long long GuildId() { return guild_id_; }
int GetMemberJob(const std::string& account_id); int GetMemberJob(const std::string& account_id);
int Status() { return guild_status_; }
std::set<std::string>* GetJobMembers(int job); std::set<std::string>* GetJobMembers(int job);
int GetJobMemberNum(int job); int GetJobMemberNum(int job);
void UpdateMemberInfo(const cs::MFUserInfo& user_info); void UpdateMemberInfo(const cs::MFUserInfo& user_info);

18
server/imserver/guildmgr.cc
View File

@ -18,6 +18,7 @@
#include "app.h" #include "app.h"
#include "typeconvert.h" #include "typeconvert.h"
#include "handlermgr.h" #include "handlermgr.h"
#include "synchelper.h"
#include "framework/cpp/httpclientpool.h" #include "framework/cpp/httpclientpool.h"
@ -44,8 +45,21 @@ public:
hdr.offset = 0; hdr.offset = 0;
hdr.hum = nullptr; hdr.hum = nullptr;
hdr.user_data = &forward_msg; hdr.user_data = &forward_msg;
guild->Active(); if (guild->Status() == kGuildDismissed) {
ProcessNetMsg(handler, guild, hdr); cs::SMShowErrorMsg notifymsg;
notifymsg.set_msg("公会已解散");
GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
forward_msg.context(),
notifymsg);
SyncHelper::Instance()->SyncGuildMemberQuit
(guild,
forward_msg.context().user_info().base_data().account_id(),
forward_msg.context().user_info().base_data().account_id(),
kGuildDismisss);
} else {
guild->Active();
ProcessNetMsg(handler, guild, hdr);
}
} }
} }

7
server/imserver/jsondatamgr.cc
View File

@ -69,6 +69,11 @@ std::shared_ptr<a8::XObject> JsonDataMgr::GetMasterServerClusterConf()
return std::make_shared<a8::XObject>(masterserver_cluster_json_); return std::make_shared<a8::XObject>(masterserver_cluster_json_);
} }
std::shared_ptr<a8::XObject> JsonDataMgr::GetRankServerClusterConf()
{
return std::make_shared<a8::XObject>(rankserver_cluster_json_);
}
std::shared_ptr<a8::XObject> JsonDataMgr::GetMysqlClusterConf() std::shared_ptr<a8::XObject> JsonDataMgr::GetMysqlClusterConf()
{ {
return std::make_shared<a8::XObject>(mysql_cluster_json_); return std::make_shared<a8::XObject>(mysql_cluster_json_);
@ -76,7 +81,7 @@ std::shared_ptr<a8::XObject> JsonDataMgr::GetMysqlClusterConf()
bool JsonDataMgr::GetRankServerConf(std::string& ip, int& port) bool JsonDataMgr::GetRankServerConf(std::string& ip, int& port)
{ {
std::shared_ptr<a8::XObject> rankserver_cluster_conf = GetMasterServerClusterConf(); std::shared_ptr<a8::XObject> rankserver_cluster_conf = GetRankServerClusterConf();
std::shared_ptr<a8::XObject> conf = rankserver_cluster_conf->At(0); std::shared_ptr<a8::XObject> conf = rankserver_cluster_conf->At(0);
ip = conf->At("ip")->AsXValue().GetString(); ip = conf->At("ip")->AsXValue().GetString();
port = conf->At("port")->AsXValue(); port = conf->At("port")->AsXValue();