From 67b4924b9ac7c86c77d6416b9e8a8c6341b93b4c Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 1 Jul 2024 10:40:13 +0800 Subject: [PATCH] add some --- base/cli/daemon.go | 7 ++++++- base/tcp/host.go | 2 +- base/web/store.go | 6 +++++- logs.go | 4 +++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/base/cli/daemon.go b/base/cli/daemon.go index 9cde2f14..c6fd6c2e 100644 --- a/base/cli/daemon.go +++ b/base/cli/daemon.go @@ -152,7 +152,12 @@ func init() { }) kit.If(len(arg) == 0, func() { m.Action(START, mdb.PRUNES) }) if len(arg) > 0 && m.Length() == 0 { - _daemon_exec(m, _system_cmd(m, kit.Simple(kit.Split(arg[0]), arg[1:])...)) + if runtime.GOOS == WINDOWS { + _daemon_exec(m, _system_cmd(m, arg...)) + } else { + _daemon_exec(m, _system_cmd(m, arg...)) + // _daemon_exec(m, _system_cmd(m, kit.Simple(kit.Split(arg[0]), arg[1:])...)) + } kit.If(IsSuccess(m) && m.Append(CMD_ERR) == "", func() { m.SetAppend() }) } }}, diff --git a/base/tcp/host.go b/base/tcp/host.go index ab45b4cd..5ee51f2b 100644 --- a/base/tcp/host.go +++ b/base/tcp/host.go @@ -104,7 +104,7 @@ func init() { m.Push(aaa.IP, kit.Keys(kit.Slice(strings.Split(m.Cmdv(HOST, aaa.IP), nfs.PT), 0, 3), "1")) }}, DOMAIN: {Name: "domain ip", Help: "主机", Icon: "bi bi-house-check", Hand: func(m *ice.Message, arg ...string) { - kit.If(m.Option(aaa.IP), func(p string) { mdb.Config(m, DOMAIN, p) }) + kit.If(m.Option(aaa.IP), func(p string) { ice.Info.Host = p; mdb.Config(m, DOMAIN, p) }) m.Echo(mdb.Config(m, DOMAIN)) }}, }, mdb.HashAction(mdb.SHORT, mdb.TEXT)), Hand: func(m *ice.Message, arg ...string) { diff --git a/base/web/store.go b/base/web/store.go index 11f00516..3c2e7434 100644 --- a/base/web/store.go +++ b/base/web/store.go @@ -46,6 +46,10 @@ func init() { ProcessIframe(m, kit.Keys(m.Option(mdb.NAME), m.ActionKey()), S(m.Option(mdb.NAME))+C(m.ActionKey()), arg...) }}, OPEN: {Hand: func(m *ice.Message, arg ...string) { m.ProcessOpen(S(m.Option(mdb.NAME))) }}, + "connect": {Help: "连接", Hand: func(m *ice.Message, arg ...string) { + m.Options(m.Cmd(SPIDE, m.Option(mdb.NAME)).AppendSimple()) + m.Cmdy(SPIDE, mdb.DEV_REQUEST) + }}, }, ctx.ConfAction(CLIENT_TIMEOUT, cli.TIME_3s), DREAM), Hand: func(m *ice.Message, arg ...string) { if kit.HasPrefixList(arg, ctx.ACTION) { m.Cmdy(DREAM, arg) @@ -63,7 +67,7 @@ func init() { if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) { m.Action() } else { - m.PushAction(mdb.REMOVE).Action(mdb.CREATE) + m.PushAction("connect", mdb.REMOVE).Action(mdb.CREATE) } } else { defer ToastProcess(m, ice.LIST, arg[0])() diff --git a/logs.go b/logs.go index 7678f886..49db19ba 100644 --- a/logs.go +++ b/logs.go @@ -67,7 +67,9 @@ func (m *Message) log(level string, str string, arg ...Any) *Message { _source := logs.FileLineMeta(3) kit.If(Info.Log != nil, func() { Info.Log(m, m.FormatPrefix(traceid), level, logs.Format(str, append(args, _source)...)) }) if os.Getenv("TERM") == "" { - return m + if !strings.Contains(Info.Make.Domain, "debug=true") { + return m + } } prefix, suffix := "", "" if Info.Colors {