diff --git a/server/imserver_new/cache/cachemgr.go b/server/imserver_new/cache/cachemgr.go index fc32c799..d742b1c4 100644 --- a/server/imserver_new/cache/cachemgr.go +++ b/server/imserver_new/cache/cachemgr.go @@ -19,10 +19,6 @@ func (this *cacheMgr) Init() { func (this *cacheMgr) UnInit() { } -func (this *cacheMgr) AsyncGetUsers(accountIds []string, cb func(int32, string)) { - this.internalGetUsers(accountIds, cb) -} - func (this *cacheMgr) PreLoadUsers(accountIds []string) { this.internalGetUsers(accountIds, func (int32, string) { @@ -90,12 +86,30 @@ func (this *cacheMgr) internalGetUsers(accountIds []string, cb func(int32, strin }) } -func (this* cacheMgr) AsyncGetUsersAndFillMFUser([]string, *[]*cs.MFUser, func(int32, string)) { +func (this* cacheMgr) AsyncGetUsersAndFillMFUser(accountIds []string, pbUsers *[]*cs.MFUser, + cb func(int32, string)) { + this.internalGetUsers( + accountIds, + func (errCode int32, errMsg string) { + if errCode != 0 { + cb(errCode, errMsg) + return + } + }) } -func (this* cacheMgr) AsyncGetUsersAndFillMFGuildMember([]string, *[]*cs.MFGuildMember, func(int32, string)) { +func (this* cacheMgr) AsyncGetUsersAndFillMFGuildMember(accountIds []string, pbUsers *[]*cs.MFGuildMember, + cb func(int32, string)) { + this.internalGetUsers( + accountIds, + func (errCode int32, errMsg string) { + if errCode != 0 { + cb(errCode, errMsg) + return + } + }) } func (this *cacheMgr) AsyncSearch(sinceId int64, q string, pbUsers *[]*cs.MFUser,