From c72a63d00cd595844e0a90c8a9e3cada64a2938a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 8 Nov 2023 17:51:21 +0800 Subject: [PATCH] =?UTF-8?q?del:=20=E7=A7=BB=E9=99=A4=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=8E=A5=E5=8F=97?= =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/framework/errorcatch/errorcatch.go | 4 ++-- src/framework/utils/ctx/ctx.go | 10 --------- src/framework/utils/parse/parse.go | 30 -------------------------- 3 files changed, 2 insertions(+), 42 deletions(-) diff --git a/src/framework/errorcatch/errorcatch.go b/src/framework/errorcatch/errorcatch.go index c4d8fec7..e267eb9a 100644 --- a/src/framework/errorcatch/errorcatch.go +++ b/src/framework/errorcatch/errorcatch.go @@ -16,11 +16,11 @@ func ErrorCatch() gin.HandlerFunc { defer func() { // 在这里处理 Panic 异常,例如记录日志或返回错误信息给客户端 if err := recover(); err != nil { - logger.Errorf("Panic 异常: %s => %v", c.Request.URL, err) + logger.Errorf("Panic Error: %s => %v", c.Request.URL, err) // 返回错误响应给客户端 if config.Env() == "prod" { - c.JSON(500, result.ErrMsg("服务器内部错误")) + c.JSON(500, result.ErrMsg("Internal Server Errors")) } else { // 通过实现 error 接口的 Error() 方法自定义错误类型进行捕获 switch v := err.(type) { diff --git a/src/framework/utils/ctx/ctx.go b/src/framework/utils/ctx/ctx.go index 7dacc0f1..7a35b90d 100644 --- a/src/framework/utils/ctx/ctx.go +++ b/src/framework/utils/ctx/ctx.go @@ -9,7 +9,6 @@ import ( "ems.agt/src/framework/constants/roledatascope" "ems.agt/src/framework/constants/token" "ems.agt/src/framework/utils/ip2region" - "ems.agt/src/framework/utils/parse" "ems.agt/src/framework/utils/ua" "ems.agt/src/framework/vo" @@ -96,15 +95,6 @@ func UaOsBrowser(c *gin.Context) (string, string) { return os, browser } -// ClientLanguage 解析请求客户端接受语言 -func ClientLanguage(c *gin.Context) string { - acceptLanguage := c.GetHeader("Accept-Language") - fmt.Println(acceptLanguage) - lang := parse.AcceptLanguage(acceptLanguage) - fmt.Println(lang) - return lang -} - // LoginUser 登录用户信息 func LoginUser(c *gin.Context) (vo.LoginUser, error) { value, exists := c.Get(common.CTX_LOGIN_USER) diff --git a/src/framework/utils/parse/parse.go b/src/framework/utils/parse/parse.go index 93ae2d44..ff8145c0 100644 --- a/src/framework/utils/parse/parse.go +++ b/src/framework/utils/parse/parse.go @@ -165,33 +165,3 @@ func Color(colorStr string) *color.RGBA { A: 255, // 不透明 } } - -// AcceptLanguage 解析 Accept-Language 头部并返回语言标签及其对应的权重值 -// "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7" -func AcceptLanguage(acceptLanguage string) string { - language := "en" - maxQ := 0.0 - for _, tag := range strings.Split(acceptLanguage, ",") { - parts := strings.Split(strings.TrimSpace(tag), ";q=") - lang := parts[0] - if strings.Contains(lang, "-") { - langParts := strings.Split(strings.TrimSpace(lang), "-") - lang = langParts[0] - } - q := 0.0 // 默认权重值 - if len(parts) > 1 { - // 解析权重值 - qValue := parts[1] - _, err := fmt.Sscanf(qValue, "%f", &q) - if err != nil { - q = 0.0 // 若解析失败,则使用默认值 - } - } - // 取最大 - if q > maxQ { - maxQ = q - language = lang - } - } - return language -}