生成视频并且上传到minio

service/video/concat_service.go

@@ -7,11 +7,14 @@ import (
 	"fmt"
 	"io"
 	"mime/multipart"
+	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"time"
 
+	"gitea.com/red-future/common/beans"
 	commonHttp "gitea.com/red-future/common/http"
 
 	"github.com/gogf/gf/v2/frame/g"
@@ -64,7 +67,16 @@ func (s *concatService) Concat(ctx context.Context, req *ConcatReq) (res *Concat
 	outputPath := req.OutputPath
 	if outputPath == "" {
 		outputDir := filepath.Dir(req.VideoPaths[0])
-		outputPath = filepath.Join(outputDir, "concat_output.mp4")
+		// 用第一个输入文件名 + 拼接数 + 时间戳，溯源更清晰
+		baseName := filepath.Base(req.VideoPaths[0])
+		ext := filepath.Ext(baseName)
+		stem := strings.TrimSuffix(baseName, ext)
+		stemRunes := []rune(stem)
+		if len(stemRunes) > 20 {
+			stemRunes = stemRunes[:20]
+		}
+		outputPath = filepath.Join(outputDir,
+			fmt.Sprintf("concat_%s_x%d_%s%s", string(stemRunes), len(req.VideoPaths), time.Now().Format("150405"), ext))
 	}
 
 	method := req.Method
@@ -304,9 +316,9 @@ type uploadFileRes struct {
 	FileAddressPrefix string `json:"fileAddressPrefix"`
 }
 
-// UploadToMinIO 通过 OSS 微服务的 multipart 文件上传接口上传到 MinIO
+// UploadToMinIO 通过 OSS 微服务的 uploadFile 接口上传到 MinIO（multipart/form-data）
 func (s *concatService) UploadToMinIO(ctx context.Context, localFilePath string) (*uploadFileRes, error) {
-	// 手动构建 multipart/form-data 表单
+	// 构建 multipart/form-data 表单
 	var buf bytes.Buffer
 	mw := multipart.NewWriter(&buf)
 
@@ -325,25 +337,39 @@ func (s *concatService) UploadToMinIO(ctx context.Context, localFilePath string)
 	}
 	mw.Close()
 
+	// 使用 commonHttp 的客户端（含 Consul 服务发现），大文件上传设置长超时
 	client := commonHttp.Httpclient.Clone()
+	// 必须单独设置 Transport.ResponseHeaderTimeout，SetTimeout 只设 Client.Timeout
+	newTransport := http.DefaultTransport.(*http.Transport).Clone()
+	newTransport.ResponseHeaderTimeout = 5 * time.Minute
+	client.Transport = newTransport
+	client.SetTimeout(10 * time.Minute)
 
 	// 透传认证 headers
+	hasAuthHeader := false
 	if r := g.RequestFromCtx(ctx); r != nil {
 		for k, v := range r.Header {
 			client.SetHeader(k, v[0])
+			if strings.EqualFold(k, "Authorization") || strings.EqualFold(k, "X-User-Info") {
+				hasAuthHeader = true
+			}
 		}
 	}
+	// 原始请求无认证信息时，注入默认用户上下文
+	if !hasAuthHeader {
+		userJSON, _ := json.Marshal(beans.User{UserName: "admin", TenantId: 1})
+		client.SetHeader("X-User-Info", string(userJSON))
+	}
+
 	// 设置 multipart Content-Type（含 boundary）
 	contentType := mw.FormDataContentType()
-	g.Log().Debugf(ctx, "[UploadToMinIO] Content-Type: %s", contentType)
 	client.SetHeader("Content-Type", contentType)
 
-	// 打印请求信息
-	postBytes := buf.Bytes()
-	g.Log().Debugf(ctx, "[UploadToMinIO] 请求URL: oss/file/uploadFile, 文件: %s, Body大小: %d bytes, Boundary: %s",
-		localFilePath, len(postBytes), mw.Boundary())
+	g.Log().Debugf(ctx, "[UploadToMinIO] 请求URL: oss/file/uploadFile, 文件: %s, Body大小: %d bytes",
+		localFilePath, buf.Len())
 
-	response, err := client.Post(ctx, "oss/file/uploadFile", postBytes)
+	// 发送 multipart 请求（原始字节流）
+	response, err := client.Post(ctx, "oss/file/uploadFile", buf.Bytes())
 	if err != nil {
 		glog.Error(ctx, err)
 		return nil, fmt.Errorf("调用OSS上传服务失败: %v", err)