去除pkg/auth对tools依赖,减少循环引用可能性

This commit is contained in:
linwenxiang committed 2020-10-30 15:40:51 +08:00
1 parent 4b5b0507e9
commit 5e3e16025c
2 files changed
+13 -15

No files matched your search

+10 -1
View File
@@ -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,
+3 -14
View File
@@ -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
}