From bc06eba6ef53c88fb7be7f4b4c6865c06c7ff8e4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 8 Apr 2024 13:54:19 +0800
Subject: [PATCH] 1

---
 server/imserver_new/common/types.go      |  3 ---
 server/imserver_new/constant/constant.go | 12 ------------
 server/imserver_new/global/global.go     | 10 ----------
 server/imserver_new/guild/guildmgr.go    |  2 +-
 4 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go
index f12e5539..a2715147 100644
--- a/server/imserver_new/common/types.go
+++ b/server/imserver_new/common/types.go
@@ -112,9 +112,6 @@ type CacheMgr interface {
 	AsyncSearch(int64, string, func(int32, string, int64, []string))
 }
 
-type ChatMgr interface {
-}
-
 type UserProfile interface {
 	GetAccountId() string
 	GetUserName() string
diff --git a/server/imserver_new/constant/constant.go b/server/imserver_new/constant/constant.go
index 6a8c0032..3e7eb854 100644
--- a/server/imserver_new/constant/constant.go
+++ b/server/imserver_new/constant/constant.go
@@ -11,7 +11,6 @@ const (
 	PLAYER_MGR_MODULE_IDX
 	FRIEND_MGR_MODULE_IDX
 	GUILD_MGR_MODULE_IDX
-	CHAT_MGR_MODULE_IDX
 	CACHE_MGR_MODULE_IDX
 	MAX_MODULE_IDX
 )
@@ -57,17 +56,6 @@ const (
 	GUILD_APPLY_STATUS_REJECT = 2
 	GUILD_APPLY_STATUS_IGNORE = 3
 )
-// im server chat
-const (
-	CCBegin   = iota
-	CCWorld   = 1
-	CCPrivate = 2
-	CCGuild   = 3
-	CCTeam    = 4
-	CCBigHorn = 5
-	CCLoopMsg = 6
-	CCEnd
-)
 
 // im server friend
 const (
diff --git a/server/imserver_new/global/global.go b/server/imserver_new/global/global.go
index d4650223..c7d235b1 100644
--- a/server/imserver_new/global/global.go
+++ b/server/imserver_new/global/global.go
@@ -15,7 +15,6 @@ var initOrders = []int32 {
 	constant.FRIEND_MGR_MODULE_IDX,
 	constant.GUILD_MGR_MODULE_IDX,
 	constant.CACHE_MGR_MODULE_IDX,
-	constant.CHAT_MGR_MODULE_IDX,
 }
 
 var app common.App
@@ -24,7 +23,6 @@ var wspListener common.WspListener
 var friendMgr common.FriendMgr
 var guildMgr common.GuildMgr
 var cacheMgr common.CacheMgr
-var chatMgr common.ChatMgr
 
 func GetPlayerMgr() common.PlayerMgr {
 	return playerMgr
@@ -42,10 +40,6 @@ func GetCacheMgr() common.CacheMgr {
 	return cacheMgr
 }
 
-func GetChatMgr() common.ChatMgr {
-	return chatMgr
-}
-
 func GetWspListener() common.WspListener {
 	return wspListener
 }
@@ -82,10 +76,6 @@ func RegModule(idx int32, m q5.Module) {
 		{
 			guildMgr = m.(common.GuildMgr)
 		}
-	case constant.CHAT_MGR_MODULE_IDX:
-		{
-			chatMgr = m.(common.ChatMgr)
-		}
 	case constant.CACHE_MGR_MODULE_IDX:
 		{
 			cacheMgr = m.(common.CacheMgr)
diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go
index 5063e46d..3ac668be 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -207,7 +207,7 @@ func (this *guildMgr) asyncCreateGuildTask(task *f5.AsyncTask,
 			}
 			f5.GetJsStyleDb().Upsert(
 				constant.FRIEND_DB,
-				"t_guild",
+				"t_guild_member",
 				[][]string{
 					{"member_id", accountId},
 				},