From ed8ee8275aa0f0de7352f293766982c98a74f196 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Sun, 17 Sep 2023 19:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E5=AE=A2IP=E8=AE=BE=E7=BD=AE=E4=B8=AD?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA=E8=AF=B7=E6=B1=82=E6=8A=A5?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cluster/settings/global-server-config/index.go    | 10 ++++++----
 .../servers/groups/group/settings/remoteAddr/index.go |  2 +-
 .../server/settings/locations/remoteAddr/index.go     |  2 +-
 .../servers/server/settings/remoteAddr/index.go       |  2 +-
 .../cluster/settings/global-server-config/index.html  | 11 +++++++++++
 5 files changed, 20 insertions(+), 7 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 65fbe53f..400804f6 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
@@ -100,10 +100,11 @@ func (this *IndexAction) RunPost(params struct {
 	HttpAllNodeIPShowPage                  bool
 	HttpAllEnableServerAddrVariable        bool
 
-	HttpAllServerName              string
-	HttpAllSupportsLowVersionHTTP  bool
-	HttpAllMatchCertFromAllServers bool
-	HttpAllForceLnRequest          bool
+	HttpAllServerName                string
+	HttpAllSupportsLowVersionHTTP    bool
+	HttpAllMatchCertFromAllServers   bool
+	HttpAllForceLnRequest            bool
+	HttpAllLnRequestSchedulingMethod string
 
 	HttpAccessLogIsOn                     bool
 	HttpAccessLogEnableRequestHeaders     bool
@@ -176,6 +177,7 @@ func (this *IndexAction) RunPost(params struct {
 	config.HTTPAll.SupportsLowVersionHTTP = params.HttpAllSupportsLowVersionHTTP
 	config.HTTPAll.MatchCertFromAllServers = params.HttpAllMatchCertFromAllServers
 	config.HTTPAll.ForceLnRequest = params.HttpAllForceLnRequest
+	config.HTTPAll.LnRequestSchedulingMethod = params.HttpAllLnRequestSchedulingMethod
 	config.HTTPAll.EnableServerAddrVariable = params.HttpAllEnableServerAddrVariable
 
 	// 访问日志
diff --git a/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go b/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go
index a9bcc468..2a924a1c 100644
--- a/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go
+++ b/internal/web/actions/default/servers/groups/group/settings/remoteAddr/index.go
@@ -66,7 +66,7 @@ func (this *IndexAction) RunPost(params struct {
 			this.FailField("requestHeaderName", "请输入请求报头")
 			return
 		}
-		if !regexp.MustCompile(`^[\w-_]+$`).MatchString(remoteAddrConfig.RequestHeaderName) {
+		if !regexp.MustCompile(`^[\w-_,]+$`).MatchString(remoteAddrConfig.RequestHeaderName) {
 			this.FailField("requestHeaderName", "请求报头中只能含有数字、英文字母、下划线、中划线")
 			return
 		}
diff --git a/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go b/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go
index e867d8d4..bdb2206c 100644
--- a/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go
+++ b/internal/web/actions/default/servers/server/settings/locations/remoteAddr/index.go
@@ -58,7 +58,7 @@ func (this *IndexAction) RunPost(params struct {
 			this.FailField("requestHeaderName", "请输入请求报头")
 			return
 		}
-		if !regexp.MustCompile(`^[\w-_]+$`).MatchString(remoteAddrConfig.RequestHeaderName) {
+		if !regexp.MustCompile(`^[\w-_,]+$`).MatchString(remoteAddrConfig.RequestHeaderName) {
 			this.FailField("requestHeaderName", "请求报头中只能含有数字、英文字母、下划线、中划线")
 			return
 		}
diff --git a/internal/web/actions/default/servers/server/settings/remoteAddr/index.go b/internal/web/actions/default/servers/server/settings/remoteAddr/index.go
index 6bdd27e9..88d2748b 100644
--- a/internal/web/actions/default/servers/server/settings/remoteAddr/index.go
+++ b/internal/web/actions/default/servers/server/settings/remoteAddr/index.go
@@ -71,7 +71,7 @@ func (this *IndexAction) RunPost(params struct {
 			this.FailField("requestHeaderName", "请输入请求报头")
 			return
 		}
-		if !regexp.MustCompile(`^[\w-_]+$`).MatchString(remoteAddrConfig.RequestHeaderName) {
+		if !regexp.MustCompile(`^[\w-_,]+$`).MatchString(remoteAddrConfig.RequestHeaderName) {
 			this.FailField("requestHeaderName", "请求报头中只能含有数字、英文字母、下划线、中划线")
 			return
 		}
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 82516965..40bb983d 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
@@ -193,6 +193,17 @@
                     <p class="comment">选中后，所有请求优先发送到L2或者更高级别节点。默认不开启的情况下，只有可以缓存的内容请求才会发送到L2或者更高级别节点。</p>
                 </td>
             </tr>
+            <tr>
+                <td>Ln请求负载均衡方法</td>
+                <td>
+                    <select class="ui dropdown auto-width" name="httpAllLnRequestSchedulingMethod" v-model="config.httpAll.lnRequestSchedulingMethod">
+                        <option value="urlMapping">URL映射</option>
+                        <option value="random">随机</option>
+                    </select>
+                    <p class="comment" v-if="config.httpAll.lnRequestSchedulingMethod == 'urlMapping'">当存在多个Ln节点时，将请求根据URL自动映射到某个固定的Ln节点。</p>
+                    <p class="comment" v-if="config.httpAll.lnRequestSchedulingMethod == 'random'">当存在多个Ln节点时，将请求随机发送到某个Ln节点。</p>
+                </td>
+            </tr>
             <tr>
                 <td>支持${serverAddr}变量</td>
                 <td>