1
This commit is contained in:
parent
d8a460cdcb
commit
c0f30140a2
6
server/imserver_new/cache/cachemgr.go
vendored
6
server/imserver_new/cache/cachemgr.go
vendored
@ -54,7 +54,7 @@ func (this *cacheMgr) internalGetUsers(accountIds []string, cb func(int32, strin
|
|||||||
subTask.SetFail()
|
subTask.SetFail()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if ds.Next() {
|
for ds.Next() {
|
||||||
accountId := ds.GetByName("account_id")
|
accountId := ds.GetByName("account_id")
|
||||||
u := this.getUser(accountId)
|
u := this.getUser(accountId)
|
||||||
if u == nil {
|
if u == nil {
|
||||||
@ -63,6 +63,9 @@ func (this *cacheMgr) internalGetUsers(accountIds []string, cb func(int32, strin
|
|||||||
u.loadFromDb(ds)
|
u.loadFromDb(ds)
|
||||||
this.userHash[u.accountId] = u
|
this.userHash[u.accountId] = u
|
||||||
}
|
}
|
||||||
|
if q5.IsDebug() && ds.NumOfReaded() <= 0 {
|
||||||
|
f5.GetSysLog().Warning("cacheMgr.internalGetUsers %s not found", keys[i][1])
|
||||||
|
}
|
||||||
if i + 1 < len(keys) {
|
if i + 1 < len(keys) {
|
||||||
i++
|
i++
|
||||||
subTask.Continue()
|
subTask.Continue()
|
||||||
@ -95,7 +98,6 @@ func (this* cacheMgr) AsyncGetUsersAndFillMFUser(accountIds []string, pbUsers *[
|
|||||||
cb(errCode, errMsg)
|
cb(errCode, errMsg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
56
server/imserver_new/cache/user_profile.go
vendored
56
server/imserver_new/cache/user_profile.go
vendored
@ -21,63 +21,31 @@ type userProfile struct {
|
|||||||
lastSyncTime int64
|
lastSyncTime int64
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *userProfile) GetAccountId() string {
|
func (this *userProfile) FillMFUser(pbUser *cs.MFUser) {
|
||||||
return this.accountId
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile) GetUserName() string {
|
|
||||||
return this.name
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile) GetAvatar() string {
|
|
||||||
return this.avatarUrl
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile) GetAvatarHead() string {
|
|
||||||
return this.head
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile) GetStar() int32 {
|
|
||||||
return this.star
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile)GetTotalKills() int32 {
|
|
||||||
return this.totalKills
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile) GetTotalWinTimes() int32 {
|
|
||||||
return this.totalWinTimes
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile) GetRank() int32 {
|
|
||||||
return this.rank
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile) GetOnlineStatus() int32 {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile) GetLastLoginTime() int32 {
|
|
||||||
return this.lastLoginTime
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *userProfile) FillMFUser1(pbUser *cs.MFUser) {
|
|
||||||
pbUser.AccountId = proto.String(this.accountId)
|
pbUser.AccountId = proto.String(this.accountId)
|
||||||
pbUser.Username = proto.String(this.name)
|
pbUser.Username = proto.String(this.name)
|
||||||
pbUser.Avatar = proto.Int32(q5.ToInt32(this.avatarUrl))
|
pbUser.Avatar = proto.Int32(q5.ToInt32(this.avatarUrl))
|
||||||
pbUser.AvatarHead = proto.Int32(q5.ToInt32(this.head))
|
pbUser.AvatarHead = proto.Int32(q5.ToInt32(this.head))
|
||||||
pbUser.Rank = proto.Int32(this.rank)
|
pbUser.Rank = proto.Int32(this.rank)
|
||||||
pbUser.OnlineStatus = proto.Int32(0)
|
if GetPlayerMgr().GetPlayerByAccountId(this.accountId) != nil {
|
||||||
|
pbUser.OnlineStatus = proto.Int32(1)
|
||||||
|
} else {
|
||||||
|
pbUser.OnlineStatus = proto.Int32(0)
|
||||||
|
}
|
||||||
pbUser.LastLoginTime = proto.Int32(this.lastLoginTime)
|
pbUser.LastLoginTime = proto.Int32(this.lastLoginTime)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *userProfile) FillMFGuildMember1(pbMember *cs.MFGuildMember) {
|
func (this *userProfile) FillMFGuildMember(pbMember *cs.MFGuildMember) {
|
||||||
pbMember.AccountId = proto.String(this.accountId)
|
pbMember.AccountId = proto.String(this.accountId)
|
||||||
pbMember.Username = proto.String(this.name)
|
pbMember.Username = proto.String(this.name)
|
||||||
pbMember.Avatar = proto.Int32(q5.ToInt32(this.avatarUrl))
|
pbMember.Avatar = proto.Int32(q5.ToInt32(this.avatarUrl))
|
||||||
pbMember.AvatarHead = proto.Int32(q5.ToInt32(this.head))
|
pbMember.AvatarHead = proto.Int32(q5.ToInt32(this.head))
|
||||||
pbMember.Rank = proto.Int32(this.rank)
|
pbMember.Rank = proto.Int32(this.rank)
|
||||||
pbMember.OnlineStatus = proto.Int32(0)
|
if GetPlayerMgr().GetPlayerByAccountId(this.accountId) != nil {
|
||||||
|
pbMember.OnlineStatus = proto.Int32(1)
|
||||||
|
} else {
|
||||||
|
pbMember.OnlineStatus = proto.Int32(0)
|
||||||
|
}
|
||||||
pbMember.LastLoginTime = proto.Int32(this.lastLoginTime)
|
pbMember.LastLoginTime = proto.Int32(this.lastLoginTime)
|
||||||
pbMember.Level = proto.Int32(GetGuildMgr().GetGuildJob(this.accountId))
|
pbMember.Level = proto.Int32(GetGuildMgr().GetGuildJob(this.accountId))
|
||||||
pbMember.Star = proto.Int32(this.star)
|
pbMember.Star = proto.Int32(this.star)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user