u

code/allapp/allapp-go/biz/router/middleware/auth.go

@@ -39,16 +39,11 @@ func Auth() app.HandlerFunc {
 		}
 
 		// 校验 token
-		token := strings.TrimSpace(string(c.GetHeader("token")))
-		if token == "" {
-			response.Fail(c).Code(response.HttpCode.Unauthorized).Send()
-			c.Abort()
-			return
-		}
+		token := strings.TrimSpace(string(c.GetHeader("Token")))
 
 		verifyToken, flag := jwtx.VerifyToken(token)
 		if !flag {
-			response.Fail(c).Code(response.HttpCode.RefreshToken).Send()
+			response.Fail(c).Code(response.HttpCode.Unauthorized).Send()
 			c.Abort()
 			return
 		}
@@ -56,18 +51,18 @@ func Auth() app.HandlerFunc {
 		userID := verifyToken.UserID
 
 		// 获取 header 中的 spaceid
-		spaceIDStr := strings.TrimSpace(string(c.GetHeader("spaceid")))
+		spaceIDStr := strings.TrimSpace(string(c.GetHeader("X-Space-Id")))
 		spaceID, err := strconv.ParseInt(spaceIDStr, 10, 64)
 		if err != nil || spaceID == 0 {
-			response.Fail(c).Message("缺少有效 spaceid").Send()
+			response.Fail(c).Code(response.HttpCode.ErrSpaceRequired).Message("请先选择空间").Send()
 			c.Abort()
 			return
 		}
 
 		// 判断用户是否在该空间
-		inSpace, err := redisx.HasUserSpace(ctx, userID, spaceID)
+		inSpace, err := redisx.InSpace(ctx, userID, spaceID)
 		if err != nil || !inSpace {
-			response.Fail(c).Message("无权限访问该空间").Send()
+			response.Fail(c).Code(response.HttpCode.ErrSpaceRequired).Message("无权限访问该空间").Send()
 			c.Abort()
 			return
 		}