Merge branch 'develop' of gitee.com:hezhaohui123/gen2d into feat/async-generate-pipeline

Signed-off-by: 何朝晖 <hezhaohui0807@163.com>

backend/internal/handler/generate.go

@@ -3,13 +3,11 @@ package handler
 import (
 	"context"
 	"fmt"
-	"log"
 	"net/http"
-	"os"
-	"path/filepath"
 	"sync"
 	"time"
 
+	"gen2d/internal/logger"
 	"gen2d/internal/model"
 	"gen2d/internal/service"
 
@@ -58,8 +56,8 @@ type TaskResponse struct {
 
 // AssetsResponse 素材列表响应。
 type AssetsResponse struct {
-	Assets   []AssetResponse        `json:"assets"`
-	Metadata service.AssetMetadata  `json:"metadata"`
+	Assets   []AssetResponse       `json:"assets"`
+	Metadata service.AssetMetadata `json:"metadata"`
 }
 
 // taskRecord 内存中的任务记录。
@@ -106,7 +104,7 @@ func Generate(c *gin.Context) {
 	c.JSON(http.StatusOK, model.OK(GenerateResponse{TaskID: taskID}))
 
 	// 后台执行管线
-	go runPipelineBg(projectID, taskID, req)
+	go runPipelineBg(c.Request.Context(), projectID, taskID, req)
 }
 
 // runPipelineBg 后台执行生成管线，更新任务状态。
@@ -116,6 +114,8 @@ func runPipelineBg(projectID, taskID string, req GenerateRequest) {
 		updateTaskProgress(taskID, "running", stage, progress)
 	})
 
+	l := logger.With("task_id", taskID, "project_id", projectID)
+
 	updateTaskProgress(taskID, "running", "prompt_builder", 5)
 
 	in := service.PipelineInput{
@@ -139,30 +139,24 @@ func runPipelineBg(projectID, taskID string, req GenerateRequest) {
 
 	output, err := service.RunPipeline(ctx, in)
 	if err != nil {
-		log.Printf("[generate] task %s failed: %v", taskID, err)
-		updateFailed(taskID, err.Error())
+		l.Error("task pipeline failed", "error", err)
+		updateFailed(taskID, "生成管线执行失败")
 		return
 	}
 
 	updateTaskProgress(taskID, "saving", "format_adapter", 90)
 
-	// 保存图片到 ../generation/{projectId}/{taskId}/
-	genDir := filepath.Join("..", "generation", projectID, taskID)
-	if err := os.MkdirAll(genDir, 0755); err != nil {
-		updateFailed(taskID, "创建输出目录失败: "+err.Error())
-		return
-	}
-
 	assets := make([]AssetResponse, len(output.Assets))
 	for i, a := range output.Assets {
-		filename := fmt.Sprintf("%d.%s", i, a.Format)
-		filePath := filepath.Join(genDir, filename)
-		if err := os.WriteFile(filePath, a.Data, 0644); err != nil {
-			updateFailed(taskID, "保存图片失败: "+err.Error())
+		key := fmt.Sprintf("generation/%s/%s/%d.%s", projectID, taskID, i, a.Format)
+		cdnURL, err := storageSvc.Upload(ctx, key, a.Data)
+		if err != nil {
+			l.Error("upload asset failed", "index", i, "error", err)
+			updateFailed(taskID, "上传素材失败")
 			return
 		}
 		assets[i] = AssetResponse{
-			URL:    fmt.Sprintf("/generation/%s/%s/%s", projectID, taskID, filename),
+			URL:    cdnURL,
 			Format: a.Format,
 		}
 	}
@@ -182,7 +176,7 @@ func runPipelineBg(projectID, taskID string, req GenerateRequest) {
 		metadata: output.Metadata,
 	})
 
-	log.Printf("[generate] task %s completed, %d assets", taskID, len(assets))
+	l.Info("task completed", "asset_count", len(assets))
 }
 
 func updateTaskProgress(taskID, status, stage string, progress int) {