TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-04 05:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

启用服务HTTP/HTTPS设置时如果没有设置端口，则自动添加80/443

Browse Source
This commit is contained in:
GoEdgeLab
2022-06-08 20:11:38 +08:00
parent 84c4ab0cfe
commit 730bff7e1a
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/web/actions/default/servers/server/settings/http/index.go
View File

@@ -72,12 +72,22 @@ func (this *IndexAction) RunPost(params struct {
// 记录日志
defer this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTP设置", params.ServerId)
addresses := []*serverconfigs.NetworkAddressConfig{}
var addresses = []*serverconfigs.NetworkAddressConfig{}
err := json.Unmarshal([]byte(params.Addresses), &addresses)
if err != nil {
this.Fail("端口地址解析失败：" + err.Error())
}
// 如果启用HTTP时没有填写端口，则默认为80
if params.IsOn && len(addresses) == 0 {
addresses = []*serverconfigs.NetworkAddressConfig{
{
Protocol: serverconfigs.ProtocolHTTP,
PortRange: "80",
},
}
}
// 检查端口地址是否正确
for _, addr := range addresses {
err = addr.Init()
@@ -100,7 +110,7 @@ func (this *IndexAction) RunPost(params struct {
if !isOk {
return
}
httpConfig := &serverconfigs.HTTPProtocolConfig{}
var httpConfig = &serverconfigs.HTTPProtocolConfig{}
if len(server.HttpJSON) > 0 {
err = json.Unmarshal(server.HttpJSON, httpConfig)
if err != nil {

14
internal/web/actions/default/servers/server/settings/https/index.go
View File

@@ -82,12 +82,22 @@ func (this *IndexAction) RunPost(params struct {
// 记录日志
defer this.CreateLog(oplogs.LevelInfo, "修改服务 %d 的HTTPS设置", params.ServerId)
addresses := []*serverconfigs.NetworkAddressConfig{}
var addresses = []*serverconfigs.NetworkAddressConfig{}
err := json.Unmarshal([]byte(params.Addresses), &addresses)
if err != nil {
this.Fail("端口地址解析失败：" + err.Error())
}
// 如果启用HTTPS时没有填写端口，则默认为443
if params.IsOn && len(addresses) == 0 {
addresses = []*serverconfigs.NetworkAddressConfig{
{
Protocol: serverconfigs.ProtocolHTTPS,
PortRange: "443",
},
}
}
// 检查端口地址是否正确
for _, addr := range addresses {
err = addr.Init()
@@ -177,7 +187,7 @@ func (this *IndexAction) RunPost(params struct {
if !isOk {
return
}
httpsConfig := &serverconfigs.HTTPSProtocolConfig{}
var httpsConfig = &serverconfigs.HTTPSProtocolConfig{}
if len(server.HttpsJSON) > 0 {
err = json.Unmarshal(server.HttpsJSON, httpsConfig)
if err != nil {