From 40c5c78d6e2075cfa9e7c3e5ffaa66845a930c72 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sat, 11 Sep 2021 20:12:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E9=9B=86=E7=BE=A4?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9ADNS=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E6=97=B6=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E8=8A=82=E7=82=B9?= =?UTF-8?q?DNS=E4=BF=A1=E6=81=AF=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/clusters/cluster/node/updateDNSPopup.go | 12 +++++++----- .../actions/default/dns/issues/updateNodePopup.go | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go b/internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go index 0ff7e41a..9e0accb3 100644 --- a/internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go +++ b/internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go @@ -85,10 +85,12 @@ func (this *UpdateDNSPopupAction) RunPost(params struct { defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId) routes := []string{} - err := json.Unmarshal(params.DnsRoutesJSON, &routes) - if err != nil { - this.ErrorPage(err) - return + if len(params.DnsRoutesJSON) > 0 { + err := json.Unmarshal(params.DnsRoutesJSON, &routes) + if err != nil { + this.ErrorPage(err) + return + } } params.Must. @@ -100,7 +102,7 @@ func (this *UpdateDNSPopupAction) RunPost(params struct { } // 执行修改 - _, err = this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{ + _, err := this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{ NodeId: params.NodeId, IpAddr: params.IpAddr, DnsDomainId: params.DomainId, diff --git a/internal/web/actions/default/dns/issues/updateNodePopup.go b/internal/web/actions/default/dns/issues/updateNodePopup.go index 0615bbfe..b43ea8e1 100644 --- a/internal/web/actions/default/dns/issues/updateNodePopup.go +++ b/internal/web/actions/default/dns/issues/updateNodePopup.go @@ -85,10 +85,12 @@ func (this *UpdateNodePopupAction) RunPost(params struct { defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId) routes := []string{} - err := json.Unmarshal(params.DnsRoutesJSON, &routes) - if err != nil { - this.ErrorPage(err) - return + if len(params.DnsRoutesJSON) > 0 { + err := json.Unmarshal(params.DnsRoutesJSON, &routes) + if err != nil { + this.ErrorPage(err) + return + } } params.Must. @@ -100,7 +102,7 @@ func (this *UpdateNodePopupAction) RunPost(params struct { } // 执行修改 - _, err = this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{ + _, err := this.RPC().NodeRPC().UpdateNodeDNS(this.AdminContext(), &pb.UpdateNodeDNSRequest{ NodeId: params.NodeId, IpAddr: params.IpAddr, DnsDomainId: params.DomainId,