diff --git a/app/admin/middleware/auth.go b/app/admin/middleware/auth.go index a7519a16..69db9511 100644 --- a/app/admin/middleware/auth.go +++ b/app/admin/middleware/auth.go @@ -8,11 +8,20 @@ import ( "go-admin/tools/config" ) +// AuthInit jwt验证new func AuthInit() (*jwt.GinJWTMiddleware, error) { + timeout := time.Hour + if config.ApplicationConfig.Mode == "dev" { + timeout = time.Duration(876010) * time.Hour + } else { + if config.JwtConfig.Timeout != 0 { + timeout = time.Duration(config.JwtConfig.Timeout) * time.Second + } + } return jwt.New(&jwt.GinJWTMiddleware{ Realm: "test zone", Key: []byte(config.ApplicationConfig.JwtSecret), - Timeout: time.Hour, + Timeout: timeout, MaxRefresh: time.Hour, PayloadFunc: handler.PayloadFunc, IdentityHandler: handler.IdentityHandler, diff --git a/pkg/jwtauth/jwtauth.go b/pkg/jwtauth/jwtauth.go index 082e9b3a..216a7f00 100644 --- a/pkg/jwtauth/jwtauth.go +++ b/pkg/jwtauth/jwtauth.go @@ -3,13 +3,13 @@ package jwtauth import ( "crypto/rsa" "errors" - "github.com/dgrijalva/jwt-go" - "github.com/gin-gonic/gin" - config2 "go-admin/tools/config" "io/ioutil" "net/http" "strings" "time" + + "github.com/dgrijalva/jwt-go" + "github.com/gin-gonic/gin" ) const JwtPayloadKey = "JWT_PAYLOAD" @@ -284,17 +284,6 @@ func (mw *GinJWTMiddleware) MiddlewareInit() error { mw.SigningAlgorithm = "HS256" } - mw.Timeout = time.Hour - if config2.JwtConfig.Timeout != 0 { - // TODO: token过期时长 - mw.Timeout = time.Duration(config2.JwtConfig.Timeout) * time.Second - } - - if config2.ApplicationConfig.Mode == "dev" { - // TODO: dev mode token过期时长 为 10 年 - mw.Timeout = time.Duration(876010) * time.Hour - } - if mw.TimeFunc == nil { mw.TimeFunc = time.Now }