feat: 添加minio内网访问地址配置与返回
分离CDN与MinIO内网地址,在文件上传响应中新增内网地址前缀字段
This commit is contained in:
+4
-1
@@ -100,9 +100,12 @@ minio:
|
||||
secure: false # 本地 MinIO 关闭 SSL(生产按需改为 true)
|
||||
region: "us-east-1" # 与 MinIO 服务端 REGION 一致(默认 us-east-1)
|
||||
|
||||
# 文件上传服务地址,与oss模块minio中的endpoint一致
|
||||
# 文件上传服务地址,cdn访问地址
|
||||
filePrefix: "http://cdn.redpowerfuture.com"
|
||||
|
||||
# 文件上传服务地址,minio内网访问地址
|
||||
minioPrefix: "http://192.168.0.83:9000"
|
||||
|
||||
# 文件存储初始化容量大小配置
|
||||
oss:
|
||||
capacitySize: 5000 #文件存储初始化容量(单位MB)
|
||||
|
||||
@@ -37,10 +37,11 @@ type UploadFile struct {
|
||||
|
||||
// UploadFileRes 上传文件响应
|
||||
type UploadFileRes struct {
|
||||
FileURL string `json:"fileURL" dc:"上传地址"`
|
||||
FileSize int `json:"fileSize" dc:"文件大小"`
|
||||
FileName string `json:"fileName" dc:"文件名称"`
|
||||
FileFormat string `json:"fileFormat" dc:"文件格式"`
|
||||
FileAddressPrefix string `json:"fileAddressPrefix"`
|
||||
Items []*UploadFileRes `json:"files"`
|
||||
FileURL string `json:"fileURL" dc:"上传地址"`
|
||||
FileSize int `json:"fileSize" dc:"文件大小"`
|
||||
FileName string `json:"fileName" dc:"文件名称"`
|
||||
FileFormat string `json:"fileFormat" dc:"文件格式"`
|
||||
FileAddressPrefix string `json:"fileAddressPrefix"`
|
||||
FileMinioAddressPrefix string `json:"fileMinioAddressPrefix"`
|
||||
Items []*UploadFileRes `json:"files"`
|
||||
}
|
||||
|
||||
+11
-7
@@ -10,6 +10,7 @@ import (
|
||||
"oss/minio"
|
||||
"oss/model/dto"
|
||||
"oss/model/entity"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/gogf/gf/v2/net/ghttp"
|
||||
@@ -101,6 +102,7 @@ func (f *file) UploadFiles(ctx context.Context, req *dto.UploadFileReq) (res *dt
|
||||
}
|
||||
|
||||
prefix, _ := utils.GetFileAddressPrefix(ctx)
|
||||
newPrefix := strings.ReplaceAll(prefix, "http://cdn.redpowerfuture.com", g.Cfg().MustGet(ctx, "minioPrefix").String())
|
||||
items := make([]*dto.UploadFileRes, 0, len(files))
|
||||
|
||||
for _, file := range files {
|
||||
@@ -124,16 +126,18 @@ func (f *file) UploadFiles(ctx context.Context, req *dto.UploadFileReq) (res *dt
|
||||
}
|
||||
|
||||
items = append(items, &dto.UploadFileRes{
|
||||
FileURL: fileURL,
|
||||
FileSize: gconv.Int(file.Size),
|
||||
FileName: fileName,
|
||||
FileFormat: fileFormat,
|
||||
FileAddressPrefix: prefix,
|
||||
FileURL: fileURL,
|
||||
FileSize: gconv.Int(file.Size),
|
||||
FileName: fileName,
|
||||
FileFormat: fileFormat,
|
||||
FileAddressPrefix: prefix,
|
||||
FileMinioAddressPrefix: newPrefix,
|
||||
})
|
||||
}
|
||||
fileRes := &dto.UploadFileRes{
|
||||
FileAddressPrefix: prefix,
|
||||
Items: items,
|
||||
FileAddressPrefix: prefix,
|
||||
FileMinioAddressPrefix: newPrefix,
|
||||
Items: items,
|
||||
}
|
||||
return fileRes, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user