From 092d5a654a374326dba30e182d4c3b81571be1fb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 17 Jun 2020 19:57:02 +0800
Subject: [PATCH] 1

---
 server/imserver/player.cc      |  2 --
 server/imserver/typeconvert.cc | 19 +++++++++++++++++++
 server/imserver/typeconvert.h  |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index b826b91..bdcd04d 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -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(),
diff --git a/server/imserver/typeconvert.cc b/server/imserver/typeconvert.cc
index c228ae4..d06bca0 100644
--- a/server/imserver/typeconvert.cc
+++ b/server/imserver/typeconvert.cc
@@ -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);
diff --git a/server/imserver/typeconvert.h b/server/imserver/typeconvert.h
index fcad644..0b588e4 100644
--- a/server/imserver/typeconvert.h
+++ b/server/imserver/typeconvert.h
@@ -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);