diff --git a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go index 70ea39b9..db30e501 100644 --- a/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go +++ b/internal/web/actions/default/servers/server/settings/locations/reverseProxy/setting.go @@ -6,6 +6,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/types" ) type SettingAction struct { @@ -62,6 +63,11 @@ func (this *SettingAction) RunPost(params struct { return } + err = reverseProxyConfig.Init() + if err != nil { + this.Fail("配置校验失败:" + err.Error()) + } + // 设置是否启用 _, err = this.RPC().HTTPLocationRPC().UpdateHTTPLocationReverseProxy(this.AdminContext(), &pb.UpdateHTTPLocationReverseProxyRequest{ LocationId: params.LocationId, @@ -74,11 +80,12 @@ func (this *SettingAction) RunPost(params struct { // 设置反向代理相关信息 _, err = this.RPC().ReverseProxyRPC().UpdateReverseProxy(this.AdminContext(), &pb.UpdateReverseProxyRequest{ - ReverseProxyId: reverseProxyConfig.Id, - RequestHost: reverseProxyConfig.RequestHost, - RequestURI: reverseProxyConfig.RequestURI, - StripPrefix: reverseProxyConfig.StripPrefix, - AutoFlush: reverseProxyConfig.AutoFlush, + ReverseProxyId: reverseProxyConfig.Id, + RequestHostType: types.Int32(reverseProxyConfig.RequestHostType), + RequestHost: reverseProxyConfig.RequestHost, + RequestURI: reverseProxyConfig.RequestURI, + StripPrefix: reverseProxyConfig.StripPrefix, + AutoFlush: reverseProxyConfig.AutoFlush, }) this.Success() diff --git a/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go b/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go index 66f0db08..2f67d8ce 100644 --- a/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go +++ b/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go @@ -6,6 +6,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/actions" + "github.com/iwind/TeaGo/types" ) type SettingAction struct { @@ -62,6 +63,11 @@ func (this *SettingAction) RunPost(params struct { return } + err = reverseProxyConfig.Init() + if err != nil { + this.Fail("配置校验失败:" + err.Error()) + } + // 设置是否启用 _, err = this.RPC().ServerRPC().UpdateServerReverseProxy(this.AdminContext(), &pb.UpdateServerReverseProxyRequest{ ServerId: params.ServerId, @@ -74,11 +80,12 @@ func (this *SettingAction) RunPost(params struct { // 设置反向代理相关信息 _, err = this.RPC().ReverseProxyRPC().UpdateReverseProxy(this.AdminContext(), &pb.UpdateReverseProxyRequest{ - ReverseProxyId: reverseProxyConfig.Id, - RequestHost: reverseProxyConfig.RequestHost, - RequestURI: reverseProxyConfig.RequestURI, - StripPrefix: reverseProxyConfig.StripPrefix, - AutoFlush: reverseProxyConfig.AutoFlush, + ReverseProxyId: reverseProxyConfig.Id, + RequestHostType: types.Int32(reverseProxyConfig.RequestHostType), + RequestHost: reverseProxyConfig.RequestHost, + RequestURI: reverseProxyConfig.RequestURI, + StripPrefix: reverseProxyConfig.StripPrefix, + AutoFlush: reverseProxyConfig.AutoFlush, }) this.Success() diff --git a/web/public/js/components/server/origin-list-box.js b/web/public/js/components/server/origin-list-box.js index d1711051..6dbcc9ed 100644 --- a/web/public/js/components/server/origin-list-box.js +++ b/web/public/js/components/server/origin-list-box.js @@ -77,12 +77,12 @@ Vue.component("origin-list-table", {
请求源站时的Host,用于修改源站接收到的域名 + ,"跟随代理服务"是指源站接收到的域名和当前代理服务保持一致 + ,"跟随源站"是指源站接收到的域名仍然是填写的源站地址中的信息,不随代理服务域名改变而改变 + ,自定义Host内容中支持请求变量。
+请求后端服务器时的Host,用于修改后端服务器接收到的域名,默认和客户端请求的主机名一致,通常不必填写,支持请求变量。
-| 用HTTP/2 | +启用HTTP/2 |
diff --git a/web/views/@default/servers/server/settings/locations/reverseProxy/updateSchedulingPopup.html b/web/views/@default/servers/server/settings/locations/reverseProxy/updateSchedulingPopup.html
index 76a41194..d79dde5a 100644
--- a/web/views/@default/servers/server/settings/locations/reverseProxy/updateSchedulingPopup.html
+++ b/web/views/@default/servers/server/settings/locations/reverseProxy/updateSchedulingPopup.html
@@ -52,7 +52,7 @@
参数名 |
- |
记录或指定后端服务器的参数名,只能是英文字母和数字的组合,不允许有下划线(因为在HTTP Header中下划线是不标准的) +记录或指定源站的参数名,只能是英文字母和数字的组合,不允许有下划线(因为在HTTP Header中下划线是不标准的) |
记录或指定后端服务器的参数名,只能是英文字母和数字的组合,不允许有下划线(因为在HTTP Header中下划线是不标准的)
+记录或指定源站的参数名,只能是英文字母和数字的组合,不允许有下划线(因为在HTTP Header中下划线是不标准的)