TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-02 11:50:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

IP名单列表显示代号

Browse Source
This commit is contained in:
GoEdgeLab
2024-05-05 19:51:17 +08:00
parent 71c7b7dcc7
commit 2da73788ec
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/web/actions/default/servers/iplists/lists.go
View File

@@ -36,8 +36,8 @@ func (this *ListsAction) RunGet(params struct {
this.ErrorPage(err) this.ErrorPage(err)
return return
} }
count := countResp.Count var count = countResp.Count
page := this.NewPage(count) var page = this.NewPage(count)
this.Data["page"] = page.AsHTML() this.Data["page"] = page.AsHTML()
listsResp, err := this.RPC().IPListRPC().ListEnabledIPLists(this.AdminContext(), &pb.ListEnabledIPListsRequest{ listsResp, err := this.RPC().IPListRPC().ListEnabledIPLists(this.AdminContext(), &pb.ListEnabledIPListsRequest{
@@ -65,6 +65,7 @@ func (this *ListsAction) RunGet(params struct {
"id": list.Id, "id": list.Id,
"isOn": list.IsOn, "isOn": list.IsOn,
"name": list.Name, "name": list.Name,
"code": list.Code,
"description": list.Description, "description": list.Description,
"countItems": countItems, "countItems": countItems,
"type": list.Type, "type": list.Type,

2
internal/web/actions/default/servers/server/settings/waf/index.go
View File

@@ -49,7 +49,7 @@ func (this *IndexAction) RunGet(params struct {
this.Data["webId"] = webConfig.Id this.Data["webId"] = webConfig.Id
this.Data["firewallConfig"] = webConfig.FirewallRef this.Data["firewallConfig"] = webConfig.FirewallRef
// 获取当前服务所在集群的WAF设置 // 获取当前网站所在集群的WAF设置
firewallPolicy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyWithServerId(this.AdminContext(), params.ServerId) firewallPolicy, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyWithServerId(this.AdminContext(), params.ServerId)
if err != nil { if err != nil {
this.ErrorPage(err) this.ErrorPage(err)

4
web/views/@default/servers/iplists/index.html
View File

@@ -9,7 +9,7 @@
</div> </div>
<div class="ui field"> <div class="ui field">
<select class="ui dropdown auto-width" name="listType" v-model="listType"> <select class="ui dropdown auto-width" name="listType" v-model="listType">
<option value="">[类型]</option> <option value="">[所有类型]</option>
<option value="black">黑名单</option> <option value="black">黑名单</option>
<option value="white">白名单</option> <option value="white">白名单</option>
<option value="grey">灰名单</option> <option value="grey">灰名单</option>
@@ -17,7 +17,7 @@
</div> </div>
<div class="ui field"> <div class="ui field">
<select class="ui dropdown" name="eventLevel" v-model="eventLevel"> <select class="ui dropdown" name="eventLevel" v-model="eventLevel">
<option value="">[级别]</option> <option value="">[所有级别]</option>
<option v-for="level in eventLevels" :value="level.code">{{level.name}}</option> <option v-for="level in eventLevels" :value="level.code">{{level.name}}</option>
</select> </select>
</div> </div>

5
web/views/@default/servers/iplists/lists.html
View File

@@ -25,6 +25,7 @@
<tr> <tr>
<th class="one wide center">ID</th> <th class="one wide center">ID</th>
<th class="three wide">名称</th> <th class="three wide">名称</th>
<th class="two wide">代号</th>
<th class="two wide center">类型</th> <th class="two wide center">类型</th>
<th>备注</th> <th>备注</th>
<th class="two wide center">IP数量</th> <th class="two wide center">IP数量</th>
@@ -37,6 +38,10 @@
<a :href="'/servers/iplists/list?listId=' + list.id"><keyword :v-word="keyword">{{list.name}}</keyword></a> <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> <div v-if="list.isGlobal" style="margin-top: 0.3em"><grey-label>全局</grey-label></div>
</td> </td>
<td>
<span v-if="list.code != null && list.code.length > 0">{{list.code}}</span>
<span v-else class="disabled">-</span>
</td>
<td class="center"> <td class="center">
<span v-if="list.type == 'black'"><span class="red">黑名单</span></span> <span v-if="list.type == 'black'"><span class="red">黑名单</span></span>
<span v-if="list.type == 'white'"><span class="green">白名单</span></span> <span v-if="list.type == 'white'"><span class="green">白名单</span></span>