diff --git a/conf.go b/conf.go index 799d0415..f664c22b 100644 --- a/conf.go +++ b/conf.go @@ -2,8 +2,8 @@ package ice const ( SP = " " - NL = "\n" PT = "." + NL = "\n" OK = "ok" TRUE = "true" @@ -49,7 +49,9 @@ const ( // MOD ) const ( // REPOS VOLCANOS = "volcanos" + LEARNING = "learning" ICEBERGS = "icebergs" + TOOLKITS = "toolkits" INTSHELL = "intshell" CONTEXTS = "contexts" @@ -61,17 +63,11 @@ const ( // DIR USR_VOLCANOS = "usr/volcanos" USR_LEARNING = "usr/learning" USR_ICEBERGS = "usr/icebergs" + USR_TOOLKITS = "usr/toolkits" USR_INTSHELL = "usr/intshell" USR_INSTALL = "usr/install" USR_PUBLISH = "usr/publish" - USR_LOCAL = "usr/local" - USR_LOCAL_WORK = "usr/local/work" - USR_LOCAL_IMAGE = "usr/local/image" - USR_LOCAL_RIVER = "usr/local/river" - USR_LOCAL_DAEMON = "usr/local/daemon" - USR_LOCAL_EXPORT = "usr/local/export" - FAVICON = "favicon.ico" PROTO_JS = "proto.js" FRAME_JS = "frame.js" @@ -80,6 +76,13 @@ const ( // DIR ORDER_SH = "order.sh" INDEX_SH = "index.sh" + USR_LOCAL = "usr/local" + USR_LOCAL_WORK = "usr/local/work" + USR_LOCAL_IMAGE = "usr/local/image" + USR_LOCAL_RIVER = "usr/local/river" + USR_LOCAL_DAEMON = "usr/local/daemon" + USR_LOCAL_EXPORT = "usr/local/export" + VAR_RUN = "var/run" VAR_TMP = "var/tmp" VAR_LOG = "var/log" diff --git a/core/chat/header.go b/core/chat/header.go index 4386aae8..faf15c5a 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -1,8 +1,6 @@ package chat import ( - "strings" - ice "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/ctx" @@ -39,7 +37,7 @@ func _header_share(m *ice.Message, arg ...string) { m.Option(kit.MDB_LINK, tcp.ReplaceLocalhost(m, m.Option(kit.MDB_LINK))) } - m.Option(kit.MDB_LINK, strings.Split(m.Option(kit.MDB_LINK), "?")[0]) + m.Option(kit.MDB_LINK, kit.MergeURL(m.Option(kit.MDB_LINK), RIVER, "", STORM, "")) m.Set(kit.MDB_NAME, kit.MDB_TEXT) m.Push(kit.MDB_NAME, m.Option(kit.MDB_LINK)) diff --git a/core/code/upgrade.go b/core/code/upgrade.go index 979c0ea3..f5b9877f 100644 --- a/core/code/upgrade.go +++ b/core/code/upgrade.go @@ -16,13 +16,13 @@ func init() { Configs: map[string]*ice.Config{ UPGRADE: {Name: UPGRADE, Help: "升级", Value: kit.Dict(kit.MDB_HASH, kit.Dict( cli.SYSTEM, kit.Dict(kit.MDB_LIST, kit.List( - kit.MDB_INPUT, "bin", kit.MDB_FILE, "ice.sh", kit.MDB_PATH, ice.BIN_ICE_SH, - kit.MDB_INPUT, "bin", kit.MDB_FILE, "ice.bin", kit.MDB_PATH, ice.BIN_ICE_BIN, + kit.MDB_TYPE, "bin", kit.MDB_FILE, "ice.sh", kit.MDB_PATH, ice.BIN_ICE_SH, + kit.MDB_TYPE, "bin", kit.MDB_FILE, "ice.bin", kit.MDB_PATH, ice.BIN_ICE_BIN, )), cli.SOURCE, kit.Dict(kit.MDB_LIST, kit.List( - kit.MDB_INPUT, "txt", kit.MDB_FILE, "main.go", kit.MDB_PATH, ice.SRC_MAIN_GO, - kit.MDB_INPUT, "txt", kit.MDB_FILE, "miss.sh", kit.MDB_PATH, ice.ETC_MISS_SH, - kit.MDB_INPUT, "txt", kit.MDB_FILE, "go.mod", kit.MDB_PATH, ice.GO_MOD, + kit.MDB_TYPE, "txt", kit.MDB_FILE, "main.go", kit.MDB_PATH, ice.SRC_MAIN_GO, + kit.MDB_TYPE, "txt", kit.MDB_FILE, "miss.sh", kit.MDB_PATH, ice.ETC_MISS_SH, + kit.MDB_TYPE, "txt", kit.MDB_FILE, "go.mod", kit.MDB_PATH, ice.GO_MOD, )), ))}, }, diff --git a/core/wiki/field.go b/core/wiki/field.go index da659284..e5b336f2 100644 --- a/core/wiki/field.go +++ b/core/wiki/field.go @@ -46,7 +46,7 @@ func _field_show(m *ice.Message, name, text string, arg ...string) { count := 0 kit.Fetch(meta[INPUTS], func(index int, value map[string]interface{}) { - if value[kit.MDB_INPUT] != kit.MDB_BUTTON && value[kit.MDB_TYPE] != kit.MDB_BUTTON { + if value[kit.MDB_TYPE] != kit.MDB_BUTTON { count++ } }) @@ -55,7 +55,7 @@ func _field_show(m *ice.Message, name, text string, arg ...string) { list := meta[INPUTS].([]interface{}) for i := count; i < len(args); i++ { list = append(list, kit.Dict( - kit.MDB_INPUT, "text", kit.MDB_NAME, "args", kit.MDB_VALUE, args[i], + kit.MDB_TYPE, "text", kit.MDB_NAME, "args", kit.MDB_VALUE, args[i], )) } meta[INPUTS] = list diff --git a/go.sum b/go.sum index e5120d68..778e377d 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=