From 7c0412755b0248759fc73be8de3a55aae33da34e Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sat, 18 Mar 2023 22:12:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0context=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/web/actions/default/api/index.go | 2 +- internal/web/actions/default/servers/certs/updatePopup.go | 2 +- internal/web/actions/default/servers/certs/uploadPopup.go | 2 +- .../servers/groups/group/settings/httpReverseProxy/setting.go | 4 ++-- .../servers/groups/group/settings/tcpReverseProxy/setting.go | 4 ++-- .../servers/groups/group/settings/udpReverseProxy/setting.go | 2 +- .../web/actions/default/servers/server/settings/http/index.go | 2 +- .../actions/default/servers/server/settings/https/index.go | 2 +- .../servers/server/settings/locations/locationutils/utils.go | 2 +- .../servers/server/settings/locations/reverseProxy/setting.go | 4 ++-- .../default/servers/server/settings/reverseProxy/setting.go | 2 +- .../web/actions/default/settings/server/updateHTTPSPopup.go | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/internal/web/actions/default/api/index.go b/internal/web/actions/default/api/index.go index 815bea00..6627742f 100644 --- a/internal/web/actions/default/api/index.go +++ b/internal/web/actions/default/api/index.go @@ -82,7 +82,7 @@ func (this *IndexAction) RunGet(params struct{}) { this.ErrorPage(err) return } - _ = httpsConfig.Init() + _ = httpsConfig.Init(nil) if httpsConfig.IsOn && len(httpsConfig.Listen) > 0 { restAccessAddrs = append(restAccessAddrs, httpsConfig.FullAddresses()...) } diff --git a/internal/web/actions/default/servers/certs/updatePopup.go b/internal/web/actions/default/servers/certs/updatePopup.go index 4d7969a2..004fca2a 100644 --- a/internal/web/actions/default/servers/certs/updatePopup.go +++ b/internal/web/actions/default/servers/certs/updatePopup.go @@ -118,7 +118,7 @@ func (this *UpdatePopupAction) RunPost(params struct { // 校验 certConfig.IsCA = params.IsCA - err = certConfig.Init() + err = certConfig.Init(nil) if err != nil { if params.IsCA { this.Fail("证书校验错误：" + err.Error()) diff --git a/internal/web/actions/default/servers/certs/uploadPopup.go b/internal/web/actions/default/servers/certs/uploadPopup.go index 77c24fec..3dc2a9bd 100644 --- a/internal/web/actions/default/servers/certs/uploadPopup.go +++ b/internal/web/actions/default/servers/certs/uploadPopup.go @@ -85,7 +85,7 @@ func (this *UploadPopupAction) RunPost(params struct { CertData: certData, KeyData: keyData, } - err := certConfig.Init() + err := certConfig.Init(nil) if err != nil { if params.IsCA { this.Fail("证书校验错误：" + err.Error()) diff --git a/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go index b96f0223..08849a28 100644 --- a/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go +++ b/internal/web/actions/default/servers/groups/group/settings/httpReverseProxy/setting.go @@ -65,14 +65,14 @@ func (this *SettingAction) RunPost(params struct { // TODO 校验配置 - reverseProxyConfig := &serverconfigs.ReverseProxyConfig{} + var reverseProxyConfig = &serverconfigs.ReverseProxyConfig{} err := json.Unmarshal(params.ReverseProxyJSON, reverseProxyConfig) if err != nil { this.ErrorPage(err) return } - err = reverseProxyConfig.Init() + err = reverseProxyConfig.Init(nil) if err != nil { this.Fail("配置校验失败：" + err.Error()) } diff --git a/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go index 83c57752..bf6fbd82 100644 --- a/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go +++ b/internal/web/actions/default/servers/groups/group/settings/tcpReverseProxy/setting.go @@ -65,14 +65,14 @@ func (this *SettingAction) RunPost(params struct { // TODO 校验配置 - reverseProxyConfig := &serverconfigs.ReverseProxyConfig{} + var reverseProxyConfig = &serverconfigs.ReverseProxyConfig{} err := json.Unmarshal(params.ReverseProxyJSON, reverseProxyConfig) if err != nil { this.ErrorPage(err) return } - err = reverseProxyConfig.Init() + err = reverseProxyConfig.Init(nil) if err != nil { this.Fail("配置校验失败：" + err.Error()) } diff --git a/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go b/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go index 2c1b3254..aeb7a676 100644 --- a/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go +++ b/internal/web/actions/default/servers/groups/group/settings/udpReverseProxy/setting.go @@ -72,7 +72,7 @@ func (this *SettingAction) RunPost(params struct { return } - err = reverseProxyConfig.Init() + err = reverseProxyConfig.Init(nil) if err != nil { this.Fail("配置校验失败：" + err.Error()) } 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 eacb4379..e0901031 100644 --- a/internal/web/actions/default/servers/server/settings/http/index.go +++ b/internal/web/actions/default/servers/server/settings/http/index.go @@ -53,7 +53,7 @@ func (this *IndexAction) RunGet(params struct { this.ErrorPage(err) return } - _ = httpsConfig.Init() + _ = httpsConfig.Init(nil) for _, port := range httpsConfig.AllPorts() { if lists.ContainsInt(httpPorts, port) { conflictingPorts = append(conflictingPorts, port) 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 d0faf86d..aa4221d2 100644 --- a/internal/web/actions/default/servers/server/settings/https/index.go +++ b/internal/web/actions/default/servers/server/settings/https/index.go @@ -43,7 +43,7 @@ func (this *IndexAction) RunGet(params struct { httpsConfig.IsOn = true } - _ = httpsConfig.Init() + _ = httpsConfig.Init(nil) var httpsPorts = httpsConfig.AllPorts() // 检查http和https端口冲突 diff --git a/internal/web/actions/default/servers/server/settings/locations/locationutils/utils.go b/internal/web/actions/default/servers/server/settings/locations/locationutils/utils.go index a5aae02d..2dc656fd 100644 --- a/internal/web/actions/default/servers/server/settings/locations/locationutils/utils.go +++ b/internal/web/actions/default/servers/server/settings/locations/locationutils/utils.go @@ -22,7 +22,7 @@ func FindLocationConfig(parentAction *actionutils.ParentAction, locationId int64 return } - err = locationConfig.Init() + err = locationConfig.Init(nil) if err != nil { parentAction.ErrorPage(err) return 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 5f364745..7b98accf 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 @@ -56,14 +56,14 @@ func (this *SettingAction) RunPost(params struct { // TODO 校验配置 - reverseProxyConfig := &serverconfigs.ReverseProxyConfig{} + var reverseProxyConfig = &serverconfigs.ReverseProxyConfig{} err := json.Unmarshal(params.ReverseProxyJSON, reverseProxyConfig) if err != nil { this.ErrorPage(err) return } - err = reverseProxyConfig.Init() + err = reverseProxyConfig.Init(nil) if err != nil { this.Fail("配置校验失败：" + err.Error()) } 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 112f93cf..1f5b0bed 100644 --- a/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go +++ b/internal/web/actions/default/servers/server/settings/reverseProxy/setting.go @@ -62,7 +62,7 @@ func (this *SettingAction) RunPost(params struct { return } - err = reverseProxyConfig.Init() + err = reverseProxyConfig.Init(nil) if err != nil { this.Fail("配置校验失败：" + err.Error()) } diff --git a/internal/web/actions/default/settings/server/updateHTTPSPopup.go b/internal/web/actions/default/settings/server/updateHTTPSPopup.go index 6cc307bd..7b4d553d 100644 --- a/internal/web/actions/default/settings/server/updateHTTPSPopup.go +++ b/internal/web/actions/default/settings/server/updateHTTPSPopup.go @@ -47,7 +47,7 @@ func (this *UpdateHTTPSPopupAction) RunGet(params struct{}) { CertData: certData, KeyData: keyData, } - _ = certConfig.Init() + _ = certConfig.Init(nil) certConfig.CertData = nil certConfig.KeyData = nil certConfigs = append(certConfigs, certConfig)