From 96d3ae86cc22d7bd94e659ce89179a4c199059fd Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Thu, 16 Jun 2022 13:41:18 +0800
Subject: [PATCH] Merge branch 'superGroup' of
 github.com:OpenIMSDK/Open-IM-Server into superGroup

---
 pkg/common/db/model.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/common/db/model.go b/pkg/common/db/model.go
index 92bbca353..a6ed0408a 100644
--- a/pkg/common/db/model.go
+++ b/pkg/common/db/model.go
@@ -28,7 +28,7 @@ type DataBases struct {
 	mgoSession *mgo.Session
 	//redisPool   *redis.Pool
 	mongoClient *mongo.Client
-	rdb         *go_redis.ClusterClient
+	rdb         *go_redis.Client
 }
 
 func key(dbAddress, dbName string) string {
@@ -112,17 +112,17 @@ func init() {
 	//		)
 	//	},
 	//}
-	//DB.rdb = go_redis.NewClient(&go_redis.Options{
-	//	Addr:     config.Config.Redis.DBAddress,
-	//	Password: config.Config.Redis.DBPassWord, // no password set
-	//	DB:       0,                              // use default DB
-	//	PoolSize: 100,                            // 连接池大小
-	//})
-	DB.rdb = go_redis.NewClusterClient(&go_redis.ClusterOptions{
-		Addrs:    []string{config.Config.Redis.DBAddress},
-		PoolSize: 50,
-		//Password: config.Config.Redis.DBPassWord,
+	DB.rdb = go_redis.NewClient(&go_redis.Options{
+		Addr:     config.Config.Redis.DBAddress,
+		Password: config.Config.Redis.DBPassWord, // no password set
+		DB:       0,                              // use default DB
+		PoolSize: 100,                            // 连接池大小
 	})
+	//DB.rdb = go_redis.NewClusterClient(&go_redis.ClusterOptions{
+	//	Addrs:    []string{config.Config.Redis.DBAddress},
+	//	PoolSize: 50,
+	//Password: config.Config.Redis.DBPassWord,
+	//})
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 	_, err = DB.rdb.Ping(ctx).Result()