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

自定义页面增加是否“启用系统自定义页面”选项

Browse Source
This commit is contained in:
GoEdgeLab
2024-05-03 11:22:50 +08:00
parent 2b4541444c
commit f8f17881aa
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/nodes/http_request.go
View File

@@ -506,6 +506,8 @@ func (this *HTTPRequest) configureWeb(web *serverconfigs.HTTPWebConfig, isTop bo
} }
// pages // pages
this.web.EnableGlobalPages = web.EnableGlobalPages
if len(web.Pages) > 0 { if len(web.Pages) > 0 {
this.web.Pages = web.Pages this.web.Pages = web.Pages
} }

4
internal/nodes/http_request_page.go
View File

@@ -17,7 +17,7 @@ const defaultPageContentType = "text/html; charset=utf-8"
func (this *HTTPRequest) doPage(status int) (shouldStop bool) { func (this *HTTPRequest) doPage(status int) (shouldStop bool) {
if len(this.web.Pages) == 0 { if len(this.web.Pages) == 0 {
// 集群自定义页面 // 集群自定义页面
if this.nodeConfig != nil && this.ReqServer != nil { if this.nodeConfig != nil && this.ReqServer != nil && this.web.EnableGlobalPages {
var httpPagesPolicy = this.nodeConfig.FindHTTPPagesPolicyWithClusterId(this.ReqServer.ClusterId) var httpPagesPolicy = this.nodeConfig.FindHTTPPagesPolicyWithClusterId(this.ReqServer.ClusterId)
if httpPagesPolicy != nil && httpPagesPolicy.IsOn && len(httpPagesPolicy.Pages) > 0 { if httpPagesPolicy != nil && httpPagesPolicy.IsOn && len(httpPagesPolicy.Pages) > 0 {
return this.doPageLookup(httpPagesPolicy.Pages, status) return this.doPageLookup(httpPagesPolicy.Pages, status)
@@ -34,7 +34,7 @@ func (this *HTTPRequest) doPage(status int) (shouldStop bool) {
} }
// 集群自定义页面 // 集群自定义页面
if this.nodeConfig != nil && this.ReqServer != nil { if this.nodeConfig != nil && this.ReqServer != nil && this.web.EnableGlobalPages {
var httpPagesPolicy = this.nodeConfig.FindHTTPPagesPolicyWithClusterId(this.ReqServer.ClusterId) var httpPagesPolicy = this.nodeConfig.FindHTTPPagesPolicyWithClusterId(this.ReqServer.ClusterId)
if httpPagesPolicy != nil && httpPagesPolicy.IsOn && len(httpPagesPolicy.Pages) > 0 { if httpPagesPolicy != nil && httpPagesPolicy.IsOn && len(httpPagesPolicy.Pages) > 0 {
return this.doPageLookup(httpPagesPolicy.Pages, status) return this.doPageLookup(httpPagesPolicy.Pages, status)