访客IP设置中支持多个请求报头

Author: iwind

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
 
 	// 访问日志

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
 		}

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
 		}

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
 		}

web/views/@default/clusters/cluster/settings/global-server-config/index.html

@@ -193,6 +193,17 @@ <h4>其他</h4>
                     <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>