|
|
@ -630,9 +630,16 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb
|
|
|
|
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUsers failed", err.Error())
|
|
|
|
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUsers failed", err.Error())
|
|
|
|
return resp, errors.WrapError(constant.ErrDB)
|
|
|
|
return resp, errors.WrapError(constant.ErrDB)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for _, v := range users {
|
|
|
|
for _, v := range users {
|
|
|
|
isBlock, err := imdb.UserIsBlock(v.UserID)
|
|
|
|
isBlock, err := imdb.UserIsBlock(v.UserID)
|
|
|
|
if err == nil {
|
|
|
|
if err == nil {
|
|
|
|
|
|
|
|
registerIP := ""
|
|
|
|
|
|
|
|
registerInfo, err := imdb.GetRegisterInfo(v.UserID)
|
|
|
|
|
|
|
|
if registerInfo != nil && err == nil {
|
|
|
|
|
|
|
|
registerIP = registerInfo.RegisterIP
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
user := &pbUser.User{
|
|
|
|
user := &pbUser.User{
|
|
|
|
ProfilePhoto: v.FaceURL,
|
|
|
|
ProfilePhoto: v.FaceURL,
|
|
|
|
UserId: v.UserID,
|
|
|
|
UserId: v.UserID,
|
|
|
@ -648,6 +655,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb
|
|
|
|
LoginTimes: v.LoginTimes,
|
|
|
|
LoginTimes: v.LoginTimes,
|
|
|
|
Gender: v.Gender,
|
|
|
|
Gender: v.Gender,
|
|
|
|
LoginLimit: v.LoginLimit,
|
|
|
|
LoginLimit: v.LoginLimit,
|
|
|
|
|
|
|
|
RegisterIp: registerIP,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
resp.User = append(resp.User, user)
|
|
|
|
resp.User = append(resp.User, user)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|