单个节点支持多个DNS线路

internal/web/actions/default/dns/clusters/cluster.go

@@ -67,16 +67,31 @@ func (this *ClusterAction) RunGet(params struct {
 	}
 	nodeMaps := []maps.Map{}
 	for _, node := range nodesResp.Nodes {
-		nodeMaps = append(nodeMaps, maps.Map{
-			"id":     node.Id,
-			"name":   node.Name,
-			"ipAddr": node.IpAddr,
-			"route": maps.Map{
-				"name": node.Route.Name,
-				"code": node.Route.Code,
-			},
-			"clusterId": node.ClusterId,
-		})
+		if len(node.Routes) > 0 {
+			for _, route := range node.Routes {
+				nodeMaps = append(nodeMaps, maps.Map{
+					"id":     node.Id,
+					"name":   node.Name,
+					"ipAddr": node.IpAddr,
+					"route": maps.Map{
+						"name": route.Name,
+						"code": route.Code,
+					},
+					"clusterId": node.ClusterId,
+				})
+			}
+		} else {
+			nodeMaps = append(nodeMaps, maps.Map{
+				"id":     node.Id,
+				"name":   node.Name,
+				"ipAddr": node.IpAddr,
+				"route": maps.Map{
+					"name": "",
+					"code": "",
+				},
+				"clusterId": node.ClusterId,
+			})
+		}
 	}
 	this.Data["nodes"] = nodeMaps
 

internal/web/actions/default/dns/domains/domainutils/utils.go

@@ -1,6 +1,9 @@
 package domainutils
 
 import (
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/maps"
 	"regexp"
 	"strings"
 )
@@ -16,3 +19,30 @@ func ValidateDomainFormat(domain string) bool {
 
 	return true
 }
+
+// 转换线路列表
+func ConvertRoutesToMaps(routes []*pb.DNSRoute) []maps.Map {
+	result := []maps.Map{}
+	for _, route := range routes {
+		result = append(result, maps.Map{
+			"name": route.Name,
+			"code": route.Code,
+		})
+	}
+	return result
+}
+
+// 筛选线路
+func FilterRoutes(routes []*pb.DNSRoute, allRoutes []*pb.DNSRoute) []*pb.DNSRoute {
+	routeCodes := []string{}
+	for _, route := range allRoutes {
+		routeCodes = append(routeCodes, route.Code)
+	}
+	result := []*pb.DNSRoute{}
+	for _, route := range routes {
+		if lists.ContainsString(routeCodes, route.Code) {
+			result = append(result, route)
+		}
+	}
+	return result
+}

internal/web/actions/default/dns/issues/updateNodePopup.go

@@ -1,8 +1,10 @@
 package issues
 
 import (
+	"encoding/json"
 	"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -33,12 +35,12 @@ func (this *UpdateNodePopupAction) RunGet(params struct {
 		return
 	}
 	this.Data["ipAddr"] = dnsInfo.IpAddr
-	this.Data["route"] = dnsInfo.Route.Code
+	this.Data["routes"] = domainutils.ConvertRoutesToMaps(dnsInfo.Routes)
 	this.Data["domainId"] = dnsInfo.DnsDomainId
 	this.Data["domainName"] = dnsInfo.DnsDomainName
 
 	// 读取所有线路
-	routeMaps := []maps.Map{}
+	allRouteMaps := []maps.Map{}
 	if dnsInfo.DnsDomainId > 0 {
 		routesResp, err := this.RPC().DNSDomainRPC().FindAllDNSDomainRoutes(this.AdminContext(), &pb.FindAllDNSDomainRoutesRequest{DnsDomainId: dnsInfo.DnsDomainId})
 		if err != nil {
@@ -47,37 +49,26 @@ func (this *UpdateNodePopupAction) RunGet(params struct {
 		}
 		if len(routesResp.Routes) > 0 {
 			for _, route := range routesResp.Routes {
-				routeMaps = append(routeMaps, maps.Map{
+				allRouteMaps = append(allRouteMaps, maps.Map{
 					"name": route.Name,
 					"code": route.Code,
 				})
 			}
-		}
-	}
-	this.Data["routes"] = routeMaps
 
-	// 是否包含现有线路
-	if len(routeMaps) > 0 {
-		isRouteValid := false
-		for _, route := range routeMaps {
-			if route.GetString("code") == dnsInfo.Route.Code {
-				isRouteValid = true
-				break
-			}
-		}
-		if !isRouteValid {
-			this.Data["route"] = routeMaps[0].GetString("code")
+			// 筛选
+			this.Data["routes"] = domainutils.ConvertRoutesToMaps(domainutils.FilterRoutes(dnsInfo.Routes, routesResp.Routes))
 		}
 	}
+	this.Data["allRoutes"] = allRouteMaps
 
 	this.Show()
 }
 
 func (this *UpdateNodePopupAction) RunPost(params struct {
-	NodeId   int64
-	IpAddr   string
-	DomainId int64
-	Route    string
+	NodeId        int64
+	IpAddr        string
+	DomainId      int64
+	DnsRoutesJSON []byte
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -85,6 +76,13 @@ func (this *UpdateNodePopupAction) RunPost(params struct {
 	// 操作日志
 	this.CreateLog(oplogs.LevelInfo, "修改节点 %d 的DNS设置", params.NodeId)
 
+	routes := []string{}
+	err := json.Unmarshal(params.DnsRoutesJSON, &routes)
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
 	params.Must.
 		Field("ipAddr", params.IpAddr).
 		Require("请输入IP地址")
@@ -94,11 +92,11 @@ 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,
-		Route:       params.Route,
+		Routes:      routes,
 	})
 	if err != nil {
 		this.ErrorPage(err)