From 296d4c547a0dccd7e9eaf97c6bb547999deeb9da Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 17 Feb 2024 20:06:37 +0800
Subject: [PATCH] 1

---
 server/imserver_new/chatmgr.go       | 5 ++---
 server/imserver_new/common/types.go  | 7 +++++++
 server/imserver_new/export.go        | 3 +--
 server/imserver_new/global/global.go | 5 +++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/imserver_new/chatmgr.go b/server/imserver_new/chatmgr.go
index a298e58f..71992b7a 100644
--- a/server/imserver_new/chatmgr.go
+++ b/server/imserver_new/chatmgr.go
@@ -10,7 +10,6 @@ import (
 )
 
 type ChatMgr struct {
-	fm *FriendsMgr
 	gm *GuildMgr
 
 	worldMsgRec      *ChatMsgRec
@@ -23,7 +22,7 @@ type ChatMgr struct {
 	//tmpMsgId   uint64
 }
 
-func NewChatMgr(fm *FriendsMgr, gm *GuildMgr) *ChatMgr {
+func NewChatMgr(gm *GuildMgr) *ChatMgr {
 	cm := &ChatMgr{
 		gm:               gm,
 		worldMsgRec:      &ChatMsgRec{},
@@ -161,7 +160,7 @@ func (cm *ChatMgr) ProcPrivateChat(p common.Player, msg *cs.CMSendChatMsg) {
 	}
 
 	// 确定是否好友
-	targetAccount := cm.fm.GetFriendByAccountId(p.GetAccountId(), targetAccountId)
+	targetAccount := GetFriendMgr().GetFriendByAccountId(p.GetAccountId(), targetAccountId)
 	if targetAccount == nil {
 		return
 	}
diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go
index 766274f2..921f9577 100644
--- a/server/imserver_new/common/types.go
+++ b/server/imserver_new/common/types.go
@@ -49,3 +49,10 @@ type PlayerMgr interface {
 	OnSocketClose(f5.WspCliConn)
 	GetPlayers() map[string]Player
 }
+
+type User interface {
+}
+
+type FriendMgr interface {
+	GetFriendByAccountId(account1Id, account2Id string) *User
+}
diff --git a/server/imserver_new/export.go b/server/imserver_new/export.go
index 7130983c..fb39c966 100644
--- a/server/imserver_new/export.go
+++ b/server/imserver_new/export.go
@@ -1,9 +1,8 @@
 package main
 
 var handlerMgr = new(HandlerMgr)
-var friendMgr = new(FriendsMgr)
 var cacheMgr = new(CacheMgr)
 
 // var guildMgr = new(GuildMgr)
 var guildMgr = NewGuildMgr()
-var chatMgr = NewChatMgr(friendMgr, guildMgr)
+var chatMgr = NewChatMgr(guildMgr)
diff --git a/server/imserver_new/global/global.go b/server/imserver_new/global/global.go
index 826bd643..7cfb6349 100644
--- a/server/imserver_new/global/global.go
+++ b/server/imserver_new/global/global.go
@@ -19,11 +19,16 @@ var initOrders = []int32 {
 var app common.App
 var playerMgr common.PlayerMgr
 var wspListener common.WspListener
+var friendMgr common.FriendMgr
 
 func GetPlayerMgr() common.PlayerMgr {
 	return playerMgr
 }
 
+func GetFriendMgr() common.FriendMgr {
+	return friendMgr
+}
+
 func GetWspListener() common.WspListener {
 	return wspListener
 }