From e6450ddc6c1ffd7f34124758f0a72a3a33ecea70 Mon Sep 17 00:00:00 2001 From: shy Date: Wed, 6 Mar 2024 22:30:52 +0800 Subject: [PATCH] add some --- core/wiki/feel.go | 2 +- misc/ssh/relay/relay.go | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/core/wiki/feel.go b/core/wiki/feel.go index 76349796..f818917d 100644 --- a/core/wiki/feel.go +++ b/core/wiki/feel.go @@ -25,7 +25,7 @@ const FEEL = "feel" func init() { Index.MergeCommands(ice.Commands{ - FEEL: {Name: "feel path auto upload record1 record2 actions", Icon: "Photos.png", Help: "影音媒体", Actions: ice.MergeActions(ice.Actions{ + FEEL: {Name: "feel path file auto upload record1 record2 actions", Icon: "Photos.png", Help: "影音媒体", Actions: ice.MergeActions(ice.Actions{ web.UPLOAD: {Hand: func(m *ice.Message, arg ...string) { up := kit.Simple(m.Optionv(ice.MSG_UPLOAD)) m.Cmdy(web.CACHE, web.WATCH, m.Option(mdb.HASH), path.Join(m.Option(nfs.PATH, _feel_path(m, m.Option(nfs.PATH))), up[1])) diff --git a/misc/ssh/relay/relay.go b/misc/ssh/relay/relay.go index 06fef5ea..dcd7075b 100644 --- a/misc/ssh/relay/relay.go +++ b/misc/ssh/relay/relay.go @@ -73,6 +73,8 @@ type relay struct { install string `name:"install dream param='forever start' dev portal=9020 nodename" help:"安装"` pushbin string `name:"pushbin dream param='forever start' dev portal=9020 nodename" help:"部署" icon:"bi bi-box-arrow-in-up"` adminCmd string `name:"adminCmd cmd" help:"命令" icon:"bi bi-terminal-plus"` + proxy string `name:"proxy" help:"代理"` + trash string `name:"trash" help:"清理"` } func (s relay) Init(m *ice.Message, arg ...string) { @@ -221,7 +223,7 @@ func (s relay) List(m *ice.Message, arg ...string) *ice.Message { return } m.Push(web.LINK, web.HostPort(m.Message, value[tcp.HOST], value[web.PORTAL])) - m.PushButton(s.Portal, s.Desktop, s.Dream, s.Admin, s.Vimer, s.Login, s.AdminCmd, s.Upgrade, s.Pushbin, s.Xterm, s.Remove) + m.PushButton(s.Portal, s.Desktop, s.Dream, s.Admin, s.Vimer, s.Login, s.Proxy, s.AdminCmd, s.Upgrade, s.Pushbin, s.Xterm, s.Trash, s.Remove) kit.If(len(arg) > 0, func() { m.PushQRCode(cli.QRCODE, m.Append(web.LINK)) }) }) _stats := kit.Dict(MEM, kit.FmtSize(stats[MEM_FREE], stats[MEM_TOTAL]), DISK, kit.FmtSize(stats[DISK_USED], stats[DISK_TOTAL])) @@ -295,6 +297,19 @@ func (s relay) Login(m *ice.Message, arg ...string) { }) } } +func (s relay) Proxy(m *ice.Message, arg ...string) { + p := kit.Format("/home/%s/%s/usr/local/daemon/10000/", m.Option(aaa.USERNAME), kit.Select(CONTEXTS, m.Option(web.DREAM))) + ssh.CombinedOutput(m.Message, kit.Format("sudo %s/sbin/nginx -s reload -p %s", p, p), func(res string) {}) + s.Modify(m, m.Options(web.PORTAL, tcp.PORT_443).OptionSimple(MACHINE, web.PORTAL)...) + m.Options(m.Cmd("", m.Option(MACHINE)).AppendSimple()) + m.Cmdy("", s.Login).ProcessOpenAndRefresh(kit.MergeURL2(m.Option(mdb.LINK), web.C(web.ADMIN))) +} +func (s relay) Trash(m *ice.Message, arg ...string) { + p := kit.Format("/home/%s/%s", m.Option(aaa.USERNAME), kit.Select(CONTEXTS, m.Option(web.DREAM))) + ssh.CombinedOutput(m.Message, kit.Format("%s/bin/ice.bin quit", p), func(res string) {}) + ssh.CombinedOutput(m.Message, kit.Format("mv %s /tmp/%s", p, path.Base(p)+"-"+kit.ReplaceAll(m.Time(), " ", "-")), func(res string) {}) + s.Modify(m, MACHINE, m.Option(MACHINE), web.PORTAL, "", web.DREAM, "") +} func (s relay) Repos(m *ice.Message, arg ...string) { s.iframe(m, web.CODE_GIT_STATUS, arg...) } func (s relay) Vimer(m *ice.Message, arg ...string) { s.iframe(m, "", arg...) } func (s relay) Admin(m *ice.Message, arg ...string) { s.iframe(m, "", arg...) }