From 3ce2b1ff2b3604c8c451d2ac74879df3c1fd2dba Mon Sep 17 00:00:00 2001 From: harveyshao Date: Mon, 22 Mar 2021 10:50:39 +0800 Subject: [PATCH] opt some --- base/cli/runtime.go | 8 +++++--- base/web/space.go | 7 +------ conf.go | 2 ++ core/chat/river.go | 2 +- core/code/publish.go | 2 ++ logs.go | 3 +++ 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/base/cli/runtime.go b/base/cli/runtime.go index 9cd4c26d..0040e6d0 100644 --- a/base/cli/runtime.go +++ b/base/cli/runtime.go @@ -55,9 +55,11 @@ func init() { m.Cmdy("tcp.host") }}, "hostname": {Name: "hostname", Help: "hostname", Hand: func(m *ice.Message, arg ...string) { - m.Conf(RUNTIME, "boot.hostname", arg[0]) - m.Conf(RUNTIME, "node.name", arg[0]) - ice.Info.HostName = arg[0] + if len(arg) > 0 { + m.Conf(RUNTIME, "boot.hostname", arg[0]) + m.Conf(RUNTIME, "node.name", arg[0]) + ice.Info.HostName = arg[0] + } m.Echo(ice.Info.HostName) }}, "userinfo": {Name: "userinfo", Help: "userinfo", Hand: func(m *ice.Message, arg ...string) { diff --git a/base/web/space.go b/base/web/space.go index e73480ac..21d8c535 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -138,12 +138,7 @@ func _space_handle(m *ice.Message, safe bool, send map[string]*ice.Message, c *w msg.Log("recv", "%v->%v %s %v", source, target, msg.Detailv(), msg.Format(kit.MDB_META)) if len(target) == 0 { // 本地执行 - if msg.Option(ice.MSG_USERROLE, aaa.UserRole(msg, msg.Option(ice.MSG_USERNAME))) == aaa.VOID { - role := msg.Cmdx(SPIDE, SPIDE_DEV, SPIDE_MSG, SPIDE_GET, "/chat/header", "cmds", aaa.USERROLE, "who", msg.Option(ice.MSG_USERNAME)) - msg.Option(ice.MSG_USERROLE, kit.Select(role, aaa.TECH, role == aaa.ROOT)) - } msg.Log_AUTH(aaa.USERROLE, msg.Option(ice.MSG_USERROLE), aaa.USERNAME, msg.Option(ice.MSG_USERNAME)) - if msg.Optionv(ice.MSG_HANDLE, "true"); !msg.Warn(!safe, ice.ErrNotRight) { msg.Go(func() { _space_exec(msg, source, target, c, name) }) } @@ -183,7 +178,7 @@ func _space_handle(m *ice.Message, safe bool, send map[string]*ice.Message, c *w } func _space_search(m *ice.Message, kind, name, text string, arg ...string) { m.Richs(SPACE, nil, kit.MDB_FOREACH, func(key string, value map[string]interface{}) { - if value = kit.GetMeta(value); strings.Contains(kit.Format(value[kit.MDB_NAME]), name) { + if value = kit.GetMeta(value); strings.Contains(kit.Format(value[kit.MDB_NAME]), name) && value[kit.MDB_TYPE] != MASTER { m.PushSearch(kit.SSH_CMD, SPACE, kit.MDB_TYPE, value[kit.MDB_TYPE], kit.MDB_NAME, value[kit.MDB_NAME], kit.MDB_TEXT, kit.MergeURL(m.Option(ice.MSG_USERWEB), kit.SSH_POD, kit.Keys(m.Option(ice.MSG_USERPOD), value[kit.MDB_NAME]))) } diff --git a/conf.go b/conf.go index abad436c..57bdd726 100644 --- a/conf.go +++ b/conf.go @@ -122,6 +122,8 @@ const ( // LOG // 分类 LOG_CMDS = "cmds" LOG_AUTH = "auth" + LOG_SEND = "send" + LOG_RECV = "recv" LOG_COST = "cost" LOG_INFO = "info" LOG_WARN = "warn" diff --git a/core/chat/river.go b/core/chat/river.go index 487f1b9d..a5b1bde4 100644 --- a/core/chat/river.go +++ b/core/chat/river.go @@ -335,7 +335,7 @@ func init() { m.Cmdy(web.SHARE, mdb.CREATE, kit.MDB_TYPE, LOGIN, arg) }}, tcp.START: {Name: "start name repos template", Help: "启动", Hand: func(m *ice.Message, arg ...string) { - m.Cmdy(web.DREAM, tcp.START, arg) + m.Cmdy(m.Space(m.Option(kit.SSH_POD)), web.DREAM, tcp.START, arg) }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Cmdy(mdb.SELECT, RIVER, "", mdb.HASH, kit.MDB_HASH, arg) diff --git a/core/code/publish.go b/core/code/publish.go index 2a632005..940f23d3 100644 --- a/core/code/publish.go +++ b/core/code/publish.go @@ -68,6 +68,8 @@ echo "hello world" m.Cmd(PUBLISH, mdb.CREATE, kit.MDB_FILE, ice.ETC_MISS) m.Cmd(PUBLISH, mdb.CREATE, kit.MDB_FILE, ice.GO_MOD) m.Cmd(nfs.DEFS, path.Join(m.Conf(PUBLISH, kit.META_PATH), ice.ORDER_JS), m.Conf(PUBLISH, kit.Keym(JS))) + m.Cmd(nfs.DEFS, "usr/volcanos/page/cache.css", "") + m.Cmd(nfs.DEFS, "usr/volcanos/page/cache.js", "") m.Option(nfs.DIR_DEEP, true) m.Option(nfs.DIR_REG, `.*\.(html|css|js)$`) diff --git a/logs.go b/logs.go index a1006ff7..74ed374a 100644 --- a/logs.go +++ b/logs.go @@ -121,6 +121,9 @@ func (m *Message) Logs(level string, arg ...interface{}) *Message { func (m *Message) Log_AUTH(arg ...interface{}) *Message { return m.log(LOG_AUTH, log_fields(arg...)) } +func (m *Message) Log_SEND(arg ...interface{}) *Message { + return m.log(LOG_AUTH, log_fields(arg...)) +} func (m *Message) Log_CREATE(arg ...interface{}) *Message { return m.log(LOG_CREATE, log_fields(arg...)) }