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-17 19:57:02 +08:00
parent a929a622f4
commit 092d5a654a
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/imserver/player.cc
View File

@ -269,9 +269,7 @@ void Player::_CMFriendAgree(f8::MsgHdr& hdr, const cs::CMFriendAgree& msg)
return;
}
Friend* friendobj = new Friend;
#if 0
TypeConvert::Convert(msg.apply().base_data(), friendobj->base_data);
#endif
friendobj->crc32_code = a8::openssl::Crc32
(
(unsigned char*)friendobj->base_data.account_id.data(),

19
server/imserver/typeconvert.cc
View File

@ -9,6 +9,9 @@ void TypeConvert::Convert(const cs::MFFriendApply& apply_pb, FriendApply& apply)
apply.idx = apply_pb.idx();
apply.applyid = apply_pb.applyid();
apply.target_id = apply_pb.target_id();
#if 0
Convert(apply_pb.base_data(), apply.base_data);
#endif
}
void TypeConvert::Convert(const FriendApply& apply, cs::MFFriendApply& apply_pb)
@ -16,6 +19,7 @@ void TypeConvert::Convert(const FriendApply& apply, cs::MFFriendApply& apply_pb)
apply_pb.set_idx(apply.idx);
apply_pb.set_applyid(apply.applyid);
apply_pb.set_target_id(apply.target_id);
Convert(apply.base_data, *apply_pb.mutable_base_data());
}
void TypeConvert::Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& base_data_pb)
@ -48,6 +52,21 @@ void TypeConvert::Convert(const ss::MFBaseUserDataDB& base_data_pb, BaseUserData
base_data.base_data_version = base_data_pb.base_data_version();
}
void TypeConvert::Convert(const cs::MFBaseUserData& base_data_pb, BaseUserData& base_data)
{
base_data.account_id = base_data_pb.account_id();
base_data.nickname = base_data_pb.nickname();
base_data.avatar_url = base_data_pb.avatar_url();
base_data.sex = base_data_pb.sex();
#if 0
base_data.group_id = base_data_pb.group_id();
#endif
base_data.user_value1 = base_data_pb.user_value1();
base_data.user_value2 = base_data_pb.user_value2();
base_data.user_value3 = base_data_pb.user_value3();
base_data.base_data_version = base_data_pb.base_data_version();
}
void TypeConvert::Convert(const BaseUserData& base_data, cs::MFBaseUserData& base_data_pb)
{
base_data_pb.set_account_id(base_data.account_id);

1
server/imserver/typeconvert.h
View File

@ -21,6 +21,7 @@ class TypeConvert
static void Convert(const BaseUserData& base_data, ss::MFBaseUserDataDB& base_data_pb);
static void Convert(const ss::MFBaseUserDataDB& base_data_pb, 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& temp_custom_data_pb,
UserTempCustomData& temp_custom_data);