From 4a45c806b29740e5a8d6cc512b613dd8d80e9559 Mon Sep 17 00:00:00 2001 From: shaoying Date: Mon, 15 Jul 2019 14:52:21 +0800 Subject: [PATCH] opt chat.steam --- src/contexts/cli/cli.go | 2 +- src/contexts/cli/version.go | 2 +- src/contexts/ssh/ssh.go | 3 +- src/examples/chat/chat.go | 61 ++++++++++++++++++++++--------------- usr/librarys/chat.js | 2 +- usr/librarys/example.js | 6 ++-- 6 files changed, 45 insertions(+), 31 deletions(-) diff --git a/src/contexts/cli/cli.go b/src/contexts/cli/cli.go index 0d0c0d81..85147bd2 100644 --- a/src/contexts/cli/cli.go +++ b/src/contexts/cli/cli.go @@ -932,7 +932,7 @@ var Index = &ctx.Context{Name: "cli", Help: "管理中心", "cmd_daemon", "true", } if m.Conf("runtime", "host.GOOS") == "windows" { - m.Cmdy("cli.system", path.Join(m.Conf("runtime", "boot.ctx_home"), "bin/node.sh"), args) + m.Cmdy("cli.system", path.Join(m.Conf("runtime", "boot.ctx_home"), "bin/node.sh"), "start", args) } else { m.Cmdy("cli.system", m.Conf("runtime", "boot.ctx_bin"), args) } diff --git a/src/contexts/cli/version.go b/src/contexts/cli/version.go index 80971a95..2894036f 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-15 09:24:05", "com.mac", 179, + "2019-07-15 14:19:05", "ZYB-20190522USI", 148, } diff --git a/src/contexts/ssh/ssh.go b/src/contexts/ssh/ssh.go index f35c98ff..21533925 100644 --- a/src/contexts/ssh/ssh.go +++ b/src/contexts/ssh/ssh.go @@ -503,7 +503,8 @@ var Index = &ctx.Context{Name: "ssh", Help: "集群中心", "tool": &ctx.Command{Name: "tool", Help: "用户", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) { if len(arg) == 0 { m.Confm("componet", func(key string, index int, value map[string]interface{}) { - if kit.Format(value["componet_type"]) != "public" && m.Option("username") != m.Conf("runtime", "work.name") { + m.Log("fuck", "what %v %v %v", m.Option("username"), m.Conf("runtime", "user.name"), m.Conf("runtime", "work.name")) + if kit.Format(value["componet_type"]) != "public" && m.Option("username") != m.Conf("runtime", "work.name") && m.Option("username") != m.Conf("runtime", "user.name") { return } diff --git a/src/examples/chat/chat.go b/src/examples/chat/chat.go index c057daee..7a690fe2 100644 --- a/src/examples/chat/chat.go +++ b/src/examples/chat/chat.go @@ -314,34 +314,42 @@ var Index = &ctx.Context{Name: "chat", Help: "会议中心", m.Sort("key").Table() return } - if len(arg) == 2 { - m.Confm("flow", []string{arg[0], "tool", arg[1], "list"}, func(index int, tool map[string]interface{}) { - m.Add("append", "river", arg[0]) - m.Add("append", "storm", arg[1]) - m.Add("append", "action", index) - m.Add("append", "node", tool["node"]) - m.Add("append", "group", tool["group"]) - m.Add("append", "index", tool["index"]) + switch arg[1] { + case "delete": + str := m.Conf("flow", []string{arg[0], "tool", arg[2]}) + m.Log("info", "delete %v %v %v", arg[0], arg[2], str) + m.Conf("flow", []string{arg[0], "tool", arg[2]}, "") + m.Echo(str) - msg := m.Cmd("ssh._route", tool["node"], "tool", tool["group"], tool["index"]) + default: + if len(arg) == 2 { + m.Confm("flow", []string{arg[0], "tool", arg[1], "list"}, func(index int, tool map[string]interface{}) { + m.Add("append", "river", arg[0]) + m.Add("append", "storm", arg[1]) + m.Add("append", "action", index) - m.Add("append", "name", msg.Append("name")) - m.Add("append", "help", msg.Append("help")) - m.Add("append", "view", msg.Append("view")) - m.Add("append", "init", msg.Append("init")) - m.Add("append", "inputs", msg.Append("inputs")) - m.Add("append", "exports", msg.Append("exports")) - m.Add("append", "display", msg.Append("display")) - }) - m.Table() - return + m.Add("append", "node", tool["node"]) + m.Add("append", "group", tool["group"]) + m.Add("append", "index", tool["index"]) + + msg := m.Cmd("ssh._route", tool["node"], "tool", tool["group"], tool["index"]) + + m.Add("append", "name", msg.Append("name")) + m.Add("append", "help", msg.Append("help")) + m.Add("append", "view", msg.Append("view")) + m.Add("append", "init", msg.Append("init")) + m.Add("append", "inputs", msg.Append("inputs")) + m.Add("append", "exports", msg.Append("exports")) + m.Add("append", "display", msg.Append("display")) + }) + m.Table() + + } else if tool := m.Confm("flow", []string{arg[0], "tool", arg[1], "list", arg[2]}); tool != nil { + m.Cmdy("ssh._route", tool["node"], "tool", "run", tool["group"], tool["index"], arg[0], arg[3:]) + } } - if tool := m.Confm("flow", []string{arg[0], "tool", arg[1], "list", arg[2]}); tool != nil { - m.Cmdy("ssh._route", tool["node"], "tool", "run", tool["group"], tool["index"], arg[0], arg[3:]) - return - } return }}, "steam": &ctx.Command{Name: "steam", Help: "天空", Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) (e error) { @@ -355,6 +363,10 @@ var Index = &ctx.Context{Name: "chat", Help: "会议中心", m.Add("append", "key", key) m.Add("append", "user.route", 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.Table() return } @@ -375,7 +387,8 @@ var Index = &ctx.Context{Name: "chat", Help: "会议中心", }) default: - m.Cmdy("ssh._route", m.Conf("flow", []string{arg[0], "user", arg[1], "user"}), "tool") + m.Cmdy("ssh._route", arg[2], "tool") + // m.Cmdy("ssh._route", m.Conf("flow", []string{arg[0], "user", arg[1], "user"}), "tool") } return }}, diff --git a/usr/librarys/chat.js b/usr/librarys/chat.js index d406000a..51b52fac 100644 --- a/usr/librarys/chat.js +++ b/usr/librarys/chat.js @@ -462,7 +462,7 @@ page = Page({ 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) { var old = table.querySelector("tr.select") - tr.className = "select", old && (old.className = "normal"), field.Pane.Run([river, pod.key], function(msg) { + tr.className = "select", old && (old.className = "normal"), field.Pane.Run([river, pod.key, pod["user.route"]], 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"]}, diff --git a/usr/librarys/example.js b/usr/librarys/example.js index 3f4f0b3c..867556ac 100644 --- a/usr/librarys/example.js +++ b/usr/librarys/example.js @@ -1121,7 +1121,7 @@ function Canvas(plugin, output, width, height, space, msg) { for (var i = 0; i < nrow; i++) { sum += data[keys[1]][i] sum > total && (total = sum) - sum -= data[keys[2]][i] + sum -= data[keys[2]||keys[1]][i] } if (!data["sum"]) { var sum = 0, max = 0, min = 0, end = 0 @@ -1132,8 +1132,8 @@ function Canvas(plugin, output, width, height, space, msg) { data["end"] = [] for (var i = 0; i < nrow; i++) { max = sum + data[keys[1]][i] - min = sum - data[keys[2]][i] - end = sum + data[keys[1]][i] - data[keys[2]][i] + min = sum - data[keys[2||keys[1]]][i] + end = sum + data[keys[1]][i] - data[keys[2]||keys[1]][i] data["sum"].push(sum) data["max"].push(max) data["min"].push(min)