[域名服务]实现基本的线路配置

internal/db/models/nameservers/ns_record_dao.go

@@ -7,6 +7,7 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/dbs"
+	"strconv"
 )
 
 const (
@@ -132,11 +133,11 @@ func (this *NSRecordDAO) CountAllEnabledRecords(tx *dbs.Tx, domainId int64, dnsT
 		query.Attr("type", dnsType)
 	}
 	if len(keyword) > 0 {
-		query.Where("(name LIKE :keyword OR description LIKE :keyword)").
+		query.Where("(name LIKE :keyword OR value LIKE :keyword OR description LIKE :keyword)").
 			Param("keyword", "%"+keyword+"%")
 	}
 	if routeId > 0 {
-		query.JSONContains("routeIds", routeId)
+		query.JSONContains("routeIds", strconv.FormatInt(routeId, 10))
 	}
 	return query.Count()
 }
@@ -149,11 +150,11 @@ func (this *NSRecordDAO) ListAllEnabledRecords(tx *dbs.Tx, domainId int64, dnsTy
 		query.Attr("type", dnsType)
 	}
 	if len(keyword) > 0 {
-		query.Where("(name LIKE :keyword OR description LIKE :keyword)").
+		query.Where("(name LIKE :keyword OR value LIKE :keyword OR description LIKE :keyword)").
 			Param("keyword", "%"+keyword+"%")
 	}
 	if routeId > 0 {
-		query.JSONContains("routeIds", routeId)
+		query.JSONContains("routeIds", strconv.FormatInt(routeId, 10))
 	}
 	_, err = query.
 		DescPk().

internal/db/models/nameservers/ns_route_dao.go

@@ -1,6 +1,7 @@
 package nameservers
 
 import (
+	"github.com/TeaOSLab/EdgeAPI/internal/errors"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/dbs"
@@ -33,7 +34,7 @@ func init() {
 }
 
 // EnableNSRoute 启用条目
-func (this *NSRouteDAO) EnableNSRoute(tx *dbs.Tx, id uint32) error {
+func (this *NSRouteDAO) EnableNSRoute(tx *dbs.Tx, id int64) error {
 	_, err := this.Query(tx).
 		Pk(id).
 		Set("state", NSRouteStateEnabled).
@@ -42,7 +43,7 @@ func (this *NSRouteDAO) EnableNSRoute(tx *dbs.Tx, id uint32) error {
 }
 
 // DisableNSRoute 禁用条目
-func (this *NSRouteDAO) DisableNSRoute(tx *dbs.Tx, id uint32) error {
+func (this *NSRouteDAO) DisableNSRoute(tx *dbs.Tx, id int64) error {
 	_, err := this.Query(tx).
 		Pk(id).
 		Set("state", NSRouteStateDisabled).
@@ -63,9 +64,81 @@ func (this *NSRouteDAO) FindEnabledNSRoute(tx *dbs.Tx, id int64) (*NSRoute, erro
 }
 
 // FindNSRouteName 根据主键查找名称
-func (this *NSRouteDAO) FindNSRouteName(tx *dbs.Tx, id uint32) (string, error) {
+func (this *NSRouteDAO) FindNSRouteName(tx *dbs.Tx, id int64) (string, error) {
 	return this.Query(tx).
 		Pk(id).
 		Result("name").
 		FindStringCol("")
 }
+
+// CreateRoute 创建线路
+func (this *NSRouteDAO) CreateRoute(tx *dbs.Tx, clusterId int64, domainId int64, userId int64, name string, rangesJSON []byte) (int64, error) {
+	op := NewNSRouteOperator()
+	op.ClusterId = clusterId
+	op.DomainId = domainId
+	op.UserId = userId
+	op.Name = name
+	if len(rangesJSON) > 0 {
+		op.Ranges = rangesJSON
+	} else {
+		op.Ranges = "[]"
+	}
+	op.IsOn = true
+	op.State = NSRouteStateEnabled
+	return this.SaveInt64(tx, op)
+}
+
+// UpdateRoute 修改线路
+func (this *NSRouteDAO) UpdateRoute(tx *dbs.Tx, routeId int64, name string, rangesJSON []byte) error {
+	if routeId <= 0 {
+		return errors.New("invalid routeId")
+	}
+	op := NewNSRouteOperator()
+	op.Id = routeId
+	op.Name = name
+	if len(rangesJSON) > 0 {
+		op.Ranges = rangesJSON
+	} else {
+		op.Ranges = "[]"
+	}
+	return this.Save(tx, op)
+}
+
+// UpdateRouteOrders 修改线路排序
+func (this *NSRouteDAO) UpdateRouteOrders(tx *dbs.Tx, routeIds []int64) error {
+	order := len(routeIds)
+	for _, routeId := range routeIds {
+		_, err := this.Query(tx).
+			Pk(routeId).
+			Set("order", order).
+			Update()
+		if err != nil {
+			return err
+		}
+		order--
+	}
+	return nil
+}
+
+// FindAllEnabledRoutes 列出所有线路
+func (this *NSRouteDAO) FindAllEnabledRoutes(tx *dbs.Tx, clusterId int64, domainId int64, userId int64) (result []*NSRoute, err error) {
+	query := this.Query(tx).
+		State(NSRouteStateEnabled).
+		Slice(&result).
+		Desc("order").
+		DescPk()
+	if clusterId > 0 {
+		query.Attr("clusterId", clusterId)
+	} else {
+		// 不查询所有集群的线路
+		query.Attr("clusterId", 0)
+	}
+	if domainId > 0 {
+		query.Attr("domainId", domainId)
+	}
+	if userId > 0 {
+		query.Attr("userId", userId)
+	}
+	_, err = query.FindAll()
+	return
+}

internal/db/models/nameservers/ns_route_model.go

@@ -3,23 +3,25 @@ package nameservers
 // NSRoute DNS线路
 type NSRoute struct {
 	Id        uint32 `field:"id"`        // ID
+	IsOn      uint8  `field:"isOn"`      // 是否启用
 	ClusterId uint32 `field:"clusterId"` // 集群ID
 	DomainId  uint32 `field:"domainId"`  // 域名ID
 	UserId    uint32 `field:"userId"`    // 用户ID
 	Name      string `field:"name"`      // 名称
-	Conds     string `field:"conds"`     // 条件定义
-	IsOn      uint8  `field:"isOn"`      // 是否启用
+	Ranges    string `field:"ranges"`    // 范围
+	Order     uint32 `field:"order"`     // 排序
 	State     uint8  `field:"state"`     // 状态
 }
 
 type NSRouteOperator struct {
 	Id        interface{} // ID
+	IsOn      interface{} // 是否启用
 	ClusterId interface{} // 集群ID
 	DomainId  interface{} // 域名ID
 	UserId    interface{} // 用户ID
 	Name      interface{} // 名称
-	Conds     interface{} // 条件定义
-	IsOn      interface{} // 是否启用
+	Ranges    interface{} // 范围
+	Order     interface{} // 排序
 	State     interface{} // 状态
 }