From 31258f51ca2d7724883ce607ac0178e0847f496b Mon Sep 17 00:00:00 2001 From: shaoying Date: Tue, 5 Jan 2021 20:01:52 +0800 Subject: [PATCH] add version.go --- base/cli/cli.go | 7 +++---- core/team/plan.go | 12 +----------- exec.go | 8 -------- go.sum | 6 ++++++ init.go | 5 ++++- misc.go | 31 ++++++++++++++++++++++--------- 6 files changed, 36 insertions(+), 33 deletions(-) diff --git a/base/cli/cli.go b/base/cli/cli.go index 55723042..29f87c04 100644 --- a/base/cli/cli.go +++ b/base/cli/cli.go @@ -72,10 +72,9 @@ var Index = &ice.Context{Name: "cli", Help: "命令模块", runtime.GOMAXPROCS(n) // 版本信息 - m.Conf(RUNTIME, "build.time", ice.Info.Build.Time) - m.Conf(RUNTIME, "build.version", ice.Info.Build.Version) - m.Conf(RUNTIME, "build.hostname", ice.Info.Build.HostName) - m.Conf(RUNTIME, "build.username", ice.Info.Build.UserName) + kit.Fetch(kit.UnMarshal(kit.Format(ice.Info.Build)), func(key string, value interface{}) { + m.Conf(RUNTIME, kit.Keys("build", strings.ToLower(key)), value) + }) }}, ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { list := []string{} diff --git a/core/team/plan.go b/core/team/plan.go index 6c7e6ee7..3bc4c099 100644 --- a/core/team/plan.go +++ b/core/team/plan.go @@ -5,7 +5,6 @@ import ( "github.com/shylinux/icebergs/base/ctx" "github.com/shylinux/icebergs/base/gdb" "github.com/shylinux/icebergs/base/mdb" - "github.com/shylinux/icebergs/base/web" kit "github.com/shylinux/toolkits" "time" @@ -66,21 +65,12 @@ func init() { if begin_time.After(begin) || begin.After(end_time) { return } - m.Push("pod", m.Option(ice.MSG_USERPOD)) m.Push(key, value, fields, val) m.PushButton(_task_action(m, value[TaskField.STATUS], mdb.PLUGIN)) }) m.Cmd(mdb.SELECT, TASK, "", mdb.ZONE, kit.MDB_FOREACH) - m.Cmd(web.SPACE).Table(func(index int, value map[string]string, head []string) { - switch value["type"] { - case "worker", "server": - m.Cmd(web.SPACE, value["name"], m.Prefix(PLAN), arg).Table(func(index int, val map[string]string, head []string) { - val["pod"] = kit.Keys(value["name"], val["pod"]) - m.Push("", val, head) - }) - } - }) + m.PushPodCmd(PLAN, arg...) }}, }, }) diff --git a/exec.go b/exec.go index afced35f..4fe9a784 100644 --- a/exec.go +++ b/exec.go @@ -110,15 +110,7 @@ func (m *Message) Back(res *Message) *Message { return m } func (m *Message) Gos(msg *Message, cb interface{}, args ...interface{}) *Message { - // h := m.Cmdx("gdb.routine", "create", "fileline", kit.FileLine(cb, 3), "status", "start") task.Put(kit.FileLine(3, 3), func(task *task.Task) error { - // msg.Optionv("task.hash", task.Arg) - // msg.Optionv("_task", task) - // defer func() { - // msg.Option(kit.MDB_HASH, task.Arg) - // msg.Cmdx("gdb.routine", "modify", "status", "stop") - // }() - msg.TryCatch(msg, true, func(msg *Message) { switch cb := cb.(type) { case func(*Message): diff --git a/go.sum b/go.sum index c6630b1f..faeb4772 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,12 @@ +github.com/AaronO/go-git-http v0.0.0-20161214145340-1d9485b3a98f/go.mod h1:+6Yuq73F9068Na+mSBNXCvyuxvgw4f/g5ii40e3U8Sc= github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII= github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA= github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -19,10 +22,13 @@ github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDq github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/init.go b/init.go index 11080abe..a19fdae3 100644 --- a/init.go +++ b/init.go @@ -14,11 +14,14 @@ var Info = struct { PathName string UserName string PassWord string - NodeName string NodeType string + NodeName string Build struct { Time string + Hash string + Remote string + Branch string Version string HostName string UserName string diff --git a/misc.go b/misc.go index e02a0f6a..7b03282a 100644 --- a/misc.go +++ b/misc.go @@ -56,11 +56,10 @@ func (m *Message) Space(arg interface{}) []string { return []string{"web.space", kit.Format(arg)} } -func (m *Message) PushPlugin(key string, arg ...string) *Message { +func (m *Message) PushPlugin(key string, arg ...string) { m.Option(MSG_PROCESS, PROCESS_FIELD) m.Option("_prefix", arg) m.Cmdy("command", key) - return m } func (m *Message) PushRender(key, view, name string, arg ...string) *Message { if m.Option(MSG_USERUA) == "" { @@ -105,12 +104,7 @@ func (m *Message) PushDownload(name string, arg ...string) { } m.PushRender("link", "download", name, arg...) } -func (m *Message) PushAction(list ...interface{}) { - m.Table(func(index int, value map[string]string, head []string) { - m.PushRender(kit.MDB_ACTION, kit.MDB_BUTTON, strings.Join(kit.Simple(list...), ",")) - }) -} -func (m *Message) PushSearch(args ...interface{}) *Message { +func (m *Message) PushSearch(args ...interface{}) { data := kit.Dict(args...) for _, k := range kit.Split(m.Option("fields")) { switch k { @@ -134,7 +128,26 @@ func (m *Message) PushSearch(args ...interface{}) *Message { m.Push(k, data[k]) } } - return m +} +func (m *Message) PushAction(list ...interface{}) { + m.Table(func(index int, value map[string]string, head []string) { + m.PushRender(kit.MDB_ACTION, kit.MDB_BUTTON, strings.Join(kit.Simple(list...), ",")) + }) +} +func (m *Message) PushPodCmd(cmd string, arg ...string) { + m.Table(func(index int, value map[string]string, head []string) { + m.Push("pod", m.Option(MSG_USERPOD)) + }) + + m.Cmd("web.space").Table(func(index int, value map[string]string, head []string) { + switch value["type"] { + case "worker", "server": + m.Cmd("web.space", value["name"], m.Prefix(cmd), arg).Table(func(index int, val map[string]string, head []string) { + val["pod"] = kit.Keys(value["name"], val["pod"]) + m.Push("", val, head) + }) + } + }) } func (m *Message) SortStr(key string) { m.Sort(key, "str") }