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 }