refactor: 将Redis客户端迁移至g.Redis并添加MinIO支持

This commit is contained in:
2026-04-15 17:00:09 +08:00
parent 076aa26036
commit f297ca9d12
5 changed files with 140 additions and 41 deletions

View File

@@ -5,14 +5,13 @@ import (
"fmt"
"oss/consts"
"oss/dao"
"oss/minio"
"oss/model/dto"
"oss/model/entity"
"time"
"github.com/gogf/gf/v2/os/glog"
"gitea.com/red-future/common/minio"
"gitea.com/red-future/common/redis"
"gitea.com/red-future/common/utils"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
@@ -41,7 +40,7 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto
success, err := utils.Lock(ctx, fileLockKey, gconv.Int64(time.Minute*1), func(ctx context.Context) error {
// 获取redis-租户存储容量总数
get, err := redis.RedisClient().Get(ctx, tenantOssTotalKey)
get, err := g.Redis().Get(ctx, tenantOssTotalKey)
if err != nil {
glog.Errorf(ctx, "获取redis-租户存储容量总数失败: %v", err)
return err
@@ -84,7 +83,7 @@ func (f *file) UploadFile(ctx context.Context, req *dto.UploadFileReq) (res *dto
Updater: user.UserName,
}
// 修改redis-租户存储容量总数 超时时间10分钟
if err = redis.RedisClient().SetEX(ctx, tenantOssTotalKey, tenantOssTotalKeyMap, gconv.Int64(time.Minute*10)); err != nil {
if err = g.Redis().SetEX(ctx, tenantOssTotalKey, tenantOssTotalKeyMap, gconv.Int64(time.Minute*10)); err != nil {
glog.Errorf(ctx, "修改redis-租户存储容量总数 超时时间10分钟失败: %v", err)
return err
}

View File

@@ -7,7 +7,6 @@ import (
"oss/model/dto"
"gitea.com/red-future/common/beans"
"gitea.com/red-future/common/redis"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/util/gconv"
)
@@ -22,7 +21,7 @@ func (s *tenantOssTotal) UpdateUsedOssSize(ctx context.Context) (err error) {
UserName: "admin",
})
// 使用 Keys 取出所有key
keys, err := redis.RedisClient().Keys(ctx, consts.OssTotalKey)
keys, err := g.Redis().Keys(ctx, consts.OssTotalKey)
if err != nil {
return
}