diff --git a/internal/web/actions/default/servers/server/settings/http/index.go b/internal/web/actions/default/servers/server/settings/http/index.go index 5a35004d..3e3c6e50 100644 --- a/internal/web/actions/default/servers/server/settings/http/index.go +++ b/internal/web/actions/default/servers/server/settings/http/index.go @@ -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 { diff --git a/internal/web/actions/default/servers/server/settings/https/index.go b/internal/web/actions/default/servers/server/settings/https/index.go index b063a43c..378daba8 100644 --- a/internal/web/actions/default/servers/server/settings/https/index.go +++ b/internal/web/actions/default/servers/server/settings/https/index.go @@ -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 { diff --git a/web/public/js/components.js b/web/public/js/components.js index 99b18d17..c9c86e8d 100644 --- a/web/public/js/components.js +++ b/web/public/js/components.js @@ -718,7 +718,7 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio 选择证书
-
+
{{cert.name}} / {{cert.dnsNames}} / 有效至{{formatTime(cert.timeEndAt)}}  
diff --git a/web/public/js/components.src.js b/web/public/js/components.src.js index 53f36341..8dee8b2d 100755 --- a/web/public/js/components.src.js +++ b/web/public/js/components.src.js @@ -2597,7 +2597,7 @@ Vue.component("ssl-config-box", { 选择证书
-
+
{{cert.name}} / {{cert.dnsNames}} / 有效至{{formatTime(cert.timeEndAt)}}  
diff --git a/web/public/js/components/server/ssl-config-box.js b/web/public/js/components/server/ssl-config-box.js index 0ab7c999..3691f2fc 100644 --- a/web/public/js/components/server/ssl-config-box.js +++ b/web/public/js/components/server/ssl-config-box.js @@ -354,7 +354,7 @@ Vue.component("ssl-config-box", { 选择证书
-
+
{{cert.name}} / {{cert.dnsNames}} / 有效至{{formatTime(cert.timeEndAt)}}