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

优化代码

Browse Source
This commit is contained in:
刘祥超
2022-07-17 17:08:28 +08:00
parent 2484cd4ae6
commit bc7ee19962
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1086,13 +1086,16 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap
if err != nil { if err != nil {
return nil, err return nil, err
} }
if clusterDNSConfig.CNameAsDomain {
domain, err := dns.SharedDNSDomainDAO.FindEnabledDNSDomain(tx, int64(clusterDNS.DnsDomainId), cacheMap) domain, err := dns.SharedDNSDomainDAO.FindEnabledDNSDomain(tx, int64(clusterDNS.DnsDomainId), cacheMap)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if domain != nil { if domain != nil {
var cname = server.DnsName + "." + domain.Name var cname = server.DnsName + "." + domain.Name
config.CNameDomain = cname
if clusterDNSConfig.CNameAsDomain {
config.CNameAsDomain = true
config.AliasServerNames = append(config.AliasServerNames, cname) config.AliasServerNames = append(config.AliasServerNames, cname)
} }
} }

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

@@ -50,7 +50,7 @@ func (this *NodeTaskService) FindNodeTasks(ctx context.Context, req *pb.FindNode
return nil, err return nil, err
} }
if status != nil && len(status.OS) > 0 && len(status.Arch) > 0 && len(status.BuildVersion) > 0 { if status != nil && len(status.OS) > 0 && len(status.Arch) > 0 && len(status.BuildVersion) > 0 {
deployFile := installers.SharedDeployManager.FindNodeFile(status.OS, status.Arch) var deployFile = installers.SharedDeployManager.FindNodeFile(status.OS, status.Arch)
if deployFile != nil { if deployFile != nil {
if stringutil.VersionCompare(deployFile.Version, status.BuildVersion) > 0 { if stringutil.VersionCompare(deployFile.Version, status.BuildVersion) > 0 {
pbTasks = append(pbTasks, &pb.NodeTask{ pbTasks = append(pbTasks, &pb.NodeTask{