diff --git a/pkg/common/cors.go b/pkg/common/cors.go index 529a806..0325af6 100644 --- a/pkg/common/cors.go +++ b/pkg/common/cors.go @@ -20,17 +20,16 @@ func DefaultCORSConfig() CORSConfig { configManager := config.GetConfigManager() cfg, _ := configManager.GetConfig() hosts := make([]string, 0) - //hosts = append(hosts, "*") + // hosts = append(hosts, "*") _, _, ipsList := config.GetIPs() - for _, server := range cfg.Servers.Instances { + for i := range cfg.Servers.Instances { + server := cfg.Servers.Instances[i] hosts = append(hosts, fmt.Sprintf("http://%s:%d", server.Host, server.Port)) hosts = append(hosts, fmt.Sprintf("https://%s:%d", server.Host, server.Port)) hosts = append(hosts, fmt.Sprintf("http://%s:%d", "localhost", server.Port)) - for _, extURL := range server.ExternalURLs { - hosts = append(hosts, extURL) - } + hosts = append(hosts, server.ExternalURLs...) for _, ip := range ipsList { hosts = append(hosts, fmt.Sprintf("http://%s:%d", ip.String(), server.Port)) hosts = append(hosts, fmt.Sprintf("https://%s:%d", ip.String(), server.Port)) diff --git a/pkg/config/server.go b/pkg/config/server.go index a532f5e..201f053 100644 --- a/pkg/config/server.go +++ b/pkg/config/server.go @@ -110,13 +110,13 @@ func (sc *ServersConfig) GetDefault() (*ServerInstanceConfig, error) { } // GetIPs - GetIP for pc -func GetIPs() (string, string, []net.IP) { +func GetIPs() (hostname string, ipList string, ipNetList []net.IP) { defer func() { if err := recover(); err != nil { fmt.Println("Recovered in GetIPs", err) } }() - hostname, _ := os.Hostname() + hostname, _ = os.Hostname() ipaddrlist := make([]net.IP, 0) iplist := "" addrs, err := net.LookupIP(hostname) @@ -125,7 +125,7 @@ func GetIPs() (string, string, []net.IP) { } for _, a := range addrs { - //cfg.LogInfo("\nFound IP Host Address: %s", a) + // cfg.LogInfo("\nFound IP Host Address: %s", a) if strings.Contains(a.String(), "127.0.0.1") { continue } @@ -135,7 +135,7 @@ func GetIPs() (string, string, []net.IP) { if iplist == "" { iff, _ := net.InterfaceAddrs() for _, a := range iff { - //cfg.LogInfo("\nFound IP Address: %s", a) + // cfg.LogInfo("\nFound IP Address: %s", a) if strings.Contains(a.String(), "127.0.0.1") { continue }