From 81138b8c225cf5e6325f91c602b4332d0e6a6cf6 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 8 Nov 2023 15:00:05 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E8=BF=94=E5=9B=9E-framework=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/framework/middleware/rate_limit.go | 3 ++- src/framework/middleware/repeat/repeat.go | 3 ++- src/framework/middleware/security/referer.go | 9 ++++++--- src/framework/utils/file/csv.go | 6 +++--- src/framework/utils/file/file.go | 10 +++++----- src/framework/utils/ip2region/ip2region.go | 7 ++++--- src/framework/utils/ssh/scp.go | 2 +- src/framework/utils/token/token.go | 7 ++++--- src/modules/net_element/controller/ne_info.go | 2 +- 9 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/framework/middleware/rate_limit.go b/src/framework/middleware/rate_limit.go index 5dbf53d9..dd5b85a5 100644 --- a/src/framework/middleware/rate_limit.go +++ b/src/framework/middleware/rate_limit.go @@ -90,7 +90,8 @@ func RateLimit(option LimitOption) gin.HandlerFunc { c.Header("X-RateLimit-Reset", fmt.Sprintf("%d", time.Now().Unix()+int64(rateTime))) // 重置时间戳 if rateCount >= option.Count { - c.JSON(200, result.ErrMsg("访问过于频繁，请稍候再试")) + // 访问过于频繁，请稍候再试 + c.JSON(200, result.ErrMsg("Visits are too frequent. Please try again later")) c.Abort() // 停止执行后续的处理函数 return } diff --git a/src/framework/middleware/repeat/repeat.go b/src/framework/middleware/repeat/repeat.go index 0a844633..c9891a0a 100644 --- a/src/framework/middleware/repeat/repeat.go +++ b/src/framework/middleware/repeat/repeat.go @@ -60,7 +60,8 @@ func RepeatSubmit(interval int64) gin.HandlerFunc { // 小于间隔时间且参数内容一致 if compareTime < interval && compareParams { - c.JSON(200, result.ErrMsg("不允许重复提交，请稍候再试")) + // 不允许重复提交，请稍候再试 + c.JSON(200, result.ErrMsg("Duplicate submissions are not allowed. Please try again later")) c.Abort() return } diff --git a/src/framework/middleware/security/referer.go b/src/framework/middleware/security/referer.go index f4e4ba2b..8f55bb2c 100644 --- a/src/framework/middleware/security/referer.go +++ b/src/framework/middleware/security/referer.go @@ -42,14 +42,16 @@ func referer(c *gin.Context) { referer := c.GetHeader("Referer") if referer == "" { - c.AbortWithStatusJSON(200, result.ErrMsg("无效 Referer 未知")) + // 无效 Referer 未知 + c.AbortWithStatusJSON(200, result.ErrMsg("Invalid referer unknown")) return } // 获取host u, err := url.Parse(referer) if err != nil { - c.AbortWithStatusJSON(200, result.ErrMsg("无效 Referer 未知")) + // 无效 Referer 未知 + c.AbortWithStatusJSON(200, result.ErrMsg("Invalid referer unknown")) return } host := u.Host @@ -70,7 +72,8 @@ func referer(c *gin.Context) { } } if !ok { - c.AbortWithStatusJSON(200, result.ErrMsg("无效 Referer "+host)) + // 无效 Referer + c.AbortWithStatusJSON(200, result.ErrMsg("Invalid referer "+host)) return } } diff --git a/src/framework/utils/file/csv.go b/src/framework/utils/file/csv.go index 4ab4b344..0e33b51e 100644 --- a/src/framework/utils/file/csv.go +++ b/src/framework/utils/file/csv.go @@ -22,7 +22,7 @@ func WriterCSVFile(data [][]string, filePath string) error { // 确保文件夹路径存在 err := os.MkdirAll(dirPath, os.ModePerm) if err != nil { - logger.Errorf("创建文件夹失败 CreateFile %v", err) + logger.Errorf("MkdirAll dir %v", err) } // 创建或打开文件 @@ -51,7 +51,7 @@ func ReadCSVFile(filePath string) []map[string]string { // 打开 CSV 文件 file, err := os.Open(filePath) if err != nil { - logger.Errorf("无法打开 CSV 文件：%v", err) + logger.Errorf("Open CSV file: %v", err) return arr } defer file.Close() @@ -62,7 +62,7 @@ func ReadCSVFile(filePath string) []map[string]string { // 读取 CSV 头部行 header, err := reader.Read() if err != nil { - logger.Errorf("无法读取 CSV 头部行：%v", err) + logger.Errorf("Read CSV header rows: %v", err) return arr } diff --git a/src/framework/utils/file/file.go b/src/framework/utils/file/file.go index 1ff47dc2..50ace0a8 100644 --- a/src/framework/utils/file/file.go +++ b/src/framework/utils/file/file.go @@ -73,13 +73,13 @@ func generateFileName(fileName string) string { func isAllowWrite(fileName string, allowExts []string, fileSize int64) error { // 判断上传文件名称长度 if len(fileName) > DEFAULT_FILE_NAME_LENGTH { - return fmt.Errorf("The maximum length limit for uploading file names is %d", DEFAULT_FILE_NAME_LENGTH) + return fmt.Errorf("the maximum length limit for uploading file names is %d", DEFAULT_FILE_NAME_LENGTH) } // 最大上传文件大小 maxFileSize := uploadFileSize() if fileSize > maxFileSize { - return fmt.Errorf("Maximum upload file size %s", parse.Bit(float64(maxFileSize))) + return fmt.Errorf("maximum upload file size %s", parse.Bit(float64(maxFileSize))) } // 判断文件拓展是否为允许的拓展类型 @@ -95,7 +95,7 @@ func isAllowWrite(fileName string, allowExts []string, fileSize int64) error { } } if !hasExt { - return fmt.Errorf("The upload file type is not supported, only the following types are supported:%s", strings.Join(allowExts, ",")) + return fmt.Errorf("the upload file type is not supported, only the following types are supported: %s", strings.Join(allowExts, ",")) } return nil @@ -107,7 +107,7 @@ func isAllowWrite(fileName string, allowExts []string, fileSize int64) error { func isAllowRead(filePath string) error { // 禁止目录上跳级别 if strings.Contains(filePath, "..") { - return fmt.Errorf("Prohibit jumping levels on the directory") + return fmt.Errorf("prohibit jumping levels on the directory") } // 检查允许下载的文件规则 @@ -120,7 +120,7 @@ func isAllowRead(filePath string) error { } } if !hasExt { - return fmt.Errorf("Rules for illegally downloaded files: %s", fileExt) + return fmt.Errorf("rules for illegally downloaded files: %s", fileExt) } return nil diff --git a/src/framework/utils/ip2region/ip2region.go b/src/framework/utils/ip2region/ip2region.go index 68bd0b16..b0c5da19 100644 --- a/src/framework/utils/ip2region/ip2region.go +++ b/src/framework/utils/ip2region/ip2region.go @@ -42,7 +42,8 @@ func init() { func RegionSearchByIp(ip string) (string, int, int64) { ip = ClientIP(ip) if ip == LOCAT_HOST { - return "0|0|0|内网IP|内网IP", 0, 0 + // "0|0|0|内网IP|内网IP" + return "0|0|0|Intranet IP|Intranet IP", 0, 0 } tStart := time.Now() region, err := searcher.SearchByStr(ip) @@ -59,12 +60,12 @@ func RegionSearchByIp(ip string) (string, int, int64) { func RealAddressByIp(ip string) string { ip = ClientIP(ip) if ip == LOCAT_HOST { - return "内网IP" + return "Intranet IP" // 内网IP } region, err := searcher.SearchByStr(ip) if err != nil { logger.Errorf("failed to SearchIP(%s): %s\n", ip, err) - return "未知" + return "unknown" // 未知 } parts := strings.Split(region, "|") province := parts[2] diff --git a/src/framework/utils/ssh/scp.go b/src/framework/utils/ssh/scp.go index de16b50e..b303a9d5 100644 --- a/src/framework/utils/ssh/scp.go +++ b/src/framework/utils/ssh/scp.go @@ -32,7 +32,7 @@ func FileSCPNeToLocal(neIp, nePath, localPath string) error { // 确保文件夹路径存在 err := os.MkdirAll(dirPath, os.ModePerm) if err != nil { - log.Errorf("创建文件夹失败 CreateFile %v", err) + log.Errorf("FileSCPNeToLocal MkdirAll err %v", err) return err } diff --git a/src/framework/utils/token/token.go b/src/framework/utils/token/token.go index 5d93761b..f02b2857 100644 --- a/src/framework/utils/token/token.go +++ b/src/framework/utils/token/token.go @@ -2,7 +2,7 @@ package token import ( "encoding/json" - "errors" + "fmt" "time" "ems.agt/src/framework/config" @@ -124,13 +124,14 @@ func Verify(tokenString string) (jwt.MapClaims, error) { }) if err != nil { logger.Errorf("token String Verify : %v", err) - return nil, errors.New("无效身份授权") + // 无效身份授权 + return nil, fmt.Errorf("invalid identity authorization") } // 如果解析负荷成功并通过签名校验 if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid { return claims, nil } - return nil, errors.New("token valid error") + return nil, fmt.Errorf("token valid error") } // LoginUser 缓存的登录用户信息 diff --git a/src/modules/net_element/controller/ne_info.go b/src/modules/net_element/controller/ne_info.go index 75b32f8f..a525e2a4 100644 --- a/src/modules/net_element/controller/ne_info.go +++ b/src/modules/net_element/controller/ne_info.go @@ -26,7 +26,7 @@ func (s *NeInfoController) NeTypeAndID(c *gin.Context) { neType := c.Query("neType") neId := c.Query("neId") if neType == "" || neId == "" { - c.JSON(400, result.CodeMsg(400, "参数错误")) + c.JSON(400, result.CodeMsg(400, "parameter error")) return }