TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-28 10:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复域名解析--DNS服务商--同步域名时无法解析集群额外附加的CNAME的问题

Browse Source
This commit is contained in:
刘祥超
2022-11-05 19:25:35 +08:00
parent b2a0204f6b
commit 6c3d24d895
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/db/models/node_cluster_dao.go
View File

@@ -437,7 +437,7 @@ func (this *NodeClusterDAO) FindAllEnabledClustersWithDNSDomainId(tx *dbs.Tx, dn
_, err = this.Query(tx). _, err = this.Query(tx).
State(NodeClusterStateEnabled). State(NodeClusterStateEnabled).
Attr("dnsDomainId", dnsDomainId). Attr("dnsDomainId", dnsDomainId).
Result("id", "name", "dnsName", "dnsDomainId", "isOn"). Result("id", "name", "dnsName", "dnsDomainId", "isOn", "dns").
Slice(&result). Slice(&result).
FindAll() FindAll()
return return

3
internal/rpc/services/service_dns_domain.go
View File

@@ -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) { 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) defaultRoute, err := dnsutils.FindDefaultDomainRoute(tx, domain)
if err != nil { if err != nil {
@@ -383,7 +383,6 @@ func (this *DNSDomainService) convertDomainToPB(tx *dbs.Tx, domain *dns.DNSDomai
countAllNodes1 := int64(0) countAllNodes1 := int64(0)
countAllServers1 := int64(0) countAllServers1 := int64(0)
for _, cluster := range clusters { for _, cluster := range clusters {
_, nodeRecords, serverRecords, countAllNodes, countAllServers, nodesChanged2, serversChanged2, err := this.findClusterDNSChanges(cluster, records, domain.Name, defaultRoute) _, nodeRecords, serverRecords, countAllNodes, countAllServers, nodesChanged2, serversChanged2, err := this.findClusterDNSChanges(cluster, records, domain.Name, defaultRoute)
if err != nil { if err != nil {
return nil, err return nil, err