From d4b64e95d2ad49b1ec95f36689ecccc5534d5e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=AD=9F=E6=9F=B1?= <hmzzrcs@163.com>
Date: Tue, 17 Sep 2019 19:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                               | 3 +++
 app/console/main.go                      | 6 +++---
 go.mod                                   | 7 +++----
 go.sum                                   | 2 ++
 goku-node/redis-plugin-proxy/pipeline.go | 2 +-
 goku-node/redis-plugin-proxy/proxy.go    | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..9164b47f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/out/
+/vendor/
+/.idea/
diff --git a/app/console/main.go b/app/console/main.go
index 5f395a3a..73355b10 100644
--- a/app/console/main.go
+++ b/app/console/main.go
@@ -14,12 +14,12 @@ import (
 var (
 	UserPassword string
 	UserName     string
-	ConfFilepath = "./config/goku.conf"
+	ConfFilePath = "./config/goku.conf"
 
 )
 
 func main() {
-	flag.StringVar(&ConfFilepath, "c", "./config/goku.conf", "Please provide a valid configuration file path")
+	flag.StringVar(&ConfFilePath, "c", "./config/goku.conf", "Please provide a valid configuration file path")
 	flag.StringVar(&UserName, "u", "", "Please provide user name")
 	flag.StringVar(&UserPassword, "p", "", "Please provide user password")
 	isDebug := flag.Bool("debug",false,"")
@@ -29,7 +29,7 @@ func main() {
 		log.StartDebug()
 	}
 	// 初始化配置
-	if err := conf.ReadConfigure(ConfFilepath); err != nil {
+	if err := conf.ReadConfigure(ConfFilePath); err != nil {
 		log.Panic(err)
 		return
 	}
diff --git a/go.mod b/go.mod
index 533068b3..b62e719e 100644
--- a/go.mod
+++ b/go.mod
@@ -3,17 +3,16 @@ module github.com/eolinker/goku
 go 1.12
 
 require (
-	github.com/360EntSecGroup-Skylar/excelize v1.4.1
+	github.com/360EntSecGroup-Skylar/excelize v1.4.1 // indirect
 	github.com/eolinker/goku-plugin v0.1.3
-	github.com/go-redis/redis v6.15.2+incompatible
+	github.com/go-redis/redis v6.15.5+incompatible
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/hashicorp/consul/api v1.1.0
 	github.com/json-iterator/go v1.1.7
 	github.com/onsi/ginkgo v1.8.0 // indirect
 	github.com/onsi/gomega v1.5.0 // indirect
-	github.com/pkg/errors v0.8.1
 	github.com/sirupsen/logrus v1.4.0
-	github.com/yuchenfw/gocrypt v0.0.0-20190627061521-ee7b5965ec93
+	github.com/yuchenfw/gocrypt v0.0.0-20190627061521-ee7b5965ec93 // indirect
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
 	google.golang.org/appengine v1.6.0 // indirect
 	gopkg.in/yaml.v2 v2.2.2
diff --git a/go.sum b/go.sum
index ac485c5a..5d8dcb1d 100644
--- a/go.sum
+++ b/go.sum
@@ -63,6 +63,8 @@ github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4=
 github.com/go-redis/redis v6.15.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-redis/redis v6.15.5+incompatible h1:pLky8I0rgiblWfa8C1EV7fPEUv0aH6vKRaYHc/YRHVk=
+github.com/go-redis/redis v6.15.5+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-sql-driver/mysql v0.0.0-20180618115901-749ddf1598b4/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
diff --git a/goku-node/redis-plugin-proxy/pipeline.go b/goku-node/redis-plugin-proxy/pipeline.go
index aaaf4745..70bf3073 100644
--- a/goku-node/redis-plugin-proxy/pipeline.go
+++ b/goku-node/redis-plugin-proxy/pipeline.go
@@ -2,7 +2,7 @@ package redis_plugin_proxy
 
 import (
 	"github.com/eolinker/goku-plugin"
-	"github.com/eolinker/goku/common/redis"
+	"github.com/go-redis/redis"
 )
 
 type PipelineProxy struct {
diff --git a/goku-node/redis-plugin-proxy/proxy.go b/goku-node/redis-plugin-proxy/proxy.go
index cf89639f..691127bf 100644
--- a/goku-node/redis-plugin-proxy/proxy.go
+++ b/goku-node/redis-plugin-proxy/proxy.go
@@ -2,7 +2,7 @@ package redis_plugin_proxy
 
 import (
 	redis2 "github.com/eolinker/goku-plugin"
-	"github.com/eolinker/goku/common/redis"
+	"github.com/go-redis/redis"
 	"time"
 )
 
-- 
GitLab