大改jwt

utils/basic/request_parse.go

@@ -2,6 +2,7 @@ package basic
 
 import (
 	"errors"
+	"fusenapi/fsm"
 	"fusenapi/utils/auth"
 	"net/http"
 	"reflect"
@@ -11,6 +12,8 @@ import (
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
+var DefaultJwtSecret uint64 = 21321321321
+
 type IJWTParse interface {
 	ParseJwtToken(r *http.Request) (jwt.MapClaims, error)
 }
@@ -48,48 +51,66 @@ func NormalAfterLogic(w http.ResponseWriter, r *http.Request, resp *Response) {
 	}
 }
 
-func RequestParse(w http.ResponseWriter, r *http.Request, svcCtx IJWTParse, LogicRequest any) (userinfo *auth.UserInfo, err error) {
+func RequestParse(w http.ResponseWriter, r *http.Request, state *fsm.StateCluster, LogicRequest any) (*auth.UserInfo, error) {
 
-	// 解析JWT token,并对空用户进行判断
-	claims, err := svcCtx.ParseJwtToken(r)
-	// auth.ParseJwtTokenUint64Secret()
-
-	// 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息
+	token, info, err := auth.ParseJwtTokenHeader[auth.UserInfo](r)
 	if err != nil {
-		httpx.OkJsonCtx(r.Context(), w, &Response{
-			Code:    401,            // 返回401状态码,表示未授权
-			Message: "unauthorized", // 返回未授权信息
-		})
-		logx.Info("unauthorized:", err.Error()) // 记录错误日志
-		return
+		logx.Error(err)
+		return nil, err
 	}
 
-	if claims != nil {
-		// 从token中获取对应的用户信息
-		userinfo, err = auth.GetUserInfoFormMapClaims(claims)
-		// 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息
+	var secret uint64 = 0
+	if info.IsUser() {
+		us, err := state.GetUserState(info.UserId)
+		if err != nil {
+			logx.Error(err)
+			return nil, err
+		}
+		secret = us.PwdHash
+
+	} else if info.IsGuest() {
+		secret = DefaultJwtSecret
+	}
+
+	var userinfo *auth.UserInfo
+	if secret != 0 {
+		claims, err := auth.ParseJwtTokenUint64Secret(token, secret)
+		// 如果解析JWT token出错,则返回未授权的JSON响应并记录错误消息
 		if err != nil {
 			httpx.OkJsonCtx(r.Context(), w, &Response{
-				Code:    401,
-				Message: "unauthorized",
+				Code:    401,            // 返回401状态码,表示未授权
+				Message: "unauthorized", // 返回未授权信息
 			})
-			logx.Info("unauthorized:", err.Error())
-			return
+			logx.Info("unauthorized:", err.Error()) // 记录错误日志
+			return nil, err
+		}
+
+		if claims != nil {
+			// 从token中获取对应的用户信息
+			userinfo, err = auth.GetUserInfoFormMapClaims(claims)
+			// 如果获取用户信息出错,则返回未授权的JSON响应并记录错误消息
+			if err != nil {
+				httpx.OkJsonCtx(r.Context(), w, &Response{
+					Code:    401,
+					Message: "unauthorized",
+				})
+				logx.Info("unauthorized:", err.Error())
+				return nil, err
+			}
+		} else {
+			// 如果claims为nil,则认为用户身份为白板用户
+			userinfo = &auth.UserInfo{UserId: 0, GuestId: 0}
 		}
-	} else {
-		// 如果claims为nil,则认为用户身份为白板用户
-		userinfo = &auth.UserInfo{UserId: 0, GuestId: 0}
 	}
 
-	// var req types.RequestGoogleLogin
 	// 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据
 	if err = httpx.Parse(r, LogicRequest); err != nil {
 		httpx.OkJsonCtx(r.Context(), w, &Response{
 			Code:    510,
 			Message: "parameter error",
 		})
-		logx.Info(err)
-		return
+		logx.Error(err)
+		return nil, err
 	}
 
 	return userinfo, err