diff --git a/internal/web/actions/default/servers/server/log/viewPopup.go b/internal/web/actions/default/servers/server/log/viewPopup.go index 986fc28d..61073d96 100644 --- a/internal/web/actions/default/servers/server/log/viewPopup.go +++ b/internal/web/actions/default/servers/server/log/viewPopup.go @@ -5,6 +5,7 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/iwind/TeaGo/maps" "net/http" + "strings" ) type ViewPopupAction struct { @@ -82,5 +83,34 @@ func (this *ViewPopupAction) RunGet(params struct { } this.Data["wafInfo"] = wafMap + // 地域相关 + var regionMap maps.Map = nil + regionResp, err := this.RPC().IPLibraryRPC().LookupIPRegion(this.AdminContext(), &pb.LookupIPRegionRequest{Ip: accessLog.RemoteAddr}) + if err != nil { + this.ErrorPage(err) + return + } + region := regionResp.Region + if region != nil { + pieces := []string{} + if len(region.Country) > 0 { + pieces = append(pieces, region.Country) + } + if len(region.Region) > 0 { + pieces = append(pieces, region.Region) + } + if len(region.Province) > 0 { + pieces = append(pieces, region.Province) + } + if len(region.City) > 0 { + pieces = append(pieces, region.City) + } + regionMap = maps.Map{ + "full": strings.Join(pieces, " "), + "isp": region.Isp, + } + } + this.Data["region"] = regionMap + this.Show() } diff --git a/web/views/@default/servers/server/log/viewPopup.html b/web/views/@default/servers/server/log/viewPopup.html index 0f64abdf..9c3487f8 100644 --- a/web/views/@default/servers/server/log/viewPopup.html +++ b/web/views/@default/servers/server/log/viewPopup.html @@ -112,5 +112,13 @@