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

删除common/consts包 - 将Redis Key常量迁移到redis/keys.go

Browse Source
This commit is contained in:
Cold
2026-01-04 14:24:45 +08:00
committed by 张斌
parent c2574b0f9c
commit ae28ac1497
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mongo/mongo.go
View File

@@ -11,7 +11,6 @@ import (
"gitee.com/red-future---jilin-g/common/log/model/dto"
"github.com/gogf/gf/v2/container/gvar"
"gitee.com/red-future---jilin-g/common/consts"
"gitee.com/red-future---jilin-g/common/redis"
"gitee.com/red-future---jilin-g/common/utils"
"github.com/gogf/gf/v2/errors/gerror"
@@ -280,7 +279,7 @@ func (m *MongoDB) Find(ctx context.Context, filter bson.M, result interface{}, c
filter["isDeleted"] = false
filterMap := utils.OrderMap(filter)
optsMap := listOptionsToMap(ctx, opts...)
redisKey := fmt.Sprintf(consts.List, user.TenantId, collection, gconv.String(filterMap), gconv.String(optsMap))
redisKey := fmt.Sprintf(redis.List, user.TenantId, collection, gconv.String(filterMap), gconv.String(optsMap))
if m.Cache {
var resultStr *gvar.Var
resultStr, err = redis.RedisClient.Get(ctx, redisKey)
@@ -328,7 +327,7 @@ func (m *MongoDB) FindOne(ctx context.Context, filter bson.M, result interface{}
}
filter["isDeleted"] = false
filterMap := utils.OrderMap(filter)
redisKey := fmt.Sprintf(consts.One, user.TenantId, collection, gconv.String(filterMap))
redisKey := fmt.Sprintf(redis.One, user.TenantId, collection, gconv.String(filterMap))
if m.Cache {
var resultStr *gvar.Var
resultStr, err = redis.RedisClient.Get(ctx, redisKey)
@@ -360,7 +359,7 @@ func (m *MongoDB) FindOne(ctx context.Context, filter bson.M, result interface{}
return
}
func (m *MongoDB) CleanRedis(ctx context.Context, filter bson.M, tenantId interface{}, collection string) (err error) {
listKeys := fmt.Sprintf(consts.CleanList, tenantId, collection)
listKeys := fmt.Sprintf(redis.CleanList, tenantId, collection)
keys, err := redis.RedisClient.Keys(ctx, listKeys)
if err != nil {
return
@@ -371,7 +370,7 @@ func (m *MongoDB) CleanRedis(ctx context.Context, filter bson.M, tenantId interf
return
}
}
countKeys := fmt.Sprintf(consts.CleanCount, tenantId, collection)
countKeys := fmt.Sprintf(redis.CleanCount, tenantId, collection)
keys, err = redis.RedisClient.Keys(ctx, countKeys)
if err != nil {
return
@@ -385,7 +384,7 @@ func (m *MongoDB) CleanRedis(ctx context.Context, filter bson.M, tenantId interf
filter["isDeleted"] = false
delete(filter, "tenantId")
filterMap := utils.OrderMap(filter)
oneKey := fmt.Sprintf(consts.One, tenantId, collection, gconv.String(filterMap))
oneKey := fmt.Sprintf(redis.One, tenantId, collection, gconv.String(filterMap))
_, err = redis.RedisClient.Del(ctx, oneKey)
if err != nil {
return
@@ -654,7 +653,7 @@ func (m *MongoDB) Count(ctx context.Context, filter bson.M, collection string) (
}
filter["isDeleted"] = false
filterMap := utils.OrderMap(filter)
redisKey := fmt.Sprintf(consts.Count, user.TenantId, collection, gconv.String(filterMap))
redisKey := fmt.Sprintf(redis.Count, user.TenantId, collection, gconv.String(filterMap))
if m.Cache {
var resultStr *gvar.Var
resultStr, err = redis.RedisClient.Get(ctx, redisKey)