x/icebergs
1
0
Fork 1
mirror of https://shylinux.com/x/icebergs synced 2025-04-28 10:12:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt team

Browse Source
This commit is contained in:
shylinux 2020-10-15 16:41:48 +08:00
parent 3ab519b309
commit ced7becb68
6 changed files with 60 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/tcp/client.go
View File

@ -33,7 +33,7 @@ func (c *Conn) Write(b []byte) (int, error) {
return n, e return n, e
} }
func (c *Conn) Close() error { func (c *Conn) Close() error {
c.m.Cmd(mdb.MODIFY, CLIENT, "", mdb.HASH, kit.MDB_HASH, c.h, kit.MDB_STATUS, CLOSE, "nread", c.s.nr, "nwrite", c.s.nw) // c.m.Cmd(mdb.MODIFY, CLIENT, "", mdb.HASH, kit.MDB_HASH, c.h, kit.MDB_STATUS, CLOSE, "nread", c.s.nr, "nwrite", c.s.nw)
return c.Conn.Close() return c.Conn.Close()
} }

19
base/tcp/server.go
View File

@ -6,7 +6,7 @@ import (
kit "github.com/shylinux/toolkits" kit "github.com/shylinux/toolkits"
"net" "net"
"strings" // "strings"
) )
type Listener struct { type Listener struct {
@ -22,15 +22,16 @@ func (l Listener) Accept() (net.Conn, error) {
l.s.nc += 1 l.s.nc += 1
l.m.Conf(SERVER, kit.Keys(kit.MDB_HASH, l.h, kit.MDB_META, "nconn"), l.s.nc) l.m.Conf(SERVER, kit.Keys(kit.MDB_HASH, l.h, kit.MDB_META, "nconn"), l.s.nc)
ls := strings.Split(c.RemoteAddr().String(), ":") // ls := strings.Split(c.RemoteAddr().String(), ":")
if strings.Contains(c.RemoteAddr().String(), "[") { // if strings.Contains(c.RemoteAddr().String(), "[") {
ls = strings.Split(strings.TrimPrefix(c.RemoteAddr().String(), "["), "]:") // ls = strings.Split(strings.TrimPrefix(c.RemoteAddr().String(), "["), "]:")
} // }
h := l.m.Cmdx(mdb.INSERT, CLIENT, "", mdb.HASH, HOST, ls[0], PORT, ls[1], // h := l.m.Cmdx(mdb.INSERT, CLIENT, "", mdb.HASH, HOST, ls[0], PORT, ls[1],
kit.MDB_TYPE, l.m.Option(kit.MDB_TYPE), kit.MDB_NAME, l.m.Option(kit.MDB_NAME), // kit.MDB_TYPE, l.m.Option(kit.MDB_TYPE), kit.MDB_NAME, l.m.Option(kit.MDB_NAME),
kit.MDB_STATUS, kit.Select(ERROR, OPEN, e == nil), kit.MDB_ERROR, kit.Format(e)) // kit.MDB_STATUS, kit.Select(ERROR, OPEN, e == nil), kit.MDB_ERROR, kit.Format(e))
return &Conn{m: l.m, h: h, s: &Stat{}, Conn: c}, e // return &Conn{m: l.m, h: h, s: &Stat{}, Conn: c}, e
return &Conn{m: l.m, h: "", s: &Stat{}, Conn: c}, e
} }
func (l Listener) Close() error { func (l Listener) Close() error {
l.m.Cmd(mdb.MODIFY, SERVER, "", mdb.HASH, kit.MDB_HASH, l.h, kit.MDB_STATUS, CLOSE) l.m.Cmd(mdb.MODIFY, SERVER, "", mdb.HASH, kit.MDB_HASH, l.h, kit.MDB_STATUS, CLOSE)

52
core/team/plan.go
View File

@ -5,6 +5,7 @@ import (
"github.com/shylinux/icebergs/base/ctx" "github.com/shylinux/icebergs/base/ctx"
"github.com/shylinux/icebergs/base/gdb" "github.com/shylinux/icebergs/base/gdb"
"github.com/shylinux/icebergs/base/mdb" "github.com/shylinux/icebergs/base/mdb"
"github.com/shylinux/icebergs/base/web"
kit "github.com/shylinux/toolkits" kit "github.com/shylinux/toolkits"
"time" "time"
@ -21,63 +22,54 @@ func init() {
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) { 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_create(m, arg[1])
_task_insert(m, arg[1], arg[2:]...) _task_insert(m, arg[1], arg[2:]...)
m.Set(ice.MSG_RESULT) m.Set(ice.MSG_RESULT).Cmdy(PLAN, m.Option("scale"))
m.Cmdy(m.Prefix(PLAN), m.Option("scale"))
}}, }},
mdb.MODIFY: {Name: "modify", Help: "编辑", Hand: func(m *ice.Message, arg ...string) { mdb.MODIFY: {Name: "modify", Help: "编辑", Hand: func(m *ice.Message, arg ...string) {
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), arg[0], arg[1]) _task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), arg[0], arg[1])
m.Set(ice.MSG_RESULT)
m.Cmdy(m.Prefix(PLAN), m.Option("scale"))
}},
mdb.DELETE: {Name: "delete", Help: "删除", Hand: func(m *ice.Message, arg ...string) {
_task_delete(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID))
m.Set(ice.MSG_RESULT)
m.Cmdy(m.Prefix(PLAN), m.Option("scale"))
}}, }},
mdb.EXPORT: {Name: "export file", Help: "导出", Hand: func(m *ice.Message, arg ...string) { mdb.EXPORT: {Name: "export file", Help: "导出", Hand: func(m *ice.Message, arg ...string) {
_task_export(m, m.Option(kit.MDB_FILE)) _task_export(m, m.Option(kit.MDB_FILE))
m.Set(ice.MSG_RESULT) m.Set(ice.MSG_RESULT).Cmdy(PLAN, m.Option("scale"))
m.Cmdy(m.Prefix(PLAN), m.Option("scale"))
}}, }},
mdb.IMPORT: {Name: "import file", Help: "导入", Hand: func(m *ice.Message, arg ...string) { mdb.IMPORT: {Name: "import file", Help: "导入", Hand: func(m *ice.Message, arg ...string) {
_task_import(m, m.Option(kit.MDB_FILE)) _task_import(m, m.Option(kit.MDB_FILE))
m.Set(ice.MSG_RESULT) m.Set(ice.MSG_RESULT).Cmdy(PLAN, m.Option("scale"))
m.Cmdy(m.Prefix(PLAN), m.Option("scale"))
}}, }},
mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) {
switch arg[0] { switch arg[0] {
case "pod", "ctx", "cmd", "arg": case "ctx", "extra.ctx":
m.Cmdy(ctx.CONTEXT)
case "cmd", "extra.cmd":
m.Cmdy(ctx.CONTEXT, kit.Select(m.Option("ctx"), m.Option("extra.ctx")), ctx.COMMAND)
case "pod":
m.Cmdy(web.ROUTE)
case "arg":
default: default:
_task_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1)) _task_inputs(m, kit.Select("", arg, 0), kit.Select("", arg, 1))
} }
}}, }},
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)
}},
gdb.END: {Name: "end", Help: "完成", Hand: func(m *ice.Message, arg ...string) {
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), TaskField.STATUS, TaskStatus.FINISH)
}},
mdb.PLUGIN: {Name: "plugin extra.pod extra.ctx extra.cmd extra.arg", 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(), _task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), kit.MDB_TIME, m.Time(), kit.Simple(kit.Dict(arg))...)
kit.Simple(kit.Dict(arg))...) m.Set(ice.MSG_RESULT).Cmdy(PLAN, m.Option("scale"))
}}, }},
ctx.COMMAND: {Name: "command", Help: "命令", Hand: func(m *ice.Message, arg ...string) { ctx.COMMAND: {Name: "command", Help: "命令", Hand: func(m *ice.Message, arg ...string) {
if arg[0] == "run" { if arg[0] == "run" {
m.Cmdy(arg[1], arg[2:]) m.Cmdy(arg[1], arg[2:])
return return
} }
if len(arg) == 1 { m.Cmdy(ctx.COMMAND, arg[0])
m.Cmdy(ctx.COMMAND, arg[0]) }},
return
} 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)
}},
gdb.END: {Name: "end", Help: "结束", Hand: func(m *ice.Message, arg ...string) {
_task_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), TaskField.STATUS, TaskStatus.FINISH)
}}, }},
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
begin_time, end_time := _task_scope(m, 8, arg...) begin_time, end_time := _task_scope(m, 8, arg...)
m.Set(ice.MSG_OPTION, "begin_time")
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(mdb.FIELDS, "begin_time,close_time,zone,id,level,status,score,type,name,text,extra")
m.Option(mdb.SELECT_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{}) {
@ -88,7 +80,7 @@ func init() {
m.Push(key, value, fields, val) m.Push(key, value, fields, val)
m.PushButton(_task_action(m, value[TaskField.STATUS], mdb.PLUGIN)) m.PushButton(_task_action(m, value[TaskField.STATUS], mdb.PLUGIN))
}) })
m.Cmdy(mdb.SELECT, m.Prefix(TASK), "", mdb.ZONE, kit.MDB_FOREACH) m.Cmd(mdb.SELECT, TASK, "", mdb.ZONE, kit.MDB_FOREACH)
}}, }},
}, },
}, nil) }, nil)

