From f10b68e487581b4e40a42f5da0e4ad902b67f8c8 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Mon, 24 Nov 2025 17:56:05 +0800 Subject: [PATCH] =?UTF-8?q?refactor(api):=20=E7=A7=BB=E9=99=A4=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E6=97=B6=E7=9A=84Content-Type?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除UploadFileToOSS函数中的contentType参数 - 更新所有调用UploadFileToOSS的地方,移除传递的Content-Type值 - 简化上传逻辑,不再手动设置HTTP请求头中的Content-Type - 依赖服务器端自动检测文件类型进行处理 --- api/viid_client.go | 3 +-- api/viid_upload.go | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/viid_client.go b/api/viid_client.go index 61ac7d4..7721265 100644 --- a/api/viid_client.go +++ b/api/viid_client.go @@ -189,12 +189,11 @@ func SubmitFailure(ctx context.Context, taskID int64, errorCode, errorMessage st return nil } -func UploadFileToOSS(ctx context.Context, uploadUrl string, data []byte, contentType string) error { +func UploadFileToOSS(ctx context.Context, uploadUrl string, data []byte) error { req, err := http.NewRequestWithContext(ctx, "PUT", uploadUrl, bytes.NewReader(data)) if err != nil { return err } - req.Header.Set("Content-Type", contentType) resp, err := GetUploadClient().Do(req) if err != nil { diff --git a/api/viid_upload.go b/api/viid_upload.go index f45ccc9..a106cf9 100644 --- a/api/viid_upload.go +++ b/api/viid_upload.go @@ -4,6 +4,7 @@ import ( "ZhenTuLocalPassiveAdapter/logger" "context" "fmt" + "go.uber.org/zap" "golang.org/x/sync/errgroup" ) @@ -25,7 +26,7 @@ func UploadFaceData(ctx context.Context, scenicId int64, deviceNo string, faceIm // Upload Face Image g.Go(func() error { if len(faceImg) > 0 { - if err := UploadFileToOSS(subCtx, uploadConfig.FaceUploadURL, faceImg, "image/jpeg"); err != nil { + if err := UploadFileToOSS(subCtx, uploadConfig.FaceUploadURL, faceImg); err != nil { return fmt.Errorf("upload face image failed: %w", err) } } @@ -35,7 +36,7 @@ func UploadFaceData(ctx context.Context, scenicId int64, deviceNo string, faceIm // Upload Thumbnail Image g.Go(func() error { if len(thumbImg) > 0 { - if err := UploadFileToOSS(subCtx, uploadConfig.ThumbnailUploadURL, thumbImg, "image/jpeg"); err != nil { + if err := UploadFileToOSS(subCtx, uploadConfig.ThumbnailUploadURL, thumbImg); err != nil { return fmt.Errorf("upload thumbnail image failed: %w", err) } } @@ -45,7 +46,7 @@ func UploadFaceData(ctx context.Context, scenicId int64, deviceNo string, faceIm // Upload Source Image g.Go(func() error { if len(srcImg) > 0 { - if err := UploadFileToOSS(subCtx, uploadConfig.SourceUploadURL, srcImg, "image/jpeg"); err != nil { + if err := UploadFileToOSS(subCtx, uploadConfig.SourceUploadURL, srcImg); err != nil { return fmt.Errorf("upload source image failed: %w", err) } }