diff --git a/base/aaa/sess.go b/base/aaa/sess.go index 0350243a..c12eba4d 100644 --- a/base/aaa/sess.go +++ b/base/aaa/sess.go @@ -24,8 +24,8 @@ func _sess_check(m *ice.Message, sessid string) { } const ( - UA = "ua" IP = "ip" + UA = "ua" ) const ( CHECK = "check" diff --git a/base/mdb/mdb.go b/base/mdb/mdb.go index a4e87b06..ed8199fb 100644 --- a/base/mdb/mdb.go +++ b/base/mdb/mdb.go @@ -54,54 +54,56 @@ const ( DICT = kit.MDB_DICT META = kit.MDB_META + SHORT = kit.MDB_SHORT + FIELD = kit.MDB_FIELD + COUNT = kit.MDB_COUNT + TOTAL = kit.MDB_TOTAL + LIMIT = kit.MDB_LIMIT + LEAST = kit.MDB_LEAST + STORE = kit.MDB_STORE + FSIZE = kit.MDB_FSIZE + UNIQ = kit.MDB_UNIQ FOREACH = kit.MDB_FOREACH RANDOMS = kit.MDB_RANDOMS ) const ( ID = kit.MDB_ID - KEY = kit.MDB_KEY TIME = kit.MDB_TIME TYPE = kit.MDB_TYPE NAME = kit.MDB_NAME TEXT = kit.MDB_TEXT + + ICON = kit.MDB_ICON + SCAN = kit.MDB_SCAN + LINK = kit.MDB_LINK + HELP = kit.MDB_HELP + FILE = kit.MDB_FILE DATA = kit.MDB_DATA VIEW = kit.MDB_VIEW - - FILE = kit.MDB_FILE - LINK = kit.MDB_LINK - SCAN = kit.MDB_SCAN SHOW = kit.MDB_SHOW - HELP = kit.MDB_HELP - ICON = kit.MDB_ICON - INDEX = kit.MDB_INDEX + KEY = kit.MDB_KEY VALUE = kit.MDB_VALUE + INDEX = kit.MDB_INDEX EXTRA = kit.MDB_EXTRA ALIAS = kit.MDB_ALIAS EXPIRE = kit.MDB_EXPIRE STATUS = kit.MDB_STATUS STREAM = kit.MDB_STREAM - SHORT = kit.MDB_SHORT - FIELD = kit.MDB_FIELD - TOTAL = kit.MDB_TOTAL - COUNT = kit.MDB_COUNT - LIMIT = kit.MDB_LIMIT - LEAST = kit.MDB_LEAST - STORE = kit.MDB_STORE - FSIZE = kit.MDB_FSIZE + TOOLS = "tools" + ICONS = "icons" + UNITS = "units" + ORDER = "order" + VALID = "valid" + ENABLE = "enable" + DISABLE = "disable" + EXPIRED = "expired" - ICONS = "icons" - UNITS = "units" - TOOLS = "tools" SOURCE = "_source" TARGET = "_target" IMPORTANT = "important" - VALID = "valid" - EXPIRED = "expired" - DISABLE = "disable" - ENABLE = "enable" ) const ( INPUTS = "inputs" @@ -130,7 +132,6 @@ const ( REPEAT = "repeat" REVERT = "revert" RENAME = "rename" - ORDER = "order" PRUNE = "prune" PAGE = "page" diff --git a/base/web/dream.go b/base/web/dream.go index 6eb9e9bd..0672ef7f 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -45,6 +45,14 @@ func _dream_list(m *ice.Message) *ice.Message { } } }) + m.RewriteAppend(func(value, key string, index int) string { + if key == mdb.TIME { + if space, ok := list[m.Appendv(mdb.NAME)[index]]; ok { + value = space[mdb.TIME] + } + } + return value + }) return m } func _dream_start(m *ice.Message, name string) { diff --git a/base/web/render.go b/base/web/render.go index 932d0cc8..a1746c7b 100644 --- a/base/web/render.go +++ b/base/web/render.go @@ -158,8 +158,8 @@ func RenderVersion(m *ice.Message) string { const ( CHAT = "chat" - XTERM = "xterm" VIMER = "vimer" + XTERM = "xterm" DESKTOP = "desktop" UPGRADE = "upgrade" COMPILE = "compile" @@ -181,9 +181,9 @@ const ( WIKI_DRAW = "web.wiki.draw" WIKI_WORD = "web.wiki.word" WIKI_PORTAL = "web.wiki.portal" + CHAT_OAUTH_CLIENT = "web.chat.oauth.client" CHAT_HEADER = "web.chat.header" CHAT_IFRAME = "web.chat.iframe" - CHAT_OAUTH_CLIENT = "web.chat.oauth.client" CHAT_FAVOR = "web.chat.favor" CHAT_FLOWS = "web.chat.flows" CHAT_GRANT = "web.chat.grant" diff --git a/base/web/space.go b/base/web/space.go index aaeee165..fd7e28a3 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -32,7 +32,7 @@ func _space_qrcode(m *ice.Message, dev string) { func _space_dial(m *ice.Message, dev, name string, arg ...string) { origin := m.Cmdv(SPIDE, dev, CLIENT_ORIGIN) u := kit.ParseURL(kit.MergeURL2(strings.Replace(origin, HTTP, "ws", 1), PP(SPACE), mdb.TYPE, ice.Info.NodeType, mdb.NAME, name, - nfs.MODULE, ice.Info.Make.Module, nfs.VERSION, ice.Info.Make.Versions(), cli.GOOS, runtime.GOOS, cli.GOARCH, runtime.GOARCH, arg)) + mdb.TIME, ice.Info.Make.Time, nfs.MODULE, ice.Info.Make.Module, nfs.VERSION, ice.Info.Make.Versions(), cli.GOOS, runtime.GOOS, cli.GOARCH, runtime.GOARCH, arg)) args := kit.SimpleKV("type,name,host,port", u.Scheme, dev, u.Hostname(), kit.Select(kit.Select(tcp.PORT_443, tcp.PORT_80, u.Scheme == "ws"), u.Port())) gdb.Go(m, func() { once := sync.Once{} @@ -93,7 +93,7 @@ func _space_fork(m *ice.Message) { safe = true } } - args := kit.Simple(mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, name, mdb.TEXT, text, m.OptionSimple(nfs.MODULE, nfs.VERSION, cli.DAEMON)) + args := kit.Simple(mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, name, mdb.TEXT, text, m.OptionSimple(mdb.TIME, nfs.MODULE, nfs.VERSION, cli.DAEMON)) args = append(args, aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERROLE, m.Option(ice.MSG_USERROLE)) args = append(args, aaa.UA, m.Option(ice.MSG_USERUA), aaa.IP, m.Option(ice.MSG_USERIP)) args = _space_agent(m, args...) @@ -115,7 +115,8 @@ func _space_fork(m *ice.Message) { case SERVER: defer gdb.EventDeferEvent(m, SPACE_OPEN, args)(SPACE_CLOSE, args) m.Go(func() { - m.Cmd(SPACE, name, cli.PWD, name, kit.Dict(nfs.MODULE, ice.Info.Make.Module, nfs.VERSION, ice.Info.Make.Versions(), AGENT, "Go-http-client", cli.SYSTEM, runtime.GOOS)) + m.Cmd(SPACE, name, cli.PWD, name, kit.Dict( + mdb.TIME, ice.Info.Make.Time, nfs.MODULE, ice.Info.Make.Module, nfs.VERSION, ice.Info.Make.Versions(), AGENT, "Go-http-client", cli.SYSTEM, runtime.GOOS)) m.Cmd(SPACE).Table(func(value ice.Maps) { if kit.IsIn(value[mdb.TYPE], WORKER, SERVER) && value[mdb.NAME] != name { m.Cmd(SPACE, value[mdb.NAME], gdb.EVENT, gdb.HAPPEN, gdb.EVENT, OPS_SERVER_OPEN, args, kit.Dict(ice.MSG_USERROLE, aaa.TECH)) @@ -183,7 +184,7 @@ func _space_exec(m *ice.Message, name string, source, target []string, c *websoc case cli.PWD: mdb.HashModify(m, mdb.HASH, name, aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERROLE, m.Option(ice.MSG_USERROLE), - aaa.IP, m.Option(ice.MSG_USERIP), aaa.UA, m.Option(ice.MSG_USERUA), m.OptionSimple(nfs.MODULE, nfs.VERSION, AGENT, cli.SYSTEM), + aaa.IP, m.Option(ice.MSG_USERIP), aaa.UA, m.Option(ice.MSG_USERUA), m.OptionSimple(mdb.TIME, nfs.MODULE, nfs.VERSION, AGENT, cli.SYSTEM), ) m.Push(mdb.LINK, m.MergePod(kit.Select("", source, -1))) default: diff --git a/base/web/web.go b/base/web/web.go index d73942db..ffbb3994 100644 --- a/base/web/web.go +++ b/base/web/web.go @@ -79,8 +79,8 @@ var Index = &ice.Context{Name: WEB, Help: "网络模块"} func init() { ice.Index.Register(Index, &Frame{}, - BROAD, SERVE, DREAM, ROUTE, SPACE, STORE, - TOKEN, SHARE, CACHE, SPIDE, COUNT, ADMIN, STATS, + BROAD, SERVE, SPACE, ROUTE, DREAM, STORE, + SHARE, TOKEN, SPIDE, CACHE, ADMIN, STATS, COUNT, ) } diff --git a/conf.go b/conf.go index a5956246..7f9e031d 100644 --- a/conf.go +++ b/conf.go @@ -18,14 +18,14 @@ const ( TRUE = "true" FALSE = "false" SUCCESS = "success" - FAILURE = "failure" PROCESS = "process" + FAILURE = "failure" WINDOWS = "windows" HTTPS = "https" HTTP = "http" - MAIL = "mail" DEMO = "demo" + MAIL = "mail" HELP = "help" MAIN = "main" AUTO = "auto" @@ -100,7 +100,6 @@ const ( // DIR PAGE = "page" PANEL = "panel" PLUGIN = "plugin" - STORY = "story" INDEX_CSS = "index.css" CONST_JS = "const.js" @@ -113,22 +112,21 @@ const ( // DIR PLUGIN_STORY = "/plugin/story/" PLUGIN_TABLE_JS = "/plugin/table.js" - ISH_PLUGED = ".ish/pluged/" - - USR_LOCAL = "usr/local/" - USR_PORTAL = "usr/portal/" + ISH_PLUGED = ".ish/pluged/" USR_INSTALL = "usr/install/" USR_REQUIRE = "usr/require/" USR_PUBLISH = "usr/publish/" - USR_RELEASE = "usr/release/" - USR_ICEBERGS = "usr/icebergs/" - USR_TOOLKITS = "usr/toolkits/" + USR_INTSHELL = "usr/intshell/" USR_VOLCANOS = "usr/volcanos/" USR_LEARNING = "usr/learning/" - USR_INTSHELL = "usr/intshell/" + USR_TOOLKITS = "usr/toolkits/" + USR_ICEBERGS = "usr/icebergs/" + USR_RELEASE = "usr/release/" + USR_ICONS = "usr/icons/" USR_PROGRAM = "usr/program/" USR_GEOAREA = "usr/geoarea/" - USR_ICONS = "usr/icons/" + USR_PORTAL = "usr/portal/" + USR_LOCAL = "usr/local/" USR_LOCAL_GO = "usr/local/go/" USR_LOCAL_GO_BIN = "usr/local/go/bin/" @@ -182,8 +180,8 @@ const ( // DIR const ( // MSG MSG_CMDS = "cmds" MSG_FIELDS = "fields" - MSG_METHOD = "method" MSG_SESSID = "sessid" + MSG_METHOD = "method" MSG_DEBUG = "debug" MSG_DETAIL = "detail" @@ -242,8 +240,8 @@ const ( // MSG LOG_TRACEID = "log.id" MSG_NODETYPE = "node.type" - TOAST_DURATION = "toast.duration" TABLE_CHECKBOX = "table.checkbox" + TOAST_DURATION = "toast.duration" TCP_DOMAIN = "tcp_domain" ) const ( // RENDER diff --git a/core/code/autogen.go b/core/code/autogen.go index 840dcbf5..4413eb96 100644 --- a/core/code/autogen.go +++ b/core/code/autogen.go @@ -107,7 +107,7 @@ func _autogen_mod(m *ice.Message, file string) (mod string) { host = path.Join(host, "x", path.Base(kit.Path(""))) } m.Cmd(nfs.DEFS, file, kit.Format(nfs.Template(m, ice.GO_MOD), host)) - ReposAddFile(m, "", ice.GO_MOD) + // ReposAddFile(m, "", ice.GO_MOD) m.Cmd(nfs.CAT, file, func(line string) { kit.If(strings.HasPrefix(line, nfs.MODULE), func() { mod = kit.Split(line, lex.SP)[1] }) })