mix some

Makefile

@@ -7,7 +7,8 @@ install:
 	@go get github.com/skip2/go-qrcode
 	@go get github.com/go-sql-driver/mysql
 	@go get github.com/gomarkdown/markdown
-	@go get github.com/PuerkitoBio/goquery
+	@go get github.com/gomodule/redigo/redis
+	# @go get github.com/PuerkitoBio/goquery
 	@go get github.com/go-cas/cas
 	@go get gopkg.in/gomail.v2
 	GOPATH=$(PWD):$(GOPATH) go install $(BENCH)

src/contexts/cli/cli.go

@@ -152,7 +152,7 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心",
 			},
 			"import": []interface{}{
 				"github.com/nsf/termbox-go",
-				"github.com/gomodule/redigo",
+				"github.com/gomodule/redigo/redis",
 				"github.com/go-sql-driver/mysql",
 				"github.com/gomarkdown/markdown",
 				"gopkg.in/gomail.v2",

src/contexts/cli/version.go

@@ -1,12 +1,9 @@
 package cli
+
 var version = struct {
 	time string
 	host string
 	self int
 }{
-<<<<<<< Updated upstream
-	"2019-07-08 23:23:11", "com.mac", 57,
-=======
-	"2019-07-09 15:35:16", "ZYB-20190522USI", 123,
->>>>>>> Stashed changes
+	"2019-07-09 06:13:52", "ZYB-20190522USI.ubuntu", 124,
 }