Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
889cb45d13
@ -75,7 +75,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.IsLandUpgradeReq
|
||||
this.module.model.Change(session.GetUserId(), map[string]interface{}{
|
||||
"nodes": info.Nodes,
|
||||
})
|
||||
session.SendMsg(string(this.module.GetType()), "upgrade", &pb.IsLandUpgradeReq{Nid: conf.NodeId})
|
||||
session.SendMsg(string(this.module.GetType()), "upgrade", &pb.IsLandUpgradeResp{Nid: conf.NodeId, Lv: info.Nodes[conf.NodeId]})
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), comm.GMResDelType, "IsLandUpgradeReq", conf.CostItem)
|
||||
})
|
||||
|
@ -169,6 +169,10 @@ func (this *WTask) OpenCmdNotice(session comm.IUserSession, keys ...string) {
|
||||
break
|
||||
}
|
||||
}
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
if user, err = this.ModuleUser.GetUser(session.GetUserId()); err != nil {
|
||||
this.Error("获取用户信息失败!", log.Field{Key: "uid", Value: session.GetUserId()})
|
||||
return
|
||||
|
Loading…
Reference in New Issue
Block a user