1
0
forked from x/icebergs
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-02-24 12:32:41 +08:00
parent a7ca869a16
commit 70dfec6da6
4 changed files with 12 additions and 2 deletions

View File

@ -228,7 +228,7 @@ func init() {
func Relative(m *ice.Message, p string) string { func Relative(m *ice.Message, p string) string {
if _p := kit.ExtChange(p, JS); Exists(m, _p) { if _p := kit.ExtChange(p, JS); Exists(m, _p) {
return _p return _p
} else if _p := kit.ExtChange(path.Join(ice.USR_VOLCANOS, ice.PLUGIN_LOCAL, path.Join(kit.Slice(kit.Split(p, PS), -2)...)), JS); Exists(m, _p) { } else if _p := kit.ExtChange(path.Join(ice.USR_VOLCANOS, ice.PLUGIN_LOCAL, path.Join(kit.Slice(kit.Split(p, PS), -2)...)), JS); Exists(m, kit.Split(_p, "?")[0]) {
return _p return _p
} else { } else {
return p return p

View File

@ -124,7 +124,10 @@ func init() {
if ice.Info.NodeType == web.WORKER { if ice.Info.NodeType == web.WORKER {
return return
} }
kit.If(m.Option(ice.MSG_USERPOD), func(p string) { m.Option(ice.MSG_NODETYPE, m.Cmdx(web.SPACE, p, cli.RUNTIME, ice.MSG_NODETYPE)) }) m.Option(ice.MSG_NODETYPE, ice.Info.NodeType)
kit.If(m.Option(ice.MSG_USERPOD), func(p string) {
m.Option(ice.MSG_NODETYPE, m.Cmdx(web.SPACE, p, cli.RUNTIME, ice.MSG_NODETYPE))
})
m.Option(aaa.LANGUAGE, strings.ReplaceAll(strings.ToLower(kit.Select("", kit.Split(kit.GetValid( m.Option(aaa.LANGUAGE, strings.ReplaceAll(strings.ToLower(kit.Select("", kit.Split(kit.GetValid(
func() string { return kit.Select("", "zh-cn", strings.Contains(m.Option(ice.MSG_USERUA), "zh_CN")) }, func() string { return kit.Select("", "zh-cn", strings.Contains(m.Option(ice.MSG_USERUA), "zh_CN")) },
func() string { return kit.Select("", kit.Split(m.R.Header.Get(html.AcceptLanguage), ",;"), 0) }, func() string { return kit.Select("", kit.Split(m.R.Header.Get(html.AcceptLanguage), ",;"), 0) },

View File

@ -82,6 +82,8 @@ func init() {
defer web.ToastProcess(m)() defer web.ToastProcess(m)()
defer m.StatusTime(web.SPACE, m.Option(web.SPACE, ls[0])) defer m.StatusTime(web.SPACE, m.Option(web.SPACE, ls[0]))
} }
m.Info("what %v", arg)
m.Info("what %v", arg)
if len(arg) == 0 { if len(arg) == 0 {
m.Option(nfs.DIR_DEEP, ice.TRUE) m.Option(nfs.DIR_DEEP, ice.TRUE)
arg = append(arg, nfs.SRC) arg = append(arg, nfs.SRC)

View File

@ -298,3 +298,8 @@ func PushShell(m *ice.Message, cmds []string, cb func(string)) {
} }
}) })
} }
func RunConnect(arg ...string) string {
defer func() { recover() }()
kit.If(len(arg) == 0, func() { arg = append(arg, os.Args...) })
return ice.Run(kit.Simple("ssh.connect", "open", "authfile", kit.HomePath(".ssh/", path.Base(arg[0])+".json"), arg[1:])...)
}