From a538fa98e7e67e25cc811dc696e7811b4285b656 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 20 Nov 2023 18:57:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20UA=E5=92=8CIP=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/framework/utils/ctx/ctx.go             | 7 ++++---
 src/framework/utils/ip2region/ip2region.go | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/framework/utils/ctx/ctx.go b/src/framework/utils/ctx/ctx.go
index 8539e63f..ff9efe0a 100644
--- a/src/framework/utils/ctx/ctx.go
+++ b/src/framework/utils/ctx/ctx.go
@@ -82,13 +82,13 @@ func UaOsBrowser(c *gin.Context) (string, string) {
 	userAgent := c.GetHeader("user-agent")
 	uaInfo := ua.Info(userAgent)
 
-	browser := "Unknown Unknown"
+	browser := "app.common.noUaOsBrowser"
 	bName, bVersion := uaInfo.Browser()
 	if bName != "" && bVersion != "" {
 		browser = bName + " " + bVersion
 	}
 
-	os := "Unknown Unknown"
+	os := "app.common.noUaOsBrowser"
 	bos := uaInfo.OS()
 	if bos != "" {
 		os = bos
@@ -116,7 +116,8 @@ func LoginUser(c *gin.Context) (vo.LoginUser, error) {
 	if exists {
 		return value.(vo.LoginUser), nil
 	}
-	return vo.LoginUser{}, fmt.Errorf("invalid login user information")
+	// 登录用户信息无效
+	return vo.LoginUser{}, fmt.Errorf("app.common.noLoginUser")
 }
 
 // LoginUserToUserID 登录用户信息-用户ID
diff --git a/src/framework/utils/ip2region/ip2region.go b/src/framework/utils/ip2region/ip2region.go
index ff041cab..b62890cb 100644
--- a/src/framework/utils/ip2region/ip2region.go
+++ b/src/framework/utils/ip2region/ip2region.go
@@ -43,7 +43,7 @@ func RegionSearchByIp(ip string) (string, int, int64) {
 	ip = ClientIP(ip)
 	if ip == LOCAT_HOST {
 		// "0|0|0|内网IP|内网IP"
-		return "0|0|0|Intranet IP|Intranet IP", 0, 0
+		return "0|0|0|app.common.noIPregion|app.common.noIPregion", 0, 0
 	}
 	tStart := time.Now()
 	region, err := searcher.SearchByStr(ip)
@@ -60,19 +60,19 @@ func RegionSearchByIp(ip string) (string, int, int64) {
 func RealAddressByIp(ip string) string {
 	ip = ClientIP(ip)
 	if ip == LOCAT_HOST {
-		return "Intranet IP" // 内网IP
+		return "app.common.noIPregion" // 内网IP
 	}
 	region, err := searcher.SearchByStr(ip)
 	if err != nil {
 		logger.Errorf("failed to SearchIP(%s): %s\n", ip, err)
-		return "unknown" // 未知
+		return "app.common.unknown" // 未知
 	}
 	parts := strings.Split(region, "|")
 	province := parts[2]
 	city := parts[3]
 	if province == "0" && city != "0" {
 		if city == "内网IP" {
-			return "Intranet IP" // 内网IP
+			return "app.common.noIPregion" // 内网IP
 		}
 		return city
 	}