refactor(task): 重构异步任务处理流程

service/gateway/gateway_http_service.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"mime/multipart"
 	"model-gateway/common/util"
@@ -15,7 +16,7 @@ import (
 	"github.com/gogf/gf/v2/util/guid"
 )
 
-type uploadFileResponse struct {
+type UploadFileResponse struct {
 	FileURL           string `json:"fileURL"`           // 文件 URL
 	FileSize          int    `json:"fileSize"`          // 文件大小（字节）
 	FileName          string `json:"fileName"`          // 文件名
@@ -23,7 +24,7 @@ type uploadFileResponse struct {
 	FileAddressPrefix string `json:"fileAddressPrefix"` // 文件地址前缀
 }
 
-func UploadByTask(ctx context.Context, _ *entity.AsynchTask, data []byte, fileExt string, _ string) (ossURL string, err error) {
+func UploadByTask(ctx context.Context, data []byte, fileExt string) (oss *UploadFileResponse, err error) {
 	// multipart
 	body := &bytes.Buffer{}
 	writer := multipart.NewWriter(body)
@@ -39,41 +40,43 @@ func UploadByTask(ctx context.Context, _ *entity.AsynchTask, data []byte, fileEx
 	filename := fmt.Sprintf("asynch_%d_%s%s", time.Now().Unix(), guid.S(), ext)
 	part, err := writer.CreateFormFile("file", filename)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	if _, err := part.Write(data); err != nil {
-		return "", err
+		return nil, err
 	}
 	contentType := writer.FormDataContentType()
 	if err = writer.Close(); err != nil {
-		return "", err
+		return nil, err
 	}
 
 	headers := util.ForwardHeaders(ctx)
 	headers["Content-Type"] = contentType
-	//fullURL := "oss/file/uploadFile"
 	fullURL := "oss/file/uploadFile"
 	g.Log().Infof(ctx, "[OSS] upload start url=%s filename=%s size=%d", fullURL, filename, len(data))
 
-	var resp uploadFileResponse
+	var resp UploadFileResponse
 	if err = commonHttp.Post(ctx, fullURL, headers, &resp, body.Bytes()); err != nil {
-		return "", err
+		return nil, err
 	}
-	g.Log().Infof(ctx, "[OSS] upload success url=%s size=%d format=%s", resp.FileURL, resp.FileSize, resp.FileFormat)
-	return resp.FileURL, nil
+	if &resp == nil {
+		return nil, errors.New("[OSS] 上传文件失败")
+	}
+	g.Log().Infof(ctx, "[OSS] 上传成功 url=%s size=%d format=%s", resp.FileURL, resp.FileSize, resp.FileFormat)
+	return &resp, nil
 }
 
 // CallbackPayload 回调请求体
 type CallbackPayload struct {
-	TaskId   string `json:"task_id"`
-	State    int    `json:"state"`
-	OssFile  string `json:"oss_file"`
-	FileType string `json:"file_type"`
-	Text     string `json:"text"`
-	ErrorMsg string `json:"error_msg"`
+	TaskId   string         `json:"task_id"`
+	State    int            `json:"state"`
+	OssFile  string         `json:"oss_file"`
+	FileType string         `json:"file_type"`
+	Messages map[string]any `json:"messages"`
+	ErrorMsg string         `json:"error_msg"`
 }
 
-// TriggerCallback 任务成功后的回调
+// TriggerCallback 任务的回调
 func TriggerCallback(ctx context.Context, t *entity.AsynchTask) {
 	headers := util.ForwardHeaders(ctx)
 	var resp struct{}
@@ -82,7 +85,7 @@ func TriggerCallback(ctx context.Context, t *entity.AsynchTask) {
 		State:    t.State,
 		OssFile:  t.OssFile,
 		FileType: t.FileType,
-		Text:     t.TextResult,
+		Messages: t.TextResult,
 		ErrorMsg: t.ErrorMsg,
 	}
 	jsonData, err := json.Marshal(payload)
@@ -103,8 +106,8 @@ func TriggerCallback(ctx context.Context, t *entity.AsynchTask) {
 
 // PromptsCallbackPayload 提示词回调请求体
 type PromptsCallbackPayload struct {
-	EpicycleId int64  `json:"epicycleId"`
-	Text       string `json:"text"`
+	EpicycleId int64          `json:"epicycleId"`
+	Messages   map[string]any `json:"messages"`
 }
 
 // TriggerPromptsCallback 任务成功后的提示词回调
@@ -114,7 +117,7 @@ func TriggerPromptsCallback(ctx context.Context, t *entity.AsynchTask, epicycleI
 	var resp struct{}
 	payload := PromptsCallbackPayload{
 		EpicycleId: epicycleId,
-		Text:       t.TextResult,
+		Messages:   t.TextResult,
 	}
 	jsonData, err := json.Marshal(payload)
 	if err != nil {