diff --git a/base/web/share.go b/base/web/share.go index 507d2857..24a6cc3d 100644 --- a/base/web/share.go +++ b/base/web/share.go @@ -102,9 +102,12 @@ func init() { m.Cmdy(mdb.SELECT, SHARE, "", mdb.HASH, kit.MDB_HASH, m.Option(kit.MDB_HASH)) }}, - LOGIN: {Name: "login", Help: "登录", Hand: func(m *ice.Message, arg ...string) { + LOGIN: {Name: "login userrole=void,tech username", Help: "登录", Hand: func(m *ice.Message, arg ...string) { m.EchoQRCode(kit.MergeURL(m.Conf(SHARE, kit.Keym(kit.MDB_DOMAIN)), - SHARE, m.Cmdx(SHARE, mdb.CREATE, kit.MDB_TYPE, LOGIN, aaa.USERNAME, ice.Info.UserName))) + SHARE, m.Cmdx(SHARE, mdb.CREATE, kit.MDB_TYPE, LOGIN, + aaa.USERNAME, kit.Select(m.Option(ice.MSG_USERNAME), m.Option(aaa.USERNAME)), + aaa.USERROLE, m.Option(aaa.USERROLE), + ))) }}, APPLY: {Name: "apply", Help: "申请", Hand: func(m *ice.Message, arg ...string) { m.EchoQRCode(kit.MergeURL(m.Conf(SHARE, kit.Keym(kit.MDB_DOMAIN)), @@ -113,8 +116,10 @@ func init() { "auth": {Name: "auth", Help: "授权", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(mdb.MODIFY, SHARE, "", mdb.HASH, kit.MDB_HASH, arg) }}, + mdb.INPUTS: {Name: "inputs", Help: "补全", Hand: func(m *ice.Message, arg ...string) { + }}, }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - m.Option(mdb.FIELDS, kit.Select("time,hash,userrole,username,river,storm,type,name,text", mdb.DETAIL, len(arg) > 0)) + m.Fields(len(arg) == 0, "time,hash,type,name,text,userrole,username,river,storm") m.Cmdy(mdb.SELECT, SHARE, "", mdb.HASH, kit.MDB_HASH, arg) m.PushAction(mdb.REMOVE) @@ -122,10 +127,12 @@ func init() { m.PushAnchor(kit.MergeURL2(m.Option(ice.MSG_USERWEB), "/share/"+arg[0], SHARE, arg[0])) m.PushScript("shell", kit.MergeURL2(m.Option(ice.MSG_USERWEB), "/share/"+arg[0], SHARE, arg[0])) m.PushQRCode("share", kit.MergeURL2(m.Option(ice.MSG_USERWEB), "/share/"+arg[0], SHARE, arg[0])) + } else { + m.Option("_action", "login") } }}, "/share/": {Name: "/share/", Help: "共享链", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { - m.Option(mdb.FIELDS, kit.Select("time,hash,userrole,username,river,storm,type,name,text")) + m.Fields(true, "time,hash,userrole,username,river,storm,type,name,text") msg := m.Cmd(mdb.SELECT, SHARE, "", mdb.HASH, kit.MDB_HASH, kit.Select(m.Option(SHARE), arg, 0)) list := []string{SHARE, kit.Select(m.Option(SHARE), arg, 0)} diff --git a/base/web/space.go b/base/web/space.go index 806b5c7e..017858dd 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -16,7 +16,7 @@ import ( ) func _space_list(m *ice.Message, space string) { - m.Option(mdb.FIELDS, kit.Select("time,type,name,text", mdb.DETAIL, space != "")) + m.Fields(space == "", "time,type,name,text") m.Cmdy(mdb.SELECT, SPACE, "", mdb.HASH, kit.MDB_NAME, space) if space == "" { @@ -180,9 +180,14 @@ func _space_search(m *ice.Message, kind, name, text string, arg ...string) { m.Richs(SPACE, nil, kit.MDB_FOREACH, func(key string, value map[string]interface{}) { if value = kit.GetMeta(value); strings.Contains(kit.Format(value[kit.MDB_NAME]), name) && value[kit.MDB_TYPE] != MASTER { m.PushSearch(kit.SSH_CMD, SPACE, kit.MDB_TYPE, value[kit.MDB_TYPE], kit.MDB_NAME, value[kit.MDB_NAME], - kit.MDB_TEXT, kit.MergeURL(m.Option(ice.MSG_USERWEB), kit.SSH_POD, kit.Keys(m.Option(ice.MSG_USERPOD), value[kit.MDB_NAME]))) + kit.MDB_TEXT, kit.MergeURL(m.Option(ice.MSG_USERWEB), kit.SSH_POD, kit.Keys(m.Option(ice.MSG_USERPOD), value))) } }) + + m.Cmd(tcp.HOST).Table(func(index int, value map[string]string, head []string) { + m.PushSearch(kit.SSH_CMD, SPACE, kit.MDB_TYPE, "local", kit.MDB_NAME, value[kit.MDB_NAME], + kit.MDB_TEXT, "http://"+value[tcp.IP]+":9020", kit.SSH_POD, kit.Keys(m.Option(ice.MSG_USERPOD), value)) + }) } const (