diff --git a/go.sum b/go.sum index f4f924ed..2927b6e5 100644 --- a/go.sum +++ b/go.sum @@ -181,7 +181,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4= github.com/iwind/TeaGo v0.0.0-20210411134150-ddf57e240c2f/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= -github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060 h1:qdLtK4PDXxk2vMKkTWl5Fl9xqYuRCukzWAgJbLHdfOo= github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= github.com/iwind/TeaGo v0.0.0-20210806054428-5534da0db9d1 h1:AZKkwTNEZYrpyv62zIkxpLJsWhfOS7OEFovAcwd0aco= github.com/iwind/TeaGo v0.0.0-20210806054428-5534da0db9d1/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= @@ -193,7 +192,6 @@ github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeY github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -403,6 +401,7 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -455,6 +454,7 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/internal/db/models/nameservers/ns_question_option_dao.go b/internal/db/models/nameservers/ns_question_option_dao.go new file mode 100644 index 00000000..088012a4 --- /dev/null +++ b/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 +} diff --git a/internal/db/models/nameservers/ns_question_option_dao_test.go b/internal/db/models/nameservers/ns_question_option_dao_test.go new file mode 100644 index 00000000..e29fe962 --- /dev/null +++ b/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" +) diff --git a/internal/db/models/nameservers/ns_question_option_model.go b/internal/db/models/nameservers/ns_question_option_model.go new file mode 100644 index 00000000..61da960e --- /dev/null +++ b/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{} +} diff --git a/internal/db/models/nameservers/ns_question_option_model_ext.go b/internal/db/models/nameservers/ns_question_option_model_ext.go new file mode 100644 index 00000000..e0f8e7e2 --- /dev/null +++ b/internal/db/models/nameservers/ns_question_option_model_ext.go @@ -0,0 +1 @@ +package nameservers diff --git a/internal/db/models/ns_node_dao.go b/internal/db/models/ns_node_dao.go index 64dc358c..8d76d904 100644 --- a/internal/db/models/ns_node_dao.go +++ b/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), } diff --git a/internal/nodes/api_node_services.go b/internal/nodes/api_node_services.go index 7cf0e6da..533e88f5 100644 --- a/internal/nodes/api_node_services.go +++ b/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) diff --git a/internal/rpc/services/nameservers/service_ns_question_option.go b/internal/rpc/services/nameservers/service_ns_question_option.go new file mode 100644 index 00000000..4550380e --- /dev/null +++ b/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() +}