fix: lint issues

This commit is contained in:
yanghao05
2023-03-09 10:23:23 +08:00
parent 8d1bd191df
commit 5943b9e1d5
17 changed files with 88 additions and 78 deletions

View File

@@ -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) {

View File

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

View File

@@ -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 // 打开到数据库的最大连接数
}

View File

@@ -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)
}

View File

@@ -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)

View File

@@ -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,

View File

@@ -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
}