Parcourir la source

Revert "update 优化用户token"

This reverts commit 02eac6b17cf254363022203347c7b8afd2819731.
Alvin il y a 9 mois
Parent
commit
81a81bd4a1

+ 1 - 2
game/game_cluster/nodes/webadmin/router/middleware.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-redis/redis/v8"
 	cfacade "github.com/mhaya/facade"
 	"github.com/mhaya/game/game_cluster/internal/code"
 	"github.com/mhaya/game/game_cluster/internal/constant"
@@ -27,7 +26,7 @@ func Auth(settingObj cfacade.ProfileJSON) gin.HandlerFunc {
 		}
 
 		result, err := mdb.RDB.Get(context.Background(), tokenString).Result()
-		if err != nil && err != redis.Nil {
+		if err != nil {
 			mhayaLogger.Warnf("Auth Get error: %s", err.Error())
 			common.PackUnauthorizedResult(c, code.InternalError, "token is empty")
 			return

+ 15 - 26
game/game_cluster/nodes/webadmin/service/admin.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	"github.com/go-redis/redis/v8"
 	"github.com/mhaya/game/game_cluster/internal/code"
 	"github.com/mhaya/game/game_cluster/internal/constant"
 	"github.com/mhaya/game/game_cluster/internal/mdb"
@@ -71,34 +70,24 @@ func (a *Admin) Login(ctx *gin.Context, username string, password string) (*enti
 		return nil, common.NewResult(code.UserNameOrPasswordError)
 	}
 
-	token, err := mdb.RDB.Get(ctx, user.Username).Result()
-	if err != nil && err != redis.Nil {
-		mhayaLogger.Warnf("Login Get error:", err)
+	// 创建token
+	generateToken, err := user.GenerateToken()
+	if err != nil {
+		mhayaLogger.Warnf("Login GenerateToken error:", err)
 		return nil, common.NewResult(code.InternalError)
 	}
 
-	if token == "" {
-		// 创建token
-		generateToken, err := user.GenerateToken()
-		if err != nil {
-			mhayaLogger.Warnf("Login GenerateToken error:", err)
-			return nil, common.NewResult(code.InternalError)
-		}
-
-		// 保存token 到 redis 中 过期时间为1天
-		err = mdb.RDB.Set(ctx, user.Username, generateToken, 24*time.Hour).Err()
-		if err != nil {
-			mhayaLogger.Warnf("Login Set error:", err)
-			return nil, common.NewResult(code.InternalError)
-		}
-
-		err = a.loginAuthSetRoleRedis(user.RoleId, generateToken)
-		if err != nil {
-			mhayaLogger.Warnf("Login loginAuthSetRoleRedis error:", err)
-			return nil, common.NewResult(code.InternalError)
-		}
+	// 保存token 到 redis 中 过期时间为1天
+	err = mdb.RDB.Set(ctx, generateToken, user.Username, 24*time.Hour).Err()
+	if err != nil {
+		mhayaLogger.Warnf("Login Set error:", err)
+		return nil, common.NewResult(code.InternalError)
+	}
 
-		token = generateToken
+	err = a.loginAuthSetRoleRedis(user.RoleId, generateToken)
+	if err != nil {
+		mhayaLogger.Warnf("Login loginAuthSetRoleRedis error:", err)
+		return nil, common.NewResult(code.InternalError)
 	}
 
 	// 更新用户登录时间
@@ -118,7 +107,7 @@ func (a *Admin) Login(ctx *gin.Context, username string, password string) (*enti
 
 	// 返回用户信息
 	resp := &entity.AdminResp{
-		ToKen:  token,
+		ToKen:  generateToken,
 		RoleID: user.RoleId,
 	}