diff --git a/src/contexts/cli/cli.go b/src/contexts/cli/cli.go index b447ccd9..5e2a46a7 100644 --- a/src/contexts/cli/cli.go +++ b/src/contexts/cli/cli.go @@ -1,21 +1,21 @@ package cli import ( + "contexts/ctx" + "toolkit" + "bufio" "bytes" - "contexts/ctx" "encoding/csv" "encoding/json" + "fmt" "io/ioutil" + "os" "os/exec" "os/user" "path" - "reflect" - "toolkit" - - "fmt" - "os" "plugin" + "reflect" "runtime" "strconv" "strings" diff --git a/src/contexts/cli/version.go b/src/contexts/cli/version.go index 748b13a8..cb644b17 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-27 20:28:57", "ZYB-20190522USI", 295, + "2019-07-28 08:54:43", "com", 220, } diff --git a/src/contexts/ctx/ctx.go b/src/contexts/ctx/ctx.go index ff65719a..4385daf6 100644 --- a/src/contexts/ctx/ctx.go +++ b/src/contexts/ctx/ctx.go @@ -1,17 +1,17 @@ package ctx import ( + "toolkit" + "encoding/json" "fmt" - "regexp" - "strconv" - "strings" - "math/rand" "os" + "regexp" "sort" + "strconv" + "strings" "time" - "toolkit" ) type CTX struct { diff --git a/src/contexts/gdb/gdb.go b/src/contexts/gdb/gdb.go index 73efd79a..93c95d7f 100644 --- a/src/contexts/gdb/gdb.go +++ b/src/contexts/gdb/gdb.go @@ -2,12 +2,12 @@ package gdb import ( "contexts/ctx" - "time" "toolkit" "os" "os/signal" "syscall" + "time" ) type GDB struct { diff --git a/src/contexts/lex/lex.go b/src/contexts/lex/lex.go index 67342f3f..8320799e 100644 --- a/src/contexts/lex/lex.go +++ b/src/contexts/lex/lex.go @@ -2,10 +2,11 @@ package lex import ( "contexts/ctx" + "toolkit" + "fmt" "strconv" "strings" - "toolkit" ) type Seed struct { diff --git a/src/contexts/log/log.go b/src/contexts/log/log.go index 539eae78..5aff9f4a 100644 --- a/src/contexts/log/log.go +++ b/src/contexts/log/log.go @@ -2,11 +2,11 @@ package log import ( "contexts/ctx" - "path" "toolkit" "fmt" "os" + "path" ) type LOG struct { diff --git a/src/contexts/nfs/nfs.go b/src/contexts/nfs/nfs.go index 763ac9fb..7558a3cd 100644 --- a/src/contexts/nfs/nfs.go +++ b/src/contexts/nfs/nfs.go @@ -1,13 +1,11 @@ package nfs import ( - "github.com/skip2/go-qrcode" - "contexts/ctx" - "crypto/md5" "toolkit" "bufio" + "crypto/md5" "crypto/sha1" "encoding/csv" "encoding/hex" @@ -1022,15 +1020,6 @@ var Index = &ctx.Context{Name: "nfs", Help: "存储中心", w.Flush() } - case strings.HasSuffix(arg[0], ".png"): - if data == nil { - data = strings.Join(arg[1:], "") - } - - if qr, e := qrcode.New(kit.Format(data), qrcode.Medium); m.Assert(e) { - m.Assert(qr.Write(256, f)) - } - default: f.WriteString(kit.Format(m.Meta["result"])) } diff --git a/src/contexts/nfs/term.go b/src/contexts/nfs/term.go index c0ba233a..7632bcef 100644 --- a/src/contexts/nfs/term.go +++ b/src/contexts/nfs/term.go @@ -1,13 +1,13 @@ package nfs import ( + "github.com/nsf/termbox-go" + "contexts/ctx" "toolkit" "fmt" "strings" - - "github.com/nsf/termbox-go" "time" ) diff --git a/src/contexts/ssh/ssh.go b/src/contexts/ssh/ssh.go index d27ceb45..76794570 100644 --- a/src/contexts/ssh/ssh.go +++ b/src/contexts/ssh/ssh.go @@ -2,12 +2,13 @@ package ssh import ( "contexts/ctx" + "toolkit" + "encoding/hex" "io" "os" "path" "strings" - "toolkit" ) type SSH struct { @@ -483,6 +484,7 @@ var Index = &ctx.Context{Name: "ssh", Help: "集群中心", case "serve": m.Conf("runtime", "work.serve", true) m.Conf("runtime", "work.route", m.Conf("runtime", "node.route")) + m.Conf("runtime", "work.name", m.Conf("runtime", "user.name")) m.Conf("work", m.Conf("runtime", "user.name"), map[string]interface{}{ "create_time": m.Time(), "user": m.Cmd("ssh.user", "init").Append("user.route"), }) diff --git a/src/contexts/tcp/tcp.go b/src/contexts/tcp/tcp.go index 0ad5a822..14b00e95 100644 --- a/src/contexts/tcp/tcp.go +++ b/src/contexts/tcp/tcp.go @@ -2,6 +2,8 @@ package tcp import ( "contexts/ctx" + "toolkit" + "crypto/tls" "fmt" "io" @@ -10,7 +12,6 @@ import ( "strings" "sync/atomic" "time" - "toolkit" ) type TCP struct { diff --git a/src/contexts/web/web.go b/src/contexts/web/web.go index 66a58fcf..fa9c8900 100644 --- a/src/contexts/web/web.go +++ b/src/contexts/web/web.go @@ -1,12 +1,15 @@ package web import ( - "bytes" - "contexts/ctx" - "encoding/json" - "fmt" "github.com/go-cas/cas" "github.com/skip2/go-qrcode" + + "contexts/ctx" + "toolkit" + + "bytes" + "encoding/json" + "fmt" "html/template" "io" "io/ioutil" @@ -18,7 +21,6 @@ import ( "path/filepath" "strconv" "strings" - "toolkit" ) type MUX interface { diff --git a/src/contexts/yac/yac.go b/src/contexts/yac/yac.go index 6d8ab664..5da13878 100644 --- a/src/contexts/yac/yac.go +++ b/src/contexts/yac/yac.go @@ -2,12 +2,13 @@ package yac import ( "contexts/ctx" + "toolkit" + "fmt" "os" "regexp" "strconv" "strings" - "toolkit" ) type Seed struct {