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

优化代码

Browse Source
This commit is contained in:
刘祥超
2022-09-21 15:09:39 +08:00
parent 6f8c5a8e99
commit 2d2b7b7bff
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,8 +149,8 @@ func (this *NodeClusterDAO) CreateCluster(tx *dbs.Tx, adminId int64, name string
var dnsConfig = &dnsconfigs.ClusterDNSConfig{ var dnsConfig = &dnsconfigs.ClusterDNSConfig{
NodesAutoSync: true, NodesAutoSync: true,
ServersAutoSync: true, ServersAutoSync: true,
CNameRecords: []string{}, CNAMERecords: []string{},
CNameAsDomain: true, CNAMEAsDomain: true,
TTL: dnsTTL, TTL: dnsTTL,
IncludingLnNodes: true, IncludingLnNodes: true,
} }
@@ -529,9 +529,9 @@ func (this *NodeClusterDAO) UpdateClusterDNS(tx *dbs.Tx, clusterId int64, dnsNam
var dnsConfig = &dnsconfigs.ClusterDNSConfig{ var dnsConfig = &dnsconfigs.ClusterDNSConfig{
NodesAutoSync: nodesAutoSync, NodesAutoSync: nodesAutoSync,
ServersAutoSync: serversAutoSync, ServersAutoSync: serversAutoSync,
CNameRecords: cnameRecords, CNAMERecords: cnameRecords,
TTL: ttl, TTL: ttl,
CNameAsDomain: cnameAsDomain, CNAMEAsDomain: cnameAsDomain,
IncludingLnNodes: includingLnNodes, IncludingLnNodes: includingLnNodes,
} }
dnsJSON, err := json.Marshal(dnsConfig) dnsJSON, err := json.Marshal(dnsConfig)

4
internal/db/models/node_cluster_model_ext.go
View File

@@ -16,12 +16,12 @@ func (this *NodeCluster) DecodeDNSConfig() (*dnsconfigs.ClusterDNSConfig, error)
return &dnsconfigs.ClusterDNSConfig{ return &dnsconfigs.ClusterDNSConfig{
NodesAutoSync: false, NodesAutoSync: false,
ServersAutoSync: false, ServersAutoSync: false,
CNameAsDomain: true, CNAMEAsDomain: true,
IncludingLnNodes: true, IncludingLnNodes: true,
}, nil }, nil
} }
var dnsConfig = &dnsconfigs.ClusterDNSConfig{ var dnsConfig = &dnsconfigs.ClusterDNSConfig{
CNameAsDomain: true, CNAMEAsDomain: true,
IncludingLnNodes: true, IncludingLnNodes: true,
} }
err := json.Unmarshal(this.Dns, &dnsConfig) err := json.Unmarshal(this.Dns, &dnsConfig)

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

@@ -1081,7 +1081,7 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap
if domain != nil { if domain != nil {
var cname = server.DnsName + "." + domain.Name var cname = server.DnsName + "." + domain.Name
config.CNameDomain = cname config.CNameDomain = cname
if clusterDNSConfig.CNameAsDomain { if clusterDNSConfig.CNAMEAsDomain {
config.CNameAsDomain = true config.CNameAsDomain = true
config.AliasServerNames = append(config.AliasServerNames, cname) config.AliasServerNames = append(config.AliasServerNames, cname)
} }

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

@@ -459,7 +459,7 @@ func (this *DNSDomainService) findClusterDNSChanges(cluster *models.NodeCluster,
if len(cluster.Dns) > 0 { if len(cluster.Dns) > 0 {
dnsConfig, _ := cluster.DecodeDNSConfig() dnsConfig, _ := cluster.DecodeDNSConfig()
if dnsConfig != nil { if dnsConfig != nil {
cnameRecords = dnsConfig.CNameRecords cnameRecords = dnsConfig.CNAMERecords
if dnsConfig.TTL > 0 { if dnsConfig.TTL > 0 {
ttl = dnsConfig.TTL ttl = dnsConfig.TTL
} }

8
internal/rpc/services/service_node_cluster.go
View File

@@ -493,9 +493,9 @@ func (this *NodeClusterService) FindEnabledNodeClusterDNS(ctx context.Context, r
Provider: nil, Provider: nil,
NodesAutoSync: dnsConfig.NodesAutoSync, NodesAutoSync: dnsConfig.NodesAutoSync,
ServersAutoSync: dnsConfig.ServersAutoSync, ServersAutoSync: dnsConfig.ServersAutoSync,
CnameRecords: dnsConfig.CNameRecords, CnameRecords: dnsConfig.CNAMERecords,
Ttl: dnsConfig.TTL, Ttl: dnsConfig.TTL,
CnameAsDomain: dnsConfig.CNameAsDomain, CnameAsDomain: dnsConfig.CNAMEAsDomain,
IncludingLnNodes: dnsConfig.IncludingLnNodes, IncludingLnNodes: dnsConfig.IncludingLnNodes,
}, nil }, nil
} }
@@ -553,9 +553,9 @@ func (this *NodeClusterService) FindEnabledNodeClusterDNS(ctx context.Context, r
Provider: pbProvider, Provider: pbProvider,
NodesAutoSync: dnsConfig.NodesAutoSync, NodesAutoSync: dnsConfig.NodesAutoSync,
ServersAutoSync: dnsConfig.ServersAutoSync, ServersAutoSync: dnsConfig.ServersAutoSync,
CnameRecords: dnsConfig.CNameRecords, CnameRecords: dnsConfig.CNAMERecords,
Ttl: dnsConfig.TTL, Ttl: dnsConfig.TTL,
CnameAsDomain: dnsConfig.CNameAsDomain, CnameAsDomain: dnsConfig.CNAMEAsDomain,
IncludingLnNodes: dnsConfig.IncludingLnNodes, IncludingLnNodes: dnsConfig.IncludingLnNodes,
DefaultRoute: defaultRoute, DefaultRoute: defaultRoute,
}, nil }, nil

2
internal/tasks/dns_task_executor.go
View File

@@ -468,7 +468,7 @@ func (this *DNSTaskExecutor) doCluster(taskId int64, clusterId int64) error {
// 自动设置的CNAME // 自动设置的CNAME
var cnameRecords = []string{} var cnameRecords = []string{}
if dnsConfig != nil { if dnsConfig != nil {
cnameRecords = dnsConfig.CNameRecords cnameRecords = dnsConfig.CNAMERecords
} }
for _, cnameRecord := range cnameRecords { for _, cnameRecord := range cnameRecords {
serverDNSNames = append(serverDNSNames, cnameRecord) serverDNSNames = append(serverDNSNames, cnameRecord)