diff --git a/agent/app/service/website.go b/agent/app/service/website.go index cef2d1a1a..269a8baaf 100644 --- a/agent/app/service/website.go +++ b/agent/app/service/website.go @@ -257,7 +257,7 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error) var ( domains []model.WebsiteDomain ) - domains, _, _, err = getWebsiteDomains(create.Domains, defaultHttpPort, 0) + domains, _, _, err = getWebsiteDomains(create.Domains, defaultHttpPort, nginxInstall.HttpsPort, 0) if err != nil { return err } @@ -680,7 +680,7 @@ func (w WebsiteService) CreateWebsiteDomain(create request.WebsiteDomainCreate) domainModels []model.WebsiteDomain addPorts []int ) - httpPort, _, err := getAppInstallPort(constant.AppOpenresty) + httpPort, httpsPort, err := getAppInstallPort(constant.AppOpenresty) if err != nil { return nil, err } @@ -689,7 +689,7 @@ func (w WebsiteService) CreateWebsiteDomain(create request.WebsiteDomainCreate) return nil, err } - domainModels, addPorts, _, err = getWebsiteDomains(create.Domains, httpPort, create.WebsiteID) + domainModels, addPorts, _, err = getWebsiteDomains(create.Domains, httpPort, httpsPort, create.WebsiteID) if err != nil { return nil, err } diff --git a/agent/app/service/website_utils.go b/agent/app/service/website_utils.go index 8ebe3084f..1a4a9958d 100644 --- a/agent/app/service/website_utils.go +++ b/agent/app/service/website_utils.go @@ -1031,7 +1031,7 @@ func chownRootDir(path string) error { return nil } -func getWebsiteDomains(domains []request.WebsiteDomain, defaultPort int, websiteID uint) (domainModels []model.WebsiteDomain, addPorts []int, addDomains []string, err error) { +func getWebsiteDomains(domains []request.WebsiteDomain, defaultHTTPPort, defaultHTTPsPort int, websiteID uint) (domainModels []model.WebsiteDomain, addPorts []int, addDomains []string, err error) { var ( ports = make(map[int]struct{}) existPort = make(map[int]struct{}) @@ -1056,7 +1056,7 @@ func getWebsiteDomains(domains []request.WebsiteDomain, defaultPort int, website domainModel.Domain = strings.ToLower(domainModel.Domain) domainModel.Port = domain.Port if domain.Port == 0 { - domain.Port = defaultPort + domain.Port = defaultHTTPPort } domainModel.SSL = domain.SSL domainModel.WebsiteID = websiteID @@ -1077,7 +1077,7 @@ func getWebsiteDomains(domains []request.WebsiteDomain, defaultPort int, website } for port := range ports { - if port == defaultPort { + if port == defaultHTTPPort || port == defaultHTTPsPort { addPorts = append(addPorts, port) continue } @@ -1098,7 +1098,7 @@ func getWebsiteDomains(domains []request.WebsiteDomain, defaultPort int, website err = buserr.WithMap("ErrPortExist", errMap, nil) return } - if port != 443 && common.ScanPort(port) { + if port != defaultHTTPsPort && common.ScanPort(port) { err = buserr.WithDetail("ErrPortInUsed", port, nil) return }