From 6c3d24d895902edf1450628743e24a1a0a282d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Sat, 5 Nov 2022 19:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9F=9F=E5=90=8D=E8=A7=A3?= =?UTF-8?q?=E6=9E=90--DNS=E6=9C=8D=E5=8A=A1=E5=95=86--=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=97=B6=E6=97=A0=E6=B3=95=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E9=9B=86=E7=BE=A4=E9=A2=9D=E5=A4=96=E9=99=84=E5=8A=A0=E7=9A=84?= =?UTF-8?q?CNAME=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_cluster_dao.go | 2 +- internal/rpc/services/service_dns_domain.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/db/models/node_cluster_dao.go b/internal/db/models/node_cluster_dao.go index 84c47e61..c75d0a93 100644 --- a/internal/db/models/node_cluster_dao.go +++ b/internal/db/models/node_cluster_dao.go @@ -437,7 +437,7 @@ func (this *NodeClusterDAO) FindAllEnabledClustersWithDNSDomainId(tx *dbs.Tx, dn _, err = this.Query(tx). State(NodeClusterStateEnabled). Attr("dnsDomainId", dnsDomainId). - Result("id", "name", "dnsName", "dnsDomainId", "isOn"). + Result("id", "name", "dnsName", "dnsDomainId", "isOn", "dns"). Slice(&result). FindAll() return diff --git a/internal/rpc/services/service_dns_domain.go b/internal/rpc/services/service_dns_domain.go index dba4370c..debb8453 100644 --- a/internal/rpc/services/service_dns_domain.go +++ b/internal/rpc/services/service_dns_domain.go @@ -351,7 +351,7 @@ func (this *DNSDomainService) ExistAvailableDomains(ctx context.Context, req *pb // 转换域名信息 func (this *DNSDomainService) convertDomainToPB(tx *dbs.Tx, domain *dns.DNSDomain) (*pb.DNSDomain, error) { - domainId := int64(domain.Id) + var domainId = int64(domain.Id) defaultRoute, err := dnsutils.FindDefaultDomainRoute(tx, domain) if err != nil { @@ -383,7 +383,6 @@ func (this *DNSDomainService) convertDomainToPB(tx *dbs.Tx, domain *dns.DNSDomai countAllNodes1 := int64(0) countAllServers1 := int64(0) for _, cluster := range clusters { - _, nodeRecords, serverRecords, countAllNodes, countAllServers, nodesChanged2, serversChanged2, err := this.findClusterDNSChanges(cluster, records, domain.Name, defaultRoute) if err != nil { return nil, err