diff --git a/internal/web/actions/default/servers/server/settings/origins/addPopup.go b/internal/web/actions/default/servers/server/settings/origins/addPopup.go index 4f302b68..debcf3e2 100644 --- a/internal/web/actions/default/servers/server/settings/origins/addPopup.go +++ b/internal/web/actions/default/servers/server/settings/origins/addPopup.go @@ -98,7 +98,7 @@ func (this *AddPopupAction) RunPost(params struct { } else if params.Protocol == "https" { addr += ":443" } else { - this.Fail("地址中需要带有端口") + this.FailField("addr", "源站地址中需要带有端口") } portIndex = strings.LastIndex(addr, ":") } @@ -107,19 +107,19 @@ func (this *AddPopupAction) RunPost(params struct { // 检查端口号 if port == "0" { - this.Fail("端口号不能为0") + this.FailField("addr", "源站端口号不能为0") } if !configutils.HasVariables(port) { // 必须是整数 if !regexp.MustCompile(`^\d+$`).MatchString(port) { - this.Fail("端口号只能为整数") + this.FailField("addr", "源站端口号只能为整数") } var portInt = types.Int(port) if portInt == 0 { - this.Fail("端口号不能为0") + this.FailField("addr", "源站端口号不能为0") } if portInt > 65535 { - this.Fail("端口号不能大于65535") + this.FailField("addr", "源站端口号不能大于65535") } } diff --git a/internal/web/actions/default/servers/server/settings/origins/updatePopup.go b/internal/web/actions/default/servers/server/settings/origins/updatePopup.go index 8ff99304..1efcf146 100644 --- a/internal/web/actions/default/servers/server/settings/origins/updatePopup.go +++ b/internal/web/actions/default/servers/server/settings/origins/updatePopup.go @@ -164,7 +164,7 @@ func (this *UpdatePopupAction) RunPost(params struct { } else if params.Protocol == "https" { addr += ":443" } else { - this.Fail("地址中需要带有端口") + this.FailField("addr", "源站地址中需要带有端口") } portIndex = strings.LastIndex(addr, ":") } @@ -172,19 +172,19 @@ func (this *UpdatePopupAction) RunPost(params struct { var port = addr[portIndex+1:] // 检查端口号 if port == "0" { - this.Fail("端口号不能为0") + this.FailField("addr", "源站端口号不能为0") } if !configutils.HasVariables(port) { // 必须是整数 if !regexp.MustCompile(`^\d+$`).MatchString(port) { - this.Fail("端口号只能为整数") + this.FailField("addr", "源站端口号只能为整数") } var portInt = types.Int(port) if portInt == 0 { - this.Fail("端口号不能为0") + this.FailField("addr", "源站端口号不能为0") } if portInt > 65535 { - this.Fail("端口号不能大于65535") + this.FailField("addr", "源站端口号不能大于65535") } } diff --git a/web/views/@default/servers/server/settings/origins/addPopup.html b/web/views/@default/servers/server/settings/origins/addPopup.html index 042fec3b..b863f33e 100644 --- a/web/views/@default/servers/server/settings/origins/addPopup.html +++ b/web/views/@default/servers/server/settings/origins/addPopup.html @@ -16,13 +16,13 @@ - - @@ -45,11 +45,11 @@ - + 回源主机名 -

请求源站时的Host,用于修改源站接收到的域名,自定义Host内容中支持请求变量。

+

请求源站时的Host,用于修改源站接收到的域名,自定义Host内容中支持请求变量

diff --git a/web/views/@default/servers/server/settings/origins/addPopup.js b/web/views/@default/servers/server/settings/origins/addPopup.js index 76031719..7dd43372 100644 --- a/web/views/@default/servers/server/settings/origins/addPopup.js +++ b/web/views/@default/servers/server/settings/origins/addPopup.js @@ -6,6 +6,10 @@ Tea.context(function () { if (this.isHTTP) { this.protocol = "http" + } else if (this.serverType == "tcpProxy") { + this.protocol = "tcp" + } else if (this.serverType == "udpProxy") { + this.protocol = "udp" } this.changeProtocol = function () { diff --git a/web/views/@default/servers/server/settings/origins/updatePopup.html b/web/views/@default/servers/server/settings/origins/updatePopup.html index 36614a64..4ebd5ae5 100644 --- a/web/views/@default/servers/server/settings/origins/updatePopup.html +++ b/web/views/@default/servers/server/settings/origins/updatePopup.html @@ -46,7 +46,7 @@ - + 回源主机名