From f89c1edadf5c7cbb73390b827371e36fe44934da Mon Sep 17 00:00:00 2001
From: Gordon <1432970085@qq.com>
Date: Fri, 8 Jul 2022 15:17:46 +0800
Subject: [PATCH] add redis username

---
 config/config.yaml          | 7 ++++---
 pkg/common/config/config.go | 1 +
 pkg/common/db/model.go      | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index 1c39886e0..063d0bd2a 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -34,12 +34,13 @@ mongo:
   dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改
 
 redis:
-  dbAddress: [ 127.0.0.1:16379 ] #redis地址 单机时，填写一个地址即可，使用redis集群时候，填写集群中多个节点地址（主从地址都可以填写，增加容灾能力），默认即可
+  dbAddress: [ r-2ze64lhldowxosta2dpd.redis.rds.aliyuncs.com:6379 ] #redis地址 单机时，填写一个地址即可，使用redis集群时候，填写集群中多个节点地址（主从地址都可以填写，增加容灾能力），默认即可
   dbMaxIdle: 128
   dbMaxActive: 0
   dbIdleTimeout: 120
-  dbPassWord: openIM #redis密码 建议修改
-  enableCluster: false #如果外部redis以集群方式启动，需要打开此开关
+  dbUserName: im
+  dbPassWord: efH8BKAeUiWQL #redis密码 建议修改
+  enableCluster: true #如果外部redis以集群方式启动，需要打开此开关
 
 kafka:
   ws2mschat:
diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
index 3ed175fe1..508720a2b 100644
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@@ -102,6 +102,7 @@ type config struct {
 		DBMaxIdle     int      `yaml:"dbMaxIdle"`
 		DBMaxActive   int      `yaml:"dbMaxActive"`
 		DBIdleTimeout int      `yaml:"dbIdleTimeout"`
+		DBUserName    string   `yaml:"dbUserName"`
 		DBPassWord    string   `yaml:"dbPassWord"`
 		EnableCluster bool     `yaml:"enableCluster"`
 	}
diff --git a/pkg/common/db/model.go b/pkg/common/db/model.go
index 61912b670..16793c3dd 100644
--- a/pkg/common/db/model.go
+++ b/pkg/common/db/model.go
@@ -124,6 +124,8 @@ func init() {
 	if config.Config.Redis.EnableCluster {
 		DB.rdb = go_redis.NewClusterClient(&go_redis.ClusterOptions{
 			Addrs:    config.Config.Redis.DBAddress,
+			Username: config.Config.Redis.DBUserName,
+			Password: config.Config.Redis.DBPassWord, // no password set
 			PoolSize: 50,
 		})
 		_, err = DB.rdb.Ping(ctx).Result()
@@ -133,6 +135,7 @@ func init() {
 	} else {
 		DB.rdb = go_redis.NewClient(&go_redis.Options{
 			Addr:     config.Config.Redis.DBAddress[0],
+			Username: config.Config.Redis.DBUserName,
 			Password: config.Config.Redis.DBPassWord, // no password set
 			DB:       0,                              // use default DB
 			PoolSize: 100,                            // 连接池大小