From 4a02ccb9c2a27a5babc0a0ff2f5fdf2859a8dbb4 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Wed, 25 Aug 2021 18:47:01 +0800 Subject: [PATCH] =?UTF-8?q?DNS=E6=9C=8D=E5=8A=A1=E5=95=86=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/dns/dns_provider_dao.go | 39 ++++++++++++------- internal/rpc/services/service_dns_provider.go | 6 +-- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/internal/db/models/dns/dns_provider_dao.go b/internal/db/models/dns/dns_provider_dao.go index 39025ba2..05bf262e 100644 --- a/internal/db/models/dns/dns_provider_dao.go +++ b/internal/db/models/dns/dns_provider_dao.go @@ -36,7 +36,7 @@ func init() { }) } -// 启用条目 +// EnableDNSProvider 启用条目 func (this *DNSProviderDAO) EnableDNSProvider(tx *dbs.Tx, id int64) error { _, err := this.Query(tx). Pk(id). @@ -45,7 +45,7 @@ func (this *DNSProviderDAO) EnableDNSProvider(tx *dbs.Tx, id int64) error { return err } -// 禁用条目 +// DisableDNSProvider 禁用条目 func (this *DNSProviderDAO) DisableDNSProvider(tx *dbs.Tx, id int64) error { _, err := this.Query(tx). Pk(id). @@ -54,7 +54,7 @@ func (this *DNSProviderDAO) DisableDNSProvider(tx *dbs.Tx, id int64) error { return err } -// 查找启用中的条目 +// FindEnabledDNSProvider 查找启用中的条目 func (this *DNSProviderDAO) FindEnabledDNSProvider(tx *dbs.Tx, id int64) (*DNSProvider, error) { result, err := this.Query(tx). Pk(id). @@ -66,7 +66,7 @@ func (this *DNSProviderDAO) FindEnabledDNSProvider(tx *dbs.Tx, id int64) (*DNSPr return result.(*DNSProvider), err } -// 创建服务商 +// CreateDNSProvider 创建服务商 func (this *DNSProviderDAO) CreateDNSProvider(tx *dbs.Tx, adminId int64, userId int64, providerType string, name string, apiParamsJSON []byte) (int64, error) { op := NewDNSProviderOperator() op.AdminId = adminId @@ -84,7 +84,7 @@ func (this *DNSProviderDAO) CreateDNSProvider(tx *dbs.Tx, adminId int64, userId return types.Int64(op.Id), nil } -// 修改服务商 +// UpdateDNSProvider 修改服务商 func (this *DNSProviderDAO) UpdateDNSProvider(tx *dbs.Tx, dnsProviderId int64, name string, apiParamsJSON []byte) error { if dnsProviderId <= 0 { return errors.New("invalid dnsProviderId") @@ -106,16 +106,25 @@ func (this *DNSProviderDAO) UpdateDNSProvider(tx *dbs.Tx, dnsProviderId int64, n return nil } -// 计算服务商数量 -func (this *DNSProviderDAO) CountAllEnabledDNSProviders(tx *dbs.Tx, adminId int64, userId int64) (int64, error) { - return dbutils.NewQuery(tx, this, adminId, userId). - State(DNSProviderStateEnabled). +// CountAllEnabledDNSProviders 计算服务商数量 +func (this *DNSProviderDAO) CountAllEnabledDNSProviders(tx *dbs.Tx, adminId int64, userId int64, keyword string) (int64, error) { + var query = dbutils.NewQuery(tx, this, adminId, userId) + if len(keyword) > 0 { + query.Where("(name LIKE :keyword)"). + Param("keyword", "%"+keyword+"%") + } + return query.State(DNSProviderStateEnabled). Count() } -// 列出单页服务商 -func (this *DNSProviderDAO) ListEnabledDNSProviders(tx *dbs.Tx, adminId int64, userId int64, offset int64, size int64) (result []*DNSProvider, err error) { - _, err = dbutils.NewQuery(tx, this, adminId, userId). +// ListEnabledDNSProviders 列出单页服务商 +func (this *DNSProviderDAO) ListEnabledDNSProviders(tx *dbs.Tx, adminId int64, userId int64, keyword string, offset int64, size int64) (result []*DNSProvider, err error) { + var query = dbutils.NewQuery(tx, this, adminId, userId) + if len(keyword) > 0 { + query.Where("(name LIKE :keyword)"). + Param("keyword", "%"+keyword+"%") + } + _, err = query. State(DNSProviderStateEnabled). Offset(offset). Limit(size). @@ -125,7 +134,7 @@ func (this *DNSProviderDAO) ListEnabledDNSProviders(tx *dbs.Tx, adminId int64, u return } -// 列出所有服务商 +// FindAllEnabledDNSProviders 列出所有服务商 func (this *DNSProviderDAO) FindAllEnabledDNSProviders(tx *dbs.Tx, adminId int64, userId int64) (result []*DNSProvider, err error) { _, err = dbutils.NewQuery(tx, this, adminId, userId). State(DNSProviderStateEnabled). @@ -135,7 +144,7 @@ func (this *DNSProviderDAO) FindAllEnabledDNSProviders(tx *dbs.Tx, adminId int64 return } -// 查询某个类型下的所有服务商 +// FindAllEnabledDNSProvidersWithType 查询某个类型下的所有服务商 func (this *DNSProviderDAO) FindAllEnabledDNSProvidersWithType(tx *dbs.Tx, providerType string) (result []*DNSProvider, err error) { _, err = this.Query(tx). State(DNSProviderStateEnabled). @@ -146,7 +155,7 @@ func (this *DNSProviderDAO) FindAllEnabledDNSProvidersWithType(tx *dbs.Tx, provi return } -// 更新数据更新时间 +// UpdateProviderDataUpdatedTime 更新数据更新时间 func (this *DNSProviderDAO) UpdateProviderDataUpdatedTime(tx *dbs.Tx, providerId int64) error { _, err := this.Query(tx). Pk(providerId). diff --git a/internal/rpc/services/service_dns_provider.go b/internal/rpc/services/service_dns_provider.go index 67198b7f..3fefe982 100644 --- a/internal/rpc/services/service_dns_provider.go +++ b/internal/rpc/services/service_dns_provider.go @@ -26,7 +26,7 @@ func (this *DNSProviderService) CreateDNSProvider(ctx context.Context, req *pb.C if err != nil { return nil, err } - + return &pb.CreateDNSProviderResponse{DnsProviderId: providerId}, nil } @@ -59,7 +59,7 @@ func (this *DNSProviderService) CountAllEnabledDNSProviders(ctx context.Context, tx := this.NullTx() - count, err := dns.SharedDNSProviderDAO.CountAllEnabledDNSProviders(tx, req.AdminId, req.UserId) + count, err := dns.SharedDNSProviderDAO.CountAllEnabledDNSProviders(tx, req.AdminId, req.UserId, req.Keyword) if err != nil { return nil, err } @@ -78,7 +78,7 @@ func (this *DNSProviderService) ListEnabledDNSProviders(ctx context.Context, req tx := this.NullTx() - providers, err := dns.SharedDNSProviderDAO.ListEnabledDNSProviders(tx, req.AdminId, req.UserId, req.Offset, req.Size) + providers, err := dns.SharedDNSProviderDAO.ListEnabledDNSProviders(tx, req.AdminId, req.UserId, req.Keyword, req.Offset, req.Size) if err != nil { return nil, err }