diff --git a/base/aaa/portal/apply.go b/base/aaa/portal/apply.go index 4894824a..1261b71c 100644 --- a/base/aaa/portal/apply.go +++ b/base/aaa/portal/apply.go @@ -38,7 +38,7 @@ func (s apply) Apply(m *ice.Message, arg ...string) { h := s.Hash.Create(m, kit.Simple(arg, mdb.STATUS, kit.FuncName(s.Apply), web.ParseUA(m.Message))...) m.ProcessCookie(_cookie_key(m), h) m.StreamPushRefreshConfirm() - m.ChatMessageInsertPlug(aaa.APPLY, "apply.signup", m.PrefixKey(), h) + m.ChatMessageInsertPlug(aaa.APPLY, "user.signup", m.PrefixKey(), h) } } func (s apply) Agree(m *ice.Message, arg ...string) { @@ -50,7 +50,7 @@ func (s apply) Agree(m *ice.Message, arg ...string) { return } s.Hash.Modify(m, kit.Simple(m.OptionSimple(mdb.HASH, aaa.USERROLE), mdb.STATUS, s.Agree)...) - m.UserCreate(m.Option(aaa.USERROLE), msg.Append(aaa.USERNAME), msg.Append(aaa.USERNICK)) + // m.UserCreate(m.Option(aaa.USERROLE), msg.Append(aaa.USERNAME), msg.Append(aaa.USERNICK)) m.PushRefresh(msg.Append(cli.DAEMON)) } func (s apply) Login(m *ice.Message, arg ...string) { @@ -72,7 +72,6 @@ func (s apply) Login(m *ice.Message, arg ...string) { s.Hash.Modify(m, kit.Simple(m.OptionSimple(mdb.HASH), mdb.STATUS, s.Login)...) m.ProcessLocation(nfs.PS) m.StreamPushRefreshConfirm() - m.ChatMessageInsertPlug(aaa.APPLY, "user.create", aaa.USER, msg.Append(aaa.USERNAME)) } else { if m.WarnNotFound(m.Cmd(aaa.USER, m.Option(aaa.EMAIL)).Length() == 0, m.Option(aaa.EMAIL)) { return diff --git a/base/web/serve.go b/base/web/serve.go index d5994ff2..1d0e0d85 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -210,6 +210,7 @@ const ( OPS_SERVER_OPEN = "ops.server.open" SERVE_START = "serve.start" PROXY_CONF = "proxyConf" + PROXY_PATH = "usr/local/daemon/10000/" ) const SERVE = "serve" @@ -245,7 +246,7 @@ func init() { m.Cmd("", PROXY_CONF, ice.Info.NodeName) }}, PROXY_CONF: {Name: "proxyConf name* port path", Hand: func(m *ice.Message, arg ...string) { - if dir := m.OptionDefault(nfs.PATH, "usr/local/daemon/10000/"); nfs.Exists(m, dir) { + if dir := m.OptionDefault(nfs.PATH, PROXY_PATH); nfs.Exists(m, dir) { for _, p := range []string{"server.conf", "location.conf", "upstream.conf"} { m.Cmd(nfs.SAVE, kit.Format("%s/conf/portal/%s/%s", dir, m.Option(mdb.NAME), p), m.Template(p)+lex.NL) } diff --git a/core/chat/message.go b/core/chat/message.go index 42050bf1..27c15661 100644 --- a/core/chat/message.go +++ b/core/chat/message.go @@ -7,6 +7,7 @@ import ( "shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/cli" "shylinux.com/x/icebergs/base/ctx" + "shylinux.com/x/icebergs/base/gdb" "shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/tcp" "shylinux.com/x/icebergs/base/web" @@ -47,6 +48,14 @@ func init() { m.Cmd("", mdb.INSERT, m.Option(ice.FROM_SPACE), arg, tcp.DIRECT, tcp.RECV) mdb.HashSelectUpdate(m, m.Option(ice.FROM_SPACE), func(value ice.Map) { kit.Value(value, web.TARGET, m.Option(ice.FROM_SPACE)) }) }}, + aaa.USER_CREATE: {Hand: func(m *ice.Message, arg ...string) { + if ice.Info.Important { + MessageInsert(m, aaa.APPLY, mdb.TYPE, html.PLUG, mdb.NAME, m.ActionKey(), ctx.INDEX, aaa.USER, ctx.ARGS, m.Option(aaa.USERNAME)) + } + }}, + aaa.USER_REMOVE: {Hand: func(m *ice.Message, arg ...string) { + MessageInsert(m, aaa.APPLY, mdb.TYPE, html.PLUG, mdb.NAME, m.ActionKey(), ctx.INDEX, aaa.USER, ctx.ARGS, m.Option(aaa.USERNAME)) + }}, web.DREAM_CREATE: {Hand: func(m *ice.Message, arg ...string) { if ice.Info.Important { MessageInsert(m, web.DREAM, mdb.TYPE, html.PLUG, ctx.INDEX, IFRAME, ctx.ARGS, web.S(m.Option(mdb.NAME))) @@ -61,7 +70,7 @@ func init() { } }}, ctx.RUN: {Hand: func(m *ice.Message, arg ...string) { m.Cmdy(web.Space(m, arg[0]), arg[1], arg[2:]) }}, - }, web.DreamAction(), web.DreamTablesAction(), mdb.ZoneAction( + }, web.DreamAction(), web.DreamTablesAction(), gdb.EventsAction(aaa.USER_CREATE, aaa.USER_REMOVE), mdb.ZoneAction( mdb.SHORT, mdb.ZONE, mdb.FIELD, "time,hash,type,zone,icons,title,count,target", mdb.FIELDS, "time,id,type,name,text,space,index,args,style,display,username,usernick,avatar,direct", )), Hand: func(m *ice.Message, arg ...string) { diff --git a/core/chat/message.js b/core/chat/message.js index 4983a61d..a28c6beb 100644 --- a/core/chat/message.js +++ b/core/chat/message.js @@ -71,7 +71,7 @@ Volcanos(chat.ONIMPORT, { can.onmotion.delay(can, function() { can.ui.message && (can.ui.message.scrollTop += 10000) }, 300) }, _request: function(can) { - can.run(can.request(event, {"cache.begin": parseInt(can.db.zone.id||0)+1, "cache.limit": 10}), [can.db.hash], function(msg) { + can.Update(can.request({}, {"cache.begin": parseInt(can.db.zone.id||0)+1, "cache.limit": 10}), [can.db.hash], function(msg) { can.onimport._message(can, msg) }) }, @@ -93,7 +93,7 @@ Volcanos(chat.ONIMPORT, { }, }, [""]) Volcanos(chat.ONDAEMON, { - refresh: function(can, msg, sub, arg) { can.base.isFunc(sub.Update) && sub.Update(), can.user.toast(can, "new message") }, + refresh: function(can, msg, sub, arg) { sub.sub.onimport._request(sub.sub) }, }) Volcanos(chat.ONEXPORT, { plugHeight: function(can, value) { var height = can.base.Min(can.ui.content.offsetHeight-240, 240)