From aadbf4f8fec3f0c0a32e5d654b22adc792325cfe Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 22 Apr 2024 11:10:48 +0800 Subject: [PATCH] 1 --- server/imserver/model/friend_apply.go | 4 +--- server/imserver/player/player.go | 2 +- server/mailserver/player/player.go | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/server/imserver/model/friend_apply.go b/server/imserver/model/friend_apply.go index e644f398..4717f170 100644 --- a/server/imserver/model/friend_apply.go +++ b/server/imserver/model/friend_apply.go @@ -50,7 +50,5 @@ func (this *friendApply) SetStatus(senderId string, targetId string, status int3 {"status", q5.ToString(status)}, {"modifytime", q5.ToString(f5.GetApp().GetNowSeconds())}, }, - func (err error, lastInsertId int64, rowsAffected int64) { - - }) + cb) } diff --git a/server/imserver/player/player.go b/server/imserver/player/player.go index 2ad6bf6c..71047ede 100644 --- a/server/imserver/player/player.go +++ b/server/imserver/player/player.go @@ -230,8 +230,8 @@ func (this *player) CMRejectFriendRequest(hdr *f5.MsgHdr, msg *cs.CMRejectFriend }, func (task *f5.LockAsyncTask) { GetFriendMgr().AsyncRejectApply( - this.GetAccountId(), msg.GetTargetAccountId(), + this.GetAccountId(), func (errCode int32, errMsg string) { if errCode != 0 { task.SetFail() diff --git a/server/mailserver/player/player.go b/server/mailserver/player/player.go index 11b1628b..eba4bb12 100644 --- a/server/mailserver/player/player.go +++ b/server/mailserver/player/player.go @@ -56,12 +56,9 @@ func (this *player) MarkMails(mails []common.Mail) error { resultErr = err break } - + mi = new(inbox) } } - if resultErr != nil { - break - } } return resultErr }