将公用IP名单默认改成全局名单，自动应用于所有服务

internal/web/actions/default/servers/iplists/createPopup.go

@@ -29,6 +29,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Name        string
 	Type        string
 	Description string
+	IsGlobal    bool
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -49,6 +50,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		TimeoutJSON: nil,
 		IsPublic:    true,
 		Description: params.Description,
+		IsGlobal:    params.IsGlobal,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/servers/iplists/index.go

@@ -68,6 +68,7 @@ func (this *IndexAction) RunGet(params struct {
 			"description": list.Description,
 			"countItems":  countItems,
 			"type":        list.Type,
+			"isGlobal":    list.IsGlobal,
 		})
 	}
 	this.Data["lists"] = listMaps

internal/web/actions/default/servers/iplists/utils.go

@@ -47,6 +47,7 @@ func InitIPList(action *actionutils.ParentAction, listId int64) error {
 		"description": list.Description,
 		"isOn":        list.IsOn,
 		"countItems":  countItems,
+		"isGlobal":    list.IsGlobal,
 	}
 	return nil
 }

web/views/@default/servers/iplists/createPopup.html

@@ -20,6 +20,13 @@
                 </select>
             </td>
         </tr>
+        <tr>
+            <td>是否全局</td>
+            <td>
+                <checkbox name="isGlobal" checked="checked"></checkbox>
+                <p class="comment">如果选择为全局有效，则所有服务都自动使用此名单，否则只有在WAF策略中绑定此名单后才会生效。</p>
+            </td>
+        </tr>
         <tr>
             <td>备注</td>
             <td>

web/views/@default/servers/iplists/index.html

@@ -33,7 +33,10 @@
     </thead>
     <tr v-for="list in lists">
         <td class="center">{{list.id}}</td>
-        <td><a :href="'/servers/iplists/list?listId=' + list.id"><keyword :v-word="keyword">{{list.name}}</keyword></a></td>
+        <td>
+            <a :href="'/servers/iplists/list?listId=' + list.id"><keyword :v-word="keyword">{{list.name}}</keyword></a>
+            <div v-if="list.isGlobal" style="margin-top: 0.3em"><grey-label>全局</grey-label></div>
+        </td>
         <td class="center">
             <span v-if="list.type == 'black'">黑名单</span>
             <span v-if="list.type == 'white'">白名单</span>

web/views/@default/servers/iplists/index.js

@@ -1,6 +1,7 @@
 Tea.context(function () {
 	this.createList = function () {
 		teaweb.popup(Tea.url(".createPopup", {type: this.type}), {
+			height: "24em",
 			callback: function (resp) {
 				teaweb.success("保存成功", function () {
 					window.location = "/servers/iplists?type=" + resp.data.list.type

web/views/@default/servers/iplists/list.html

@@ -14,6 +14,13 @@
             {{list.typeName}}
         </td>
     </tr>
+    <tr>
+        <td>是否全局</td>
+        <td>
+            <span v-if="list.isGlobal" class="green">Y</span>
+            <span v-else class="disabled">N</span>
+        </td>
+    </tr>
     <tr>
         <td>备注</td>
         <td>