mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2025-10-26 08:46:28 +08:00
feat: 网站新增域名,自动放开相应端口 (#899)
This commit is contained in:
parent
28ebf7a0cc
commit
8ce73a38dd
2 changed files with 16 additions and 11 deletions
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue