From 447278865d858e1b87d42059e27801f9a89cf229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Sat, 7 May 2022 01:49:41 +0800 Subject: [PATCH] update redis --- connom.go | 2 ++ memcached_cache.go | 6 +++--- redis.go | 54 ++++++++++++++++++++++++++++++++-------------- redis_cache.go | 31 +++++++++++++++----------- 4 files changed, 61 insertions(+), 32 deletions(-) diff --git a/connom.go b/connom.go index db10d8f..8009ed1 100644 --- a/connom.go +++ b/connom.go @@ -2,6 +2,8 @@ package gocache import "time" +const Version = "1.0.1" + var ( DefaultExpiration = time.Minute * 30 // 默认过期时间 ) diff --git a/memcached_cache.go b/memcached_cache.go index d9ac53e..069dcf7 100644 --- a/memcached_cache.go +++ b/memcached_cache.go @@ -44,14 +44,14 @@ func (mc *MemcachedCache) GetInterface(key string, result interface{}) { } // 如果不存在，则调用GetterInterface - get, err := mc.db.Get(key) + ret, err := mc.db.Get(key) if err == memcache.ErrCacheMiss { mc.db.Set(key, []byte(f())) - get, _ = mc.db.Get(key) + ret, _ = mc.db.Get(key) } - err = json.Unmarshal([]byte(get), result) + err = json.Unmarshal([]byte(ret), result) return } diff --git a/redis.go b/redis.go index 6c7a532..1f58426 100644 --- a/redis.go +++ b/redis.go @@ -2,84 +2,106 @@ package gocache import ( "context" + "errors" + "fmt" "github.com/go-redis/redis/v8" "time" ) // Redis https://github.com/go-redis/redis type Redis struct { - redis *redis.Client // 驱动 + db *redis.Client // 驱动 ctx context.Context // 上下文内容 expiration time.Duration // 默认过期时间 } // NewRedis 实例化 -func NewRedis(db *redis.Client, expiration time.Duration) *Redis { - return &Redis{redis: db, ctx: context.Background(), expiration: expiration} +func NewRedis(addr, password string, dbName int, expiration time.Duration) *Redis { + db := redis.NewClient(&redis.Options{ + Addr: addr, // 地址 + Password: password, // 密码 + DB: dbName, // 数据库 + PoolSize: 100, // 连接池大小 + }) + + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + + _, err := db.Ping(ctx).Result() + if err != nil { + panic(errors.New(fmt.Sprintf("连接失败，%s", err.Error()))) + } + + return &Redis{db: db, ctx: context.Background(), expiration: expiration} +} + +// NewRedisDb 实例化 +func NewRedisDb(db *redis.Client, expiration time.Duration) *Redis { + return &Redis{db: db, ctx: context.Background(), expiration: expiration} } // Set 设置一个key的值 func (r *Redis) Set(key string, value interface{}, expiration time.Duration) (string, error) { - return r.redis.Set(r.ctx, key, value, expiration).Result() + return r.db.Set(r.ctx, key, value, expiration).Result() } // SetDefaultExpiration 设置一个key的值，使用全局默认过期时间 func (r *Redis) SetDefaultExpiration(key string, value interface{}) (string, error) { - return r.redis.Set(r.ctx, key, value, r.expiration).Result() + return r.db.Set(r.ctx, key, value, r.expiration).Result() } // Get 查询key的值 func (r *Redis) Get(key string) (string, error) { - return r.redis.Get(r.ctx, key).Result() + return r.db.Get(r.ctx, key).Result() } // GetSet 设置一个key的值，并返回这个key的旧值 func (r *Redis) GetSet(key string, value interface{}) (string, error) { - return r.redis.GetSet(r.ctx, key, value).Result() + return r.db.GetSet(r.ctx, key, value).Result() } // SetNX 如果key不存在，则设置这个key的值 func (r *Redis) SetNX(key string, value interface{}, expiration time.Duration) error { - return r.redis.SetNX(r.ctx, key, value, expiration).Err() + return r.db.SetNX(r.ctx, key, value, expiration).Err() } // SetNXDefaultExpiration 如果key不存在，则设置这个key的值，使用全局默认过期时间 func (r *Redis) SetNXDefaultExpiration(key string, value interface{}) error { - return r.redis.SetNX(r.ctx, key, value, r.expiration).Err() + return r.db.SetNX(r.ctx, key, value, r.expiration).Err() } // MGet 批量查询key的值 func (r *Redis) MGet(keys ...string) ([]interface{}, error) { - return r.redis.MGet(r.ctx, keys...).Result() + return r.db.MGet(r.ctx, keys...).Result() } // MSet 批量设置key的值 // MSet(map[string]interface{}{"key1": "value1", "key2": "value2"}) func (r *Redis) MSet(values map[string]interface{}) error { - return r.redis.MSet(r.ctx, values).Err() + return r.db.MSet(r.ctx, values).Err() } // Incr 针对一个key的数值进行递增操作 func (r *Redis) Incr(key string) (int64, error) { - return r.redis.Incr(r.ctx, key).Result() + return r.db.Incr(r.ctx, key).Result() } // IncrBy 针对一个key的数值进行递增操作，指定每次递增多少 func (r *Redis) IncrBy(key string, value int64) (int64, error) { - return r.redis.IncrBy(r.ctx, key, value).Result() + return r.db.IncrBy(r.ctx, key, value).Result() } // Decr 针对一个key的数值进行递减操作 func (r *Redis) Decr(key string) (int64, error) { - return r.redis.Decr(r.ctx, key).Result() + return r.db.Decr(r.ctx, key).Result() } // DecrBy 针对一个key的数值进行递减操作，指定每次递减多少 func (r *Redis) DecrBy(key string, value int64) (int64, error) { - return r.redis.DecrBy(r.ctx, key, value).Result() + return r.db.DecrBy(r.ctx, key, value).Result() } // Del 删除key操作，支持批量删除 func (r *Redis) Del(keys ...string) error { - return r.redis.Del(r.ctx, keys...).Err() + return r.db.Del(r.ctx, keys...).Err() } diff --git a/redis_cache.go b/redis_cache.go index 1df9057..3dca8a9 100644 --- a/redis_cache.go +++ b/redis_cache.go @@ -1,6 +1,7 @@ package gocache import ( + "encoding/json" "time" ) @@ -14,39 +15,43 @@ type RedisCache struct { // NewCache 返回Redis缓存实例 func (r *Redis) NewCache(expiration time.Duration) *RedisCache { - return &RedisCache{ - db: r, // 操作类 - expiration: expiration, // 过期时间 - } + return &RedisCache{db: r, expiration: expiration} } -func (rc *RedisCache) GetInterface(key string) (ret string) { +// GetString 缓存操作 +func (rc *RedisCache) GetString(key string) (ret string) { - f := func() interface{} { - return rc.GetterInterface() + f := func() string { + return rc.GetterString() } + // 如果不存在，则调用GetterString ret, err := rc.db.Get(key) - if err != nil { - rc.db.Set(key, f, rc.expiration) + rc.db.Set(key, f(), rc.expiration) ret, _ = rc.db.Get(key) } return } -func (rc *RedisCache) GetString(key string) (ret string) { +// GetInterface 缓存操作 +func (rc *RedisCache) GetInterface(key string, result interface{}) { f := func() string { - return rc.GetterString() + marshal, _ := json.Marshal(rc.GetterInterface()) + return string(marshal) } + // 如果不存在，则调用GetterInterface ret, err := rc.db.Get(key) + if err != nil { - rc.db.Set(key, f, rc.expiration) - ret = f() + rc.db.Set(key, f(), rc.expiration) + ret, _ = rc.db.Get(key) } + err = json.Unmarshal([]byte(ret), result) + return }