diff --git a/backend/app/service/app.go b/backend/app/service/app.go index eb617b2f2..24d6b155b 100644 --- a/backend/app/service/app.go +++ b/backend/app/service/app.go @@ -343,13 +343,6 @@ func (a AppService) Install(ctx context.Context, req request.AppInstallCreate) ( } go upApp(appInstall) go updateToolApp(appInstall) - ports := []int{appInstall.HttpPort} - if appInstall.HttpsPort > 0 { - ports = append(ports, appInstall.HttpsPort) - } - go func() { - _ = OperateFirewallPort(nil, ports) - }() return } diff --git a/backend/app/service/website.go b/backend/app/service/website.go index 1c046679f..33abef84b 100644 --- a/backend/app/service/website.go +++ b/backend/app/service/website.go @@ -10,6 +10,7 @@ import ( "fmt" "github.com/1Panel-dev/1Panel/backend/app/api/v1/helper" "github.com/1Panel-dev/1Panel/backend/utils/cmd" + "github.com/1Panel-dev/1Panel/backend/utils/common" "github.com/1Panel-dev/1Panel/backend/utils/nginx" "github.com/1Panel-dev/1Panel/backend/utils/nginx/components" "github.com/1Panel-dev/1Panel/backend/utils/nginx/parser" @@ -409,10 +410,16 @@ func (w WebsiteService) DeleteWebsite(req request.WebsiteDelete) error { } func (w WebsiteService) CreateWebsiteDomain(create request.WebsiteDomainCreate) (model.WebsiteDomain, error) { - var domainModel model.WebsiteDomain - var ports []int - var domains []string - + var ( + domainModel model.WebsiteDomain + ports []int + domains []string + ) + if create.Port != 80 { + if common.ScanPort(create.Port) { + return domainModel, buserr.WithDetail(constant.ErrPortInUsed, create.Port, nil) + } + } website, err := websiteRepo.GetFirst(commonRepo.WithByID(create.WebsiteID)) if err != nil { return domainModel, err @@ -429,6 +436,11 @@ func (w WebsiteService) CreateWebsiteDomain(create request.WebsiteDomainCreate) Port: create.Port, WebsiteID: create.WebsiteID, } + if create.Port != 80 { + go func() { + _ = OperateFirewallPort(nil, []int{create.Port}) + }() + } return domainModel, websiteDomainRepo.Create(context.TODO(), &domainModel) }