diff --git a/middleware/fasthttp.go b/middleware/fasthttp.go index 7fd8667..e240710 100644 --- a/middleware/fasthttp.go +++ b/middleware/fasthttp.go @@ -51,9 +51,7 @@ func WechatSpider(handle fasthttp.RequestHandler) fasthttp.RequestHandler { "msg": "该UserAgent禁止访问接口!", }) return - } else { - handle(ctx) } - + handle(ctx) } } diff --git a/middleware/jwt.go b/middleware/jwt.go index 50acfc4..6636f8b 100644 --- a/middleware/jwt.go +++ b/middleware/jwt.go @@ -27,20 +27,22 @@ func JwtMiddleware(c *fiber.Ctx) error { if util.GetToken(c) == "" { err = my_error.NewBusiness(TOKEN_ERROR, INVALID_PARAMS) return res.Error(c, err) - } else { - - var service gm_user.GmUserService - claims, err = jwt.ParseToken(token) - if err != nil { - err = my_error.NewBusiness(TOKEN_ERROR, ERROR_AUTH_CHECK_TOKEN_FAIL) - return res.Error(c, err) - } else if time.Now().Unix() > claims.ExpiresAt { - err = my_error.NewBusiness(TOKEN_ERROR, ERROR_AUTH_CHECK_TOKEN_TIMEOUT) - return res.Error(c, err) - } else if !service.IsExitUser(claims) { - err = my_error.NewBusiness(TOKEN_ERROR, ERROR_AUTH_CHECK_TOKEN_TIMEOUT) - return res.Error(c, err) - } } + + var service gm_user.GmUserService + claims, err = jwt.ParseToken(token) + if err != nil { + err = my_error.NewBusiness(TOKEN_ERROR, ERROR_AUTH_CHECK_TOKEN_FAIL) + return res.Error(c, err) + } + if time.Now().Unix() > claims.ExpiresAt { + err = my_error.NewBusiness(TOKEN_ERROR, ERROR_AUTH_CHECK_TOKEN_TIMEOUT) + return res.Error(c, err) + } + if !service.IsExitUser(claims) { + err = my_error.NewBusiness(TOKEN_ERROR, ERROR_AUTH_CHECK_TOKEN_TIMEOUT) + return res.Error(c, err) + } + return c.Next() } diff --git a/platform-basic-libs/request/Request.go b/platform-basic-libs/request/Request.go index aab121a..89468f1 100644 --- a/platform-basic-libs/request/Request.go +++ b/platform-basic-libs/request/Request.go @@ -22,17 +22,19 @@ type CheckConfigStruct struct { func (this Request) CheckParameter(checkConfig []CheckConfigStruct, ctx *fiber.Ctx) (err error) { method := strings.ToUpper(ctx.Method()) for _, config := range checkConfig { - if method == "GET" { + switch method { + case "GET": if ctx.FormValue(config.Key) == "" { err = my_error.NewBusiness(ErrorMap, config.Code) return } - } else if method == "POST" { + case "POST": if !gjson.GetBytes(ctx.Body(), config.Key).Exists() { err = my_error.NewBusiness(ErrorMap, config.Code) return } } + } return } diff --git a/platform-basic-libs/sinker/clickhouse.go b/platform-basic-libs/sinker/clickhouse.go index eebb9fc..5527c5d 100644 --- a/platform-basic-libs/sinker/clickhouse.go +++ b/platform-basic-libs/sinker/clickhouse.go @@ -107,9 +107,8 @@ func GetDims(database, table string, excludedColumns []string, conn *sqlx.DB,onl if jsonErr == nil { dimsCacheMap.Store(dimsCachekey,dims) return dims,err - } else { - logs.Logger.Error("jsonErr", zap.Error(jsonErr)) } + logs.Logger.Error("jsonErr", zap.Error(jsonErr)) }else{ logs.Logger.Error("GzipUnCompressByte Err", zap.Error(err)) }