From 09a60face84736f5046712a9f2497cac2e9a1f7c Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 23 Nov 2023 11:51:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=88=B7=E6=96=B0=E4=BB=BB=E5=8A=A1=E6=9C=BA?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/wtask/module.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/wtask/module.go b/modules/wtask/module.go index e1d7b3f80..50b45e14e 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -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 From 7c65438b9bdfea7a0308c9336e8daba30d6a0346 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 23 Nov 2023 16:09:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B5=B7=E5=B2=9B?= =?UTF-8?q?=E6=98=9F=E5=BA=A7=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/island/api_upgrade.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/island/api_upgrade.go b/modules/island/api_upgrade.go index 6a0206cf2..c47b9f55f 100644 --- a/modules/island/api_upgrade.go +++ b/modules/island/api_upgrade.go @@ -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) })