From 211cf4b7852fc92ecb418e84def3d3ce808a5069 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 23 Mar 2024 09:02:36 +0800 Subject: [PATCH] 1 --- server/imserver_new/cache/cachemgr.go | 3 ++- server/imserver_new/common/types.go | 2 +- server/imserver_new/player/player.go | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/server/imserver_new/cache/cachemgr.go b/server/imserver_new/cache/cachemgr.go index f7f1803e..6fb6ccbd 100644 --- a/server/imserver_new/cache/cachemgr.go +++ b/server/imserver_new/cache/cachemgr.go @@ -31,6 +31,7 @@ func (this *CacheMgr) GetUserProfile(accountId string) common.UserProfile { func (this *CacheMgr) PreLoad(accountIds []string) { } -func (this *CacheMgr) Search(sinceId int64, q string, cb func(int64, []string)) { +func (this *CacheMgr) Search(sinceId int64, q string, + cb func(int32, string, int64, []string)) { } diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go index 0bcc77a8..dc027eb5 100644 --- a/server/imserver_new/common/types.go +++ b/server/imserver_new/common/types.go @@ -73,7 +73,7 @@ type CacheMgr interface { PreLoadUser([]string) AsyncGetUsers([]string, func(bool)) GetUserProfile(string) UserProfile - Search(int64, string, func(int64, []string)) + Search(int64, string, func(int32, string, int64, []string)) } type ChatMgr interface { diff --git a/server/imserver_new/player/player.go b/server/imserver_new/player/player.go index 23ecd7a8..d9664312 100644 --- a/server/imserver_new/player/player.go +++ b/server/imserver_new/player/player.go @@ -54,8 +54,12 @@ func (this *player) CMPing(hdr *f5.MsgHdr, msg *cs.CMPing) { func (this *player) CMSearchUser(hdr *f5.MsgHdr, msg *cs.CMSearchUser) { GetCacheMgr().Search(msg.GetSinceId(), msg.GetUsername(), - func (sinceId int64, accountIds []string) { + func (errCode int32, errMsg string, sinceId int64, accountIds []string) { rspMsg := new(cs.SMSearchUser) + if errCode != 0 { + this.SendMsg(rspMsg.Err(1, "internal server error")) + return + } rspMsg.SinceId = proto.Int64(sinceId) q5.NewSlice(&rspMsg.Users, 0, int32(len(accountIds))) for _, accountId := range(accountIds) {