EdgeDNS支持内置线路

internal/web/actions/default/ns/domains/records/createPopup.go

@@ -54,7 +54,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Value       string
 	Ttl         int32
 	Description string
-	RouteIds    []int64
+	RouteCodes  []string
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -76,13 +76,13 @@ func (this *CreatePopupAction) RunPost(params struct {
 	}
 
 	createResp, err := this.RPC().NSRecordRPC().CreateNSRecord(this.AdminContext(), &pb.CreateNSRecordRequest{
-		NsDomainId:  params.DomainId,
+		NsDomainId:   params.DomainId,
-		Description: params.Description,
+		Description:  params.Description,
-		Name:        params.Name,
+		Name:         params.Name,
-		Type:        params.Type,
+		Type:         params.Type,
-		Value:       params.Value,
+		Value:        params.Value,
-		Ttl:         params.Ttl,
+		Ttl:          params.Ttl,
-		NsRouteIds:  params.RouteIds,
+		NsRouteCodes: params.RouteCodes,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/ns/domains/records/index.go

@@ -22,7 +22,7 @@ func (this *IndexAction) RunGet(params struct {
 	DomainId int64
 	Type     string
 	Keyword  string
-	RouteId  int64
+	RouteCode  string
 }) {
 	// 初始化域名信息
 	err := domainutils.InitDomain(this.Parent(), params.DomainId)
@@ -33,14 +33,14 @@ func (this *IndexAction) RunGet(params struct {
 
 	this.Data["type"] = params.Type
 	this.Data["keyword"] = params.Keyword
-	this.Data["routeId"] = params.RouteId
+	this.Data["routeCode"] = params.RouteCode
 
 	// 记录
 	countResp, err := this.RPC().NSRecordRPC().CountAllEnabledNSRecords(this.AdminContext(), &pb.CountAllEnabledNSRecordsRequest{
-		NsDomainId: params.DomainId,
+		NsDomainId:  params.DomainId,
-		Type:       params.Type,
+		Type:        params.Type,
-		NsRouteId:  params.RouteId,
+		NsRouteCode: params.RouteCode,
-		Keyword:    params.Keyword,
+		Keyword:     params.Keyword,
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -51,12 +51,12 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()
 
 	recordsResp, err := this.RPC().NSRecordRPC().ListEnabledNSRecords(this.AdminContext(), &pb.ListEnabledNSRecordsRequest{
-		NsDomainId: params.DomainId,
+		NsDomainId:  params.DomainId,
-		Type:       params.Type,
+		Type:        params.Type,
-		NsRouteId:  params.RouteId,
+		NsRouteCode: params.RouteCode,
-		Keyword:    params.Keyword,
+		Keyword:     params.Keyword,
-		Offset:     page.Offset,
+		Offset:      page.Offset,
-		Size:       page.Size,
+		Size:        page.Size,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/ns/domains/records/updatePopup.go

@@ -33,11 +33,6 @@ func (this *UpdatePopupAction) RunGet(params struct {
 		return
 	}
 
-	routeIds := []int64{}
-	for _, route := range record.NsRoutes {
-		routeIds = append(routeIds, route.Id)
-	}
-
 	this.Data["record"] = maps.Map{
 		"id":          record.Id,
 		"name":        record.Name,
@@ -47,7 +42,7 @@ func (this *UpdatePopupAction) RunGet(params struct {
 		"weight":      record.Weight,
 		"description": record.Description,
 		"isOn":        record.IsOn,
-		"routeIds":    routeIds,
+		"routes":      record.NsRoutes,
 	}
 
 	// 域名信息
@@ -83,7 +78,7 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	Ttl         int32
 	Description string
 	IsOn        bool
-	RouteIds    []int64
+	RouteCodes  []string
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -102,14 +97,14 @@ func (this *UpdatePopupAction) RunPost(params struct {
 	}
 
 	_, err := this.RPC().NSRecordRPC().UpdateNSRecord(this.AdminContext(), &pb.UpdateNSRecordRequest{
-		NsRecordId:  params.RecordId,
+		NsRecordId:   params.RecordId,
-		Description: params.Description,
+		Description:  params.Description,
-		Name:        params.Name,
+		Name:         params.Name,
-		Type:        params.Type,
+		Type:         params.Type,
-		Value:       params.Value,
+		Value:        params.Value,
-		Ttl:         params.Ttl,
+		Ttl:          params.Ttl,
-		IsOn:        params.IsOn,
+		IsOn:         params.IsOn,
-		NsRouteIds:  params.RouteIds,
+		NsRouteCodes: params.RouteCodes,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/ns/routes/options.go

@@ -4,8 +4,10 @@ package clusters
 
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/types"
 )
 
 type OptionsAction struct {
@@ -17,6 +19,18 @@ func (this *OptionsAction) RunPost(params struct {
 	DomainId  int64
 	UserId    int64
 }) {
+	var routeMaps = []maps.Map{}
+
+	// 默认线路
+	for _, route := range dnsconfigs.AllDefaultRoutes {
+		routeMaps = append(routeMaps, maps.Map{
+			"name": route.Name,
+			"code": route.Code,
+			"type": "default",
+		})
+	}
+
+	// 自定义
 	routesResp, err := this.RPC().NSRouteRPC().FindAllEnabledNSRoutes(this.AdminContext(), &pb.FindAllEnabledNSRoutesRequest{
 		NsClusterId: params.ClusterId,
 		NsDomainId:  params.DomainId,
@@ -27,13 +41,45 @@ func (this *OptionsAction) RunPost(params struct {
 		return
 	}
 
-	routeMaps := []maps.Map{}
 	for _, route := range routesResp.NsRoutes {
+		if len(route.Code) == 0 {
+			route.Code = "id:" + types.String(route.Id)
+		}
+
 		routeMaps = append(routeMaps, maps.Map{
-			"id":   route.Id,
 			"name": route.Name,
+			"code": route.Code,
+			"type": "user",
 		})
 	}
+
+	// 运营商
+	for _, route := range dnsconfigs.AllDefaultISPRoutes {
+		routeMaps = append(routeMaps, maps.Map{
+			"name": route.Name,
+			"code": route.Code,
+			"type": "isp",
+		})
+	}
+
+	// 中国
+	for _, route := range dnsconfigs.AllDefaultChinaProvinceRoutes {
+		routeMaps = append(routeMaps, maps.Map{
+			"name": route.Name,
+			"code": route.Code,
+			"type": "china",
+		})
+	}
+
+	// 全球
+	for _, route := range dnsconfigs.AllDefaultWorldRegionRoutes {
+		routeMaps = append(routeMaps, maps.Map{
+			"name": route.Name,
+			"code": route.Code,
+			"type": "world",
+		})
+	}
+
 	this.Data["routes"] = routeMaps
 
 	this.Success()

web/public/js/components/ns/ns-route-selector.js

@@ -1,6 +1,6 @@
 // 选择单一线路
 Vue.component("ns-route-selector", {
-	props: ["v-route-id"],
+	props: ["v-route-code"],
 	mounted: function () {
 		let that = this
 		Tea.action("/ns/routes/options")
@@ -10,20 +10,20 @@ Vue.component("ns-route-selector", {
 			})
 	},
 	data: function () {
-		let routeId = this.vRouteId
+		let routeCode = this.vRouteCode
-		if (routeId == null) {
+		if (routeCode == null) {
-			routeId = 0
+			routeCode = ""
 		}
 		return {
-			routeId: routeId,
+			routeCode: routeCode,
 			routes: []
 		}
 	},
 	template: `<div>
 	<div v-if="routes.length > 0">
-		<select class="ui dropdown" name="routeId" v-model="routeId">
+		<select class="ui dropdown" name="routeCode" v-model="routeCode">
-			<option value="0">[线路]</option>
+			<option value="">[线路]</option>
-			<option v-for="route in routes" :value="route.id">{{route.name}}</option>
+			<option v-for="route in routes" :value="route.code">{{route.name}}</option>
 		</select>
 	</div>
 </div>`

web/public/js/components/ns/ns-routes-selector.js

@@ -1,66 +1,70 @@
 // 选择多个线路
 Vue.component("ns-routes-selector", {
-	props: ["v-route-ids"],
+	props: ["v-routes"],
 	mounted: function () {
 		let that = this
-
-		let routeIds = this.vRouteIds
-		if (routeIds == null) {
-			routeIds = []
-		}
-
 		Tea.action("/ns/routes/options")
 			.post()
 			.success(function (resp) {
-				that.allRoutes = resp.data.routes
+				that.routes = resp.data.routes
-				that.allRoutes.forEach(function (v) {
-					v.isChecked = (routeIds.$contains(v.id))
-				})
 			})
 	},
 	data: function () {
-		return {
+		let selectedRoutes = this.vRoutes
-			routeId: 0,
+		if (selectedRoutes == null) {
-			allRoutes: [],
+			selectedRoutes = []
-			routes: [],
-			isAdding: false
 		}
-	}
+
-	,
+		return {
+			routeCode: "default",
+			routes: [],
+			isAdding: false,
+			routeType: "default",
+			selectedRoutes: selectedRoutes
+		}
+	},
+	watch: {
+		routeType: function (v) {
+			this.routeCode = ""
+			let that = this
+			this.routes.forEach(function (route) {
+				if (route.type == v && that.routeCode.length == 0) {
+					that.routeCode = route.code
+				}
+			})
+		}
+	},
 	methods: {
 		add: function () {
 			this.isAdding = true
-			this.routes = this.allRoutes.$findAll(function (k, v) {
+			this.routeType = "default"
-				return !v.isChecked
+			this.routeCode = "default"
-			})
-			this.routeId = 0
 		},
 		cancel: function () {
 			this.isAdding = false
 		},
 		confirm: function () {
-			if (this.routeId == 0) {
+			if (this.routeCode.length == 0) {
 				return
 			}
 
 			let that = this
 			this.routes.forEach(function (v) {
-				if (v.id == that.routeId) {
+				if (v.code == that.routeCode) {
-					v.isChecked = true
+					that.selectedRoutes.push(v)
 				}
 			})
 			this.cancel()
 		},
 		remove: function (index) {
-			this.allRoutes[index].isChecked = false
+			this.selectedRoutes.$remove(index)
-			Vue.set(this.allRoutes, index, this.allRoutes[index])
 		}
 	}
 	,
 	template: `<div>
 	<div>
-		<div class="ui label basic text small" v-for="(route, index) in allRoutes" v-if="route.isChecked">
+		<div class="ui label basic text small" v-for="(route, index) in selectedRoutes" style="margin-bottom: 0.3em">
-			<input type="hidden" name="routeIds" :value="route.id"/>
+			<input type="hidden" name="routeCodes" :value="route.code"/>
 			{{route.name}} &nbsp; <a href="" title="删除" @click.prevent="remove(index)"><i class="icon remove small"></i></a>
 		</div>
 		<div class="ui divider"></div>
@@ -68,11 +72,21 @@ Vue.component("ns-routes-selector", {
 	<div v-if="isAdding" style="margin-bottom: 1em">
 		<div class="ui fields inline">
 			<div class="ui field">
-				<select class="ui dropdown" name="routeId" v-model="routeId">
+				<select class="ui dropdown" v-model="routeType">
-					<option value="0">[线路]</option>
+					<option value="default">[默认线路]</option>
-					<option v-for="route in routes" :value="route.id">{{route.name}}</option>
+					<option value="user">自定义线路</option>
+					<option value="isp">运营商</option>
+					<option value="china">中国省市</option>
+					<option value="world">全球国家地区</option>
 				</select>
 			</div>
+			
+			<div class="ui field">
+				<select class="ui dropdown" v-model="routeCode" style="width: 10em">
+					<option v-for="route in routes" :value="route.code" v-if="route.type == routeType">{{route.name}}</option>
+				</select>
+			</div>
+			
 			<div class="ui field">
 				<button type="button" class="ui button tiny" @click.prevent="confirm">确定</button>
 				&nbsp; <a href="" title="取消" @click.prevent="cancel"><i class="icon remove small"></i></a>

web/views/@default/ns/domains/records/index.html

@@ -15,7 +15,7 @@
             </select>
         </div>
         <div class="ui field">
-            <ns-route-selector :v-route-id="routeId"></ns-route-selector>
+            <ns-route-selector :v-route-code="routeCode"></ns-route-selector>
         </div>
         <div class="ui field">
             <input type="text" placeholder="记录名、备注..." name="keyword" v-model="keyword"/>

web/views/@default/ns/domains/records/index.js

@@ -1,7 +1,7 @@
 Tea.context(function () {
 	this.createRecord = function () {
 		teaweb.popup("/ns/domains/records/createPopup?domainId=" + this.domain.id, {
-			height: "32em",
+			height: "33em",
 			callback: function () {
 				teaweb.success("保存成功", function () {
 					teaweb.reload()
@@ -12,7 +12,7 @@ Tea.context(function () {
 
 	this.updateRecord = function (recordId) {
 		teaweb.popup("/ns/domains/records/updatePopup?recordId=" + recordId, {
-			height: "32em",
+			height: "33em",
 			callback: function () {
 				teaweb.success("保存成功", function () {
 					teaweb.reload()

web/views/@default/ns/domains/records/updatePopup.html

@@ -40,7 +40,7 @@
         <tr>
             <td>线路</td>
             <td>
-                <ns-routes-selector :v-route-ids="record.routeIds"></ns-routes-selector>
+                <ns-routes-selector :v-routes="record.routes"></ns-routes-selector>
             </td>
         </tr>
         <tr>

web/views/@default/ns/routes/index.html

@@ -11,6 +11,7 @@
             <tr>
                 <th style="width: 3em"></th>
                 <th>线路名称</th>
+                <th>代号</th>
                 <th class="two wide">状态</th>
                 <th class="two op">操作</th>
             </tr>
@@ -19,6 +20,7 @@
             <tr>
                 <td style="text-align: center;"><i class="icon bars handle grey"></i> </td>
                 <td>{{route.name}}</td>
+                <td>id:{{route.id}}</td>
                 <td>
                     <label-on :v-is-on="route.isOn"></label-on>
                 </td>