diff --git a/internal/db/models/dns/dns_provider_dao.go b/internal/db/models/dns/dns_provider_dao.go index 7449c062..bda6939c 100644 --- a/internal/db/models/dns/dns_provider_dao.go +++ b/internal/db/models/dns/dns_provider_dao.go @@ -107,7 +107,7 @@ func (this *DNSProviderDAO) UpdateDNSProvider(tx *dbs.Tx, dnsProviderId int64, n } // CountAllEnabledDNSProviders 计算服务商数量 -func (this *DNSProviderDAO) CountAllEnabledDNSProviders(tx *dbs.Tx, adminId int64, userId int64, keyword string, domain string) (int64, error) { +func (this *DNSProviderDAO) CountAllEnabledDNSProviders(tx *dbs.Tx, adminId int64, userId int64, keyword string, domain string, providerType string) (int64, error) { var query = dbutils.NewQuery(tx, this, adminId, userId) if len(keyword) > 0 { query.Where("(name LIKE :keyword)"). @@ -119,12 +119,16 @@ func (this *DNSProviderDAO) CountAllEnabledDNSProviders(tx *dbs.Tx, adminId int6 query.Param("domain", domain) } + if len(providerType) > 0 { + query.Attr("type", providerType) + } + return query.State(DNSProviderStateEnabled). Count() } // ListEnabledDNSProviders 列出单页服务商 -func (this *DNSProviderDAO) ListEnabledDNSProviders(tx *dbs.Tx, adminId int64, userId int64, keyword string, domain string, offset int64, size int64) (result []*DNSProvider, err error) { +func (this *DNSProviderDAO) ListEnabledDNSProviders(tx *dbs.Tx, adminId int64, userId int64, keyword string, domain string, providerType 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)"). @@ -134,6 +138,9 @@ func (this *DNSProviderDAO) ListEnabledDNSProviders(tx *dbs.Tx, adminId int64, u query.Where("id IN (SELECT providerId FROM " + SharedDNSDomainDAO.Table + " WHERE state=1 AND name=:domain)") query.Param("domain", domain) } + if len(providerType) > 0 { + query.Attr("type", providerType) + } _, err = query. State(DNSProviderStateEnabled). Offset(offset). diff --git a/internal/nodes/api_node.go b/internal/nodes/api_node.go index 62499b2a..e66100d6 100644 --- a/internal/nodes/api_node.go +++ b/internal/nodes/api_node.go @@ -154,7 +154,7 @@ func (this *APINode) Start() { // Daemon 实现守护进程 func (this *APINode) Daemon() { - path := os.TempDir() + "/edge-api.sock" + path := os.TempDir() + "/" + teaconst.ProcessName + ".sock" isDebug := lists.ContainsString(os.Args, "debug") isDebug = true for { diff --git a/internal/rpc/services/service_dns_provider.go b/internal/rpc/services/service_dns_provider.go index 2ab97583..50f7c4d0 100644 --- a/internal/rpc/services/service_dns_provider.go +++ b/internal/rpc/services/service_dns_provider.go @@ -59,7 +59,7 @@ func (this *DNSProviderService) CountAllEnabledDNSProviders(ctx context.Context, tx := this.NullTx() - count, err := dns.SharedDNSProviderDAO.CountAllEnabledDNSProviders(tx, req.AdminId, req.UserId, req.Keyword, req.Domain) + count, err := dns.SharedDNSProviderDAO.CountAllEnabledDNSProviders(tx, req.AdminId, req.UserId, req.Keyword, req.Domain, req.Type) if err != nil { return nil, err } @@ -76,9 +76,9 @@ func (this *DNSProviderService) ListEnabledDNSProviders(ctx context.Context, req // TODO 校验权限 - tx := this.NullTx() + var tx = this.NullTx() - providers, err := dns.SharedDNSProviderDAO.ListEnabledDNSProviders(tx, req.AdminId, req.UserId, req.Keyword, req.Domain, req.Offset, req.Size) + providers, err := dns.SharedDNSProviderDAO.ListEnabledDNSProviders(tx, req.AdminId, req.UserId, req.Keyword, req.Domain, req.Type, req.Offset, req.Size) if err != nil { return nil, err }