From 9f11d10311e61b98132ef0d8a6c6f3e61471c77e Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sat, 21 Nov 2020 22:30:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9B=A0=E4=B8=BA=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=80=89=E6=8B=A9=E7=BA=BF=E8=B7=AF=E8=80=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=88=9B=E5=BB=BA=E5=92=8C=E4=BF=AE=E6=94=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/default/clusters/cluster/createNode.go | 10 ++++++---- .../actions/default/clusters/cluster/node/update.go | 12 +++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/internal/web/actions/default/clusters/cluster/createNode.go b/internal/web/actions/default/clusters/cluster/createNode.go index 8215990c..e5a479eb 100644 --- a/internal/web/actions/default/clusters/cluster/createNode.go +++ b/internal/web/actions/default/clusters/cluster/createNode.go @@ -95,10 +95,12 @@ func (this *CreateNodeAction) RunPost(params struct { } dnsRouteCodes := []string{} - err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes) - if err != nil { - this.ErrorPage(err) - return + if len(params.DnsRoutesJSON) > 0 { + err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes) + if err != nil { + this.ErrorPage(err) + return + } } // TODO 检查登录授权 diff --git a/internal/web/actions/default/clusters/cluster/node/update.go b/internal/web/actions/default/clusters/cluster/node/update.go index 40add657..1f3bf462 100644 --- a/internal/web/actions/default/clusters/cluster/node/update.go +++ b/internal/web/actions/default/clusters/cluster/node/update.go @@ -206,10 +206,12 @@ func (this *UpdateAction) RunPost(params struct { } dnsRouteCodes := []string{} - err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes) - if err != nil { - this.ErrorPage(err) - return + if len(params.DnsRoutesJSON) > 0 { + err := json.Unmarshal(params.DnsRoutesJSON, &dnsRouteCodes) + if err != nil { + this.ErrorPage(err) + return + } } // TODO 检查登录授权 @@ -225,7 +227,7 @@ func (this *UpdateAction) RunPost(params struct { } // 保存 - _, err = this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{ + _, err := this.RPC().NodeRPC().UpdateNode(this.AdminContext(), &pb.UpdateNodeRequest{ NodeId: params.NodeId, GroupId: params.GroupId, Name: params.Name,