From a67c1b430739fda8782e28bcbadcb4fa43d357f5 Mon Sep 17 00:00:00 2001 From: shaoying Date: Sat, 4 Jul 2020 13:09:34 +0800 Subject: [PATCH] opt some --- base/ssh/ssh.go | 3 +++ core/code/code.go | 2 +- misc/docker/docker.go | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/base/ssh/ssh.go b/base/ssh/ssh.go index 2a79078a..8a8d4191 100644 --- a/base/ssh/ssh.go +++ b/base/ssh/ssh.go @@ -271,6 +271,9 @@ func (f *Frame) Start(m *ice.Message, arg ...string) bool { r, f.stdout = os.Stdin, os.Stdout m.Cap(ice.CTX_STREAM, STDIO) f.target = m.Target() + m.Option("_option", ice.MSG_USERNAME) + m.Option(ice.MSG_USERNAME, cli.UserName) + m.Option(ice.MSG_USERROLE, aaa.ROOT) aaa.UserRoot(m) default: if s, e := os.Open(arg[0]); !m.Warn(e != nil, "%s", e) { diff --git a/core/code/code.go b/core/code/code.go index c67619ef..2489b8f2 100644 --- a/core/code/code.go +++ b/core/code/code.go @@ -196,4 +196,4 @@ export %s }, } -func init() { web.Index.Register(Index, &web.Frame{}, COMPILE, BENCH, PPROF) } +func init() { web.Index.Register(Index, &web.Frame{}, COMPILE, UPGRADE, BENCH, PPROF) } diff --git a/misc/docker/docker.go b/misc/docker/docker.go index e619214a..d214161b 100644 --- a/misc/docker/docker.go +++ b/misc/docker/docker.go @@ -102,7 +102,7 @@ var Index = &ice.Context{Name: DOCKER, Help: "虚拟机", } // 镜像列表 - m.Split(strings.Replace(m.Cmdx(_image, "ls"), "IMAGE ID", _IMAGE_ID, 1), "index", " ", "\n") + m.Split(strings.Replace(m.Cmdx(_docker, "images"), "IMAGE ID", _IMAGE_ID, 1), "index", " ", "\n") m.Sort(_REPOSITORY) // 镜像操作 @@ -146,7 +146,7 @@ var Index = &ice.Context{Name: DOCKER, Help: "虚拟机", } // 容器列表 - m.Split(strings.Replace(m.Cmdx(_container, "ls", "-a"), "CONTAINER ID", _CONTAINER_ID, 1), "index", " ", "\n") + m.Split(strings.Replace(m.Cmdx(_docker, "ps", "-a"), "CONTAINER ID", _CONTAINER_ID, 1), "index", " ", "\n") m.Sort("NAMES") m.Table(func(index int, value map[string]string, head []string) { if strings.TrimSpace(value["PORTS"]) == "" {