diff --git a/base/web/dream.go b/base/web/dream.go index 64c7a57c..fa9647b6 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -279,6 +279,7 @@ func init() { case tcp.NODENAME: m.Cmdy(SPACE, m.Option(mdb.NAME), SPACE, ice.INFO).CutTo(mdb.NAME, tcp.NODENAME) case aaa.USERNAME: + m.Push(arg[0], m.Option(tcp.NODENAME)) m.Push(arg[0], m.Option(ice.MSG_USERNAME)) default: gdb.Event(m, DREAM_INPUTS, arg) diff --git a/core/team/corporation.go b/core/team/corporation.go index 417401d4..80040821 100644 --- a/core/team/corporation.go +++ b/core/team/corporation.go @@ -9,8 +9,8 @@ import ( func init() { const corporation = "corporation" Index.MergeCommands(ice.Commands{ - corporation: {Name: "corporation username auto", Help: "企业法人", Actions: ice.MergeActions(ice.Actions{}, mdb.ExportHashAction( - mdb.SHORT, "username", mdb.FIELD, "time,username,mobile,idnumber,usci,email,portal", + corporation: {Name: "corporation username auto", Help: "法人", Actions: ice.MergeActions(ice.Actions{}, mdb.ExportHashAction( + mdb.SHORT, "username", mdb.FIELD, "time,username,mobile,idnumber,usci,account,bank,email,portal", )), Hand: func(m *ice.Message, arg ...string) { mdb.HashSelect(m, arg...) web.PushPodCmd(m, "", arg...) diff --git a/misc/git/repos.go b/misc/git/repos.go index 1f0d8b58..1ae02fb1 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -503,6 +503,7 @@ func init() { } switch mdb.HashInputs(m, arg); m.Option(ctx.ACTION) { case INIT: + m.Push(arg[0], ice.Info.Make.Remote) m.Cmd(web.SPIDE, ice.OptionFields(web.CLIENT_ORIGIN), func(value ice.Maps) { m.Push(arg[0], value[web.CLIENT_ORIGIN]+web.X(path.Base(kit.Path("")))) }) m.Push(arg[0], kit.MergeURL2(web.UserHost(m), web.X(path.Base(kit.Path(""))))) m.Sort(arg[0]) diff --git a/misc/git/status.go b/misc/git/status.go index 4ea1b13e..23ea13f2 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -38,8 +38,10 @@ func init() { mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) { switch arg[0] { case aaa.EMAIL: + m.Push(arg[0], ice.Info.NodeName+"@"+kit.Keys(kit.Slice(kit.Split(web.UserWeb(m).Hostname(), nfs.PT), -2))) m.Push(arg[0], _configs_get(m, USER_EMAIL), ice.Info.Make.Email) case aaa.USERNAME: + m.Push(arg[0], ice.Info.NodeName) m.Push(arg[0], kit.Select(m.Option(ice.MSG_USERNAME), _configs_get(m, USER_NAME)), ice.Info.Make.Username) default: m.Cmdy(REPOS, mdb.INPUTS, arg) diff --git a/misc/wx/access.go b/misc/wx/access.go index f60ab7ac..3c393208 100644 --- a/misc/wx/access.go +++ b/misc/wx/access.go @@ -68,7 +68,6 @@ func init() { msg := mdb.HashSelect(m.Spawn(), m.Option(ACCESS)) if msg.Append(TOKENS) == "" || m.Time() > msg.Append(EXPIRES) { res := m.Cmd(web.SPIDE, WX, http.MethodGet, TOKEN_CREDENTIAL, msg.AppendSimple(APPID, SECRET)) - m.Debug("what %v", res.FormatMeta()) mdb.HashModify(m, m.OptionSimple(ACCESS), EXPIRES, m.Time(kit.Format("%vs", res.Append(oauth.EXPIRES_IN))), TOKENS, res.Append(oauth.ACCESS_TOKEN)) msg = mdb.HashSelect(m.Spawn(), m.Option(ACCESS)) } @@ -110,7 +109,7 @@ func init() { m.Cmd(mdb.PRUNES, m.Prefix(SCAN), "", mdb.HASH, m.OptionSimple(mdb.NAME)) m.Cmd(mdb.PRUNES, m.Prefix(IDE), "", mdb.HASH, m.OptionSimple(mdb.NAME)) }}, - }, gdb.EventsAction(web.SPACE_GRANT, web.SPACE_LOGIN_CLOSE), mdb.ImportantHashAction( + }, gdb.EventsAction(web.SPACE_GRANT, web.SPACE_LOGIN_CLOSE), mdb.ExportHashAction( mdb.SHORT, ACCESS, mdb.FIELD, "time,type,access,icons,usernick,appid,secret,token", tcp.SERVER, CGI_BIN, )), Hand: func(m *ice.Message, arg ...string) { mdb.HashSelect(m, arg...).PushAction(web.SSO, mdb.REMOVE).StatusTimeCount(mdb.ConfigSimple(m, ACCESS, APPID), web.SERVE, m.MergeLink("/chat/wx/login/"))