refactor: 将分布式锁从 redis 迁移至 utils 包
This commit is contained in:
@@ -39,7 +39,7 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto
|
||||
// 获取redis-租户存储-锁key
|
||||
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-租户存储容量总数
|
||||
get, err := redis.RedisClient().Get(ctx, tenantOssTotalKey)
|
||||
if err != nil {
|
||||
@@ -100,7 +100,7 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto
|
||||
return nil, gerror.New("存储服务内存不足")
|
||||
}
|
||||
// 上传图片
|
||||
fileURL, err := minio.UploadFile(ctx, req.File)
|
||||
fileURL, fileName, fileFormat, err := minio.UploadFile(ctx, req.File)
|
||||
if err != nil {
|
||||
glog.Errorf(ctx, "上传图片失败: %v", err)
|
||||
return nil, err
|
||||
@@ -116,7 +116,10 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto
|
||||
}
|
||||
// 返回图片url
|
||||
res = &dto.UploadFileRes{
|
||||
FileURL: fileURL,
|
||||
FileURL: fileURL,
|
||||
FileSize: fileSize,
|
||||
FileName: fileName,
|
||||
FileFormat: fileFormat,
|
||||
}
|
||||
url, err := utils.GetFileAddressPrefix(ctx)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user