From 660d594e8e2d2721e12e3fa5d679d6697bec7d5a Mon Sep 17 00:00:00 2001 From: harveyshao Date: Tue, 20 Apr 2021 21:58:59 +0800 Subject: [PATCH] opt some --- base/aaa/user.go | 8 ++++---- core/chat/header.go | 2 +- core/code/js.go | 50 ++++++++++++++++++++++++++++++++++++++++++++- core/wiki/wiki.go | 12 +++++++---- core/wiki/word.go | 6 +++++- 5 files changed, 67 insertions(+), 11 deletions(-) diff --git a/base/aaa/user.go b/base/aaa/user.go index 8062c677..006fd932 100644 --- a/base/aaa/user.go +++ b/base/aaa/user.go @@ -1,11 +1,11 @@ package aaa import ( + "strings" + ice "github.com/shylinux/icebergs" "github.com/shylinux/icebergs/base/mdb" kit "github.com/shylinux/toolkits" - - "strings" ) func _user_login(m *ice.Message, name, word string) (ok bool) { @@ -27,7 +27,7 @@ func _user_create(m *ice.Message, name, word string) { USERNAME, name, PASSWORD, word, USERNICK, name, USERZONE, m.Option(ice.MSG_USERZONE), )) - m.Log_CREATE(USERNAME, name, "hash", h) + m.Log_CREATE(USERNAME, name, kit.MDB_HASH, h) m.Event(USER_CREATE, name) } func _user_search(m *ice.Message, kind, name, text string, arg ...string) { @@ -117,7 +117,7 @@ func init() { mdb.REMOVE: {Name: "remove", Help: "删除", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(mdb.DELETE, USER, "", mdb.HASH, USERNAME, m.Option(USERNAME)) }}, - mdb.SEARCH: {Name: "search type name text arg...", Help: "搜索", Hand: func(m *ice.Message, arg ...string) { + mdb.SEARCH: {Name: "search type name text", Help: "搜索", Hand: func(m *ice.Message, arg ...string) { _user_search(m, arg[0], arg[1], kit.Select("", arg, 2)) }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { diff --git a/core/chat/header.go b/core/chat/header.go index 3300c685..780706c7 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -22,7 +22,7 @@ const HEADER = "header" func init() { Index.Merge(&ice.Context{ Configs: map[string]*ice.Config{ - HEADER: {Name: HEADER, Help: "标题栏", Value: kit.Dict(TITLE, "github.com/shylinux/contexts")}, + HEADER: {Name: HEADER, Help: "标题栏", Value: kit.Data(TITLE, "github.com/shylinux/contexts")}, }, Commands: map[string]*ice.Command{ P_HEADER: {Name: "/header", Help: "标题栏", Action: map[string]*ice.Action{ diff --git a/core/code/js.go b/core/code/js.go index 8038c856..a84ec1b8 100644 --- a/core/code/js.go +++ b/core/code/js.go @@ -15,6 +15,7 @@ const JS = "js" const CSS = "css" const HTML = "html" const NODE = "node" +const VUE = "vue" func init() { Index.Register(&ice.Context{Name: JS, Help: "前端", @@ -24,6 +25,11 @@ func init() { m.Cmd(mdb.RENDER, mdb.CREATE, JS, m.Prefix(JS)) m.Cmd(mdb.ENGINE, mdb.CREATE, JS, m.Prefix(JS)) m.Cmd(mdb.SEARCH, mdb.CREATE, JS, m.Prefix(JS)) + + m.Cmd(mdb.PLUGIN, mdb.CREATE, VUE, m.Prefix(VUE)) + m.Cmd(mdb.RENDER, mdb.CREATE, VUE, m.Prefix(VUE)) + m.Cmd(mdb.ENGINE, mdb.CREATE, VUE, m.Prefix(VUE)) + m.Cmd(mdb.SEARCH, mdb.CREATE, VUE, m.Prefix(VUE)) }}, JS: {Name: JS, Help: "前端", Action: map[string]*ice.Action{ mdb.PLUGIN: {Hand: func(m *ice.Message, arg ...string) { @@ -50,10 +56,43 @@ func init() { m.Cmdy(INSTALL, m.Conf(NODE, kit.META_SOURCE)) }}, }}, + VUE: {Name: "vue", Help: "前端", Action: map[string]*ice.Action{ + mdb.PLUGIN: {Hand: func(m *ice.Message, arg ...string) { + m.Echo(m.Conf(VUE, "meta.plug")) + }}, + mdb.RENDER: {Hand: func(m *ice.Message, arg ...string) { + m.Cmdy(nfs.CAT, path.Join(arg[2], arg[1])) + }}, + mdb.ENGINE: {Hand: func(m *ice.Message, arg ...string) { + m.Option(cli.CMD_DIR, arg[2]) + m.Cmdy(cli.SYSTEM, NODE, arg[1]) + m.Set(ice.MSG_APPEND) + }}, + mdb.SEARCH: {Hand: func(m *ice.Message, arg ...string) { + if arg[0] == kit.MDB_FOREACH { + return + } + _go_find(m, kit.Select("main", arg, 1)) + _go_grep(m, kit.Select("main", arg, 1)) + }}, + }}, }, Configs: map[string]*ice.Config{ + VUE: {Name: VUE, Help: "vue", Value: kit.Data( + "plug", kit.Dict( + PREFIX, kit.Dict( + "//", COMMENT, + "/*", COMMENT, + "*", COMMENT, + ), + SPLIT, kit.Dict( + "space", " \t", + "operator", "{[(&.,;!|<>)]}", + ), + ), + )}, NODE: {Name: NODE, Help: "前端", Value: kit.Data( - "source", "https://nodejs.org/dist/v10.13.0/node-v10.13.0-linux-x64.tar.xz", + kit.SSH_SOURCE, "https://nodejs.org/dist/v10.13.0/node-v10.13.0-linux-x64.tar.xz", )}, JS: {Name: JS, Help: "js", Value: kit.Data( "plug", kit.Dict( @@ -67,10 +106,15 @@ func init() { "*", COMMENT, ), KEYWORD, kit.Dict( + "import", KEYWORD, + "from", KEYWORD, + "export", KEYWORD, + "var", KEYWORD, "new", KEYWORD, "delete", KEYWORD, "typeof", KEYWORD, + "const", KEYWORD, "function", KEYWORD, "if", KEYWORD, @@ -83,6 +127,10 @@ func init() { "case", KEYWORD, "default", KEYWORD, "return", KEYWORD, + "try", KEYWORD, + "throw", KEYWORD, + "catch", KEYWORD, + "finally", KEYWORD, "window", FUNCTION, "console", FUNCTION, diff --git a/core/wiki/wiki.go b/core/wiki/wiki.go index d3420b35..c22c20da 100644 --- a/core/wiki/wiki.go +++ b/core/wiki/wiki.go @@ -1,13 +1,14 @@ package wiki import ( + "path" + "strings" + ice "github.com/shylinux/icebergs" + "github.com/shylinux/icebergs/base/mdb" "github.com/shylinux/icebergs/base/nfs" "github.com/shylinux/icebergs/base/web" kit "github.com/shylinux/toolkits" - - "path" - "strings" ) func _wiki_path(m *ice.Message, cmd string, arg ...string) string { @@ -52,7 +53,10 @@ const WIKI = "wiki" var Index = &ice.Context{Name: WIKI, Help: "文档中心", Commands: map[string]*ice.Command{ - ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Load() }}, + ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + m.Cmd(mdb.RENDER, mdb.CREATE, "png", m.Prefix(IMAGE)) + m.Load() + }}, ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Save() }}, }, } diff --git a/core/wiki/word.go b/core/wiki/word.go index d476cd77..18d06b29 100644 --- a/core/wiki/word.go +++ b/core/wiki/word.go @@ -398,7 +398,11 @@ func init() { _local_show(m, arg[0], kit.Select(arg[0], arg[1]), arg[2:]...) }}, - IMAGE: {Name: "image [name] url", Help: "图片", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + IMAGE: {Name: "image [name] url", Help: "图片", Action: map[string]*ice.Action{ + mdb.RENDER: {Hand: func(m *ice.Message, arg ...string) { + _image_show(m, arg[1], path.Join(arg[2], arg[1])) + }}, + }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { arg = _name(m, arg) _image_show(m, arg[0], kit.Select(arg[0], arg[1]), arg[2:]...) m.Render("")