From 5d43125284d51b946b5c8a235fa2a03e0bfbf527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Wed, 5 Jul 2023 15:29:17 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E9=9B=86=E7=BE=A4=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=20--=20=E7=BD=91=E7=AB=99=E8=AE=BE=E7=BD=AE=E2=80=9D=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E2=80=9C=E5=85=81=E8=AE=B8=E8=AE=B0=E5=BD=95=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E6=97=A5=E5=BF=97=E2=80=9D=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/global-server-config/index.go    |  6 ++++--
 .../web/actions/default/clusters/create.go    |  2 +-
 .../settings/global-server-config/index.html  | 19 +++++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go b/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go
index 2a7eacb9..8195c93d 100644
--- a/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go
+++ b/internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go
@@ -31,7 +31,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 
 	var configJSON = configResp.GlobalServerConfigJSON
-	var config = serverconfigs.DefaultGlobalServerConfig()
+	var config = serverconfigs.NewGlobalServerConfig()
 	if len(configJSON) > 0 {
 		err = json.Unmarshal(configJSON, config)
 		if err != nil {
@@ -86,6 +86,7 @@ func (this *IndexAction) RunPost(params struct {
 	HttpAllSupportsLowVersionHTTP  bool
 	HttpAllMatchCertFromAllServers bool
 
+	HttpAccessLogIsOn                     bool
 	HttpAccessLogEnableRequestHeaders     bool
 	HttpAccessLogEnableResponseHeaders    bool
 	HttpAccessLogCommonRequestHeadersOnly bool
@@ -110,7 +111,7 @@ func (this *IndexAction) RunPost(params struct {
 	}
 
 	var configJSON = configResp.GlobalServerConfigJSON
-	var config = serverconfigs.DefaultGlobalServerConfig()
+	var config = serverconfigs.NewGlobalServerConfig()
 	if len(configJSON) > 0 {
 		err = json.Unmarshal(configJSON, config)
 		if err != nil {
@@ -150,6 +151,7 @@ func (this *IndexAction) RunPost(params struct {
 	config.HTTPAll.ForceLnRequest = params.HttpAllForceLnRequest
 
 	// 访问日志
+	config.HTTPAccessLog.IsOn = params.HttpAccessLogIsOn
 	config.HTTPAccessLog.EnableRequestHeaders = params.HttpAccessLogEnableRequestHeaders
 	config.HTTPAccessLog.EnableResponseHeaders = params.HttpAccessLogEnableResponseHeaders
 	config.HTTPAccessLog.CommonRequestHeadersOnly = params.HttpAccessLogCommonRequestHeadersOnly
diff --git a/internal/web/actions/default/clusters/create.go b/internal/web/actions/default/clusters/create.go
index cc3c6735..5e43d8fc 100644
--- a/internal/web/actions/default/clusters/create.go
+++ b/internal/web/actions/default/clusters/create.go
@@ -99,7 +99,7 @@ func (this *CreateAction) RunPost(params struct {
 	// TODO 检查DnsDomainId的有效性
 
 	// 全局服务配置
-	var globalServerConfig = serverconfigs.DefaultGlobalServerConfig()
+	var globalServerConfig = serverconfigs.NewGlobalServerConfig()
 	globalServerConfig.HTTPAll.MatchDomainStrictly = params.MatchDomainStrictly
 	globalServerConfigJSON, err := json.Marshal(globalServerConfig)
 	if err != nil {
diff --git a/web/views/@default/clusters/cluster/settings/global-server-config/index.html b/web/views/@default/clusters/cluster/settings/global-server-config/index.html
index 402d7868..003344a0 100644
--- a/web/views/@default/clusters/cluster/settings/global-server-config/index.html
+++ b/web/views/@default/clusters/cluster/settings/global-server-config/index.html
@@ -65,24 +65,31 @@
         <h4>访问日志</h4>
         <table class="ui table definition selectable">
             <tr>
-                <td>记录请求Header</td>
+                <td>允许记录访问日志</td>
+                <td>
+                    <checkbox name="httpAccessLogIsOn" v-model="config.httpAccessLog.isOn"></checkbox>
+                    <p class="comment">选中后，表示允许当前集群下的网站记录访问日志，否则当前集群下的所有网站都不会记录访问日志。</p>
+                </td>
+            </tr>
+            <tr>
+                <td>记录请求报头</td>
                 <td>
                     <checkbox name="httpAccessLogEnableRequestHeaders" v-model="config.httpAccessLog.enableRequestHeaders"></checkbox>
-                    <p class="comment">选中后，表示在访问日志中记录请求Header。</p>
+                    <p class="comment">选中后，表示在访问日志中记录请求报头。</p>
                 </td>
             </tr>
             <tr>
-                <td class="title">只记录通用请求<br/>Header</td>
+                <td class="title">只记录通用请求报头</td>
                 <td>
                     <checkbox name="httpAccessLogCommonRequestHeadersOnly" v-model="config.httpAccessLog.commonRequestHeadersOnly"></checkbox>
-                    <p class="comment">选中后，表示访问日志中只记录通用的HTTP请求Header（比如<code-label>User-Agent</code-label>），其他自定义或非标准的（比如<code-label>Test-Header</code-label>）将不记录。</p>
+                    <p class="comment">选中后，表示访问日志中只记录通用的HTTP请求报头（比如<code-label>User-Agent</code-label>），其他自定义或非标准的（比如<code-label>Test-Header</code-label>）将不记录。</p>
                 </td>
             </tr>
             <tr>
-                <td>记录响应Header</td>
+                <td>记录响应报头</td>
                 <td>
                     <checkbox name="httpAccessLogEnableResponseHeaders" v-model="config.httpAccessLog.enableResponseHeaders"></checkbox>
-                    <p class="comment">选中后，表示在访问日志中记录响应Header。</p>
+                    <p class="comment">选中后，表示在访问日志中记录响应报头。</p>
                 </td>
             </tr>
             <tr>