diff --git a/README.md b/README.md index 6a80420d..82b43335 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # icebergs -icebergs 是一个应用框架,通过模块化、集群化、自动化方式,在各种设备上,即可一键启动完整的云计算服务与云研发环境。 +icebergs 是一个后端框架,通过集群化、模块化、自动化方式,在各种设备上,即可一键启动完整的云计算服务与云研发环境。 diff --git a/base/web/serve.go b/base/web/serve.go index 080dc041..c180e0c1 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -312,11 +312,14 @@ func init() { ice.Info.Important = ice.HasVar() }}, PROXY_CONF: {Name: "proxyConf name* port host path", Hand: func(m *ice.Message, arg ...string) { - if dir := m.OptionDefault(nfs.PATH, PROXY_PATH, tcp.HOST, "127.0.0.1", tcp.PORT, tcp.PORT_9020); true || nfs.Exists(m, dir) { - for _, p := range []string{"server.conf", "location.conf", "upstream.conf"} { + if dir := m.OptionDefault(nfs.PATH, PROXY_PATH, tcp.HOST, "127.0.0.1", tcp.PORT, tcp.PORT_9020); nfs.Exists(m, dir) { + for _, p := range []string{"upstream.conf"} { m.Cmd(nfs.SAVE, kit.Format("%s/conf/portal/%s/%s", dir, m.Option(mdb.NAME), p), m.Template(p)+lex.NL) } - m.Cmd(cli.SYSTEM, "sudo", kit.Path("usr/local/daemon/10000/sbin/nginx"), "-p", kit.Path("usr/local/daemon/10000/"), "-s", "reload") + for _, p := range []string{"server.conf", "location.conf"} { + m.Cmd(nfs.DEFS, kit.Format("%s/conf/portal/%s/%s", dir, m.Option(mdb.NAME), p), m.Template(p)+lex.NL) + } + m.Cmd(cli.SYSTEM, cli.SUDO, kit.Path(dir, "sbin/nginx"), "-p", kit.Path(dir), "-s", "reload") } }}, }, gdb.EventsAction(SERVE_START), mdb.HashAction( diff --git a/core/chat/iframe.go b/core/chat/iframe.go index b72f2600..16f46ffd 100644 --- a/core/chat/iframe.go +++ b/core/chat/iframe.go @@ -65,7 +65,10 @@ func init() { kit.If(m.Option(mdb.TYPE) == web.LINK, func() { ctx.ProcessField(m, m.ShortKey(), m.Option(mdb.TEXT)) }) }}, }, FavorAction(), mdb.HashAction(mdb.SHORT, web.LINK, mdb.FIELD, "time,hash,type,name,link")), Hand: func(m *ice.Message, arg ...string) { - list := []string{m.MergePodCmd("", web.PORTAL), m.MergePodCmd("", web.ADMIN)} + list := []string{m.MergePodCmd("", web.PORTAL), m.MergePodCmd("", web.ADMIN), m.MergePodCmd("", web.DESKTOP)} + m.Cmd(web.SPACE).Table(func(value ice.Maps) { + kit.If(kit.IsIn(value[mdb.TYPE], web.WORKER, web.SERVER), func() { list = append(list, m.MergePod(value[mdb.NAME])) }) + }) if mdb.HashSelect(m, arg...); len(arg) == 0 { for _, link := range list { if u := kit.ParseURL(link); u != nil { diff --git a/misc/misc.go b/misc/misc.go index 19c04757..51d73b31 100644 --- a/misc/misc.go +++ b/misc/misc.go @@ -2,5 +2,4 @@ package misc import ( _ "shylinux.com/x/icebergs/misc/git" - _ "shylinux.com/x/icebergs/misc/wx" )