mirror of
https://github.com/bufanyun/hotgo.git
synced 2025-08-28 00:51:13 +08:00
add golangci-lint.
This commit is contained in:
@@ -51,7 +51,6 @@ func WalkDir(dirname string) (error, []fileInfo) {
|
||||
fileInfos = append(fileInfos, fi) //slice 中添加成员
|
||||
}
|
||||
}
|
||||
|
||||
return nil, fileInfos
|
||||
}
|
||||
|
||||
@@ -64,7 +63,6 @@ func DirSize(dirname string) string {
|
||||
for _, n := range files {
|
||||
ss += n.size
|
||||
}
|
||||
|
||||
return format.FileSize(ss)
|
||||
}
|
||||
|
||||
|
@@ -133,15 +133,10 @@ func Ext(baseName string) string {
|
||||
}
|
||||
|
||||
// UploadFileByte 获取上传文件的byte
|
||||
func UploadFileByte(file *ghttp.UploadFile) (b []byte, err error) {
|
||||
func UploadFileByte(file *ghttp.UploadFile) ([]byte, error) {
|
||||
open, err := file.Open()
|
||||
if err != nil {
|
||||
return
|
||||
return nil, err
|
||||
}
|
||||
all, err := io.ReadAll(open)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
return all, nil
|
||||
return io.ReadAll(open)
|
||||
}
|
||||
|
@@ -47,7 +47,6 @@ func DecryptText(text string) (string, error) {
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return string(str), nil
|
||||
}
|
||||
|
||||
|
@@ -49,7 +49,6 @@ func GetIds(tree string) (ids []int64) {
|
||||
ids = append(ids, newId)
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@@ -65,7 +64,7 @@ func GenTree(menus []map[string]interface{}) (realMenu []map[string]interface{})
|
||||
// GenTreeWithField 生成关系树 自定义生成属性
|
||||
func GenTreeWithField(menus []map[string]interface{}, op GenOption) (realMenu []map[string]interface{}) {
|
||||
if len(menus) < 1 {
|
||||
return nil
|
||||
return
|
||||
}
|
||||
|
||||
minPid := GetMinPid(menus, op.PidField)
|
||||
|
@@ -7,6 +7,7 @@ package useragent
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/gogf/gf/v2/text/gstr"
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
@@ -18,7 +19,7 @@ func GetOs(userAgent string) string {
|
||||
return osName
|
||||
}
|
||||
|
||||
strRe, _ := regexp.Compile(`(?i:((.*?)))`)
|
||||
strRe, _ := regexp.Compile(`(?i:\((.*?)\))`)
|
||||
userAgent = strRe.FindString(userAgent)
|
||||
|
||||
levelNames := ":micromessenger:dart:Windows NT:Windows Mobile:Windows Phone:Windows Phone OS:Macintosh|Macintosh:Mac OS:CrOS|CrOS:iPhone OS:iPad|iPad:OS:Android:Linux:blackberry:hpwOS:Series:Symbian:PalmOS:SymbianOS:J2ME:Sailfish:Bada:MeeGo:webOS|hpwOS:Maemo:"
|
||||
@@ -41,9 +42,8 @@ func GetOs(userAgent string) string {
|
||||
} else if strings.Contains(name, s) {
|
||||
name = strings.TrimSpace(s)
|
||||
} else if !strings.Contains(s, name) {
|
||||
if strings.Contains(name, "iPhone") ||
|
||||
strings.Contains(name, "iPad") {
|
||||
s = strings.Trim(s, "Mac OS X")
|
||||
if strings.Contains(name, "iPhone") || strings.Contains(name, "iPad") {
|
||||
s = gstr.Trim(s, "Mac OS X")
|
||||
}
|
||||
|
||||
if s != "" {
|
||||
|
Reference in New Issue
Block a user