TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-10 01:10:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复当集群没有绑定DNS域名时无法修改节点DNS信息的Bug

Browse Source
This commit is contained in:
GoEdgeLab
2021-09-11 20:12:06 +08:00
parent 242da2d065
commit 40c5c78d6e
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/web/actions/default/clusters/cluster/node/updateDNSPopup.go
View File

@@ -85,10 +85,12 @@ func (this *UpdateDNSPopupAction) RunPost(params struct {
defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId) defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)
routes := []string{} routes := []string{}
err := json.Unmarshal(params.DnsRoutesJSON, &routes) if len(params.DnsRoutesJSON) > 0 {
if err != nil { err := json.Unmarshal(params.DnsRoutesJSON, &routes)
this.ErrorPage(err) if err != nil {
return this.ErrorPage(err)
return
}
} }
params.Must. 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, NodeId: params.NodeId,
IpAddr: params.IpAddr, IpAddr: params.IpAddr,
DnsDomainId: params.DomainId, DnsDomainId: params.DomainId,

12
internal/web/actions/default/dns/issues/updateNodePopup.go
View File

@@ -85,10 +85,12 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId) defer this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)
routes := []string{} routes := []string{}
err := json.Unmarshal(params.DnsRoutesJSON, &routes) if len(params.DnsRoutesJSON) > 0 {
if err != nil { err := json.Unmarshal(params.DnsRoutesJSON, &routes)
this.ErrorPage(err) if err != nil {
return this.ErrorPage(err)
return
}
} }
params.Must. 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, NodeId: params.NodeId,
IpAddr: params.IpAddr, IpAddr: params.IpAddr,
DnsDomainId: params.DomainId, DnsDomainId: params.DomainId,