diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..9164b47f2af404d5d7e0e3f60331b1e41e2cdd53 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/out/ +/vendor/ +/.idea/ diff --git a/app/console/main.go b/app/console/main.go index 5f395a3af0428a10cc487c5d19f6d44e0d6d8344..73355b102127e1b3ea819c4b199341fcb3560f3a 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 533068b3d0e3878df14ae7fd8db6a050efab9f2c..b62e719ecba7e863e157fb7ab1d2f2837a98f3c6 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 ac485c5af1296d80a22846ae0070389aa0a64309..5d8dcb1db1e8bf31dc208061d49ac051a434049a 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 aaaf4745d141464bc4ab1819c823dba2e27aa046..70bf30730d3ee80ffd471a752eb12bfaeb6cb04c 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 cf89639f99dcd1b3235b4c821bb9ca6611c25d1b..691127bf7630276a3ae91c61c8f86ca51ba6f9eb 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" )