From f25b00654c03542e80d29e3831623c9f40d3b18d Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Tue, 21 Jul 2020 16:07:24 +0800 Subject: [PATCH] 'commit' --- dsBaseRpc/Utils/RedisUtil/RedisUtil.go | 15 ++++++--------- dsBaseRpc/Utils/SqlKit/SqlKit.go | 10 +++++----- dsBaseRpc/Utils/SysKit/SysKit.go | 4 ++-- dsBaseRpc/go.mod | 2 +- dsBaseRpc/go.sum | 9 +++++---- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dsBaseRpc/Utils/RedisUtil/RedisUtil.go b/dsBaseRpc/Utils/RedisUtil/RedisUtil.go index c89488da..acded31d 100644 --- a/dsBaseRpc/Utils/RedisUtil/RedisUtil.go +++ b/dsBaseRpc/Utils/RedisUtil/RedisUtil.go @@ -5,8 +5,7 @@ import ( "dsBaseRpc/Utils/ConfigUtil" "dsBaseRpc/Utils/LogUtil" garybudRedis "github.com/garyburd/redigo/redis" - "github.com/go-redis/redis/v8" - "golang.org/x/net/context" + "github.com/go-redis/redis/v7" "time" ) @@ -15,8 +14,6 @@ var ( RedisClient *redis.Client //这个是为了使用OAuth2类库，引入的redis池，也是没办法之举~ Pool *garybudRedis.Pool - //上下文 - Ctx = context.Background() ) func init() { @@ -45,7 +42,7 @@ func init() { IdleCheckFrequency: 100 * time.Millisecond, }) - _, err := RedisClient.Ping(Ctx).Result() + _, err := RedisClient.Ping().Result() if err == redis.Nil { LogUtil.Error(ErrorConst.CreateRedisError, "Redis异常") } else if err != nil { @@ -60,7 +57,7 @@ func init() { 时间：2020-02-18 */ func DEL(key string) { - RedisClient.Del(Ctx, key) + RedisClient.Del(key) } /** @@ -69,14 +66,14 @@ func DEL(key string) { 时间：2020-02-25 */ func SET(key string, value string, ttl time.Duration) { - RedisClient.Set(Ctx, key, value, ttl) + RedisClient.Set(key, value, ttl) } /** 功能：将指定的键值增加 */ func IncrBy(key string, value int64) int64 { - c, _ := RedisClient.IncrBy(Ctx, key, value).Result() + c, _ := RedisClient.IncrBy(key, value).Result() return c } @@ -86,7 +83,7 @@ func IncrBy(key string, value int64) int64 { 时间：2020-02-25 */ func GET(key string) (string, error) { - var r = RedisClient.Get(Ctx, key) + var r = RedisClient.Get(key) if r.Err() != nil { return "", r.Err() } else { diff --git a/dsBaseRpc/Utils/SqlKit/SqlKit.go b/dsBaseRpc/Utils/SqlKit/SqlKit.go index 0043a946..ce566d93 100644 --- a/dsBaseRpc/Utils/SqlKit/SqlKit.go +++ b/dsBaseRpc/Utils/SqlKit/SqlKit.go @@ -9,7 +9,7 @@ import ( "dsBaseRpc/Utils/RedisUtil" "encoding/json" "fmt" - "github.com/go-redis/redis/v8" + "github.com/go-redis/redis/v7" "github.com/xormplus/builder" "reflect" "strconv" @@ -112,10 +112,10 @@ func batchWriteRedis(list []map[string]interface{}, m Selector) { } key := prefix + pkSuffix jsonStr, _ := json.Marshal(bean) - pipe.Set(RedisUtil.Ctx, key, jsonStr, 24*time.Hour) + pipe.Set(key, jsonStr, 24*time.Hour) } //执行管道 - pipe.Exec(RedisUtil.Ctx) + pipe.Exec() } /** @@ -128,10 +128,10 @@ func batchReadRedis(ids []string, prefix string) ([]map[string]interface{}, []st var list []*redis.StringCmd pipe := RedisUtil.RedisClient.Pipeline() for i := 0; i < len(ids); i++ { - list = append(list, pipe.Get(RedisUtil.Ctx, prefix+ids[i])) + list = append(list, pipe.Get(prefix+ids[i])) } //2、执行管道 - _, err := pipe.Exec(RedisUtil.Ctx) + _, err := pipe.Exec() if err != nil { LogUtil.Error(ErrorConst.RedisError, err.Error()) } diff --git a/dsBaseRpc/Utils/SysKit/SysKit.go b/dsBaseRpc/Utils/SysKit/SysKit.go index b11ce9e9..821dfd1d 100644 --- a/dsBaseRpc/Utils/SysKit/SysKit.go +++ b/dsBaseRpc/Utils/SysKit/SysKit.go @@ -38,7 +38,7 @@ func ClearRpcRedis() { for { var keys []string var err error - keys, cursor, err = redisClient.Scan(RedisUtil.Ctx, cursor, "T*", 10).Result() + keys, cursor, err = redisClient.Scan(cursor, "T*", 10).Result() if err != nil { //panic(err) fmt.Println(err.Error()) @@ -55,7 +55,7 @@ func ClearRpcRedis() { } } if !found { - redisClient.Del(RedisUtil.Ctx, keys[i]) + redisClient.Del(keys[i]) n++ } } diff --git a/dsBaseRpc/go.mod b/dsBaseRpc/go.mod index f35d382d..8253bba9 100644 --- a/dsBaseRpc/go.mod +++ b/dsBaseRpc/go.mod @@ -27,7 +27,7 @@ require ( github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/fullstorydev/grpcurl v1.5.1 // indirect github.com/garyburd/redigo v1.6.0 - github.com/go-redis/redis/v8 v8.0.0-beta.6 + github.com/go-redis/redis/v7 v7.4.0 github.com/go-sql-driver/mysql v1.5.0 github.com/go-xorm/cmd/xorm v0.0.0-20190426080617-f87981e709a1 // indirect github.com/go-xorm/xorm v0.7.9 // indirect diff --git a/dsBaseRpc/go.sum b/dsBaseRpc/go.sum index f1e29d90..f139e6d9 100644 --- a/dsBaseRpc/go.sum +++ b/dsBaseRpc/go.sum @@ -232,10 +232,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-redis/redis v6.15.7+incompatible h1:3skhDh95XQMpnqeqNftPkQD9jL9e5e36z/1SUm6dy1U= github.com/go-redis/redis v6.15.8+incompatible h1:BKZuG6mCnRj5AOaWJXoCgf6rqTYnYJLe4en2hxT7r9o= -github.com/go-redis/redis/v8 v8.0.0-beta.2 h1:9S28J9QMBotgI3tGgXbX1Wk9i8QYC3Orw4bTLoPrQeI= -github.com/go-redis/redis/v8 v8.0.0-beta.2/go.mod h1:o1M7JtsgfDYyv3o+gBn/jJ1LkqpnCrmil7PSppZGBak= -github.com/go-redis/redis/v8 v8.0.0-beta.6 h1:QeXAkG9L5cWJA+eJTBvhkftE7dwpJ0gbMYeBE2NxXS4= -github.com/go-redis/redis/v8 v8.0.0-beta.6/go.mod h1:g79Vpae8JMzg5qjk8BiwU9tK+HmU3iDVyS4UAJLFycI= +github.com/go-redis/redis/v7 v7.4.0 h1:7obg6wUoj05T0EpY0o8B59S9w5yeMWql7sw2kwNW1x4= +github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= github.com/go-sql-driver/mysql v0.0.0-20180719071942-99ff426eb706/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= @@ -292,6 +290,7 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= @@ -1016,6 +1015,7 @@ golang.org/x/sys v0.0.0-20200427175716-29b57079015a h1:08u6b1caTT9MQY4wSbmsd4Ulm golang.org/x/sys v0.0.0-20200427175716-29b57079015a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA= golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 h1:ogLJMz+qpzav7lGMh10LMvAkM/fAoGlaiiHYiFYdm80= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1124,6 +1124,7 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=