refactor: token authentication

server/common/jwt.go

@@ -2,25 +2,36 @@ package common
 
 import (
 	"crm/global"
-	"strconv"
 	"time"
 
 	"github.com/golang-jwt/jwt/v4"
 )
 
-var signingKey = []byte(global.Config.Jwt.SigningKey)
+type Claims struct {
+	Uid int64 `json:"uid"`
+	jwt.RegisteredClaims
+}
 
 // 生成Token
-func GenToken(uid int64, expire int64) (string, error) {
-	username := strconv.FormatInt(uid, 20)
-	type Claims struct {
-		Username string `json:"username"`
-		jwt.RegisteredClaims
-	}
-	claims := Claims{username, jwt.RegisteredClaims{
-		ExpiresAt: &jwt.NumericDate{Time: time.Now().Add(time.Duration(expire) * time.Hour)},
-		Issuer:    username,
+func GenToken(uid int64) (string, error) {
+	var signingKey = []byte(global.Config.Jwt.SigningKey)
+	var expiredTime = global.Config.Jwt.ExpiredTime
+	claims := Claims{uid, jwt.RegisteredClaims{
+		ExpiresAt: &jwt.NumericDate{Time: time.Now().Add(time.Duration(expiredTime) * time.Second)},
+		Issuer:    "crm",
 	}}
 	token, err := jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString(signingKey)
 	return token, err
 }
+
+// 校验Token
+func VerifyToken(tokens string) (int64, error) {
+	token, err := jwt.ParseWithClaims(tokens, &Claims{}, func(token *jwt.Token) (interface{}, error) {
+		return []byte(global.Config.Jwt.SigningKey), nil
+	})
+	claims, ok := token.Claims.(*Claims)
+	if ok && token.Valid {
+		return claims.Uid, nil
+	}
+	return 0, err
+}

server/config.yaml

@@ -23,6 +23,7 @@ redis:
 # JWT配置
 jwt:
   signingKey: z3d6k8v0n3w7m9sa1fd0u09h
+  expiredTime: 604800
 
 # 邮件服务
 mail:

server/config/config.go

@@ -36,7 +36,8 @@ type Redis struct {
 
 // JWT用户认证配置
 type Jwt struct {
-	SigningKey string `mapstructure:"signingKey"`
+	SigningKey  string `mapstructure:"signingKey"`
+	ExpiredTime int    `mapstructure:"expiredTime"`
 }
 
 // 邮件服务配置

server/middleware/jwt.go

@@ -1,23 +1,25 @@
 package middleware
 
 import (
+	"crm/common"
 	"crm/response"
-	"crm/service"
+	"strconv"
 
 	"github.com/gin-gonic/gin"
 )
 
-// JwtAuth JWT认证中间件
+// JWT认证中间件
 func JwtAuth() gin.HandlerFunc {
 	return func(c *gin.Context) {
+		uid, _ := strconv.Atoi(c.Request.Header.Get("uid"))
 		token := c.Request.Header.Get("token")
 		if token == "" {
 			response.Result(response.ErrCodeNoLogin, nil, c)
 			c.Abort()
 			return
 		}
-		user := &service.UserService{}
-		if err := user.VerifyToken(token); err != nil {
+		userid, err := common.VerifyToken(token)
+		if userid != int64(uid) || err != nil {
 			response.Result(response.ErrCodeTokenExpire, nil, c)
 			c.Abort()
 			return

server/service/user.go

@@ -74,17 +74,12 @@ func (u *UserService) Login(param *models.UserLoginParam) (*models.UserInfo, int
 	}
 
 	// 生成并保存Token
-	token, err := common.GenToken(user.Id, TOKEN_MAX_EXPIRE_TIME)
+	token, err := common.GenToken(user.Id)
 	if err != nil {
 		log.Printf("[error]Login:GenerateToken:%s", err)
 		return nil, response.ErrCodeFailed
 	}
-	expiration := time.Duration(TOKEN_MAX_EXPIRE_TIME) * time.Hour
-	if err := global.Rdb.SetEx(ctx, token, "", expiration).Err(); err != nil {
-		log.Printf("[error]Login:SaveToken:%s", err)
-		return nil, response.ErrCodeFailed
-	}
-
+	
 	userInfo := models.UserInfo{
 		Uid:   user.Id,
 		Token: token,