From 1d42a86a2add89a95fd06d7cec31a30403c403ca Mon Sep 17 00:00:00 2001 From: shylinux Date: Tue, 2 Jul 2019 23:40:14 +0800 Subject: [PATCH] fix import err --- Makefile | 2 +- src/contexts/cli/cli.go | 6 ++---- src/contexts/cli/version.go | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e272a732..b55e375a 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ install: @go get github.com/gomarkdown/markdown @go get github.com/PuerkitoBio/goquery @go get github.com/go-cas/cas - @go get github.com/gopkg.in/gomail.v2 + @go get gopkg.in/gomail.v2 GOPATH=$(PWD):$(GOPATH) go install $(BENCH) @date # bench web.code.counter nmake 1 diff --git a/src/contexts/cli/cli.go b/src/contexts/cli/cli.go index 34624ff3..7e273476 100644 --- a/src/contexts/cli/cli.go +++ b/src/contexts/cli/cli.go @@ -146,7 +146,7 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心", "github.com/gomodule/redigo", "github.com/go-sql-driver/mysql", "github.com/gomarkdown/markdown", - "github.com/gopkg.in/gomail.v2", + "gopkg.in/gomail.v2", "github.com/skip2/go-qrcode", "github.com/PuerkitoBio/goquery", "github.com/go-cas/cas", @@ -449,10 +449,8 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心", m.Gos(m, func(m *ctx.Message) { if e := cmd.Start(); e != nil { m.Echo("error: ").Echo("%s\n", e) - m.Log("fuck", "%v", e) } else if e := cmd.Wait(); e != nil { m.Echo("error: ").Echo("%s\n", e) - m.Log("fuck", "%v", e) } m.Conf("daemon", []string{h, "finish_time"}, time.Now().Format(m.Conf("time_format"))) }) @@ -797,7 +795,7 @@ var version = struct { "cmd_env", "ctx_box", fmt.Sprintf("http://127.0.0.1%s", m.Conf("runtime", "boot.web_port")), "cmd_daemon", "true", ) - return + return m.Cmdy("cli.system", m.Conf("runtime", "boot.ctx_bin"), "daemon", "cmd_dir", p, "cmd_env", "ctx_home", m.Conf("runtime", "boot.ctx_home"), diff --git a/src/contexts/cli/version.go b/src/contexts/cli/version.go index 7b8c180e..f21d5352 100644 --- a/src/contexts/cli/version.go +++ b/src/contexts/cli/version.go @@ -4,5 +4,5 @@ var version = struct { host string self int }{ - "2019-07-02 22:32:30", "ZYB-20190522USI", 91, + "2019-07-02 23:37:53", "com", 92, }