fix: lint issues

middleware/cors.go

@@ -50,11 +50,9 @@ func CorsByRules(config *config.Config) gin.HandlerFunc {
 		// 严格白名单模式且未通过检查，直接拒绝处理请求
 		if whitelist == nil && config.Http.Cors.Mode == "strict-whitelist" && !(c.Request.Method == "GET" && c.Request.URL.Path == "/health") {
 			c.AbortWithStatus(http.StatusForbidden)
-		} else {
+		} else if c.Request.Method == http.MethodOptions {
 			// 非严格白名单模式，无论是否通过检查均放行所有 OPTIONS 方法
-			if c.Request.Method == http.MethodOptions {
+			c.AbortWithStatus(http.StatusNoContent)
-				c.AbortWithStatus(http.StatusNoContent)
-			}
 		}
 
 		// 处理请求

middleware/jwt.go

@@ -29,7 +29,7 @@ func JWTAuth(j *jwt.JWT) gin.HandlerFunc {
 		// 已登录用户被管理员禁用 需要使该用户的jwt失效 此处比较消耗性能 如果需要 请自行打开
 		// 用户被删除的逻辑 需要优化 此处比较消耗性能 如果需要 请自行打开
 
-		//if user, err := userService.FindUserByUuid(claims.UUID.String()); err != nil || user.Enable == 2 {
+		// if user, err := userService.FindUserByUuid(claims.UUID.String()); err != nil || user.Enable == 2 {
 		//	_ = jwtService.JsonInBlacklist(system.JwtBlacklist{Jwt: token})
 		//	response.FailWithDetailed(gin.H{"reload": true}, err.Error(), c)
 		//	c.Abort()

middleware/rbac.go

@@ -27,7 +27,7 @@ func CheckPermission(config *config.Config, rbac rbac.IRbac) gin.HandlerFunc {
 		}
 		claims := claimsCtx.(jwt.Claims)
 
-		//获取请求的PATH
+		// 获取请求的PATH
 		path := c.Request.URL.Path
 
 		// 获取请求方法

modules/auth/container/container.go

@@ -12,7 +12,6 @@ import (
 )
 
 func init() {
-
 	// controller
 	if err := container.Container.Provide(controller.NewRoleController); err != nil {
 		log.Fatal(err)
@@ -26,7 +25,7 @@ func init() {
 		log.Fatal(err)
 	}
 
-	//service
+	// service
 	if err := container.Container.Provide(service.NewRoleService); err != nil {
 		log.Fatal(err)
 	}

modules/auth/routes/routes.go

@@ -42,36 +42,31 @@ func (r *Route) Register() {
 		))
 
 		roleGroup := group.Group("roles")
-		{
+		roleGroup.GET("", gen.DataFunc2(
-			roleGroup.GET("", gen.DataFunc2(
+			r.role.GetByFilter,
-				r.role.GetByFilter,
+			gen.BindQuery(dto.RoleRequestFilter{}, err.BindQueryFailed),
-				gen.BindQuery(dto.RoleRequestFilter{}, err.BindQueryFailed),
+			gen.BindQuery(request.PageFilter{}, err.BindQueryFailed),
-				gen.BindQuery(request.PageFilter{}, err.BindQueryFailed),
+		))
-			))
 
-			roleGroup.GET("/tree", gen.DataFunc(r.role.Tree))
+		roleGroup.GET("/tree", gen.DataFunc(r.role.Tree))
 
-			roleGroup.POST("", gen.Func1(
+		roleGroup.POST("", gen.Func1(
-				r.role.Create,
+			r.role.Create,
-				gen.BindBody(dto.RoleRequestForm{}, err.BindBodyFailed),
+			gen.BindBody(dto.RoleRequestForm{}, err.BindBodyFailed),
-			))
+		))
 
-			roleGroup.PUT("/:id", gen.Func2(
+		roleGroup.PUT("/:id", gen.Func2(
-				r.role.UpdateByID,
+			r.role.UpdateByID,
-				gen.Int("role_id", err.BindPathFailed.Format("id")),
+			gen.Int("role_id", err.BindPathFailed.Format("id")),
-				gen.BindBody(dto.RoleRequestForm{}, err.BindBodyFailed),
+			gen.BindBody(dto.RoleRequestForm{}, err.BindBodyFailed),
-			))
+		))
 
-			roleGroup.DELETE("/:id", gen.Func1(
+		roleGroup.DELETE("/:id", gen.Func1(
-				r.role.Delete,
+			r.role.Delete,
-				gen.Int("role_id", err.BindPathFailed.Format("id")),
+			gen.Int("role_id", err.BindPathFailed.Format("id")),
-			))
+		))
-		}
 
 		permissionGroup := group.Group("permissions")
-		{
+		permissionGroup.GET("", gen.DataFunc(r.permission.Get))
-			permissionGroup.GET("", gen.DataFunc(r.permission.Get))
-		}
-
 	}
 }

modules/system/dao/dao.go

@@ -13,8 +13,8 @@ type Dao struct {
 	DB   *gorm.DB
 }
 
-func NewDao(DB *gorm.DB) *Dao {
+func NewDao(db *gorm.DB) *Dao {
-	return &Dao{DB: DB}
+	return &Dao{DB: db}
 }
 
 func (c *Dao) Release(ctx context.Context, a int, b string) error {

providers/captcha/captcha.go

@@ -33,7 +33,6 @@ func NewCaptcha(conf *config.Config, driver base64Captcha.Driver) (*Captcha, err
 		conf:    conf,
 		captcha: base64Captcha.NewCaptcha(driver, store),
 	}, nil
-
 }
 
 func (c *Captcha) Generate() (*CaptchaResponse, error) {

providers/config/loader.go

@@ -53,5 +53,4 @@ func Load() (*Config, error) {
 	}
 
 	return config, nil
-
 }

providers/config/section_database.go

@@ -21,10 +21,10 @@ type MySQL struct {
 	Username     string
 	Password     string
 	Prefix       string // 表前缀
-	Singular     bool   //是否开启全局禁用复数，true表示开启
+	Singular     bool   // 是否开启全局禁用复数，true表示开启
 	MaxIdleConns int    // 空闲中的最大连接数
 	MaxOpenConns int    // 打开到数据库的最大连接数
-	Engine       string //数据库引擎，默认InnoDB
+	Engine       string // 数据库引擎，默认InnoDB
 }
 
 func (m *MySQL) CreateDatabaseSql() string {
@@ -66,7 +66,7 @@ type PostgreSQL struct {
 	SslMode      string
 	TimeZone     string
 	Prefix       string // 表前缀
-	Singular     bool   //是否开启全局禁用复数，true表示开启
+	Singular     bool   // 是否开启全局禁用复数，true表示开启
 	MaxIdleConns int    // 空闲中的最大连接数
 	MaxOpenConns int    // 打开到数据库的最大连接数
 }

providers/config/section_http.go

@@ -42,10 +42,10 @@ type Whitelist struct {
 	AllowCredentials bool
 }
 
-func (h Http) Address() string {
+func (h *Http) Address() string {
 	return fmt.Sprintf("%s:%d", h.Host, h.Port)
 }
 
-func (h Http) PortString() string {
+func (h *Http) PortString() string {
 	return fmt.Sprintf(":%d", h.Port)
 }

providers/database/mysql.go

@@ -2,8 +2,8 @@ package database
 
 import (
 	"atom/providers/config"
+	"atom/providers/log"
 	"database/sql"
-	"fmt"
 
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
@@ -53,7 +53,7 @@ func NewMySQL(conf *config.MySQL) (*gorm.DB, error) {
 }
 
 // createDatabase 创建数据库
-func createMySQLDatabase(dsn string, driver string, createSql string) error {
+func createMySQLDatabase(dsn, driver, createSql string) error {
 	db, err := sql.Open(driver, dsn)
 	if err != nil {
 		return err
@@ -61,10 +61,11 @@ func createMySQLDatabase(dsn string, driver string, createSql string) error {
 	defer func(db *sql.DB) {
 		err = db.Close()
 		if err != nil {
-			fmt.Println(err)
+			log.Error(err)
 		}
 	}(db)
-	if err = db.Ping(); err != nil {
+	err = db.Ping()
+	if err != nil {
 		return err
 	}
 	_, err = db.Exec(createSql)

providers/http/engine.go

@@ -42,7 +42,7 @@ func NewService(cfg *config.Config, logger *log.Logger) *Service {
 	engine := gin.New()
 
 	engine.Use(gin.LoggerWithFormatter(func(param gin.LogFormatterParams) string {
-		return fmt.Sprintf("%s - [%s] \"%s %s %s %d %s \"%s\" %s\"\n",
+		return fmt.Sprintf(`%s - [%s] "%s %s %s %d %s '%q' %s"\n`,
 			param.ClientIP,
 			param.TimeStamp.Format(time.RFC1123),
 			param.Method,

providers/jwt/jwt.go

@@ -56,7 +56,7 @@ func NewJWT(config *config.Config) (*JWT, error) {
 	}, nil
 }
 
-func (j *JWT) CreateClaims(baseClaims BaseClaims) Claims {
+func (j *JWT) CreateClaims(baseClaims BaseClaims) *Claims {
 	ep, _ := time.ParseDuration(j.config.Http.JWT.ExpiresTime)
 	claims := Claims{
 		BaseClaims: baseClaims,
@@ -66,17 +66,17 @@ func (j *JWT) CreateClaims(baseClaims BaseClaims) Claims {
 			Issuer:    j.config.Http.JWT.Issuer,                              // 签名的发行者
 		},
 	}
-	return claims
+	return &claims
 }
 
 // 创建一个token
-func (j *JWT) CreateToken(claims Claims) (string, error) {
+func (j *JWT) CreateToken(claims *Claims) (string, error) {
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
 	return token.SignedString(j.SigningKey)
 }
 
 // CreateTokenByOldToken 旧token 换新token 使用归并回源避免并发问题
-func (j *JWT) CreateTokenByOldToken(oldToken string, claims Claims) (string, error) {
+func (j *JWT) CreateTokenByOldToken(oldToken string, claims *Claims) (string, error) {
 	v, err, _ := j.singleflight.Do("JWT:"+oldToken, func() (interface{}, error) {
 		return j.CreateToken(claims)
 	})
@@ -108,7 +108,6 @@ func (j *JWT) ParseToken(tokenString string) (*Claims, error) {
 			return claims, nil
 		}
 		return nil, TokenInvalid
-
 	} else {
 		return nil, TokenInvalid
 	}

utils/fs/dir.go

@@ -20,13 +20,15 @@ func PathExists(path string) (bool, error) {
 }
 
 func CreateDir(dirs ...string) (err error) {
+	var exist bool
 	for _, v := range dirs {
-		exist, err := PathExists(v)
+		exist, err = PathExists(v)
 		if err != nil {
 			return err
 		}
 		if !exist {
-			if err := os.MkdirAll(v, os.ModePerm); err != nil {
+			err = os.MkdirAll(v, os.ModePerm)
+			if err != nil {
 				return err
 			}
 		}

utils/fs/file.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 )
 
-func Move(src string, dst string) (err error) {
+func Move(src, dst string) (err error) {
 	if dst == "" {
 		return nil
 	}
@@ -48,8 +48,7 @@ func TrimSpace(target interface{}) {
 	t = t.Elem()
 	v := reflect.ValueOf(target).Elem()
 	for i := 0; i < t.NumField(); i++ {
-		switch v.Field(i).Kind() {
+		if v.Field(i).Kind() == reflect.String {
-		case reflect.String:
 			v.Field(i).SetString(strings.TrimSpace(v.Field(i).String()))
 		}
 	}

utils/zip.go

@@ -4,15 +4,16 @@ import (
 	"archive/zip"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
-// 解压
+// Unzip 解压
-func Unzip(zipFile string, destDir string) ([]string, error) {
+func Unzip(zipFile, destDir string) ([]string, error) {
 	zipReader, err := zip.OpenReader(zipFile)
-	var paths []string
+	paths := []string{}
 	if err != nil {
 		return []string{}, err
 	}
@@ -22,30 +23,45 @@ func Unzip(zipFile string, destDir string) ([]string, error) {
 		if strings.Contains(f.Name, "..") {
 			return []string{}, fmt.Errorf("%s 文件名不合法", f.Name)
 		}
+		// nolint
 		fpath := filepath.Join(destDir, f.Name)
 		paths = append(paths, fpath)
 		if f.FileInfo().IsDir() {
-			if err := os.MkdirAll(fpath, os.ModePerm); err != nil {
+			err = os.MkdirAll(fpath, os.ModePerm)
+			if err != nil {
 				return nil, err
 			}
 		} else {
-			if err = os.MkdirAll(filepath.Dir(fpath), os.ModePerm); err != nil {
+			err = os.MkdirAll(filepath.Dir(fpath), os.ModePerm)
-				return []string{}, err
-			}
-
-			inFile, err := f.Open()
 			if err != nil {
 				return []string{}, err
 			}
-			defer inFile.Close()
 
-			outFile, err := os.OpenFile(fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
+			zipFunc := func(fpath string) error {
-			if err != nil {
+				var inFile io.ReadCloser
-				return []string{}, err
+				var outFile *os.File
+
+				inFile, err = f.Open()
+				if err != nil {
+					return err
+				}
+				defer inFile.Close()
+
+				outFile, err = os.OpenFile(fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
+				if err != nil {
+					return err
+				}
+				defer outFile.Close()
+
+				// nolint
+				_, err = io.Copy(outFile, inFile)
+				if err != nil {
+					return err
+				}
+				return nil
 			}
-			defer outFile.Close()
 
-			_, err = io.Copy(outFile, inFile)
+			err = zipFunc(fpath)
 			if err != nil {
 				return []string{}, err
 			}
@@ -70,32 +86,35 @@ func ZipFiles(filename string, files []string, oldForm, newForm string) error {
 
 	// 把files添加到zip中
 	for _, file := range files {
-
 		err = func(file string) error {
-			zipFile, err := os.Open(file)
+			var zipFile *os.File
+			zipFile, err = os.Open(file)
 			if err != nil {
 				return err
 			}
 			defer zipFile.Close()
 			// 获取file的基础信息
-			info, err := zipFile.Stat()
+			var info fs.FileInfo
+			info, err = zipFile.Stat()
 			if err != nil {
 				return err
 			}
 
-			header, err := zip.FileInfoHeader(info)
+			var header *zip.FileHeader
+			header, err = zip.FileInfoHeader(info)
 			if err != nil {
 				return err
 			}
 
-			// 使用上面的FileInforHeader() 就可以把文件保存的路径替换成我们自己想要的了，如下面
+			// 使用上面的FileInfoHeader() 就可以把文件保存的路径替换成我们自己想要的了，如下面
 			header.Name = strings.Replace(file, oldForm, newForm, -1)
 
 			// 优化压缩
 			// 更多参考see http://golang.org/pkg/archive/zip/#pkg-constants
 			header.Method = zip.Deflate
 
-			writer, err := zipWriter.CreateHeader(header)
+			var writer io.Writer
+			writer, err = zipWriter.CreateHeader(header)
 			if err != nil {
 				return err
 			}