From f402a38a41244ee86e23fa1da87557769fa0d218 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 12 Jun 2020 14:30:18 +0800 Subject: [PATCH] 1 --- server/imserver/group.cc | 4 +-- server/imserver/group.h | 4 +-- server/imserver/groupmgr.cc | 28 ++++++++-------- server/imserver/player.cc | 44 +++++++++++++++----------- server/imserver/player.h | 4 +-- server/imserver/playermgr.cc | 4 +-- server/tools/protobuild/cs_proto.proto | 13 ++++++++ 7 files changed, 60 insertions(+), 41 deletions(-) diff --git a/server/imserver/group.cc b/server/imserver/group.cc index 55bec94..9953f9e 100644 --- a/server/imserver/group.cc +++ b/server/imserver/group.cc @@ -87,14 +87,14 @@ void Group::MarkDirty() } } -void Group::FillGroupDB(cs::MFGroupDB& group_dto) +void Group::FillGroupDB(ss::MFGroupDB& group_dto) { } void Group::SaveToDB() { - cs::MFGroupDB group_db; + ss::MFGroupDB group_db; FillGroupDB(group_db); std::string group_data; group_db.SerializeToString(&group_data); diff --git a/server/imserver/group.h b/server/imserver/group.h index 6ce13f1..1acb40a 100644 --- a/server/imserver/group.h +++ b/server/imserver/group.h @@ -13,7 +13,7 @@ struct GroupMember int data_version1 = 0; }; -namespace cs +namespace ss { class MFGroupDB; } @@ -40,7 +40,7 @@ class Group void MarkDirty(); private: - void FillGroupDB(cs::MFGroupDB& group_dto); + void FillGroupDB(ss::MFGroupDB& group_dto); void SaveToDB(); private: diff --git a/server/imserver/groupmgr.cc b/server/imserver/groupmgr.cc index 95a315e..e05ba93 100644 --- a/server/imserver/groupmgr.cc +++ b/server/imserver/groupmgr.cc @@ -86,8 +86,8 @@ void GroupMgr::_CMGroupCreate(const ss::MFIMMsgConext& context, const cs::CMGrou Group* group = GetGroup(context.group_id()); if (group) { cs::SMGroupCreate respmsg; - respmsg.set_error_code(1); - respmsg.set_error_msg("群id已经存在"); + respmsg.set_errcode(1); + respmsg.set_errmsg("群id已经存在"); ForwardGroupSMMsg(context, respmsg); return; } @@ -98,8 +98,8 @@ void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJ Group* group = GetGroup(msg.group_id()); if (!group) { cs::SMGroupJoin respmsg; - respmsg.set_error_code(1); - respmsg.set_error_msg("群id已经存在"); + respmsg.set_errcode(1); + respmsg.set_errmsg("群id已经存在"); ForwardGroupSMMsg(context, respmsg); return; } @@ -111,8 +111,8 @@ void GroupMgr::_CMGroupJoin(const ss::MFIMMsgConext& context, const cs::CMGroupJ } if (group->IsFull()) { cs::SMGroupJoin respmsg; - respmsg.set_error_code(2); - respmsg.set_error_msg("群已满"); + respmsg.set_errcode(2); + respmsg.set_errmsg("群已满"); ForwardGroupSMMsg(context, respmsg); return; } @@ -140,8 +140,8 @@ void GroupMgr::_CMGroupKick(const ss::MFIMMsgConext& context, const cs::CMGroupK Group* group = GetGroup(context.group_id()); if (!group) { cs::SMGroupKick respmsg; - respmsg.set_error_code(1); - respmsg.set_error_msg("群id错误"); + respmsg.set_errcode(1); + respmsg.set_errmsg("群id错误"); ForwardGroupSMMsg(context, respmsg); return; } @@ -161,8 +161,8 @@ void GroupMgr::_CMGroupQuit(const ss::MFIMMsgConext& context, const cs::CMGroupQ Group* group = GetGroup(context.group_id()); if (!group) { cs::SMGroupQuit respmsg; - respmsg.set_error_code(1); - respmsg.set_error_msg("群id错误"); + respmsg.set_errcode(1); + respmsg.set_errmsg("群id错误"); ForwardGroupSMMsg(context, respmsg); return; } @@ -189,16 +189,16 @@ void GroupMgr::_CMGroupRename(const ss::MFIMMsgConext& context, const cs::CMGrou Group* group = GetGroup(context.group_id()); if (!group) { cs::SMGroupRename respmsg; - respmsg.set_error_code(1); - respmsg.set_error_msg("群id错误"); + respmsg.set_errcode(1); + respmsg.set_errmsg("群id错误"); ForwardGroupSMMsg(context, respmsg); return; } GroupMember* member = group->GetMember(context.account_id()); if (!member) { cs::SMGroupRename respmsg; - respmsg.set_error_code(2); - respmsg.set_error_msg("没有权限"); + respmsg.set_errcode(2); + respmsg.set_errmsg("没有权限"); ForwardGroupSMMsg(context, respmsg); return; } diff --git a/server/imserver/player.cc b/server/imserver/player.cc index 6582484..3b13ae2 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -28,8 +28,9 @@ void Player::UnInit() timer_attacher.ClearTimerList(); } -void Player::Deserialize(const cs::MFUserDB& user_db) +void Player::Deserialize(const ss::MFUserDB& user_db) { + #if 0 for (auto& friend_db : user_db.friends()) { Friend friendobj; friendobj.account_id = friend_db.account_id(); @@ -44,10 +45,12 @@ void Player::Deserialize(const cs::MFUserDB& user_db) );; friend_hash_[friendobj.account_id] = friendobj; } + #endif } -void Player::Serialize(cs::MFUserDB& user_db) +void Player::Serialize(ss::MFUserDB& user_db) { + #if 0 for (auto& pair : friend_hash_) { auto p = user_db.add_friends(); p->set_account_id(pair.second.account_id); @@ -57,6 +60,7 @@ void Player::Serialize(cs::MFUserDB& user_db) p->set_group_id(pair.second.group_id); p->set_data_version1(pair.second.data_version1); } + #endif } void Player::_CMFriendList(f8::MsgHdr& hdr, const cs::CMFriendList& msg) @@ -70,8 +74,8 @@ void Player::_CMFriendApply(f8::MsgHdr& hdr, const cs::CMFriendApply& msg) { cs::SMFriendApply respmsg; if (GetFriendById(msg.friend_id())) { - respmsg.set_error_code(1); - respmsg.set_error_msg("已经是好友"); + respmsg.set_errcode(1); + respmsg.set_errmsg("已经是好友"); } SendMsg(respmsg); { @@ -232,8 +236,8 @@ void Player::_CMGroupCreate(f8::MsgHdr& hdr, const cs::CMGroupCreate& msg) { if (group_id != 0) { cs::SMGroupCreate respmsg; - respmsg.set_error_code(1); - respmsg.set_error_msg("你已经有群"); + respmsg.set_errcode(1); + respmsg.set_errmsg("你已经有群"); SendMsg(respmsg); return; } @@ -244,8 +248,8 @@ void Player::_CMGroupJoin(f8::MsgHdr& hdr, const cs::CMGroupJoin& msg) { if (group_id != 0) { cs::SMGroupJoin respmsg; - respmsg.set_error_code(1); - respmsg.set_error_msg("你已经有群"); + respmsg.set_errcode(1); + respmsg.set_errmsg("你已经有群"); SendMsg(respmsg); return; } @@ -256,8 +260,8 @@ void Player::_CMGroupAgree(f8::MsgHdr& hdr, const cs::CMGroupAgree& msg) { if (group_id == 0) { cs::SMGroupAgree respmsg; - respmsg.set_error_code(2); - respmsg.set_error_msg("你还没有群"); + respmsg.set_errcode(2); + respmsg.set_errmsg("你还没有群"); SendMsg(respmsg); return; } @@ -268,8 +272,8 @@ void Player::_CMGroupKick(f8::MsgHdr& hdr, const cs::CMGroupKick& msg) { if (group_id == 0) { cs::SMGroupKick respmsg; - respmsg.set_error_code(2); - respmsg.set_error_msg("你还没有群"); + respmsg.set_errcode(2); + respmsg.set_errmsg("你还没有群"); SendMsg(respmsg); return; } @@ -280,8 +284,8 @@ void Player::_CMGroupQuit(f8::MsgHdr& hdr, const cs::CMGroupQuit& msg) { if (group_id == 0) { cs::SMGroupQuit respmsg; - respmsg.set_error_code(2); - respmsg.set_error_msg("你还没有群"); + respmsg.set_errcode(2); + respmsg.set_errmsg("你还没有群"); SendMsg(respmsg); return; } @@ -292,8 +296,8 @@ void Player::_CMGroupDismiss(f8::MsgHdr& hdr, const cs::CMGroupDismiss& msg) { if (group_id == 0) { cs::SMGroupQuit respmsg; - respmsg.set_error_code(2); - respmsg.set_error_msg("你还没有群"); + respmsg.set_errcode(2); + respmsg.set_errmsg("你还没有群"); SendMsg(respmsg); return; } @@ -304,8 +308,8 @@ void Player::_CMGroupRename(f8::MsgHdr& hdr, const cs::CMGroupRename& msg) { if (group_id == 0) { cs::SMGroupRename respmsg; - respmsg.set_error_code(2); - respmsg.set_error_msg("你还没有群"); + respmsg.set_errcode(2); + respmsg.set_errmsg("你还没有群"); SendMsg(respmsg); return; } @@ -337,6 +341,7 @@ void Player::NotifyOffline() void Player::FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInfo >* friend_list) { + #if 0 for (auto& pair : friend_hash_) { auto p = friend_list->Add(); p->set_account_id(pair.second.account_id); @@ -345,6 +350,7 @@ void Player::FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserIn p->set_sex(pair.second.sex); p->set_online(pair.second.online); } + #endif } void Player::FillIMMsgConext(f8::MsgHdr& hdr, ss::MFIMMsgConext* conext) @@ -397,7 +403,7 @@ void Player::MarkDirty() void Player::SaveToDB() { - cs::MFUserDB user_db; + ss::MFUserDB user_db; Serialize(user_db); std::string friend_data; user_db.SerializeToString(&friend_data); diff --git a/server/imserver/player.h b/server/imserver/player.h index 8cae1e9..a2f76ac 100644 --- a/server/imserver/player.h +++ b/server/imserver/player.h @@ -28,8 +28,8 @@ class Player void Init(); void UnInit(); - void Deserialize(const cs::MFUserDB& friend_db); - void Serialize(cs::MFUserDB& friend_db); + void Deserialize(const ss::MFUserDB& friend_db); + void Serialize(ss::MFUserDB& friend_db); template void SendMsg(T& msg) diff --git a/server/imserver/playermgr.cc b/server/imserver/playermgr.cc index 8f8d4a2..8bfd444 100644 --- a/server/imserver/playermgr.cc +++ b/server/imserver/playermgr.cc @@ -44,7 +44,7 @@ void PlayerMgr::_CMLogin(f8::MsgHdr& hdr, const cs::CMLogin& msg) if (GetHdrBySocket(hdr.socket_handle) || GetHdrByAccountId(msg.account_id())) { cs::SMLogin respmsg; - respmsg.set_error_code(1); + respmsg.set_errcode(1); WSListener::Instance()->SendToClient(hdr.socket_handle, 0, respmsg); return; } @@ -272,7 +272,7 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id, hum->data_version1 = data_version1; hum->Init(); { - cs::MFUserDB user_db; + ss::MFUserDB user_db; user_db.ParseFromString(friend_data); hum->Deserialize(user_db); } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index fddb4d2..9a9837f 100644 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -75,12 +75,25 @@ message CMLogin optional string avatar_url = 5; //头像 optional int32 sex = 6; //性别 } +//登录回复 message SMLogin { optional int32 errcode = 1; //错误码 optional string errmsg = 2; //错误信息 } +//更新用户信息(增量更新，不需更新的字段不传即可) +message CMUpdateUserInfo +{ + optional string nickname = 2; //昵称 + optional string avatar_url = 3; //头像 + optional int32 sex = 4; //性别 1：男 2：女 0：未知 + + optional int64 user_value1 = 50; //用户字段1 + optional int64 user_value2 = 51; //用户字段2 + optional int64 user_value3 = 52; //用户字段3 +} + //获取好友列表 message CMFriendList {