自建DNS增加解析测试

internal/db/models/nameservers/ns_question_option_dao.go

@@ -0,0 +1,67 @@
+package nameservers
+
+import (
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+type NSQuestionOptionDAO dbs.DAO
+
+func NewNSQuestionOptionDAO() *NSQuestionOptionDAO {
+	return dbs.NewDAO(&NSQuestionOptionDAO{
+		DAOObject: dbs.DAOObject{
+			DB:     Tea.Env,
+			Table:  "edgeNSQuestionOptions",
+			Model:  new(NSQuestionOption),
+			PkName: "id",
+		},
+	}).(*NSQuestionOptionDAO)
+}
+
+var SharedNSQuestionOptionDAO *NSQuestionOptionDAO
+
+func init() {
+	dbs.OnReady(func() {
+		SharedNSQuestionOptionDAO = NewNSQuestionOptionDAO()
+	})
+}
+
+// FindNSQuestionOptionName 根据主键查找名称
+func (this *NSQuestionOptionDAO) FindNSQuestionOptionName(tx *dbs.Tx, id uint64) (string, error) {
+	return this.Query(tx).
+		Pk(id).
+		Result("name").
+		FindStringCol("")
+}
+
+// CreateOption 创建选项
+func (this *NSQuestionOptionDAO) CreateOption(tx *dbs.Tx, name string, values maps.Map) (int64, error) {
+	if values == nil {
+		values = maps.Map{}
+	}
+	var op = NewNSQuestionOptionOperator()
+	op.Name = name
+	op.Values = values.AsJSON()
+	return this.SaveInt64(tx, op)
+}
+
+// FindOption 读取选项
+func (this *NSQuestionOptionDAO) FindOption(tx *dbs.Tx, optionId int64) (*NSQuestionOption, error) {
+	one, err := this.Query(tx).
+		Pk(optionId).
+		Find()
+	if one == nil {
+		return nil, err
+	}
+	return one.(*NSQuestionOption), nil
+}
+
+// DeleteOption 删除选项
+func (this *NSQuestionOptionDAO) DeleteOption(tx *dbs.Tx, optionId int64) error {
+	_, err := this.Query(tx).
+		Pk(optionId).
+		Delete()
+	return err
+}

internal/db/models/nameservers/ns_question_option_dao_test.go

@@ -0,0 +1,6 @@
+package nameservers
+
+import (
+	_ "github.com/go-sql-driver/mysql"
+	_ "github.com/iwind/TeaGo/bootstrap"
+)

internal/db/models/nameservers/ns_question_option_model.go

@@ -0,0 +1,20 @@
+package nameservers
+
+// NSQuestionOption DNS请求选项
+type NSQuestionOption struct {
+	Id        uint64 `field:"id"`        // ID
+	Name      string `field:"name"`      // 选项名
+	Values    string `field:"values"`    // 选项值
+	CreatedAt uint64 `field:"createdAt"` // 创建时间
+}
+
+type NSQuestionOptionOperator struct {
+	Id        interface{} // ID
+	Name      interface{} // 选项名
+	Values    interface{} // 选项值
+	CreatedAt interface{} // 创建时间
+}
+
+func NewNSQuestionOptionOperator() *NSQuestionOptionOperator {
+	return &NSQuestionOptionOperator{}
+}

internal/db/models/nameservers/ns_question_option_model_ext.go

@@ -0,0 +1 @@
+package nameservers

internal/db/models/ns_node_dao.go

@@ -384,6 +384,7 @@ func (this *NSNodeDAO) ComposeNodeConfig(tx *dbs.Tx, nodeId int64) (*dnsconfigs.
 	config := &dnsconfigs.NSNodeConfig{
 		Id:        int64(node.Id),
 		NodeId:    node.UniqueId,
+		Secret:    node.Secret,
 		ClusterId: int64(node.ClusterId),
 	}
 

internal/nodes/api_node_services.go

@@ -453,6 +453,11 @@ func (this *APINode) registerServices(server *grpc.Server) {
 		pb.RegisterNSRecordHourlyStatServiceServer(server, instance)
 		this.rest(instance)
 	}
+	{
+		instance := this.serviceInstance(&nameservers.NSQuestionOptionService{}).(*nameservers.NSQuestionOptionService)
+		pb.RegisterNSQuestionOptionServiceServer(server, instance)
+		this.rest(instance)
+	}
 	{
 		instance := this.serviceInstance(&nameservers.NSService{}).(*nameservers.NSService)
 		pb.RegisterNSServiceServer(server, instance)

internal/rpc/services/nameservers/service_ns_question_option.go

@@ -0,0 +1,77 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package nameservers
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/nameservers"
+	"github.com/TeaOSLab/EdgeAPI/internal/rpc/services"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/maps"
+)
+
+// NSQuestionOptionService DNS查询选项
+type NSQuestionOptionService struct {
+	services.BaseService
+}
+
+// CreateNSQuestionOption 创建选项
+func (this *NSQuestionOptionService) CreateNSQuestionOption(ctx context.Context, req *pb.CreateNSQuestionOptionRequest) (*pb.CreateNSQuestionOptionResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	var values = maps.Map{}
+	if len(req.ValuesJSON) > 0 {
+		err = json.Unmarshal(req.ValuesJSON, &values)
+		if err != nil {
+			return nil, err
+		}
+	}
+	optionId, err := nameservers.SharedNSQuestionOptionDAO.CreateOption(tx, req.Name, values)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.CreateNSQuestionOptionResponse{NsQuestionOptionId: optionId}, nil
+}
+
+// FindNSQuestionOption 读取选项
+func (this *NSQuestionOptionService) FindNSQuestionOption(ctx context.Context, req *pb.FindNSQuestionOptionRequest) (*pb.FindNSQuestionOptionResponse, error) {
+	_, err := this.ValidateNSNode(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	option, err := nameservers.SharedNSQuestionOptionDAO.FindOption(tx, req.NsQuestionOptionId)
+	if err != nil {
+		return nil, err
+	}
+	if option == nil {
+		return &pb.FindNSQuestionOptionResponse{NsQuestionOption: nil}, nil
+	}
+
+	return &pb.FindNSQuestionOptionResponse{NsQuestionOption: &pb.NSQuestionOption{
+		Id:         int64(option.Id),
+		Name:       option.Name,
+		ValuesJSON: []byte(option.Values),
+	}}, nil
+}
+
+// DeleteNSQuestionOption 删除选项
+func (this *NSQuestionOptionService) DeleteNSQuestionOption(ctx context.Context, req *pb.DeleteNSQuestionOptionRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = nameservers.SharedNSQuestionOptionDAO.DeleteOption(tx, req.NsQuestionOptionId)
+	if err != nil {
+		return nil, err
+	}
+	return this.Success()
+}