gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-19 08:19:15 +08:00
Code

feat: 网站支持不同域名使用同一个端口 (#2071)

Browse Source 
Refs https://github.com/1Panel-dev/1Panel/issues/1997
This commit is contained in:
zhengkunwang 2023-08-25 23:40:17 +08:00 committed by GitHub
parent f546ffee90
commit 680e93dcd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/app/service/website.go
View File

@ -9,6 +9,7 @@ import (
"encoding/pem"
"errors"
"fmt"
"github.com/1Panel-dev/1Panel/backend/utils/common"
"os"
"path"
"reflect"
@ -454,6 +455,15 @@ func (w WebsiteService) CreateWebsiteDomain(create request.WebsiteDomainCreate)
return domainModel, err
}
if existDomains, _ := websiteDomainRepo.GetBy(websiteDomainRepo.WithPort(create.Port)); len(existDomains) == 0 {
if existAppInstall, _ := appInstallRepo.GetFirst(appInstallRepo.WithPort(create.Port)); !reflect.DeepEqual(existAppInstall, model.AppInstall{}) {
return domainModel, buserr.WithMap(constant.ErrPortInOtherApp, map[string]interface{}{"port": create.Port, "apps": existAppInstall.App.Name}, nil)
}
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

2
backend/i18n/lang/en.yaml
View File

@ -20,7 +20,7 @@ ErrPortInUsed: "{{ .detail }} port already in use"
ErrAppLimit: "App exceeds install limit"
ErrAppRequired: "{{ .detail }} app is required"
ErrNotInstall: "App not installed"
ErrPortInOtherApp: "{{ .port }} port already in use by {{ .apps }}"
ErrPortInOtherApp: "{{ .port }} port already in use by app {{ .apps }}"
ErrDbUserNotValid: "Stock database, username and password do not match！"
ErrDockerComposeNotValid: "docker-compose file format error!"
ErrUpdateBuWebsite: 'The application was updated successfully, but the modification of the website configuration file failed, please check the configuration!'

2
backend/i18n/lang/zh-Hant.yaml
View File

@ -20,7 +20,7 @@ ErrPortInUsed: "{{ .detail }} 端口已被佔用！"
ErrAppLimit: "應用超出安裝數量限制"
ErrAppRequired: "請先安裝 {{ .detail }} 應用"
ErrNotInstall: "應用未安裝"
ErrPortInOtherApp: "{{ .port }} 端口已被 {{ .apps }}佔用！"
ErrPortInOtherApp: "{{ .port }} 端口已被應用 {{ .apps }} 佔用！"
ErrDbUserNotValid: "儲存資料庫，用戶名密碼不匹配！"
ErrDockerComposeNotValid: "docker-compose 文件格式錯誤"
ErrUpdateBuWebsite: '應用更新成功，但是網站配置文件修改失敗，請檢查配置！'

2
backend/i18n/lang/zh.yaml
View File

@ -20,7 +20,7 @@ ErrPortInUsed: "{{ .detail }} 端口已被占用！"
ErrAppLimit: "应用超出安装数量限制"
ErrAppRequired: "请先安装 {{ .detail }} 应用"
ErrNotInstall: "应用未安装"
ErrPortInOtherApp: "{{ .port }} 端口已被 {{ .apps }}占用！"
ErrPortInOtherApp: "{{ .port }} 端口已被应用 {{ .apps }} 占用！"
ErrDbUserNotValid: "存量数据库，用户名密码不匹配！"
ErrDockerComposeNotValid: "docker-compose 文件格式错误"
ErrUpdateBuWebsite: '应用更新成功，但是网站配置文件修改失败，请检查配置！'