Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
c877b55ced
@ -103,8 +103,10 @@ func (this *User) GetUser(uid string) (user *pb.DBUser) {
|
||||
if this.IsCross() {
|
||||
user, err = this.getRemoteUser(uid)
|
||||
if err != nil {
|
||||
this.Errorln("查询远程玩家信息", err)
|
||||
return nil
|
||||
}
|
||||
this.Debug("查询远程玩家信息", log.Field{Key: "uid", Value: uid}, log.Field{Key: "user", Value: user})
|
||||
} else {
|
||||
user = this.modelUser.GetUser(uid)
|
||||
}
|
||||
@ -129,6 +131,7 @@ func (this *User) getRemoteUser(uid string) (*pb.DBUser, error) {
|
||||
if err := this.getUserFromRemoteDb(uid, reply); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
this.Debug("远程用户", log.Field{Key: "uid", Value: uid}, log.Field{Key: "user", Value: reply})
|
||||
return reply, nil
|
||||
}
|
||||
|
||||
@ -556,6 +559,7 @@ func (this *User) getUserFromRemoteDb(uid string, rsp *pb.DBUser) error {
|
||||
model := db.NewDBModel(comm.TableUser, 0, conn)
|
||||
|
||||
if err := model.Get(uid, rsp); err != nil {
|
||||
this.Errorln(err)
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
Loading…
Reference in New Issue
Block a user