diff --git a/base/cli/system.go b/base/cli/system.go index 9b241b03..05151e4a 100644 --- a/base/cli/system.go +++ b/base/cli/system.go @@ -2,7 +2,6 @@ package cli import ( ice "github.com/shylinux/icebergs" - "github.com/shylinux/icebergs/base/aaa" "github.com/shylinux/icebergs/base/mdb" kit "github.com/shylinux/toolkits" @@ -15,11 +14,6 @@ import ( ) func _system_show(m *ice.Message, cmd *exec.Cmd) { - m.Cmd(mdb.INSERT, SYSTEM, "", mdb.LIST, "cmd", strings.Join(cmd.Args, " "), "dir", cmd.Dir, "env", strings.Join(cmd.Env, ","), - 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), - ) - if w, ok := m.Optionv("output").(io.WriteCloser); ok { cmd.Stderr = w cmd.Stdout = w diff --git a/base/mdb/mdb.go b/base/mdb/mdb.go index 51ed20bd..85b00f87 100644 --- a/base/mdb/mdb.go +++ b/base/mdb/mdb.go @@ -168,9 +168,7 @@ func _list_select(m *ice.Message, prefix, chain, field, value string) { } func _list_modify(m *ice.Message, prefix, chain string, field, value string, arg ...string) { m.Grows(prefix, chain, field, value, func(index int, val map[string]interface{}) { - if val[kit.MDB_META] != nil { - val = val[kit.MDB_META].(map[string]interface{}) - } + val = kit.GetMeta(val) for i := 0; i < len(arg)-1; i += 2 { if arg[i] == field { continue @@ -268,7 +266,7 @@ func _zone_fields(m *ice.Message) []string { return kit.Split(kit.Select("zone,id,time,type,name,text", strings.Join(kit.Simple(m.Optionv(FIELDS)), ","))) } func _zone_select(m *ice.Message, prefix, chain, zone string, id string) { - cb := m.Optionv("cache.cb") + cb := m.Optionv(SELECT_CB) fields := _zone_fields(m) m.Richs(prefix, chain, kit.Select(kit.MDB_FOREACH, zone), func(key string, val map[string]interface{}) { if val[kit.MDB_META] != nil { @@ -289,6 +287,8 @@ func _zone_select(m *ice.Message, prefix, chain, zone string, id string) { } switch cb := cb.(type) { + case func(string, []string, map[string]interface{}, map[string]interface{}): + cb(key, fields, value, val) case func(string, map[string]interface{}, map[string]interface{}): cb(key, value, val) case func(string, map[string]interface{}): @@ -404,6 +404,8 @@ const ( DELETE = "delete" REMOVE = "remove" + SELECT_CB = "select.cb" + EXPORT = "export" IMPORT = "import" PRUNES = "prunes" @@ -482,7 +484,7 @@ var Index = &ice.Context{Name: MDB, Help: "数据模块", Commands: map[string]* case HASH: _hash_inputs(m, arg[0], _domain_chain(m, arg[1]), kit.Select("name", arg, 3), kit.Select("", arg, 4)) case LIST: - _hash_inputs(m, arg[0], _domain_chain(m, arg[1]), kit.Select("name", arg, 3), kit.Select("", arg, 4)) + _list_inputs(m, arg[0], _domain_chain(m, arg[1]), kit.Select("name", arg, 3), kit.Select("", arg, 4)) } }}, }} diff --git a/base/web/dream.go b/base/web/dream.go index 3b663646..aa07fdaa 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -98,8 +98,8 @@ ish_miss_prepare_install }, Commands: map[string]*ice.Command{ DREAM: {Name: "dream name path auto 启动", Help: "梦想家", Action: map[string]*ice.Action{ - gdb.START: {Name: "start type=worker,server name repos", Help: "启动", Hand: func(m *ice.Message, arg ...string) { - _dream_show(m, m.Option(kit.MDB_NAME, kit.Select(path.Base(m.Option(kit.SSH_REPOS)), m.Option(kit.MDB_NAME)))) + gdb.START: {Name: "start type=worker,server repos", Help: "启动", Hand: func(m *ice.Message, arg ...string) { + _dream_show(m, m.Option(kit.MDB_NAME, path.Base(m.Option(kit.SSH_REPOS)))) }}, gdb.STOP: {Name: "stop", Help: "停止", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(SPACE, m.Option(kit.MDB_NAME), "exit", "0") diff --git a/base/web/route.go b/base/web/route.go index 3c2f6df5..e8d2df18 100644 --- a/base/web/route.go +++ b/base/web/route.go @@ -75,9 +75,8 @@ func init() { m.Sort(kit.MDB_PATH) } }}, - gdb.START: {Name: "start type=worker,server name=hi@key repos", Help: "启动", Hand: func(m *ice.Message, arg ...string) { + gdb.START: {Name: "start type=worker,server repos", Help: "启动", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(SPACE, m.Option(ROUTE), DREAM, gdb.START, arg) - m.Sleep("3s") }}, gdb.STOP: {Name: "stop", Help: "结束", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(SPACE, m.Option(ROUTE), "exit") diff --git a/core/chat/chat.go b/core/chat/chat.go index ed4e6df2..fe10ce81 100644 --- a/core/chat/chat.go +++ b/core/chat/chat.go @@ -19,6 +19,8 @@ var Index = &ice.Context{Name: CHAT, Help: "聊天中心", m.Conf(ACTION, "meta.domain.web.chat.paste", "true") m.Conf(ACTION, "meta.domain.web.chat.scan", "true") m.Conf(ACTION, "meta.domain.web.wiki.feel", "true") + m.Conf(ACTION, "meta.domain.web.team.task", "true") + m.Conf(ACTION, "meta.domain.web.team.plan", "true") m.Conf(RIVER, "meta.template", kit.Dict( "base", kit.Dict( diff --git a/core/team/plan.go b/core/team/plan.go index 5586a002..8a71ab13 100644 --- a/core/team/plan.go +++ b/core/team/plan.go @@ -15,7 +15,7 @@ const PLAN = "plan" func init() { Index.Merge(&ice.Context{ Commands: map[string]*ice.Command{ - PLAN: {Name: "plan scale=day,week,month,year,long begin_time@date auto 添加 导出 导入", Help: "计划", Meta: kit.Dict( + PLAN: {Name: "plan scale=day,week,month,year,long begin_time@date auto insert export import", Help: "计划", Meta: kit.Dict( "display", "/plugin/local/team/plan.js", "style", "plan", ), Action: map[string]*ice.Action{ mdb.INSERT: {Name: "insert zone type=once,step,week name text begin_time@date close_time@date", Help: "添加", Hand: func(m *ice.Message, arg ...string) { @@ -35,7 +35,12 @@ func init() { _task_import(m, m.Option(kit.MDB_FILE)) }}, mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { - _task_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1)) + switch arg[0] { + case "pod", "ctx", "cmd", "arg": + + default: + _task_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1)) + } }}, gdb.BEGIN: {Name: "begin", Help: "开始", Hand: func(m *ice.Message, arg ...string) { @@ -45,12 +50,19 @@ func init() { _task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), TaskField.STATUS, TaskStatus.FINISH) }}, - "command": {Name: "command", Help: "命令", Hand: func(m *ice.Message, arg ...string) { + mdb.PLUGIN: {Name: "plugin extra.pod extra.ctx extra.cmd extra.arg", Help: "插件", Hand: func(m *ice.Message, arg ...string) { + _task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), kit.MDB_TIME, m.Time(), + kit.Simple(kit.Dict(arg))...) + }}, + ctx.COMMAND: {Name: "command", Help: "命令", Hand: func(m *ice.Message, arg ...string) { + if arg[0] == "run" { + m.Cmdy(arg[1], arg[2:]) + return + } if len(arg) == 1 { m.Cmdy(ctx.COMMAND, arg[0]) return } - m.Cmdy(arg[0], arg[1:]) }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { begin_time, end_time := _task_scope(m, 8, arg...) @@ -58,15 +70,15 @@ func init() { m.Set(ice.MSG_OPTION, "end_time") m.Option(mdb.FIELDS, "begin_time,close_time,zone,id,level,status,score,type,name,text,extra") - m.Option("cache.cb", func(key string, fields []string, value, val map[string]interface{}) { + m.Option(mdb.SELECT_CB, func(key string, fields []string, value, val map[string]interface{}) { begin, _ := time.ParseInLocation(ice.MOD_TIME, kit.Format(value[TaskField.BEGIN_TIME]), time.Local) if begin_time.After(begin) || begin.After(end_time) { return } m.Push(key, value, fields, val) - m.PushRender(kit.MDB_ACTION, kit.MDB_BUTTON, _task_action(m, value[TaskField.STATUS], "插件")) + m.PushButton(_task_action(m, value[TaskField.STATUS], mdb.PLUGIN)) }) - m.Cmdy(mdb.SELECT, m.Prefix(TASK), kit.Keys(m.Option(ice.MSG_DOMAIN)), mdb.ZONE, kit.MDB_FOREACH) + m.Cmdy(mdb.SELECT, m.Prefix(TASK), "", mdb.ZONE, kit.MDB_FOREACH) }}, }, }, nil) diff --git a/core/team/task.go b/core/team/task.go index a2ff777e..dc3bea4f 100644 --- a/core/team/task.go +++ b/core/team/task.go @@ -11,15 +11,15 @@ import ( ) func _sub_key(m *ice.Message, zone string) string { - return kit.Keys(m.Option(ice.MSG_DOMAIN), kit.MDB_HASH, kit.Hashs(zone)) + return kit.Keys(kit.MDB_HASH, kit.Hashs(zone)) } func _task_action(m *ice.Message, status interface{}, action ...string) string { switch status { case TaskStatus.PREPARE: - action = append(action, "开始") + action = append(action, gdb.BEGIN) case TaskStatus.PROCESS: - action = append(action, "完成") + action = append(action, gdb.END) case TaskStatus.CANCEL: case TaskStatus.FINISH: } @@ -42,12 +42,12 @@ func _task_list(m *ice.Message, zone string, id string) { } }) } - m.Cmdy(mdb.SELECT, m.Prefix(TASK), m.Option(ice.MSG_DOMAIN), mdb.ZONE, zone, id) + m.Cmdy(mdb.SELECT, m.Prefix(TASK), "", mdb.ZONE, zone, id) } func _task_create(m *ice.Message, zone string) { - if msg := m.Cmd(mdb.SELECT, m.Prefix(TASK), m.Option(ice.MSG_DOMAIN), mdb.HASH, kit.MDB_ZONE, zone); len(msg.Appendv(kit.MDB_HASH)) == 0 { + if msg := m.Cmd(mdb.SELECT, m.Prefix(TASK), "", mdb.HASH, kit.MDB_ZONE, zone); len(msg.Appendv(kit.MDB_HASH)) == 0 { m.Conf(m.Prefix(TASK), kit.Keys(m.Option(ice.MSG_DOMAIN), kit.MDB_META, kit.MDB_SHORT), kit.MDB_ZONE) - m.Cmdy(mdb.INSERT, m.Prefix(TASK), m.Option(ice.MSG_DOMAIN), mdb.HASH, kit.MDB_ZONE, zone) + m.Cmdy(mdb.INSERT, m.Prefix(TASK), "", mdb.HASH, kit.MDB_ZONE, zone) } } func _task_insert(m *ice.Message, zone string, arg ...string) { @@ -73,46 +73,21 @@ func _task_delete(m *ice.Message, zone, id string) { } func _task_export(m *ice.Message, file string) { m.Option(mdb.FIELDS, "zone,id,time,type,name,text,level,status,score,begin_time,close_time,extra") - m.Cmdy(mdb.EXPORT, m.Prefix(TASK), m.Option(ice.MSG_DOMAIN), mdb.ZONE, file) + m.Cmdy(mdb.EXPORT, m.Prefix(TASK), "", mdb.ZONE, file) } func _task_import(m *ice.Message, file string) { m.Option(mdb.FIELDS, "zone") - m.Cmdy(mdb.IMPORT, m.Prefix(TASK), m.Option(ice.MSG_DOMAIN), mdb.ZONE, file) + m.Cmdy(mdb.IMPORT, m.Prefix(TASK), "", mdb.ZONE, file) } func _task_inputs(m *ice.Message, field, value string) { switch field { case kit.MDB_ZONE: - m.Cmdy(mdb.INPUTS, m.Prefix(TASK), m.Option(ice.MSG_DOMAIN), mdb.HASH, field, value) + m.Cmdy(mdb.INPUTS, m.Prefix(TASK), "", mdb.HASH, field, value) case kit.MDB_TYPE, kit.MDB_NAME, kit.MDB_TEXT: m.Cmdy(mdb.INPUTS, m.Prefix(TASK), _sub_key(m, m.Option(kit.MDB_ZONE)), mdb.LIST, field, value) } } -func _task_search(m *ice.Message, kind, name, text string, arg ...string) { - m.Richs(TASK, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), kit.MDB_FOREACH, func(key string, val map[string]interface{}) { - m.Grows(TASK, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN), kit.MDB_HASH, key), "", "", func(index int, value map[string]interface{}) { - if value[kit.MDB_NAME] == name || strings.Contains(kit.Format(value[kit.MDB_TEXT]), name) { - m.Push("pod", m.Option(ice.MSG_USERPOD)) - m.Push("ctx", m.Prefix()) - m.Push("cmd", TASK) - m.Push("time", value[kit.MDB_TIME]) - m.Push("size", 1) - m.Push("type", TASK) - m.Push("name", value[kit.MDB_NAME]) - m.Push("text", kit.Format("%s:%d", kit.Value(val, "meta.zone"), kit.Int(value[kit.MDB_ID]))) - - } - }) - }) -} -func _task_render(m *ice.Message, kind, name, text string, arg ...string) { - ls := strings.Split(text, ":") - m.Richs(TASK, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN)), ls[0], func(key string, val map[string]interface{}) { - m.Grows(TASK, kit.Keys(kit.MDB_HASH, m.Optionv(ice.MSG_DOMAIN), kit.MDB_HASH, key), "id", ls[1], func(index int, value map[string]interface{}) { - m.Push("detail", value) - }) - }) -} func _task_scope(m *ice.Message, tz int, arg ...string) (time.Time, time.Time) { begin_time := time.Now() if len(arg) > 1 { @@ -176,8 +151,8 @@ func init() { TASK: {Name: TASK, Help: "任务", Value: kit.Data(kit.MDB_SHORT, kit.MDB_ZONE)}, }, Commands: map[string]*ice.Command{ - TASK: {Name: "task zone id auto 添加 导出 导入", Help: "任务", Action: map[string]*ice.Action{ - mdb.INSERT: {Name: "insert zone@key type=once,step,week name@key text@key begin_time@date close_time@date", Help: "添加", Hand: func(m *ice.Message, arg ...string) { + TASK: {Name: "task zone id auto insert export import", Help: "任务", Action: map[string]*ice.Action{ + mdb.INSERT: {Name: "insert zone type=once,step,week name text begin_time@date close_time@date", Help: "添加", Hand: func(m *ice.Message, arg ...string) { _task_create(m, arg[1]) _task_insert(m, arg[1], arg[2:]...) }}, @@ -197,13 +172,6 @@ func init() { _task_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1)) }}, - mdb.SEARCH: {Name: "search type name text", Help: "搜索", Hand: func(m *ice.Message, arg ...string) { - _task_search(m, arg[0], arg[1], arg[2], arg[3:]...) - }}, - mdb.RENDER: {Name: "render type name text", Help: "渲染", Hand: func(m *ice.Message, arg ...string) { - _task_render(m, arg[0], arg[1], arg[2], arg[3:]...) - }}, - gdb.BEGIN: {Name: "begin", Help: "开始", Hand: func(m *ice.Message, arg ...string) { _task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), TaskField.STATUS, TaskStatus.PROCESS) }}, diff --git a/core/team/team.go b/core/team/team.go index 7f0d9983..9f062575 100644 --- a/core/team/team.go +++ b/core/team/team.go @@ -9,8 +9,12 @@ const TEAM = "team" var Index = &ice.Context{Name: TEAM, 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_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { m.Save() }}, + ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + m.Load() + }}, + ice.CTX_EXIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { + m.Save() + }}, }, } diff --git a/meta.go b/meta.go index 8a1127a9..da1ae757 100644 --- a/meta.go +++ b/meta.go @@ -94,12 +94,7 @@ func (m *Message) Push(key string, value interface{}, arg ...interface{}) *Messa fallthrough default: if v = kit.Value(value, k); v == nil { - v = kit.Value(value, kit.Keys(kit.MDB_EXTRA, k)) - } - if v == nil { - if v = kit.Value(val, k); v == nil { - v = kit.Value(val, kit.Keys(kit.MDB_EXTRA, k)) - } + v = kit.Value(val, k) } }