支持阿里云DNS

internal/db/models/dns_domain_dao.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"encoding/json"
+	"github.com/TeaOSLab/EdgeAPI/internal/dnsclients"
 	"github.com/TeaOSLab/EdgeAPI/internal/errors"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/Tea"
@@ -162,7 +163,7 @@ func (this *DNSDomainDAO) UpdateDomainRoutes(domainId int64, routesJSON []byte)
 }
 
 // 查找域名线路
-func (this *DNSDomainDAO) FindDomainRoutes(domainId int64) ([]string, error) {
+func (this *DNSDomainDAO) FindDomainRoutes(domainId int64) ([]*dnsclients.Route, error) {
 	routes, err := this.Query().
 		Pk(domainId).
 		Result("routes").
@@ -173,10 +174,24 @@ func (this *DNSDomainDAO) FindDomainRoutes(domainId int64) ([]string, error) {
 	if len(routes) == 0 || routes == "null" {
 		return nil, nil
 	}
-	result := []string{}
+	result := []*dnsclients.Route{}
 	err = json.Unmarshal([]byte(routes), &result)
 	if err != nil {
 		return nil, err
 	}
 	return result, nil
 }
+
+// 查找线路名称
+func (this *DNSDomainDAO) FindDomainRouteName(domainId int64, routeCode string) (string, error) {
+	routes, err := this.FindDomainRoutes(domainId)
+	if err != nil {
+		return "", err
+	}
+	for _, route := range routes {
+		if route.Code == routeCode {
+			return route.Name, nil
+		}
+	}
+	return "", nil
+}

internal/db/models/dns_domain_model_ext.go

@@ -3,15 +3,14 @@ package models
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAPI/internal/dnsclients"
-	"github.com/iwind/TeaGo/lists"
 )
 
 // 获取所有的线路
-func (this *DNSDomain) DecodeRoutes() ([]string, error) {
+func (this *DNSDomain) DecodeRoutes() ([]*dnsclients.Route, error) {
 	if len(this.Routes) == 0 || this.Routes == "null" {
 		return nil, nil
 	}
-	result := []string{}
+	result := []*dnsclients.Route{}
 	err := json.Unmarshal([]byte(this.Routes), &result)
 	if err != nil {
 		return nil, err
@@ -25,7 +24,12 @@ func (this *DNSDomain) ContainsRoute(route string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	return lists.ContainsString(routes, route), nil
+	for _, r := range routes {
+		if r.Code == route {
+			return true, nil
+		}
+	}
+	return false, nil
 }
 
 // 获取所有的记录

internal/dnsclients/.gitignore

@@ -1 +0,0 @@
-*_test.go

internal/dnsclients/provider_alidns.go

@@ -0,0 +1,156 @@
+package dnsclients
+
+import (
+	"errors"
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
+	"github.com/aliyun/alibaba-cloud-sdk-go/services/alidns"
+	"github.com/iwind/TeaGo/maps"
+	"strings"
+)
+
+// 阿里云服务商
+type AliDNSProvider struct {
+	accessKeyId     string
+	accessKeySecret string
+}
+
+// 认证
+func (this *AliDNSProvider) Auth(params maps.Map) error {
+	this.accessKeyId = params.GetString("accessKeyId")
+	this.accessKeySecret = params.GetString("accessKeySecret")
+	if len(this.accessKeyId) == 0 {
+		return errors.New("'accessKeyId' should not be empty")
+	}
+	if len(this.accessKeySecret) == 0 {
+		return errors.New("'accessKeySecret' should not be empty")
+	}
+	return nil
+}
+
+// 获取域名列表
+func (this *AliDNSProvider) GetRecords(domain string) (records []*Record, err error) {
+	pageNumber := 1
+	size := 100
+
+	for {
+		req := alidns.CreateDescribeDomainRecordsRequest()
+		req.DomainName = domain
+		req.PageNumber = requests.NewInteger(pageNumber)
+		req.PageSize = requests.NewInteger(size)
+
+		resp := alidns.CreateDescribeDomainRecordsResponse()
+		err = this.doAPI(req, resp)
+		if err != nil {
+			return nil, err
+		}
+		for _, record := range resp.DomainRecords.Record {
+			// 修正Record
+			if record.Type == RecordTypeCName && !strings.HasSuffix(record.Value, ".") {
+				record.Value += "."
+			}
+
+			records = append(records, &Record{
+				Id:    record.RecordId,
+				Name:  record.RR,
+				Type:  record.Type,
+				Value: record.Value,
+				Route: record.Line,
+			})
+		}
+
+		pageNumber++
+		if int64((pageNumber-1)*size) >= resp.TotalCount {
+			break
+		}
+	}
+
+	return
+}
+
+// 读取域名支持的线路数据
+func (this *AliDNSProvider) GetRoutes(domain string) (routes []*Route, err error) {
+	req := alidns.CreateDescribeSupportLinesRequest()
+	req.DomainName = domain
+
+	resp := alidns.CreateDescribeSupportLinesResponse()
+	err = this.doAPI(req, resp)
+	if err != nil {
+		return nil, err
+	}
+	for _, line := range resp.RecordLines.RecordLine {
+		routes = append(routes, &Route{
+			Name: line.LineName,
+			Code: line.LineCode,
+		})
+	}
+	return
+}
+
+// 设置记录
+func (this *AliDNSProvider) AddRecord(domain string, newRecord *Record) error {
+	req := alidns.CreateAddDomainRecordRequest()
+	req.RR = newRecord.Name
+	req.Type = newRecord.Type
+	req.Value = newRecord.Value
+	req.DomainName = domain
+	req.Line = newRecord.Route
+
+	resp := alidns.CreateAddDomainRecordResponse()
+	err := this.doAPI(req, resp)
+	if err != nil {
+		return err
+	}
+	if resp.IsSuccess() {
+		return nil
+	}
+
+	return errors.New(resp.GetHttpContentString())
+}
+
+// 修改记录
+func (this *AliDNSProvider) UpdateRecord(domain string, record *Record, newRecord *Record) error {
+	req := alidns.CreateUpdateDomainRecordRequest()
+	req.RecordId = record.Id
+	req.RR = newRecord.Name
+	req.Type = newRecord.Type
+	req.Value = newRecord.Value
+	req.Line = newRecord.Route
+
+	resp := alidns.CreateUpdateDomainRecordResponse()
+	err := this.doAPI(req, resp)
+	return err
+}
+
+// 删除记录
+func (this *AliDNSProvider) DeleteRecord(domain string, record *Record) error {
+	req := alidns.CreateDeleteDomainRecordRequest()
+	req.RecordId = record.Id
+
+	resp := alidns.CreateDeleteDomainRecordResponse()
+	err := this.doAPI(req, resp)
+	return err
+}
+
+// 默认线路
+func (this *AliDNSProvider) DefaultRoute() string {
+	return "default"
+}
+
+// 执行请求
+func (this *AliDNSProvider) doAPI(req requests.AcsRequest, resp responses.AcsResponse) error {
+	req.SetScheme("https")
+
+	client, err := alidns.NewClientWithAccessKey("cn-hangzhou", this.accessKeyId, this.accessKeySecret)
+	if err != nil {
+		return err
+	}
+	err = client.DoAction(req, resp)
+	if err != nil {
+		return err
+	}
+	if !resp.IsSuccess() {
+		return errors.New(resp.GetHttpContentString())
+	}
+	return nil
+}

internal/dnsclients/provider_alidns_test.go

@@ -0,0 +1,112 @@
+package dnsclients
+
+import (
+	"encoding/json"
+	_ "github.com/go-sql-driver/mysql"
+	_ "github.com/iwind/TeaGo/bootstrap"
+	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
+	"testing"
+)
+
+func TestAliDNSProvider_GetRecords(t *testing.T) {
+	provider, err := testAliDNSProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	records, err := provider.GetRecords("meloy.cn")
+	if err != nil {
+		t.Fatal(err)
+	}
+	logs.PrintAsJSON(records, t)
+}
+
+func TestAliDNSProvider_DeleteRecord(t *testing.T) {
+	provider, err := testAliDNSProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = provider.DeleteRecord("meloy.cn", &Record{
+		Id: "20746603318032384",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestAliDNSProvider_GetRoutes(t *testing.T) {
+	provider, err := testAliDNSProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	routes, err := provider.GetRoutes("meloy.cn")
+	if err != nil {
+		t.Fatal(err)
+	}
+	logs.PrintAsJSON(routes, t)
+}
+
+func TestAliDNSProvider_AddRecord(t *testing.T) {
+	provider, err := testAliDNSProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = provider.AddRecord("meloy.cn", &Record{
+		Id:    "",
+		Name:  "test",
+		Type:  RecordTypeA,
+		Value: "192.168.1.100",
+		Route: "unicom",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestAliDNSProvider_UpdateRecord(t *testing.T) {
+	provider, err := testAliDNSProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = provider.UpdateRecord("meloy.cn", &Record{Id: "20746664455255040"}, &Record{
+		Id:    "",
+		Name:  "test",
+		Type:  RecordTypeA,
+		Value: "192.168.1.101",
+		Route: "unicom",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func testAliDNSProvider() (ProviderInterface, error) {
+	db, err := dbs.Default()
+	if err != nil {
+		return nil, err
+	}
+	one, err := db.FindOne("SELECT * FROM edgeDNSProviders WHERE type='alidns' ORDER BY id DESC")
+	if err != nil {
+		return nil, err
+	}
+	apiParams := maps.Map{}
+	err = json.Unmarshal([]byte(one.GetString("apiParams")), &apiParams)
+	if err != nil {
+		return nil, err
+	}
+	provider := &AliDNSProvider{}
+	err = provider.Auth(apiParams)
+	if err != nil {
+		return nil, err
+	}
+	return provider, nil
+}

internal/dnsclients/provider_dnspod.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 )
 
+// DNSPod服务商
 type DNSPodProvider struct {
 	apiId    string
 	apiToken string
@@ -70,7 +71,7 @@ func (this *DNSPodProvider) GetRecords(domain string) (records []*Record, err er
 }
 
 // 读取线路数据
-func (this *DNSPodProvider) GetRoutes(domain string) ([]string, error) {
+func (this *DNSPodProvider) GetRoutes(domain string) (routes []*Route, err error) {
 	infoResp, err := this.post("/Domain.info", map[string]string{
 		"domain": domain,
 	})
@@ -92,12 +93,15 @@ func (this *DNSPodProvider) GetRoutes(domain string) ([]string, error) {
 	if len(lines) == 0 {
 		return nil, nil
 	}
-	lineStrings := []string{}
 	for _, line := range lines {
-		lineStrings = append(lineStrings, types.String(line))
+		lineString := types.String(line)
+		routes = append(routes, &Route{
+			Name: lineString,
+			Code: lineString,
+		})
 	}
 
-	return lineStrings, nil
+	return routes, nil
 }
 
 // 设置记录

internal/dnsclients/provider_dnspod_test.go

@@ -0,0 +1,110 @@
+package dnsclients
+
+import (
+	"encoding/json"
+	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/logs"
+	"github.com/iwind/TeaGo/maps"
+	"testing"
+)
+
+func TestDNSPodProvider_GetRoutes(t *testing.T) {
+	provider, err := testDNSPodProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+	routes, err := provider.GetRoutes("yun4s.cn")
+	if err != nil {
+		t.Fatal(err)
+	}
+	logs.PrintAsJSON(routes, t)
+}
+
+func TestDNSPodProvider_GetRecords(t *testing.T) {
+	provider, err := testDNSPodProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+	records, err := provider.GetRecords("yun4s.cn")
+	if err != nil {
+		t.Fatal(err)
+	}
+	for _, record := range records {
+		t.Log(record.Id, record.Type, record.Name, record.Value, record.Route)
+	}
+}
+
+func TestDNSPodProvider_AddRecord(t *testing.T) {
+	provider, err := testDNSPodProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = provider.AddRecord("yun4s.cn", &Record{
+		Type:  RecordTypeCName,
+		Name:  "hello-forward",
+		Value: "hello.yun4s.cn",
+		Route: "联通",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestDNSPodProvider_UpdateRecord(t *testing.T) {
+	provider, err := testDNSPodProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = provider.UpdateRecord("yun4s.cn", &Record{
+		Id: "697036856",
+	}, &Record{
+		Type:  RecordTypeA,
+		Name:  "hello",
+		Value: "192.168.1.102",
+		Route: "联通",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func TestDNSPodProvider_DeleteRecord(t *testing.T) {
+	provider, err := testDNSPodProvider()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = provider.DeleteRecord("yun4s.cn", &Record{
+		Id: "697040986",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("ok")
+}
+
+func testDNSPodProvider() (ProviderInterface, error) {
+	db, err := dbs.Default()
+	if err != nil {
+		return nil, err
+	}
+	one, err := db.FindOne("SELECT * FROM edgeDNSProviders WHERE type='dnspod' ORDER BY id DESC")
+	if err != nil {
+		return nil, err
+	}
+	apiParams := maps.Map{}
+	err = json.Unmarshal([]byte(one.GetString("apiParams")), &apiParams)
+	if err != nil {
+		return nil, err
+	}
+	provider := &DNSPodProvider{}
+	err = provider.Auth(apiParams)
+	if err != nil {
+		return nil, err
+	}
+	return provider, nil
+}

internal/dnsclients/provider_interface.go

@@ -11,7 +11,7 @@ type ProviderInterface interface {
 	GetRecords(domain string) (records []*Record, err error)
 
 	// 读取域名支持的线路数据
-	GetRoutes(domain string) (routes []string, err error)
+	GetRoutes(domain string) (routes []*Route, err error)
 
 	// 设置记录
 	AddRecord(domain string, newRecord *Record) error

internal/dnsclients/record.go

@@ -5,7 +5,7 @@ type RecordType = string
 const (
 	RecordTypeA     RecordType = "A"
 	RecordTypeCName RecordType = "CNAME"
-	RecordTypeText  RecordType = "TXT"
+	RecordTypeTXT   RecordType = "TXT"
 )
 
 type Record struct {

internal/dnsclients/route.go

@@ -0,0 +1,7 @@
+package dnsclients
+
+// 线路描述
+type Route struct {
+	Name string `json:"name"`
+	Code string `json:"code"`
+}

internal/dnsclients/types.go

@@ -7,24 +7,24 @@ type ProviderType = string
 // 服务商代号
 const (
 	ProviderTypeDNSPod ProviderType = "dnspod"
-	ProviderTypeAliyun ProviderType = "aliyun"
+	ProviderTypeAliDNS ProviderType = "alidns"
 	ProviderTypeDNSCom ProviderType = "dnscom"
 )
 
 // 所有的服务商类型
 var AllProviderTypes = []maps.Map{
+	{
+		"name": "阿里云DNS",
+		"code": ProviderTypeAliDNS,
+	},
 	{
 		"name": "DNSPod",
 		"code": ProviderTypeDNSPod,
 	},
-	{
-		"name": "阿里云",
-		"code": ProviderTypeAliyun,
-	},
-	{
-		"name": "帝恩思",
+	/**{
+		"name": "帝恩思DNS.COM",
 		"code": ProviderTypeDNSCom,
-	},
+	},**/
 }
 
 // 查找服务商实例
@@ -32,6 +32,8 @@ func FindProvider(providerType ProviderType) ProviderInterface {
 	switch providerType {
 	case ProviderTypeDNSPod:
 		return &DNSPodProvider{}
+	case ProviderTypeAliDNS:
+		return &AliDNSProvider{}
 	}
 	return nil
 }

internal/rpc/services/service_dns_domain.go

@@ -10,7 +10,6 @@ import (
 	"github.com/TeaOSLab/EdgeAPI/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/lists"
-	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
 )
 
@@ -294,7 +293,6 @@ func (this *DNSDomainService) SyncDNSDomainData(ctx context.Context, req *pb.Syn
 		}
 		allChanges = append(allChanges, changes...)
 	}
-	logs.Println("====")
 	for _, change := range allChanges {
 		action := change.GetString("action")
 		record := change.Get("record").(*dnsclients.Record)
@@ -316,7 +314,7 @@ func (this *DNSDomainService) SyncDNSDomainData(ctx context.Context, req *pb.Syn
 			}
 		}
 
-		logs.Println(action, record.Name, record.Type, record.Value, record.Route) // TODO 仅供调试
+		//logs.Println(action, record.Name, record.Type, record.Value, record.Route)
 	}
 
 	// 重新更新记录
@@ -352,7 +350,16 @@ func (this *DNSDomainService) FindAllDNSDomainRoutes(ctx context.Context, req *p
 	if err != nil {
 		return nil, err
 	}
-	return &pb.FindAllDNSDomainRoutesResponse{Routes: routes}, nil
+
+	pbRoutes := []*pb.DNSRoute{}
+	for _, route := range routes {
+		pbRoutes = append(pbRoutes, &pb.DNSRoute{
+			Name: route.Name,
+			Code: route.Code,
+		})
+	}
+
+	return &pb.FindAllDNSDomainRoutesResponse{Routes: pbRoutes}, nil
 }
 
 // 转换域名信息
@@ -396,12 +403,16 @@ func (this *DNSDomainService) convertDomainToPB(domain *models.DNSDomain) (*pb.D
 	}
 
 	// 线路
-	routes := []string{}
-	if len(domain.Routes) > 0 && domain.Routes != "null" {
-		err := json.Unmarshal([]byte(domain.Routes), &routes)
-		if err != nil {
-			return nil, err
-		}
+	routes, err := domain.DecodeRoutes()
+	if err != nil {
+		return nil, err
+	}
+	pbRoutes := []*pb.DNSRoute{}
+	for _, route := range routes {
+		pbRoutes = append(pbRoutes, &pb.DNSRoute{
+			Name: route.Name,
+			Code: route.Code,
+		})
 	}
 
 	return &pb.DNSDomain{
@@ -414,7 +425,7 @@ func (this *DNSDomainService) convertDomainToPB(domain *models.DNSDomain) (*pb.D
 		NodesChanged:       nodesChanged,
 		CountServerRecords: int64(countServerRecords),
 		ServersChanged:     serversChanged,
-		Routes:             routes,
+		Routes:             pbRoutes,
 	}, nil
 }
 

internal/rpc/services/service_node.go

@@ -856,6 +856,11 @@ func (this *NodeService) FindAllEnabledNodesDNSWithClusterId(ctx context.Context
 	}
 	dnsDomainId := int64(clusterDNS.DnsDomainId)
 
+	routes, err := models.SharedDNSDomainDAO.FindDomainRoutes(dnsDomainId)
+	if err != nil {
+		return nil, err
+	}
+
 	nodes, err := models.SharedNodeDAO.FindAllEnabledNodesDNSWithClusterId(req.NodeClusterId)
 	if err != nil {
 		return nil, err
@@ -872,11 +877,21 @@ func (this *NodeService) FindAllEnabledNodesDNSWithClusterId(ctx context.Context
 			return nil, err
 		}
 
+		routeName := ""
+		for _, r := range routes {
+			if r.Code == route {
+				routeName = r.Name
+			}
+		}
+
 		result = append(result, &pb.NodeDNSInfo{
 			Id:     int64(node.Id),
 			Name:   node.Name,
 			IpAddr: ipAddr,
-			Route:  route,
+			Route: &pb.DNSRoute{
+				Name: routeName,
+				Code: route,
+			},
 		})
 	}
 	return &pb.FindAllEnabledNodesDNSWithClusterIdResponse{Nodes: result}, nil
@@ -915,11 +930,17 @@ func (this *NodeService) FindEnabledNodeDNS(ctx context.Context, req *pb.FindEna
 	}
 
 	var route = ""
+	var routeName = ""
 	if dnsDomainId > 0 {
 		route, err = node.DNSRoute(dnsDomainId)
 		if err != nil {
 			return nil, err
 		}
+
+		routeName, err = models.SharedDNSDomainDAO.FindDomainRouteName(dnsDomainId, route)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	ipAddr, err := models.SharedNodeIPAddressDAO.FindFirstNodeIPAddress(int64(node.Id))
@@ -929,10 +950,13 @@ func (this *NodeService) FindEnabledNodeDNS(ctx context.Context, req *pb.FindEna
 
 	return &pb.FindEnabledNodeDNSResponse{
 		Node: &pb.NodeDNSInfo{
-			Id:            int64(node.Id),
-			Name:          node.Name,
-			IpAddr:        ipAddr,
-			Route:         route,
+			Id:     int64(node.Id),
+			Name:   node.Name,
+			IpAddr: ipAddr,
+			Route: &pb.DNSRoute{
+				Name: routeName,
+				Code: route,
+			},
 			ClusterId:     clusterId,
 			DnsDomainId:   dnsDomainId,
 			DnsDomainName: dnsDomainName,

internal/rpc/services/service_node_cluster.go

@@ -515,5 +515,6 @@ func (this *NodeClusterService) CheckNodeClusterDNSChanges(ctx context.Context,
 	if err != nil {
 		return nil, err
 	}
+
 	return &pb.CheckNodeClusterDNSChangesResponse{IsChanged: len(changes) > 0}, nil
 }