mirror of
https://github.com/TeaOSLab/EdgeAPI.git
synced 2025-12-03 23:20:24 +08:00
可以直接用CNAME访问服务
This commit is contained in:
@@ -562,6 +562,24 @@ func (this *ServerDAO) ComposeServerConfig(serverId int64) (*serverconfigs.Serve
|
|||||||
config.ServerNames = serverNames
|
config.ServerNames = serverNames
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CNAME
|
||||||
|
if server.ClusterId > 0 && len(server.DnsName) > 0 {
|
||||||
|
clusterDNS, err := SharedNodeClusterDAO.FindClusterDNSInfo(int64(server.ClusterId))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if clusterDNS != nil && clusterDNS.DnsDomainId > 0 {
|
||||||
|
domain, err := SharedDNSDomainDAO.FindEnabledDNSDomain(int64(clusterDNS.DnsDomainId))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if domain != nil {
|
||||||
|
cname := server.DnsName + "." + domain.Name
|
||||||
|
config.AliasServerNames = append(config.AliasServerNames, cname)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// HTTP
|
// HTTP
|
||||||
if len(server.Http) > 0 && server.Http != "null" {
|
if len(server.Http) > 0 && server.Http != "null" {
|
||||||
httpConfig := &serverconfigs.HTTPProtocolConfig{}
|
httpConfig := &serverconfigs.HTTPProtocolConfig{}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestServerDAO_ComposeServerConfig(t *testing.T) {
|
func TestServerDAO_ComposeServerConfig(t *testing.T) {
|
||||||
|
dbs.NotifyReady()
|
||||||
config, err := SharedServerDAO.ComposeServerConfig(1)
|
config, err := SharedServerDAO.ComposeServerConfig(1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
@@ -17,7 +18,18 @@ func TestServerDAO_ComposeServerConfig(t *testing.T) {
|
|||||||
logs.PrintAsJSON(config, t)
|
logs.PrintAsJSON(config, t)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestServerDAO_ComposeServerConfig_AliasServerNames(t *testing.T) {
|
||||||
|
dbs.NotifyReady()
|
||||||
|
config, err := SharedServerDAO.ComposeServerConfig(14)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
logs.PrintAsJSON(config.AliasServerNames, t)
|
||||||
|
}
|
||||||
|
|
||||||
func TestServerDAO_UpdateServerConfig(t *testing.T) {
|
func TestServerDAO_UpdateServerConfig(t *testing.T) {
|
||||||
|
dbs.NotifyReady()
|
||||||
|
|
||||||
config, err := SharedServerDAO.ComposeServerConfig(1)
|
config, err := SharedServerDAO.ComposeServerConfig(1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|||||||
Reference in New Issue
Block a user