From 7edd234d4654ae8309dc73f436a489072f2b6c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Thu, 5 Nov 2020 11:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8C=BA=E5=9F=9F=E5=92=8CISP=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/servers/server/log/viewPopup.go   | 30 +++++++++++++++++++
 .../servers/server/log/viewPopup.html         |  8 +++++
 2 files changed, 38 insertions(+)

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 @@
 			<td>IP</td>
 			<td>{{accessLog.remoteAddr}}</td>
 		</tr>
+		<tr v-if="region != null">
+			<td>区域</td>
+			<td>{{region.full}}</td>
+		</tr>
+		<tr v-if="region.isp.length > 0">
+			<td>ISP</td>
+			<td>{{region.isp}}</td>
+		</tr>
 	</table>
 </div>
\ No newline at end of file