From 4f5352fc5750e136e653f4f368732407e1165282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Wed, 31 Jul 2019 14:35:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20redis=E8=BF=9E=E6=8E=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/conf/config.yml   |  6 ++++--
 backend/database/redis.go | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/backend/conf/config.yml b/backend/conf/config.yml
index 3e7aa234..e9f29b3c 100644
--- a/backend/conf/config.yml
+++ b/backend/conf/config.yml
@@ -7,8 +7,10 @@ mongo:
   username: ""
   password: ""
 redis:
-  network: tcp
-  address: "localhost:6379"
+  address: 127.0.0.1
+  password: redis-1.0
+  database: 1
+  port: 6379
 log:
   level: info
   path: "/var/logs/crawlab"
diff --git a/backend/database/redis.go b/backend/database/redis.go
index 17382122..ffebf776 100644
--- a/backend/database/redis.go
+++ b/backend/database/redis.go
@@ -103,10 +103,18 @@ func (r *Redis) HKeys(collection string) ([]string, error) {
 }
 
 func GetRedisConn() (redis.Conn, error) {
-	c, err := redis.Dial(
-		viper.GetString("redis.network"),
-		viper.GetString("redis.address"),
-	)
+	var address = viper.GetString("redis.address")
+	var port = viper.GetString("redis.port")
+	var database = viper.GetString("redis.database")
+	var password = viper.GetString("redis.password")
+
+	var url string
+	if password == "" {
+		url = "redis://" + address + ":" + port + "/" + database
+	} else {
+		url = "redis://x:" + password + "@" + address + ":" + port + "/" + database
+	}
+	c, err := redis.DialURL(url)
 	if err != nil {
 		debug.PrintStack()
 		return c, err