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

IP名单增加区域和ISP显示

Browse Source
This commit is contained in:
GoEdgeLab
2022-04-19 10:57:47 +08:00
parent 9cdfd0da1b
commit 1cd7a8f4c8
7 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/web/actions/default/servers/iplists/index.go
View File

@@ -148,6 +148,22 @@ func (this *IndexAction) RunGet(params struct {
}
}
// 区域 & ISP
var region = ""
var isp = ""
if len(item.IpFrom) > 0 && len(item.IpTo) == 0 {
regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: item.IpFrom})
if err != nil {
this.ErrorPage(err)
return
}
var ipRegion = regionResp.IpRegion
if ipRegion != nil {
region = ipRegion.Summary
isp = ipRegion.Isp
}
}
itemMaps = append(itemMaps, maps.Map{
"id": item.Id,
"ipFrom": item.IpFrom,
@@ -167,6 +183,8 @@ func (this *IndexAction) RunGet(params struct {
"sourceNode": sourceNodeMap,
"list": listMap,
"policy": policyMap,
"region": region,
"isp": isp,
})
}
this.Data["items"] = itemMaps

18
internal/web/actions/default/servers/iplists/items.go
View File

@@ -104,6 +104,22 @@ func (this *ItemsAction) RunGet(params struct {
}
}
// 区域 & ISP
var region = ""
var isp = ""
if len(item.IpFrom) > 0 && len(item.IpTo) == 0 {
regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: item.IpFrom})
if err != nil {
this.ErrorPage(err)
return
}
var ipRegion = regionResp.IpRegion
if ipRegion != nil {
region = ipRegion.Summary
isp = ipRegion.Isp
}
}
itemMaps = append(itemMaps, maps.Map{
"id": item.Id,
"ipFrom": item.IpFrom,
@@ -118,6 +134,8 @@ func (this *ItemsAction) RunGet(params struct {
"sourceSet": sourceSetMap,
"sourceServer": sourceServerMap,
"lifeSeconds": item.ExpiredAt - time.Now().Unix(),
"region": region,
"isp": isp,
})
}
this.Data["items"] = itemMaps