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

rename data->myself

Browse Source
This commit is contained in:
aozhiwei 2020-06-17 15:28:32 +08:00
parent b31615b4ea
commit 39f1f6138f
3 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
server/imserver/player.cc
View File

@ -21,11 +21,11 @@
void Player::Init() void Player::Init()
{ {
data.hum = this; myself.hum = this;
data.crc32_code = a8::openssl::Crc32 myself.crc32_code = a8::openssl::Crc32
( (
(unsigned char*)data.base_data.account_id.data(), (unsigned char*)myself.base_data.account_id.data(),
data.base_data.account_id.size() myself.base_data.account_id.size()
); );
SyncLocToMasterServer(); SyncLocToMasterServer();
NotifyOnline(); NotifyOnline();
@ -47,8 +47,8 @@ void Player::Deserialize(const ss::MFUserDB& user_db)
Friend friendobj; Friend friendobj;
TypeConvert::Convert(friend_db.base_data(), friendobj.base_data); TypeConvert::Convert(friend_db.base_data(), friendobj.base_data);
friendobj.crc32_code = a8::openssl::Crc32( friendobj.crc32_code = a8::openssl::Crc32(
(unsigned char*)data.base_data.account_id.data(), (unsigned char*)myself.base_data.account_id.data(),
data.base_data.account_id.size() myself.base_data.account_id.size()
);; );;
friend_hash_[friendobj.base_data.account_id] = friendobj; friend_hash_[friendobj.base_data.account_id] = friendobj;
} }
@ -70,37 +70,37 @@ void Player::Serialize(ss::MFUserDB& user_db)
void Player::_CMUpdateUserInfo(f8::MsgHdr& hdr, const cs::CMUpdateUserInfo& msg) void Player::_CMUpdateUserInfo(f8::MsgHdr& hdr, const cs::CMUpdateUserInfo& msg)
{ {
if (msg.has_nickname()) { if (msg.has_nickname()) {
data.base_data.nickname = msg.nickname(); myself.base_data.nickname = msg.nickname();
} }
if (msg.has_avatar_url()) { if (msg.has_avatar_url()) {
data.base_data.avatar_url = msg.avatar_url(); myself.base_data.avatar_url = msg.avatar_url();
} }
if (msg.has_sex()) { if (msg.has_sex()) {
data.base_data.sex = msg.sex(); myself.base_data.sex = msg.sex();
} }
if (msg.has_user_value1()) { if (msg.has_user_value1()) {
data.base_data.user_value1 = msg.user_value1(); myself.base_data.user_value1 = msg.user_value1();
} }
if (msg.has_user_value2()) { if (msg.has_user_value2()) {
data.base_data.user_value2 = msg.user_value2(); myself.base_data.user_value2 = msg.user_value2();
} }
if (msg.has_user_value3()) { if (msg.has_user_value3()) {
data.base_data.user_value3 = msg.user_value3(); myself.base_data.user_value3 = msg.user_value3();
} }
++data.base_data.base_data_version; ++myself.base_data.base_data_version;
OnDataVersion1Change(); OnDataVersion1Change();
} }
void Player::_CMUpdateTempCustomData(f8::MsgHdr& hdr, const cs::CMUpdateTempCustomData& msg) void Player::_CMUpdateTempCustomData(f8::MsgHdr& hdr, const cs::CMUpdateTempCustomData& msg)
{ {
if (msg.temp_custom_data().has_value1()) { if (msg.temp_custom_data().has_value1()) {
data.temp_custom_data.value1 = msg.temp_custom_data().value1(); myself.temp_custom_data.value1 = msg.temp_custom_data().value1();
} }
if (msg.temp_custom_data().has_value2()) { if (msg.temp_custom_data().has_value2()) {
data.temp_custom_data.value2 = msg.temp_custom_data().value2(); myself.temp_custom_data.value2 = msg.temp_custom_data().value2();
} }
if (msg.temp_custom_data().has_value3()) { if (msg.temp_custom_data().has_value3()) {
data.temp_custom_data.value2 = msg.temp_custom_data().value3(); myself.temp_custom_data.value2 = msg.temp_custom_data().value3();
} }
OnTempCustomDataChange(); OnTempCustomDataChange();
} }
@ -145,12 +145,12 @@ void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg)
{ {
App::Instance()->NewUUID(), App::Instance()->NewUUID(),
msg.friend_id(), msg.friend_id(),
data.base_data.account_id, myself.base_data.account_id,
data.base_data.nickname, myself.base_data.nickname,
data.base_data.avatar_url, myself.base_data.avatar_url,
data.base_data.sex, myself.base_data.sex,
data.base_data.group_id, myself.base_data.group_id,
data.base_data.base_data_version, myself.base_data.base_data_version,
App::Instance()->nowtime App::Instance()->nowtime
}, },
a8::XParams(), a8::XParams(),
@ -164,7 +164,7 @@ void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg)
void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& msg) void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& msg)
{ {
if (last_apply_idx_ > 0 && if (last_apply_idx_ > 0 &&
last_apply_idx_ >= DBEngine::Instance()->GetFriendApplyCurrIdx(data.crc32_code)) { last_apply_idx_ >= DBEngine::Instance()->GetFriendApplyCurrIdx(myself.crc32_code)) {
cs::SMFriendApplyList respmsg; cs::SMFriendApplyList respmsg;
FillApplyList(msg.paging(), respmsg); FillApplyList(msg.paging(), respmsg);
SendMsg(respmsg); SendMsg(respmsg);
@ -213,7 +213,7 @@ void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& ms
cs::MFPaging* paging_copy = nullptr; cs::MFPaging* paging_copy = nullptr;
*paging_copy = msg.paging(); *paging_copy = msg.paging();
a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(data.crc32_code); a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(myself.crc32_code);
DBEngine::Instance()->ExecAsyncScript DBEngine::Instance()->ExecAsyncScript
( (
conn_info, conn_info,
@ -222,15 +222,15 @@ void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& ms
"FROM friend_apply WHERE %d > idx AND target_id='%s';", "FROM friend_apply WHERE %d > idx AND target_id='%s';",
{ {
last_apply_idx_, last_apply_idx_,
data.base_data.account_id myself.base_data.account_id
}, },
a8::XParams() a8::XParams()
.SetSender(data.base_data.account_id) .SetSender(myself.base_data.account_id)
.SetParam1(hdr.socket_handle) .SetParam1(hdr.socket_handle)
.SetParam2(paging_copy), .SetParam2(paging_copy),
on_ok, on_ok,
on_error, on_error,
data.crc32_code myself.crc32_code
); );
} }
@ -302,7 +302,7 @@ void Player::_CMSendCustomMsg(f8::MsgHdr& hdr, const cs::CMSendCustomMsg& msg)
void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg) void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg)
{ {
if (data.base_data.group_id != 0) { if (myself.base_data.group_id != 0) {
cs::SMGroupCreate respmsg; cs::SMGroupCreate respmsg;
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你已经有群"); respmsg.set_errmsg("你已经有群");
@ -314,74 +314,74 @@ void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg)
void Player::_CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg) void Player::_CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg)
{ {
if (data.base_data.group_id != 0) { if (myself.base_data.group_id != 0) {
cs::SMGroupJoin respmsg; cs::SMGroupJoin respmsg;
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("你已经有群"); respmsg.set_errmsg("你已经有群");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
ForwardGroupCMMsg(hdr, data.base_data.group_id); ForwardGroupCMMsg(hdr, myself.base_data.group_id);
} }
void Player::_CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg) void Player::_CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg)
{ {
if (data.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupAgree respmsg; cs::SMGroupAgree respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
ForwardGroupCMMsg(hdr, data.base_data.group_id); ForwardGroupCMMsg(hdr, myself.base_data.group_id);
} }
void Player::_CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg) void Player::_CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg)
{ {
if (data.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupKick respmsg; cs::SMGroupKick respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
ForwardGroupCMMsg(hdr, data.base_data.group_id); ForwardGroupCMMsg(hdr, myself.base_data.group_id);
} }
void Player::_CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg) void Player::_CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg)
{ {
if (data.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupQuit respmsg; cs::SMGroupQuit respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
ForwardGroupCMMsg(hdr, data.base_data.group_id); ForwardGroupCMMsg(hdr, myself.base_data.group_id);
} }
void Player::_CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg) void Player::_CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg)
{ {
if (data.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupQuit respmsg; cs::SMGroupQuit respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
ForwardGroupCMMsg(hdr, data.base_data.group_id); ForwardGroupCMMsg(hdr, myself.base_data.group_id);
} }
void Player::_CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg) void Player::_CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg)
{ {
if (data.base_data.group_id == 0) { if (myself.base_data.group_id == 0) {
cs::SMGroupRename respmsg; cs::SMGroupRename respmsg;
respmsg.set_errcode(2); respmsg.set_errcode(2);
respmsg.set_errmsg("你还没有群"); respmsg.set_errmsg("你还没有群");
SendMsg(respmsg); SendMsg(respmsg);
return; return;
} }
ForwardGroupCMMsg(hdr, data.base_data.group_id); ForwardGroupCMMsg(hdr, myself.base_data.group_id);
} }
void Player::ReLogin(f8::MsgHdr& hdr, const cs::CMLogin& msg) void Player::ReLogin(f8::MsgHdr& hdr, const cs::CMLogin& msg)
@ -396,8 +396,8 @@ void Player::FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserIn
{ {
{ {
auto p = friend_list->Add(); auto p = friend_list->Add();
TypeConvert::Convert(data.base_data, *(p->mutable_base_data())); TypeConvert::Convert(myself.base_data, *(p->mutable_base_data()));
TypeConvert::Convert(data.temp_custom_data, *(p->mutable_temp_custom_data())); TypeConvert::Convert(myself.temp_custom_data, *(p->mutable_temp_custom_data()));
} }
for (auto& pair : friend_hash_) { for (auto& pair : friend_hash_) {
auto p = friend_list->Add(); auto p = friend_list->Add();
@ -410,10 +410,10 @@ void Player::FillIMMsgConext(f8::MsgHdr& hdr, ss::MFIMMsgConext* conext)
{ {
#if 0 #if 0
conext->set_socket_handle(hdr.socket_handle); conext->set_socket_handle(hdr.socket_handle);
conext->set_account_id(data.base_data.account_id); conext->set_account_id(myself.base_data.account_id);
conext->set_nickname(data.base_data.nickname); conext->set_nickname(myself.base_data.nickname);
conext->set_avatar_url(data.base_data.avatar_url); conext->set_avatar_url(myself.base_data.avatar_url);
conext->set_sex(data.base_data.sex); conext->set_sex(myself.base_data.sex);
#if 1 #if 1
conext->set_online(true); conext->set_online(true);
#else #else
@ -479,7 +479,7 @@ void Player::SaveToDB()
}; };
a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(data.crc32_code); a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(myself.crc32_code);
DBEngine::Instance()-> DBEngine::Instance()->
ExecAsyncScript( ExecAsyncScript(
conn_info, conn_info,
@ -489,17 +489,17 @@ void Player::SaveToDB()
{ {
friend_data, friend_data,
App::Instance()->nowtime, App::Instance()->nowtime,
data.base_data.nickname, myself.base_data.nickname,
data.base_data.avatar_url, myself.base_data.avatar_url,
data.base_data.sex, myself.base_data.sex,
data.base_data.group_id, myself.base_data.group_id,
data.base_data.base_data_version, myself.base_data.base_data_version,
data.base_data.account_id myself.base_data.account_id
}, },
a8::XParams(), a8::XParams(),
on_ok, on_ok,
on_error, on_error,
data.crc32_code myself.crc32_code
); );
} }
@ -599,7 +599,7 @@ void Player::InternalSendSSMsg(const Friend& friend_data,
const std::string Player::AccountId() const std::string Player::AccountId()
{ {
return data.base_data.account_id; return myself.base_data.account_id;
} }
void Player::InternalUpdateUserInfo() void Player::InternalUpdateUserInfo()
@ -622,6 +622,7 @@ void Player::InternalUpdateUserInfo()
return true; return true;
} }
); );
NotifyUserInfoUpdate(&myself);
} }
void Player::NotifyUserInfoUpdate(Friend* friend_data) void Player::NotifyUserInfoUpdate(Friend* friend_data)

