diff --git a/base/aaa/email.go b/base/aaa/email.go index e276fce4..9e23ab54 100644 --- a/base/aaa/email.go +++ b/base/aaa/email.go @@ -32,7 +32,7 @@ func init() { ) Index.MergeCommands(ice.Commands{ EMAIL: {Help: "邮件", Actions: ice.MergeActions(ice.Actions{ - mdb.CREATE: {Name: "create name*=admin service*='mail.shylinux.com:25' username*='shy@shylinux.com' password*"}, + mdb.CREATE: {Name: "create name*=admin service*='smtp.163.com:25' username* password*"}, SEND: {Name: "send from=admin to*='shy@shylinux.com' cc subject*=hi content*:textarea=hello", Help: "发送", Icon: "bi bi-send-plus", Hand: func(m *ice.Message, arg ...string) { msg := mdb.HashSelects(m.Spawn(), m.OptionDefault(FROM, ADMIN)) if m.WarnNotFound(msg.Append(SERVICE) == "", m.Option(FROM)) { diff --git a/base/aaa/portal/apply.go b/base/aaa/portal/apply.go index 42437d46..be743f3d 100644 --- a/base/aaa/portal/apply.go +++ b/base/aaa/portal/apply.go @@ -78,9 +78,11 @@ func (s apply) Login(m *ice.Message, arg ...string) { } m.Options(ice.MSG_USERNAME, m.Option(aaa.EMAIL)) space := kit.Keys(kit.Slice(kit.Split(m.Option(ice.MSG_DAEMON), nfs.PT), 0, -1)) - share := m.Cmd(web.SHARE, mdb.CREATE, mdb.TYPE, web.FIELD, mdb.NAME, web.CHAT_GRANT, mdb.TEXT, space).Append(mdb.LINK) + share := m.Cmd(web.SHARE, mdb.CREATE, mdb.TYPE, web.FIELD, mdb.NAME, web.CHAT_GRANT, mdb.TEXT, space, web.SPACE, ice.OPS).Append(mdb.LINK) m.Options(web.LINK, share).SendEmail("", "", "") - m.ProcessHold(m.Trans("please auth login in mailbox", "请注意查收邮件")) + // m.ProcessHold(m.Trans("please auth login in mailbox", "请注意查收邮件")) + m.Echo(m.Trans("please auth login in mailbox", "请注意查收邮件")) + m.ProcessInner() } } func (s apply) List(m *ice.Message, arg ...string) *ice.Message { diff --git a/base/web/share.go b/base/web/share.go index 6342ecce..0a1a4665 100644 --- a/base/web/share.go +++ b/base/web/share.go @@ -91,7 +91,8 @@ func init() { ctx.RUN: {Hand: func(m *ice.Message, arg ...string) { if msg := mdb.HashSelects(m.Spawn(), m.Option(SHARE)); !IsNotValidFieldShare(m, msg) { aaa.SessAuth(m, kit.Dict(msg.AppendSimple(aaa.USERNICK, aaa.USERNAME, aaa.USERROLE))) - m.Cmdy(Space(m, msg.Append(SPACE)), msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT)), arg[1:], kit.Dict(ice.MSG_USERPOD, msg.Append(SPACE))) + // m.Cmdy(Space(m, msg.Append(SPACE)), msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT)), arg[1:], kit.Dict(ice.MSG_USERPOD, msg.Append(SPACE))) + m.Cmdy(Space(m, msg.Append(SPACE)), msg.Append(mdb.NAME), arg[1:], kit.Dict(ice.MSG_USERPOD, msg.Append(SPACE))) } }}, nfs.PS: {Hand: func(m *ice.Message, arg ...string) { @@ -118,7 +119,11 @@ func init() { RenderCookie(m, aaa.SessCreate(m, msg.Append(aaa.USERNAME))) m.RenderRedirect(m.MergeLink(kit.Select(nfs.PS, msg.Append(mdb.TEXT)), msg.AppendSimple(RIVER, STORM))) case FIELD: - RenderPodCmd(m, msg.Append(SPACE), msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT))) + if msg.Append(mdb.NAME) == "web.chat.grant" { + RenderPodCmd(m, "", msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT))) + } else { + RenderPodCmd(m, msg.Append(SPACE), msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT))) + } case DOWNLOAD: m.RenderDownload(msg.Append(mdb.TEXT)) default: