red-future/oss
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 将分布式锁从 redis 迁移至 utils 包

Browse Source
This commit is contained in:
曲皓东
2026-03-27 09:49:45 +08:00
parent 19d62ab927
commit 12a743d8da
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
model/dto/file_dto.go
View File

@@ -20,5 +20,8 @@ type UploadFile struct {
// UploadFileRes 上传文件响应 // UploadFileRes 上传文件响应
type UploadFileRes struct { type UploadFileRes struct {
FileURL string `json:"fileURL" dc:"上传地址"` FileURL string `json:"fileURL" dc:"上传地址"`
FileSize int `json:"fileSize" dc:"文件大小"`
FileName string `json:"fileName" dc:"文件名称"`
FileFormat string `json:"fileFormat" dc:"文件格式"`
FileAddressPrefix string `json:"fileAddressPrefix"` FileAddressPrefix string `json:"fileAddressPrefix"`
} }

9
service/file_service.go
View File

@@ -39,7 +39,7 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto
// 获取redis-租户存储-锁key // 获取redis-租户存储-锁key
fileLockKey := fmt.Sprintf(consts.FileLockKey, gconv.String(user.TenantId)) fileLockKey := fmt.Sprintf(consts.FileLockKey, gconv.String(user.TenantId))
success, err := redis.Lock(ctx, fileLockKey, gconv.Int64(time.Minute*1), func(ctx context.Context) error { success, err := utils.Lock(ctx, fileLockKey, gconv.Int64(time.Minute*1), func(ctx context.Context) error {
// 获取redis-租户存储容量总数 // 获取redis-租户存储容量总数
get, err := redis.RedisClient().Get(ctx, tenantOssTotalKey) get, err := redis.RedisClient().Get(ctx, tenantOssTotalKey)
if err != nil { if err != nil {
@@ -100,7 +100,7 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto
return nil, gerror.New("存储服务内存不足") return nil, gerror.New("存储服务内存不足")
} }
// 上传图片 // 上传图片
fileURL, err := minio.UploadFile(ctx, req.File) fileURL, fileName, fileFormat, err := minio.UploadFile(ctx, req.File)
if err != nil { if err != nil {
glog.Errorf(ctx, "上传图片失败: %v", err) glog.Errorf(ctx, "上传图片失败: %v", err)
return nil, err return nil, err
@@ -116,7 +116,10 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto
} }
// 返回图片url // 返回图片url
res = &dto.UploadFileRes{ res = &dto.UploadFileRes{
FileURL: fileURL, FileURL: fileURL,
FileSize: fileSize,
FileName: fileName,
FileFormat: fileFormat,
} }
url, err := utils.GetFileAddressPrefix(ctx) url, err := utils.GetFileAddressPrefix(ctx)
if err != nil { if err != nil {