upgrade: update wrapper

This commit is contained in:
2025-10-13 22:25:55 +08:00
parent ef3a36f288
commit be4a065041
3 changed files with 35 additions and 20 deletions

View File

@ -9,15 +9,17 @@ package redis
import (
"context"
"git.zhangdeman.cn/zhangdeman/consts"
"github.com/go-redis/redismock/v9"
"strings"
"sync"
"time"
"git.zhangdeman.cn/zhangdeman/consts"
"git.zhangdeman.cn/zhangdeman/wrapper/op_any"
"git.zhangdeman.cn/zhangdeman/wrapper/op_array"
"github.com/go-redis/redismock/v9"
"git.zhangdeman.cn/zhangdeman/redis/abstract"
"git.zhangdeman.cn/zhangdeman/redis/define"
wrapperOperate "git.zhangdeman.cn/zhangdeman/wrapper"
"github.com/pkg/errors"
redisClient "github.com/redis/go-redis/v9"
"go.uber.org/zap"
@ -79,7 +81,7 @@ func (o *OwnClient) Exec(ctx context.Context, instanceFlag string, command const
}
argStrList := make([]string, 0)
for _, itemArg := range args {
argStrList = append(argStrList, wrapperOperate.AnyDataType(itemArg).ToString().Value())
argStrList = append(argStrList, op_any.AnyDataType(itemArg).ToString())
cmdParamList = append(cmdParamList, itemArg)
}
res := &define.RedisResult{
@ -140,7 +142,7 @@ func (o *OwnClient) Exec(ctx context.Context, instanceFlag string, command const
if res.Err = cmdRes.Err(); nil != res.Err {
return res
}
res.Result = wrapperOperate.AnyDataType(cmdRes.Val()).ToString().Value()
res.Result = op_any.AnyDataType(cmdRes.Val()).ToString()
return res
}
@ -209,12 +211,8 @@ func (o *OwnClient) SetLogger(loggerInstance *zap.Logger, extraLogFieldList []st
}
// isWriteCommand 判断是否写命令
//
// Author : go_developer@163.com<白茶清欢>
//
// Date : 16:22 2024/10/8
func (o *OwnClient) isWriteCommand(command consts.RedisCmd) bool {
return wrapperOperate.ArrayType([]consts.RedisCmd{
return op_array.Has(*op_array.ArrayType([]consts.RedisCmd{
consts.RedisCommandDel,
consts.RedisCommandSet,
consts.RedisCommandLpush,
@ -222,7 +220,7 @@ func (o *OwnClient) isWriteCommand(command consts.RedisCmd) bool {
consts.RedisCommandMSet,
consts.RedisCommandPublish,
consts.RedisCommandPsubScribe,
}).Has(consts.RedisCmd(strings.ToUpper(command.String()))) >= 0
}), consts.RedisCmd(strings.ToUpper(command.String()))) >= 0
}
// SetMockMode 启用mock, 非单元测试不要使用!!!!!!!!