diff --git a/dsBaseRpc/Utils/RedisUtil/RedisUtil.go b/dsBaseRpc/Utils/RedisUtil/RedisUtil.go index acded31d..a9748c79 100644 --- a/dsBaseRpc/Utils/RedisUtil/RedisUtil.go +++ b/dsBaseRpc/Utils/RedisUtil/RedisUtil.go @@ -4,8 +4,8 @@ import ( "dsBaseRpc/Const/ErrorConst" "dsBaseRpc/Utils/ConfigUtil" "dsBaseRpc/Utils/LogUtil" - garybudRedis "github.com/garyburd/redigo/redis" "github.com/go-redis/redis/v7" + redigoRedis "github.com/gomodule/redigo/redis" "time" ) @@ -13,15 +13,15 @@ var ( // 定义redis链接池 RedisClient *redis.Client //这个是为了使用OAuth2类库,引入的redis池,也是没办法之举~ - Pool *garybudRedis.Pool + Pool *redigoRedis.Pool ) func init() { // 从配置文件获取redis的ip以及db var redisHost = ConfigUtil.RedisIp + ":" + ConfigUtil.RedisPort - Pool = &garybudRedis.Pool{ - Dial: func() (garybudRedis.Conn, error) { - conn, err := garybudRedis.Dial("tcp", redisHost) + Pool = &redigoRedis.Pool{ + Dial: func() (redigoRedis.Conn, error) { + conn, err := redigoRedis.Dial("tcp", redisHost) if err != nil { return nil, err } diff --git a/dsBaseRpc/Utils/SqlKit/SqlKit.go b/dsBaseRpc/Utils/SqlKit/SqlKit.go index afa2f6f5..0dd426cd 100644 --- a/dsBaseRpc/Utils/SqlKit/SqlKit.go +++ b/dsBaseRpc/Utils/SqlKit/SqlKit.go @@ -127,12 +127,11 @@ func batchReadRedis(ids []string, prefix string) ([]map[string]interface{}, []st var existList []map[string]interface{} //不存在的主键有哪些 var notExistsIds []string - - //1、创建管道 + //3、输出结果 for i := 0; i < len(ids); i++ { - _bean, err := RedisUtil.GET(prefix + ids[i]) - if err == nil { - n := CommonUtil.ConvertJsonStringToMap(_bean) + r := RedisUtil.RedisClient.Exists(prefix + ids[i]).Val() + if r > 0 { + n := CommonUtil.ConvertJsonStringToMap(RedisUtil.RedisClient.Get(prefix + ids[i]).Val()) //找到了加到返回值列表中去 existList = append(existList, n) } else { diff --git a/dsBaseRpc/go.mod b/dsBaseRpc/go.mod index 8253bba9..aac4f8bc 100644 --- a/dsBaseRpc/go.mod +++ b/dsBaseRpc/go.mod @@ -26,7 +26,6 @@ require ( github.com/fatih/structs v1.1.0 // indirect 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/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 @@ -34,6 +33,7 @@ require ( github.com/gogo/protobuf v1.3.1 // indirect github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect github.com/golang/protobuf v1.4.2 + github.com/gomodule/redigo v1.8.2 github.com/google/uuid v1.1.1 // indirect github.com/grpc-ecosystem/grpc-gateway v1.14.4 // indirect github.com/hashicorp/go-hclog v0.12.2 // indirect @@ -75,7 +75,6 @@ require ( go.opencensus.io v0.22.3 // indirect go.opentelemetry.io/otel v0.9.0 // indirect golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 - golang.org/x/net v0.0.0-20200602114024-627f9648deb9 google.golang.org/appengine v1.6.5 // indirect google.golang.org/genproto v0.0.0-20200429120912-1f37eeb960b2 // indirect google.golang.org/grpc v1.30.0 diff --git a/dsBaseRpc/go.sum b/dsBaseRpc/go.sum index f139e6d9..675783de 100644 --- a/dsBaseRpc/go.sum +++ b/dsBaseRpc/go.sum @@ -296,8 +296,11 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v1.7.0 h1:ZKld1VOtsGhAe37E7wMxEDgAlGM5dvFY+DiOhSkhP9Y= +github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= +github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/gomodule/redigo/redis v0.0.0-do-not-use h1:J7XIp6Kau0WoyT4JtXHT3Ei0gA1KkSc6bc87j9v9WIo= github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=