u

code/allapp/allapp-go/api/router/middleware/space_guard.go

@@ -17,46 +17,60 @@ const CtxSpaceIDKey = "space_id"
 func SpaceGuard() fiber.Handler {
 	return func(c fiber.Ctx) error {
 		userID, err := GetUserID(c)
-
 		if err != nil {
 			return err
 		}
 
 		spaceIDStr := strings.TrimSpace(c.Get("SPACE_ID"))
-
 		spaceID, err := strconv.ParseInt(spaceIDStr, 10, 64)
 		if err != nil || spaceID <= 0 {
 			return responsex.SpaceError(c, "请选择空间")
 		}
 
-		// 校验
+		// 1 先查 Redis
 		inSpace, err := redisx.SpaceIsMember(spaceID, userID)
+		if err != nil {
+			return err
+		}
 
 		if inSpace {
+			c.Locals(CtxSpaceIDKey, spaceID)
 			return c.Next()
 		}
 
-		// 检验空间是否存在
-		space, err := db.Queries.GetSpaceById(c.Context(), spaceID)
-
+		// 2 Redis miss → 查数据库
+		role, err := db.Queries.GetUserSpaceRole(c.Context(), repo.GetUserSpaceRoleParams{
+			SpaceID: spaceID,
+			UserID:  userID,
+		})
 		if err != nil {
 			if errorx.IsNotFound(err) {
-				// 未找到
-				return responsex.SpaceError(c, "空间已失效")
+				return responsex.SpaceError(c, "未加入空间")
 			}
 			return err
 		}
 
-		// 空间有效，判断是否在该空间内
-		role, err := db.Queries.GetUserSpaceRole(c.Context(), repo.GetUserSpaceRoleParams{
-			SpaceID: spaceID,
-			UserID:  spaceID,
-		})
-		if err != nil {
-			if errorx.IsNotFound(err) {
-
-			}
-		}
+		// 3 写回 Redis（重建缓存）
+		_ = redisx.SpaceAddOrUpdateMember(spaceID, userID, int(role))
+		c.Locals(CtxSpaceIDKey, spaceID)
 
+		// 4 放行
+		return c.Next()
 	}
 }
+
+func GetSpaceID(c fiber.Ctx) (int64, error) {
+	v := c.Locals(CtxSpaceIDKey)
+
+	if v == nil {
+		return 0, responsex.SpaceError(c, "空间无效")
+	}
+
+	spaceID, ok := v.(int64)
+
+	if !ok {
+		return 0, responsex.SpaceError(c, "空间无效")
+	}
+
+	return spaceID, nil
+}