diff --git a/base/web/dream.go b/base/web/dream.go index f1f212db..c540ed1a 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -99,6 +99,7 @@ func _dream_list_more(m *ice.Message, simple bool) *ice.Message { value[mdb.ICONS] = kit.Select(value[mdb.ICONS], spide[mdb.ICONS]) } value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT]) + value[aaa.ACCESS] = value[aaa.USERROLE] if simple { defer m.PushButton("") } else { @@ -418,12 +419,17 @@ func init() { } }) }}, + TOKEN: {Hand: func(m *ice.Message, arg ...string) { + m.Options(m.Cmd(SPIDE, m.Option(mdb.NAME)).AppendSimple()).Cmdy(SPIDE, mdb.DEV_REQUEST) + }}, DREAM_TABLES: {Hand: func(m *ice.Message, arg ...string) { switch m.Option(mdb.TYPE) { case WORKER: m.PushButton(cli.RUNTIME, "settings", tcp.SEND, OPEN) + case MASTER: + m.PushButton(cli.RUNTIME, DREAM, TOKEN, OPEN) default: - m.PushButton(cli.RUNTIME, DREAM, OPEN) + m.PushButton(cli.RUNTIME, DREAM, TOKEN, OPEN) } }}, "settings": {Name: "settings restart=manual,always access=public,private", Help: "设置", Hand: func(m *ice.Message, arg ...string) { diff --git a/base/web/space.go b/base/web/space.go index e751b61b..f7efa587 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -173,10 +173,7 @@ func _space_exec(m *ice.Message, name string, source, target []string, c *websoc m.Warn(true, ice.ErrNotValid) return 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), - ParseUA(m), m.OptionSimple(mdb.TIME, nfs.MODULE, nfs.VERSION, AGENT, cli.SYSTEM), - ) + mdb.HashModify(m, mdb.HASH, name, ParseUA(m), m.OptionSimple(mdb.TIME, nfs.MODULE, nfs.VERSION, AGENT, cli.SYSTEM)) m.Push(mdb.LINK, m.MergePod(kit.Select("", source, -1))) default: if m.IsErr() { diff --git a/base/web/spide.go b/base/web/spide.go index d8ebc1e3..1badaccc 100644 --- a/base/web/spide.go +++ b/base/web/spide.go @@ -370,7 +370,7 @@ func init() { m.Table(func(value ice.Maps) { if value[CLIENT_TYPE] == nfs.REPOS { if _, ok := list[value[CLIENT_NAME]]; ok { - m.Push(mdb.STATUS, ONLINE).PushButton("disconn", mdb.REMOVE) + m.Push(mdb.STATUS, ONLINE).PushButton("disconn", mdb.DEV_REQUEST, mdb.REMOVE) } else { m.Push(mdb.STATUS, "").PushButton(mdb.DEV_REQUEST, mdb.REMOVE) }