From 9d937a50ea982f768c57ee3662fd6249a2cb5fee Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 15 Sep 2020 19:52:30 +0800
Subject: [PATCH] 1

---
 server/imserver/guild.h                |  7 +++++++
 server/tools/protobuild/cs_proto.proto | 18 +++++++++---------
 sql/relationdb_n.sql                   |  3 ++-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index 50d57a8..3624f77 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -24,8 +24,15 @@ class Guild
  public:
     long long guild_id = 0;
     std::string guild_name;
+    int guild_lv = 0;
+    int guild_exp = 0;
+    int guild_badge = 0;
+    int guild_apply_num = 0;
+    std::string guild_notice;
+    std::string guild_declaration;
     std::string owner_id;
     std::string creator_id;
+    int guild_status = 0;
     int createtime = 0;
     a8::TimerAttacher timer_attacher;
 
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 10e627c..e4b5e7a 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -323,23 +323,23 @@ message CMGuildCreate
 //建公会返回
 message SMGuildCreate
 {
-    optional int32 errcode = 1; //1:群已存在 2: 你已经有群
+    optional int32 errcode = 1; //1:公会已存在 2: 你已经有公会
     optional string errmsg = 2; //错误消息
 }
 
-//加群
+//加公会
 message CMGuildJoin
 {
-    optional int64 guild_id = 1; //群id
+    optional int64 guild_id = 1; //公会id
 }
 //加群返回
 message SMGuildJoin
 {
-    optional int32 errcode = 1; //1:群id不存在 2:群已满
+    optional int32 errcode = 1; //1:公会id不存在 2:公会已满
     optional string errmsg = 2; //错误消息
 }
 
-//同意加群
+//同意加公会
 message CMGuildAgree
 {
 }
@@ -362,7 +362,7 @@ message SMGuildKick
     optional string errmsg = 2; //错误消息
 }
 
-//退群
+//退公会
 message CMGuildQuit
 {
 }
@@ -372,7 +372,7 @@ message SMGuildQuit
     optional string errmsg = 2; //错误消息
 }
 
-//解散群
+//解散公会
 message CMGuildDismiss
 {
 }
@@ -382,10 +382,10 @@ message SMGuildDismiss
     optional string errmsg = 2; //错误信息
 }
 
-//群改名
+//公会改名
 message CMGuildRename
 {
-    optional string new_guild_name = 1; //新群名
+    optional string new_guild_name = 1; //新公会名
 }
 message SMGuildRename
 {
diff --git a/sql/relationdb_n.sql b/sql/relationdb_n.sql
index 9cc9d2d..3081906 100644
--- a/sql/relationdb_n.sql
+++ b/sql/relationdb_n.sql
@@ -106,7 +106,8 @@ CREATE TABLE `guild` (
   `modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
   PRIMARY KEY (`idx`),
   UNIQUE KEY `guild_id` (`guild_id`),
-  KEY `owner_id` (`owner_id`)
+  KEY `owner_id` (`owner_id`),
+  KEY `creator_id` (`creator_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10000 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;