v0.0.1开发：移除apibff的解析token信息中间件

apis/auth/internal/logic/csauthlogic.go

@@ -5,7 +5,7 @@ import (
 	"github.com/golang-jwt/jwt/v4"
 	"google.golang.org/protobuf/types/known/structpb"
 	"time"
-	"ylink/ext/jwtdata"
+	"ylink/ext/jwtkey"
 
 	"ylink/apis/auth/internal/svc"
 	"ylink/apis/auth/pb"
@@ -61,7 +61,7 @@ func (l *CsAuthLogic) generateCsToken(iat int64, csId string) (string, error) {
 	claims := make(jwt.MapClaims)
 	claims["iat"] = iat
 	claims["exp"] = iat + expire
-	claims[jwtdata.JwtKeyCsId] = csId
+	claims[jwtkey.CsId] = csId
 	token := jwt.New(jwt.SigningMethodHS256)
 	token.Claims = claims
 	return token.SignedString([]byte(secret))

apis/auth/internal/logic/playerauthlogic.go

@@ -5,7 +5,7 @@ import (
 	"github.com/golang-jwt/jwt/v4"
 	"google.golang.org/protobuf/types/known/structpb"
 	"time"
-	"ylink/ext/jwtdata"
+	"ylink/ext/jwtkey"
 
 	"ylink/apis/auth/internal/svc"
 	"ylink/apis/auth/pb"
@@ -64,8 +64,8 @@ func (l *PlayerAuthLogic) generatePlayerToken(iat int64, playerId string, gameId
 	claims := make(jwt.MapClaims)
 	claims["iat"] = iat
 	claims["exp"] = iat + expire
-	claims[jwtdata.JwtKeyPlayerId] = playerId
-	claims[jwtdata.JwtKeyGameId] = gameId
+	claims[jwtkey.PlayerId] = playerId
+	claims[jwtkey.GameId] = gameId
 	token := jwt.New(jwt.SigningMethodHS256)
 	token.Claims = claims
 	return token.SignedString([]byte(secret))

bff/apibff/desc/apibff.api

@@ -15,7 +15,6 @@ import (
 	group: player/cmd
 	prefix: api/v1
 	jwt: JwtAuth
-	middleware: Player2Ctx
 )
 service apibff {
 	@doc "玩家获取客服信息"

bff/apibff/internal/handler/routes.go

@@ -13,36 +13,33 @@ import (
 
 func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	server.AddRoutes(
-		rest.WithMiddlewares(
-			[]rest.Middleware{serverCtx.Player2Ctx},
-			[]rest.Route{
-				{
-					Method:  http.MethodPost,
-					Path:    "/player/fetch-cs-info",
-					Handler: playercmd.PlayerFetchCsInfoHandler(serverCtx),
-				},
-				{
-					Method:  http.MethodPost,
-					Path:    "/player/fetch-history-msg",
-					Handler: playercmd.PlayerFetchHistoryMsgHandler(serverCtx),
-				},
-				{
-					Method:  http.MethodPost,
-					Path:    "/player/fetch-msg",
-					Handler: playercmd.PlayerFetchMsgHandler(serverCtx),
-				},
-				{
-					Method:  http.MethodPost,
-					Path:    "/player/send-msg",
-					Handler: playercmd.PlayerSendMsgHandler(serverCtx),
-				},
-				{
-					Method:  http.MethodPost,
-					Path:    "/player/disconnect",
-					Handler: playercmd.PlayerDisconnectHandler(serverCtx),
-				},
-			}...,
-		),
+		[]rest.Route{
+			{
+				Method:  http.MethodPost,
+				Path:    "/player/fetch-cs-info",
+				Handler: playercmd.PlayerFetchCsInfoHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/player/fetch-history-msg",
+				Handler: playercmd.PlayerFetchHistoryMsgHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/player/fetch-msg",
+				Handler: playercmd.PlayerFetchMsgHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/player/send-msg",
+				Handler: playercmd.PlayerSendMsgHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/player/disconnect",
+				Handler: playercmd.PlayerDisconnectHandler(serverCtx),
+			},
+		},
 		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
 		rest.WithPrefix("/api/v1"),
 	)

bff/apibff/internal/middleware/player2ctxmiddleware.go

@@ -1,33 +0,0 @@
-package middleware
-
-import (
-	"context"
-	"github.com/golang-jwt/jwt/v4"
-	"net/http"
-	"ylink/ext/globalkey"
-	"ylink/ext/jwtdata"
-)
-
-type Player2CtxMiddleware struct {
-}
-
-func NewPlayer2CtxMiddleware() *Player2CtxMiddleware {
-	return &Player2CtxMiddleware{}
-}
-
-func (m *Player2CtxMiddleware) Handle(next http.HandlerFunc) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		accessToken := r.Header.Get("Authorization")
-		ctx := r.Context()
-		token, _ := jwt.Parse(accessToken, func(token *jwt.Token) (i interface{}, err error) {
-			return []byte(globalkey.AccessSecret), nil
-		})
-		// 将获取的token中的Claims强转为MapClaims
-		claims, _ := token.Claims.(jwt.MapClaims)
-		playerId := claims[jwtdata.JwtKeyPlayerId]
-		gameId := claims[jwtdata.JwtKeyGameId]
-		ctx = context.WithValue(ctx, jwtdata.JwtKeyPlayerId, playerId)
-		ctx = context.WithValue(ctx, jwtdata.JwtKeyGameId, gameId)
-		next(w, r.WithContext(ctx))
-	}
-}

bff/apibff/internal/svc/servicecontext.go

@@ -1,26 +1,19 @@
 package svc
 
 import (
-	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/zrpc"
 	"ylink/apis/cmd/cmd"
 	"ylink/bff/apibff/internal/config"
-	"ylink/bff/apibff/internal/middleware"
-	"ylink/ext/globalkey"
 )
 
 type ServiceContext struct {
-	Config     config.Config
-	CmdRpc     cmd.Cmd
-	Player2Ctx rest.Middleware
+	Config config.Config
+	CmdRpc cmd.Cmd
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
-	globalkey.AccessSecret = c.JwtAuth.AccessSecret
-	globalkey.AccessExpire = c.JwtAuth.AccessExpire
 	return &ServiceContext{
-		Config:     c,
-		CmdRpc:     cmd.NewCmd(zrpc.MustNewClient(c.CmdRpc)),
-		Player2Ctx: middleware.NewPlayer2CtxMiddleware().Handle,
+		Config: c,
+		CmdRpc: cmd.NewCmd(zrpc.MustNewClient(c.CmdRpc)),
 	}
 }

ext/ctxdata/ctxdata.go

@@ -6,20 +6,20 @@ package ctxdata
 
 import (
 	"context"
-	"ylink/ext/jwtdata"
+	"ylink/ext/jwtkey"
 )
 
 func GetPlayerIdFromCtx(ctx context.Context) string {
-	playerId, _ := ctx.Value(jwtdata.JwtKeyPlayerId).(string)
+	playerId, _ := ctx.Value(jwtkey.PlayerId).(string)
 	return playerId
 }
 
 func GetGameIdFromCtx(ctx context.Context) string {
-	gameId, _ := ctx.Value(jwtdata.JwtKeyGameId).(string)
+	gameId, _ := ctx.Value(jwtkey.GameId).(string)
 	return gameId
 }
 
 func GetCsIdFromJwt(ctx context.Context) string {
-	csId, _ := ctx.Value(jwtdata.JwtKeyCsId).(string)
+	csId, _ := ctx.Value(jwtkey.CsId).(string)
 	return csId
 }

ext/jwtkey/jwtkey.go

@@ -0,0 +1,11 @@
+//@File     jwtkey.go
+//@Time     2022/04/24
+//@Author   #Suyghur,
+
+package jwtkey
+
+const (
+	PlayerId = "player_id"
+	GameId   = "game_id"
+	CsId     = "cs_id"
+)