4
server/imserver/player.h
View File

@ -15,7 +15,7 @@ class Player
int socket_handle = 0; int socket_handle = 0;
a8::TimerAttacher timer_attacher; a8::TimerAttacher timer_attacher;
Friend data; Friend myself;
int today_invite_times = 0; int today_invite_times = 0;
int last_invite_time = 0; int last_invite_time = 0;
@ -52,7 +52,7 @@ class Player
void BoradcastSSMsg(const T& msg) void BoradcastSSMsg(const T& msg)
{ {
static int msgid = f8::Net_GetMessageId(msg); static int msgid = f8::Net_GetMessageId(msg);
InternalSendSSMsg(data, msgid, msg); InternalSendSSMsg(myself, msgid, msg);
BoradcastExcludeSSMsg(msg); BoradcastExcludeSSMsg(msg);
} }

20
server/imserver/playermgr.cc
View File

@ -346,15 +346,15 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id,
{ {
hum = new Player(); hum = new Player();
hum->socket_handle = hdr->socket_handle; hum->socket_handle = hdr->socket_handle;
hum->data.base_data.account_id = account_id; hum->myself.base_data.account_id = account_id;
hum->data.base_data.nickname = nickname; hum->myself.base_data.nickname = nickname;
hum->data.base_data.avatar_url = avatar_url; hum->myself.base_data.avatar_url = avatar_url;
hum->data.base_data.sex = sex; hum->myself.base_data.sex = sex;
hum->data.base_data.group_id = group_id; hum->myself.base_data.group_id = group_id;
hum->data.base_data.base_data_version = data_version1; hum->myself.base_data.base_data_version = data_version1;
hum->data.base_data.user_value1 = user_value1; hum->myself.base_data.user_value1 = user_value1;
hum->data.base_data.user_value2 = user_value2; hum->myself.base_data.user_value2 = user_value2;
hum->data.base_data.user_value3 = user_value3; hum->myself.base_data.user_value3 = user_value3;
hum->Init(); hum->Init();
{ {
ss::MFUserDB user_db; ss::MFUserDB user_db;
@ -404,7 +404,7 @@ void PlayerMgr::OnClientSocketDisconnect(int socket_handle)
hum->NotifyOffline(); hum->NotifyOffline();
hum->UnInit(); hum->UnInit();
socket_hash_.erase(socket_handle); socket_hash_.erase(socket_handle);
accountid_hash_.erase(hum->data.base_data.account_id); accountid_hash_.erase(hum->myself.base_data.account_id);
} }
} }
#ifdef DEBUG #ifdef DEBUG