From 5c63a4b467eccf037077b9e1a3d0086a95dd311a Mon Sep 17 00:00:00 2001 From: shy Date: Wed, 5 Jun 2024 15:32:41 +0800 Subject: [PATCH] add some --- core/chat/river.go | 2 +- misc/wx/access.go | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/chat/river.go b/core/chat/river.go index 7cda512b..9b279e8d 100644 --- a/core/chat/river.go +++ b/core/chat/river.go @@ -14,7 +14,7 @@ func _river_right(m *ice.Message, hash string) (ok bool) { return true } ok = true - m.Cmd(mdb.SELECT, RIVER, "", mdb.HASH, hash).Table(func(value ice.Maps) { + m.Cmd(mdb.SELECT, RIVER, "", mdb.HASH, mdb.HASH, hash).Table(func(value ice.Maps) { ok = kit.IsIn(m.Option(ice.MSG_USERROLE), value[mdb.TYPE], aaa.TECH, aaa.ROOT) }) return diff --git a/misc/wx/access.go b/misc/wx/access.go index ed012162..136d21de 100644 --- a/misc/wx/access.go +++ b/misc/wx/access.go @@ -85,18 +85,17 @@ func init() { AGENT: {Hand: func(m *ice.Message, arg ...string) { ctx.OptionFromConfig(m, ACCESS, APPID) }}, - web.SSO: {Name: "sso name*=weixin help*=微信扫码 order=11 wifi env=release,trial,develop", Hand: func(m *ice.Message, arg ...string) { + web.SSO: {Name: "sso name*=weixin help*=微信扫码 order=11 env=release,trial,develop wifi", Hand: func(m *ice.Message, arg ...string) { m.Cmd(web.CHAT_HEADER, mdb.CREATE, mdb.TYPE, mdb.PLUGIN, m.OptionSimple(mdb.NAME, mdb.HELP, mdb.ORDER), - ctx.INDEX, m.PrefixKey(), ctx.ARGS, kit.Join(kit.Simple(aaa.LOGIN, m.Option(ACCESS), m.Option(tcp.WIFI), m.Option(ENV)))) + ctx.INDEX, m.PrefixKey(), ctx.ARGS, kit.Join(kit.Simple(aaa.LOGIN, m.Option(ACCESS), m.Option(ENV), m.Option(tcp.WIFI)))) }}, aaa.LOGIN: {Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { if m.Cmd("", m.Option(ACCESS, arg[0])).Append(mdb.TYPE) == ice.WEB { m.Cmdy(SCAN, mdb.CREATE, mdb.TYPE, QR_STR_SCENE, mdb.NAME, "请授权登录", mdb.TEXT, m.Option(web.SPACE), ctx.INDEX, web.CHAT_GRANT, ctx.ARGS, m.Option(web.SPACE)) } else { - h := m.Cmdx(IDE, mdb.CREATE, mdb.NAME, "请授权登录", mdb.TEXT, m.Option(web.SPACE), PAGES, PAGES_ACTION, tcp.WIFI, kit.Select("", arg, 1), - ctx.INDEX, web.CHAT_GRANT, ctx.ARGS, kit.JoinQuery(m.OptionSimple(web.SPACE, log.DEBUG)...), - ) - m.Echo(m.Cmdx(SCAN, UNLIMIT, SCENE, h, ENV, kit.Select("release", arg, 2), IS_HYALINE, ice.FALSE, mdb.NAME, m.Option(web.SPACE))) + h := m.Cmdx(IDE, mdb.CREATE, mdb.NAME, "请授权登录", mdb.TEXT, m.Option(web.SPACE), PAGES, PAGES_ACTION, tcp.WIFI, kit.Select("", arg, 2), + ctx.INDEX, web.CHAT_GRANT, ctx.ARGS, kit.JoinQuery(m.OptionSimple(web.SPACE, log.DEBUG)...)) + m.Echo(m.Cmdx(SCAN, UNLIMIT, SCENE, h, ENV, kit.Select("develop", arg, 1), IS_HYALINE, ice.FALSE, mdb.NAME, m.Option(web.SPACE))) } }}, web.SPACE_GRANT: {Hand: func(m *ice.Message, arg ...string) {