From 95e9be4d493216e626eb25e688ba66764233c6f0 Mon Sep 17 00:00:00 2001 From: shaoying Date: Mon, 15 Jul 2019 22:09:19 +0800 Subject: [PATCH] opt steam --- bin/boot.sh | 2 ++ src/contexts/cli/cli.go | 3 +++ src/contexts/cli/version.go | 3 ++- src/contexts/ssh/ssh.go | 2 +- src/examples/chat/chat.go | 8 ++++---- usr/librarys/chat.js | 6 +++--- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bin/boot.sh b/bin/boot.sh index f12197a0..f07a9009 100755 --- a/bin/boot.sh +++ b/bin/boot.sh @@ -40,6 +40,8 @@ install() { wget -O ${ctx_app} "$ctx_dev/publish/${ctx_app}?GOOS=$GOOS&GOARCH=$GOARCH" && chmod a+x ${ctx_app} \ && ./${ctx_app} upgrade ${target} && ${md5} ${ctx_app} \ && mv ${ctx_app} bin/${ctx_app} + + mkdir -p usr/script && touch usr/script/local.shy && cd etc && ln -s ../usr/script/local.shy . } hup() { echo "term hup" diff --git a/src/contexts/cli/cli.go b/src/contexts/cli/cli.go index e3e0f1bd..f5cb1a84 100644 --- a/src/contexts/cli/cli.go +++ b/src/contexts/cli/cli.go @@ -848,6 +848,9 @@ func main() { return } switch arg[0] { + case "restart": + m.Cmd("cli.quit", "1") + case "project": m.Cmd("cli.project", "init") m.Cmd("cli.compile", "all") diff --git a/src/contexts/cli/version.go b/src/contexts/cli/version.go index 34545580..5f4afcc0 100644 --- a/src/contexts/cli/version.go +++ b/src/contexts/cli/version.go @@ -1,8 +1,9 @@ package cli + var version = struct { time string host string self int }{ - "2019-07-15 20:46:47", "ZYB-20190522USI.ubuntu", 168, + "2019-07-15 20:55:13", "ZYB-20190522USI", 151, } diff --git a/src/contexts/ssh/ssh.go b/src/contexts/ssh/ssh.go index 3e08d745..7da01eb8 100644 --- a/src/contexts/ssh/ssh.go +++ b/src/contexts/ssh/ssh.go @@ -157,7 +157,7 @@ var Index = &ctx.Context{Name: "ssh", Help: "集群中心", "componet_type": "private", "componet_ctx": "ssh", "componet_cmd": "_route", "componet_args": []interface{}{"$$", "context", "cli", "upgrade"}, "inputs": []interface{}{ map[string]interface{}{"type": "text", "name": "pod", "imports": "plugin_pod"}, - map[string]interface{}{"type": "select", "name": "action", "values": []interface{}{"script", "plugin", "portal", "system", "bench"}}, + map[string]interface{}{"type": "select", "name": "action", "values": []interface{}{"script", "restart", "plugin", "portal", "system", "bench"}}, map[string]interface{}{"type": "text", "name": "who"}, map[string]interface{}{"type": "button", "value": "升级"}, }, diff --git a/src/examples/chat/chat.go b/src/examples/chat/chat.go index 7a690fe2..31d63884 100644 --- a/src/examples/chat/chat.go +++ b/src/examples/chat/chat.go @@ -360,12 +360,12 @@ var Index = &ctx.Context{Name: "chat", Help: "会议中心", } if len(arg) == 1 { m.Confm("flow", []string{arg[0], "user"}, func(key string, value map[string]interface{}) { - m.Add("append", "key", key) - m.Add("append", "user.route", value["user"]) + m.Add("append", "user", key) + m.Add("append", "node", value["user"]) }) m.Confm("ssh.node", func(key string, value map[string]interface{}) { - m.Add("append", "key", key) - m.Add("append", "user.route", value["name"]) + m.Add("append", "user", "") + m.Add("append", "node", value["name"]) }) m.Table() return diff --git a/usr/librarys/chat.js b/usr/librarys/chat.js index 51b52fac..594b10d2 100644 --- a/usr/librarys/chat.js +++ b/usr/librarys/chat.js @@ -460,13 +460,13 @@ page = Page({ }, Show: function() { this.ShowDialog() && (table.innerHTML = "", ui.name.value = "nice", this.Run([river], function(msg) { - kit.AppendTable(table, ctx.Table(msg), ["key", "user.route"], function(value, key, pod, i, tr, event) { + kit.AppendTable(table, ctx.Table(msg), ["user", "node"], function(value, key, pod, i, tr, event) { var old = table.querySelector("tr.select") - tr.className = "select", old && (old.className = "normal"), field.Pane.Run([river, pod.key, pod["user.route"]], function(msg) { + tr.className = "select", old && (old.className = "normal"), field.Pane.Run([river, pod.user, pod.node], function(msg) { device.innerHTML = "", kit.AppendTable(device, ctx.Table(msg), ["key", "index", "name", "help"], function(value, key, com, i, tr, event) { var last = kit.AppendChild(ui.list, [{type: "tr", list: [ {text: [com.key, "td"]}, {text: [com.index, "td"]}, {text: [com.name, "td"]}, {text: [com.help, "td"]}, - ], dataset: {pod: pod["user.route"], group: com.key, index: com.index, name: com.name}, click: function(event) { + ], dataset: {pod: pod.node, group: com.key, index: com.index, name: com.name}, click: function(event) { last.parentNode.removeChild(last) }}]).last })