From 69e366b9b0a30a1b1874efb01e68d14e5ed95031 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 18 Jun 2020 20:18:43 +0800
Subject: [PATCH] 1

---
 server/imserver/app.cc    |  5 +++++
 server/imserver/app.h     |  2 ++
 server/imserver/player.cc | 17 +++--------------
 server/imserver/player.h  |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/server/imserver/app.cc b/server/imserver/app.cc
index 5467570..c0ee0ef 100644
--- a/server/imserver/app.cc
+++ b/server/imserver/app.cc
@@ -641,3 +641,8 @@ long long App::NewUUID()
 {
     return uuid.Generate();
 }
+
+long long App::NewSeqId()
+{
+    return ++seq_id_;
+}
diff --git a/server/imserver/app.h b/server/imserver/app.h
index 8b56fc6..3c9fb69 100644
--- a/server/imserver/app.h
+++ b/server/imserver/app.h
@@ -33,6 +33,7 @@ class App : public a8::Singleton<App>
     a8::XParams* GetContext(long long context_id);
     bool HasFlag(int flag);
     long long NewUUID();
+    long long NewSeqId();
 
 private:
     void QuickExecute();
@@ -69,6 +70,7 @@ public:
     bool servicing = true;
 
  private:
+    long long seq_id_ = 1000;
     std::mutex *loop_mutex_ = nullptr;
     std::condition_variable *loop_cond_ = nullptr;
 
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 7edce43..3d84c3b 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -450,21 +450,10 @@ void Player::FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserIn
     }
 }
 
-void Player::FillIMMsgConext(f8::MsgHdr& hdr, ss::MFIMMsgConext* conext)
+void Player::FillIMMsgConext(f8::MsgHdr& hdr, ss::MFIMMsgConext* context)
 {
-    #if 0
-    conext->set_socket_handle(hdr.socket_handle);
-    conext->set_account_id(myself.base_data.account_id);
-    conext->set_nickname(myself.base_data.nickname);
-    conext->set_avatar_url(myself.base_data.avatar_url);
-    conext->set_sex(myself.base_data.sex);
-    #if 1
-    conext->set_online(true);
-    #else
-    conext->set_online(online);
-    #endif
-    conext->set_msgid(hdr.msgid);
-    #endif
+    FillMFUserInfo(context->mutable_user_info());
+    context->set_seqid(App::Instance()->NewSeqId());
 }
 
 void Player::ForwardGroupCMMsg(f8::MsgHdr& hdr, long long hash_code)
diff --git a/server/imserver/player.h b/server/imserver/player.h
index 39d13bc..1526227 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -98,7 +98,7 @@ class Player
 
 private:
     void FillFriendList(::google::protobuf::RepeatedPtrField< ::cs::MFUserInfo >* friend_list);
-    void FillIMMsgConext(f8::MsgHdr& hdr, ss::MFIMMsgConext* conext);
+    void FillIMMsgConext(f8::MsgHdr& hdr, ss::MFIMMsgConext* context);
     void FillMFUserInfo(cs::MFUserInfo* user_info);
     void ForwardGroupCMMsg(f8::MsgHdr& hdr, long long hash_code);
     void SaveToDB();