From a0d56871583a01ec0e5e24232b7edfaeb98479b5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 17 Sep 2020 14:14:55 +0800
Subject: [PATCH] 1

---
 server/imserver/guild.cc | 6 +++++-
 server/imserver/guild.h  | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index 3fa6191..cdec3c0 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -11,7 +11,7 @@
 
 void Guild::Init()
 {
-
+    logdb_ = new ss::MFGuildLogDB;
 }
 
 void Guild::UnInit()
@@ -20,6 +20,7 @@ void Guild::UnInit()
         delete pair.second;
     }
     member_hash_.clear();
+    A8_SAFE_DELETE(logdb_);
 }
 
 GuildMember* Guild::GetMember(const std::string& account_id)
@@ -90,7 +91,10 @@ void Guild::MarkDirty()
 
 void Guild::Deserialize(const std::string& guild_data, const std::string& guild_log)
 {
+    logdb_->ParseFromString(guild_log);
 
+    ss::MFGuildDB guilddb;
+    guilddb.ParseFromString(guild_data);
 }
 
 void Guild::_CMGuildInfo(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildInfo& msg)
diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index 62c7474..3bc59a7 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -19,6 +19,7 @@ namespace cs
 namespace ss
 {
     class MFIMMsgConext;
+    class MFGuildLogDB;
 }
 
 struct GuildMember
@@ -90,4 +91,5 @@ private:
     bool dirty_ = false;
     timer_list* dirty_timer_ = nullptr;
     std::map<std::string, GuildMember*> member_hash_;
+    ss::MFGuildLogDB* logdb_ = nullptr;
 };