liubin/ContextOS
1
0
Fork 0
forked from x/ContextOS
Code Pull Requests Activity

mix some

Browse Source
This commit is contained in:
shaoying 2019-07-09 19:52:27 -07:00
parent f953bc7bc0
commit 5966c533f8
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -7,7 +7,8 @@ install:
@go get github.com/skip2/go-qrcode @go get github.com/skip2/go-qrcode
@go get github.com/go-sql-driver/mysql @go get github.com/go-sql-driver/mysql
@go get github.com/gomarkdown/markdown @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 github.com/go-cas/cas
@go get gopkg.in/gomail.v2 @go get gopkg.in/gomail.v2
GOPATH=$(PWD):$(GOPATH) go install $(BENCH) GOPATH=$(PWD):$(GOPATH) go install $(BENCH)

2
src/contexts/cli/cli.go
View File

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

7
src/contexts/cli/version.go
View File

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