46
core/team/task.go
View File

@ -28,30 +28,22 @@ func _task_action(m *ice.Message, status interface{}, action ...string) string {
func _task_list(m *ice.Message, zone string, id string) { func _task_list(m *ice.Message, zone string, id string) {
if zone == "" { if zone == "" {
m.Option(mdb.FIELDS, "time,zone,count") m.Option(mdb.FIELDS, "time,zone,count")
} else if id == "" { } else {
m.Option(mdb.FIELDS, "begin_time,id,status,level,score,type,name,text") m.Option(mdb.FIELDS, kit.Select("begin_time,id,status,level,score,type,name,text", mdb.DETAIL, id != ""))
defer m.Table(func(index int, value map[string]string, head []string) { defer m.Table(func(index int, value map[string]string, head []string) {
m.PushRender(kit.MDB_ACTION, kit.MDB_BUTTON, _task_action(m, value[TaskField.STATUS])) m.PushRender(kit.MDB_ACTION, kit.MDB_BUTTON, _task_action(m, value[TaskField.STATUS]))
}) })
} else {
m.Option(mdb.FIELDS, mdb.DETAIL)
defer m.Table(func(index int, value map[string]string, head []string) {
if value[kit.MDB_KEY] == kit.MDB_STATUS {
m.Push(kit.MDB_KEY, kit.MDB_ACTION)
m.PushRender(kit.MDB_VALUE, kit.MDB_BUTTON, _task_action(m, value[kit.MDB_VALUE]))
}
})
} }
m.Cmdy(mdb.SELECT, m.Prefix(TASK), "", mdb.ZONE, zone, id) m.Cmdy(mdb.SELECT, TASK, "", mdb.ZONE, zone, id)
} }
func _task_create(m *ice.Message, zone string) { func _task_create(m *ice.Message, zone string) {
if msg := m.Cmd(mdb.SELECT, m.Prefix(TASK), "", mdb.HASH, kit.MDB_ZONE, zone); len(msg.Appendv(kit.MDB_HASH)) == 0 { if msg := m.Cmd(mdb.SELECT, 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.Conf(TASK, kit.Keys(m.Option(ice.MSG_DOMAIN), kit.MDB_META, kit.MDB_SHORT), kit.MDB_ZONE)
m.Cmdy(mdb.INSERT, m.Prefix(TASK), "", mdb.HASH, kit.MDB_ZONE, zone) m.Cmdy(mdb.INSERT, TASK, "", mdb.HASH, kit.MDB_ZONE, zone)
} }
} }
func _task_insert(m *ice.Message, zone string, arg ...string) { func _task_insert(m *ice.Message, zone string, arg ...string) {
m.Cmdy(mdb.INSERT, m.Prefix(TASK), _sub_key(m, zone), mdb.LIST, m.Cmdy(mdb.INSERT, TASK, _sub_key(m, zone), mdb.LIST,
TaskField.BEGIN_TIME, m.Time(), TaskField.CLOSE_TIME, m.Time("30m"), TaskField.BEGIN_TIME, m.Time(), TaskField.CLOSE_TIME, m.Time("30m"),
TaskField.STATUS, TaskStatus.PREPARE, TaskField.LEVEL, 3, TaskField.SCORE, 3, TaskField.STATUS, TaskStatus.PREPARE, TaskField.LEVEL, 3, TaskField.SCORE, 3,
arg, arg,
@ -66,25 +58,25 @@ func _task_modify(m *ice.Message, zone, id, field, value string, arg ...string)
arg = append(arg, TaskField.CLOSE_TIME, m.Time()) arg = append(arg, TaskField.CLOSE_TIME, m.Time())
} }
} }
m.Cmdy(mdb.MODIFY, m.Prefix(TASK), _sub_key(m, zone), mdb.LIST, kit.MDB_ID, id, field, value, arg) m.Cmdy(mdb.MODIFY, TASK, _sub_key(m, zone), mdb.LIST, kit.MDB_ID, id, field, value, arg)
} }
func _task_delete(m *ice.Message, zone, id string) { func _task_delete(m *ice.Message, zone, id string) {
m.Cmdy(mdb.MODIFY, m.Prefix(TASK), _sub_key(m, zone), mdb.LIST, kit.MDB_ID, id, TaskField.STATUS, TaskStatus.CANCEL) m.Cmdy(mdb.MODIFY, TASK, _sub_key(m, zone), mdb.LIST, kit.MDB_ID, id, TaskField.STATUS, TaskStatus.CANCEL)
} }
func _task_export(m *ice.Message, file 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.Option(mdb.FIELDS, "zone,id,time,type,name,text,level,status,score,begin_time,close_time,extra")
m.Cmdy(mdb.EXPORT, m.Prefix(TASK), "", mdb.ZONE, file) m.Cmdy(mdb.EXPORT, TASK, "", mdb.ZONE, file)
} }
func _task_import(m *ice.Message, file string) { func _task_import(m *ice.Message, file string) {
m.Option(mdb.FIELDS, "zone") m.Option(mdb.FIELDS, "zone")
m.Cmdy(mdb.IMPORT, m.Prefix(TASK), "", mdb.ZONE, file) m.Cmdy(mdb.IMPORT, TASK, "", mdb.ZONE, file)
} }
func _task_inputs(m *ice.Message, field, value string) { func _task_inputs(m *ice.Message, field, value string) {
switch field { switch field {
case kit.MDB_ZONE: case kit.MDB_ZONE:
m.Cmdy(mdb.INPUTS, m.Prefix(TASK), "", mdb.HASH, field, value) m.Cmdy(mdb.INPUTS, TASK, "", mdb.HASH, field, value)
case kit.MDB_TYPE, kit.MDB_NAME, kit.MDB_TEXT: default:
m.Cmdy(mdb.INPUTS, m.Prefix(TASK), _sub_key(m, m.Option(kit.MDB_ZONE)), mdb.LIST, field, value) m.Cmdy(mdb.INPUTS, TASK, _sub_key(m, m.Option(kit.MDB_ZONE)), mdb.LIST, field, value)
} }
} }
@ -94,8 +86,12 @@ func _task_scope(m *ice.Message, tz int, arg ...string) (time.Time, time.Time) {
begin_time, _ = time.ParseInLocation(ice.MOD_TIME, arg[1], time.Local) begin_time, _ = time.ParseInLocation(ice.MOD_TIME, arg[1], time.Local)
} }
begin_time = begin_time.Add(time.Duration(tz) * time.Hour)
begin_time = begin_time.Add(-time.Duration(begin_time.UnixNano()) % (24 * time.Hour))
begin_time = begin_time.Add(-time.Duration(tz) * time.Hour)
end_time := begin_time end_time := begin_time
switch begin_time = begin_time.Add(-time.Duration(begin_time.UnixNano())%(24*time.Hour) - time.Duration(tz)*time.Hour); arg[0] { switch arg[0] {
case TaskScale.DAY: case TaskScale.DAY:
end_time = begin_time.AddDate(0, 0, 1) end_time = begin_time.AddDate(0, 0, 1)
case TaskScale.WEEK: case TaskScale.WEEK:
@ -109,8 +105,8 @@ func _task_scope(m *ice.Message, tz int, arg ...string) (time.Time, time.Time) {
end_time = begin_time.AddDate(1, 0, 0) end_time = begin_time.AddDate(1, 0, 0)
case TaskScale.LONG: case TaskScale.LONG:
begin_time = begin_time.AddDate(0, 0, -begin_time.YearDay()+1) begin_time = begin_time.AddDate(0, 0, -begin_time.YearDay()+1)
begin_time = begin_time.AddDate(-begin_time.Year()%5, 0, 0) begin_time = begin_time.AddDate(-5, 0, 0)
end_time = begin_time.AddDate(5, 0, 0) end_time = begin_time.AddDate(10, 0, 0)
} }
return begin_time, end_time return begin_time, end_time

2
core/team/team.go
View File

@ -18,4 +18,4 @@ var Index = &ice.Context{Name: TEAM, Help: "团队中心",
}, },
} }
func init() { web.Index.Register(Index, &web.Frame{}) } func init() { web.Index.Register(Index, nil, TASK, PLAN) }

5
meta.go
View File

@ -460,6 +460,11 @@ func (m *Message) Optionv(key string, arg ...interface{}) interface{} {
default: default:
m.data[key] = str m.data[key] = str
} }
if key == "fields" {
for _, k := range kit.Split(strings.Join(m.meta[key], ",")) {
delete(m.meta, k)
}
}
} }
for msg := m; msg != nil; msg = msg.message { for msg := m; msg != nil; msg = msg.message {