liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

add some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-07-01 10:40:13 +08:00
parent cfd5db37ca
commit 67b4924b9a
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
base/cli/daemon.go
View File

@ -152,7 +152,12 @@ func init() {
}) })
kit.If(len(arg) == 0, func() { m.Action(START, mdb.PRUNES) }) kit.If(len(arg) == 0, func() { m.Action(START, mdb.PRUNES) })
if len(arg) > 0 && m.Length() == 0 { 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() }) kit.If(IsSuccess(m) && m.Append(CMD_ERR) == "", func() { m.SetAppend() })
} }
}}, }},

2
base/tcp/host.go
View File

@ -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")) 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) { 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)) m.Echo(mdb.Config(m, DOMAIN))
}}, }},
}, mdb.HashAction(mdb.SHORT, mdb.TEXT)), Hand: func(m *ice.Message, arg ...string) { }, mdb.HashAction(mdb.SHORT, mdb.TEXT)), Hand: func(m *ice.Message, arg ...string) {

6
base/web/store.go
View File

@ -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...) 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))) }}, 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) { }, ctx.ConfAction(CLIENT_TIMEOUT, cli.TIME_3s), DREAM), Hand: func(m *ice.Message, arg ...string) {
if kit.HasPrefixList(arg, ctx.ACTION) { if kit.HasPrefixList(arg, ctx.ACTION) {
m.Cmdy(DREAM, arg) m.Cmdy(DREAM, arg)
@ -63,7 +67,7 @@ func init() {
if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) { if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) {
m.Action() m.Action()
} else { } else {
m.PushAction(mdb.REMOVE).Action(mdb.CREATE) m.PushAction("connect", mdb.REMOVE).Action(mdb.CREATE)
} }
} else { } else {
defer ToastProcess(m, ice.LIST, arg[0])() defer ToastProcess(m, ice.LIST, arg[0])()

4
logs.go
View File

@ -67,7 +67,9 @@ func (m *Message) log(level string, str string, arg ...Any) *Message {
_source := logs.FileLineMeta(3) _source := logs.FileLineMeta(3)
kit.If(Info.Log != nil, func() { Info.Log(m, m.FormatPrefix(traceid), level, logs.Format(str, append(args, _source)...)) }) kit.If(Info.Log != nil, func() { Info.Log(m, m.FormatPrefix(traceid), level, logs.Format(str, append(args, _source)...)) })
if os.Getenv("TERM") == "" { if os.Getenv("TERM") == "" {
return m if !strings.Contains(Info.Make.Domain, "debug=true") {
return m
}
} }
prefix, suffix := "", "" prefix, suffix := "", ""
if Info.Colors { if Info.Colors {