From 8ce73a38dd77264eb2bbfb431018167e1f29869f Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Sat, 6 May 2023 14:27:34 +0700
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E7=AB=99=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=EF=BC=8C=E8=87=AA=E5=8A=A8=E6=94=BE=E5=BC=80?=
 =?UTF-8?q?=E7=9B=B8=E5=BA=94=E7=AB=AF=E5=8F=A3=20(#899)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/app.go     |  7 -------
 backend/app/service/website.go | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

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)
 }