diff --git a/core/chat/header.go b/core/chat/header.go index 915a6201..6fe07b61 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -120,7 +120,7 @@ func init() { m.Echo("login failure") } }}, - }, web.ApiAction(), mdb.ImportantHashAction(mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,help,icons,type,link,order,space,index,args")), Hand: func(m *ice.Message, arg ...string) { + }, web.ApiAction(), mdb.ImportantHashAction(mdb.SHORT, mdb.NAME, mdb.FIELD, "time,type,name,help,icons,order,link,space,index,args")), Hand: func(m *ice.Message, arg ...string) { if ice.Info.NodeType == web.WORKER { return } diff --git a/misc/wx/access.go b/misc/wx/access.go index bea2e3a7..ed012162 100644 --- a/misc/wx/access.go +++ b/misc/wx/access.go @@ -64,9 +64,6 @@ func init() { m.Echo(ice.TRUE) } }}, - AGENT: {Hand: func(m *ice.Message, arg ...string) { - ctx.OptionFromConfig(m, ACCESS, APPID) - }}, TOKENS: {Hand: func(m *ice.Message, arg ...string) { msg := mdb.HashSelect(m.Spawn(), m.Option(ACCESS)) if msg.Append(TOKENS) == "" || m.Time() > msg.Append(EXPIRES) { @@ -85,8 +82,11 @@ func init() { } m.Echo(msg.Append(TICKET)).Status(msg.AppendSimple(EXPIRE)) }}, - web.SSO: {Name: "sso name*=微信扫码 order=11 wifi env=release,trial,develop", Help: "登录", Hand: func(m *ice.Message, arg ...string) { - m.Cmd(web.CHAT_HEADER, mdb.CREATE, mdb.TYPE, mdb.PLUGIN, m.OptionSimple(mdb.NAME, mdb.ORDER), + 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) { + 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)))) }}, aaa.LOGIN: {Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { diff --git a/misc/wx/ide.go b/misc/wx/ide.go index 68f1c15a..9aa6ec65 100644 --- a/misc/wx/ide.go +++ b/misc/wx/ide.go @@ -166,7 +166,10 @@ func init() { defer web.ToastProcess(m)() m.Cmd(web.SPACE, m.Option(web.WEIXIN), lex.PARSE, m.Cmdx("", m.Option(mdb.HASH))) }}, - }, web.StatsAction("", "小程序场景数"), mdb.ExportHashAction(mdb.FIELD, "time,hash,name,text,pages,space,index,args,wifi", cli.DARWIN, "/Applications/wechatwebdevtools.app/Contents/MacOS/cli")), Hand: func(m *ice.Message, arg ...string) { + }, web.StatsAction("", "小程序场景数"), mdb.ExportHashAction( + mdb.FIELD, "time,hash,name,text,pages,space,index,args,wifi", + cli.DARWIN, "/Applications/wechatwebdevtools.app/Contents/MacOS/cli", + )), Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 && tcp.IsLocalHost(m, m.Option(ice.MSG_USERIP)) && kit.Value(kit.UnMarshal(IdeCli(m.Spawn(), ISLOGIN).Append(cli.CMD_OUT)), aaa.LOGIN) != true { m.EchoInfoButton("请登录: ", aaa.LOGIN) return