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-06-16 16:35:47 +08:00
parent 631830c3f1
commit 93f07b409f
5 changed files with 68 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
server/masterserver/cachemgr.cc
View File

@ -5,6 +5,9 @@
#include "cachemgr.h"
#include "app.h"
#include "jsondatamgr.h"
#include "typeconvert.h"
#include "svrmgr.h"
#include "IMListener.h"
void CacheMgr::Init()
{
@ -18,17 +21,33 @@ void CacheMgr::UnInit()
void CacheMgr::_SS_IM_UserOnline(f8::MsgHdr& hdr, const ss::SS_IM_UserOnline& msg)
{
for (auto& user_info : msg.user_infos()) {
unsigned int code = a8::openssl::Crc32
(
(unsigned char*)user_info.base_data().account_id().data(),
user_info.base_data().account_id().size()
);
int instance_id = code % JsonDataMgr::Instance()->GetMasterSvrNum() + 1;
if (App::Instance()->instance_id == instance_id) {
Friend* friend_data = GetFriendData(user_info.base_data().account_id());
if (friend_data) {
SvrNode* svr_node = SvrMgr::Instance()->GetNodeBySocket(hdr.socket_handle);
if (svr_node) {
for (auto& user_info : msg.user_infos()) {
unsigned int crc32_code = a8::openssl::Crc32
(
(unsigned char*)user_info.base_data().account_id().data(),
user_info.base_data().account_id().size()
);
int instance_id = crc32_code % JsonDataMgr::Instance()->GetMasterSvrNum() + 1;
if (App::Instance()->instance_id == instance_id) {
Friend* friend_data = GetFriendData(user_info.base_data().account_id());
if (!friend_data) {
friend_data = new Friend();
list_add_tail(&friend_data->human_entry, &svr_node->human_list);
friend_data->svr_node = svr_node;
friend_hash_[user_info.base_data().account_id()] = friend_data;
} else {
if (friend_data->svr_node != svr_node) {
if (!list_empty(&friend_data->human_entry)) {
list_del_init(&friend_data->human_entry);
}
list_add_tail(&friend_data->human_entry, &svr_node->human_list);
friend_data->svr_node = svr_node;
}
}
TypeConvert::Convert(user_info.base_data(), friend_data->base_data);
TypeConvert::Convert(user_info.temp_custom_data(), friend_data->temp_custom_data);
}
}
}
@ -36,12 +55,33 @@ void CacheMgr::_SS_IM_UserOnline(f8::MsgHdr& hdr, const ss::SS_IM_UserOnline& ms
void CacheMgr::_SS_IM_UserOffline(f8::MsgHdr& hdr, const ss::SS_IM_UserOffline& msg)
{
SvrNode* svr_node = SvrMgr::Instance()->GetNodeBySocket(hdr.socket_handle);
if (svr_node) {
for (const std::string& account_id : msg.account_ids()) {
Friend* friend_data = GetFriendData(account_id);
if (friend_data) {
friend_data->base_data.online = false;
if (!list_empty(&friend_data->human_entry)) {
list_del_init(&friend_data->human_entry);
}
friend_data->svr_node = nullptr;
}
}
}
}
void CacheMgr::_SS_IM_PullUserList(f8::MsgHdr& hdr, const ss::SS_IM_PullUserList& msg)
{
ss::SS_MS_PushUserList respmsg;
for (const std::string& account_id : msg.account_ids()) {
Friend* friend_data = GetFriendData(account_id);
if (friend_data) {
auto p = respmsg.add_user_infos();
TypeConvert::Convert(friend_data->base_data, *p->mutable_base_data());
TypeConvert::Convert(friend_data->temp_custom_data, *p->mutable_temp_custom_data());
}
}
IMListener::Instance()->SendMsg(hdr.socket_handle, respmsg);
}
Friend* CacheMgr::GetFriendData(const std::string& account_id)

2
server/masterserver/svrmgr.h
View File

@ -42,6 +42,7 @@ class SvrMgr : public a8::Singleton<SvrMgr>
void ___GSList(f8::JsonHttpRequest* request);
SvrNode* GetNodeBySocket(int socket_handle);
void OnIMServerDisconnect(a8::XParams& param);
private:
@ -49,7 +50,6 @@ class SvrMgr : public a8::Singleton<SvrMgr>
void RearrangeNode();
void ClearTimeOutNode();
SvrNode* GetNodeByKey(const std::string& key);
SvrNode* GetNodeBySocket(int socket_handle);
void RemoveNode(SvrNode* node);
private:

11
server/masterserver/typeconvert.cc
View File

@ -14,11 +14,22 @@ void TypeConvert::Convert(const ss::MFBaseUserDataDB& base_data_pb, const BaseUs
}
void TypeConvert::Convert(const cs::MFBaseUserData& base_data_pb, BaseUserData& base_data)
{
}
void TypeConvert::Convert(const BaseUserData& base_data, cs::MFBaseUserData& base_data_pb)
{
}
void TypeConvert::Convert(const cs::MFUserTempCustomData& tmpe_custom_data_pb,
UserTempCustomData& temp_custom_data)
{
}
void TypeConvert::Convert(const UserTempCustomData& temp_custom_data,
cs::MFUserTempCustomData& tmpe_custom_data_pb)
{

3
server/masterserver/typeconvert.h
View File

@ -16,7 +16,10 @@ class TypeConvert
public:
static void Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& base_data_pb);
static void Convert(const ss::MFBaseUserDataDB& base_data_pb, const BaseUserData& base_data);
static void Convert(const cs::MFBaseUserData& base_data_pb, BaseUserData& base_data);
static void Convert(const BaseUserData& base_data, cs::MFBaseUserData& base_data_pb);
static void Convert(const cs::MFUserTempCustomData& tmpe_custom_data_pb,
UserTempCustomData& temp_custom_data);
static void Convert(const UserTempCustomData& temp_custom_data,
cs::MFUserTempCustomData& tmpe_custom_data_pb);
};

1
server/masterserver/types.h
View File

@ -36,7 +36,6 @@ struct Friend
{
BaseUserData base_data;
UserTempCustomData temp_custom_data;
unsigned int crc32_code = 0;
list_head human_entry;
struct SvrNode* svr_node = nullptr;