feat: 响应标头新增 Last-Modified

Author: SugarMGP

internal/controllers/objectController/get.go

@@ -63,7 +63,7 @@ func GetFile(c *gin.Context) {
 	objectKey := objectService.CleanLocation(data.ObjectKey)
 
 	if data.Thumbnail {
-		thumbnail, size, err := objectService.GetThumbnail(data.Bucket, objectKey)
+		thumbnail, info, err := objectService.GetThumbnail(data.Bucket, objectKey)
 		if errors.Is(err, oss.ErrResourceNotExists) || errors.Is(err, image.ErrFormat) {
 			c.AbortWithStatus(http.StatusNotFound)
 			return
@@ -76,7 +76,10 @@ func GetFile(c *gin.Context) {
 			_ = thumbnail.Close()
 		}()
 
-		c.DataFromReader(http.StatusOK, size, "image/jpeg", thumbnail, nil)
+		headers := map[string]string{
+			"Last-Modified": info.LastModified.Format(http.TimeFormat),
+		}
+		c.DataFromReader(http.StatusOK, info.ContentLength, info.ContentType, thumbnail, headers)
 	} else {
 		bucket, err := oss.Buckets.GetBucket(data.Bucket)
 		if err != nil {
@@ -97,7 +100,10 @@ func GetFile(c *gin.Context) {
 			_ = obj.Close()
 		}()
 
-		c.DataFromReader(http.StatusOK, content.ContentLength, content.ContentType, obj, nil)
+		headers := map[string]string{
+			"Last-Modified": content.LastModified.Format(http.TimeFormat),
+		}
+		c.DataFromReader(http.StatusOK, content.ContentLength, content.ContentType, obj, headers)
 	}
 }
 

internal/services/objectService/service.go

@@ -12,6 +12,7 @@ import (
 	"regexp"
 	"strings"
 	"sync"
+	"time"
 
 	"cube-go/pkg/config"
 	"cube-go/pkg/oss"
@@ -74,15 +75,20 @@ func ConvertToWebP(reader io.Reader) (*bytes.Reader, error) {
 }
 
 // GetThumbnail 获取缩略图
-func GetThumbnail(bucket string, objectKey string) (io.ReadCloser, int64, error) {
+func GetThumbnail(bucket string, objectKey string) (io.ReadCloser, *oss.GetObjectInfo, error) {
 	filename := bucket + "-" + objectKey
 	cachePath := filepath.Join(config.Config.GetString("oss.thumbnailDir"), filename+".jpg")
 
 	// 尝试从缓存中读取
 	if stat, err := os.Stat(cachePath); err == nil {
 		file, err := os.Open(cachePath)
 		if err == nil {
-			return file, stat.Size(), nil
+			info := oss.GetObjectInfo{
+				ContentType:   "image/jpeg",
+				ContentLength: stat.Size(),
+				LastModified:  stat.ModTime(),
+			}
+			return file, &info, nil
 		}
 	}
 
@@ -93,21 +99,26 @@ func GetThumbnail(bucket string, objectKey string) (io.ReadCloser, int64, error)
 		if stat, err := os.Stat(cachePath); err == nil {
 			file, err := os.Open(cachePath)
 			if err == nil {
-				return file, stat.Size(), nil
+				info := oss.GetObjectInfo{
+					ContentType:   "image/jpeg",
+					ContentLength: stat.Size(),
+					LastModified:  stat.ModTime(),
+				}
+				return file, &info, nil
 			}
 		}
-		return nil, 0, oss.ErrResourceNotExists
+		return nil, nil, oss.ErrResourceNotExists
 	}
 	defer done()
 
 	// 从 OSS 获取源文件
 	provider, err := oss.Buckets.GetBucket(bucket)
 	if err != nil {
-		return nil, 0, err
+		return nil, nil, err
 	}
 	object, _, err := provider.GetObject(objectKey)
 	if err != nil {
-		return nil, 0, err
+		return nil, nil, err
 	}
 	defer func() {
 		_ = object.Close()
@@ -116,7 +127,7 @@ func GetThumbnail(bucket string, objectKey string) (io.ReadCloser, int64, error)
 	// 解码图片
 	img, err := imaging.Decode(object, imaging.AutoOrientation(true))
 	if err != nil {
-		return nil, 0, err
+		return nil, nil, err
 	}
 	img = removeAlpha(img)
 	finalImg := imaging.Fit(img, maxLongEdge, maxLongEdge, imaging.CatmullRom)
@@ -129,15 +140,20 @@ func GetThumbnail(bucket string, objectKey string) (io.ReadCloser, int64, error)
 		Quality: config.Config.GetInt("oss.thumbnailQuality"),
 	})
 	if err != nil {
-		return nil, 0, err
+		return nil, nil, err
 	}
 
 	// 写入缓存文件
 	if err := os.MkdirAll(filepath.Dir(cachePath), os.ModePerm); err == nil {
 		_ = os.WriteFile(cachePath, buf.Bytes(), 0644)
 	}
 
-	return io.NopCloser(bytes.NewReader(buf.Bytes())), int64(buf.Len()), nil
+	info := oss.GetObjectInfo{
+		ContentType:   "image/jpeg",
+		ContentLength: int64(buf.Len()),
+		LastModified:  time.Now(),
+	}
+	return io.NopCloser(bytes.NewReader(buf.Bytes())), &info, nil
 }
 
 func waitForPath(p string) (first bool, done func()) {

pkg/oss/local.go

@@ -111,6 +111,7 @@ func (p *LocalStorageProvider) GetObject(objectKey string) (io.ReadCloser, *GetO
 	info := &GetObjectInfo{
 		ContentLength: stat.Size(),
 		ContentType:   getMimeType(relativePath),
+		LastModified:  stat.ModTime(),
 	}
 
 	// 读取文件

pkg/oss/provider.go

@@ -3,6 +3,7 @@ package oss
 import (
 	"errors"
 	"io"
+	"time"
 )
 
 // StorageProvider 定义存储服务接口
@@ -26,6 +27,7 @@ type FileListElement struct {
 type GetObjectInfo struct {
 	ContentType   string
 	ContentLength int64
+	LastModified  time.Time
 }
 
 var (

pkg/oss/s3.go

@@ -98,6 +98,7 @@ func (p *S3StorageProvider) GetObject(objectKey string) (io.ReadCloser, *GetObje
 	info := &GetObjectInfo{
 		ContentLength: aws.ToInt64(result.ContentLength),
 		ContentType:   aws.ToString(result.ContentType),
+		LastModified:  aws.ToTime(result.LastModified),
 	}
 	return result.Body, info, nil
 }