diff --git a/base/web/share.go b/base/web/share.go index 8c9c3e2e..7619c332 100644 --- a/base/web/share.go +++ b/base/web/share.go @@ -76,7 +76,7 @@ func init() { // kit.If(m.Option(mdb.TYPE) == LOGIN, func() { arg = append(arg, mdb.TEXT, tcp.PublishLocalhost(m, m.Option(mdb.TEXT))) }) kit.If(m.Option(mdb.TYPE) == LOGIN && m.Option(mdb.TEXT) == "", func() { arg = append(arg, mdb.TEXT, tcp.PublishLocalhost(m, m.Option(ice.MSG_USERWEB))) }) mdb.HashCreate(m, arg, SPACE, m.Option(ice.MSG_USERPOD), aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERROLE, m.Option(ice.MSG_USERROLE)) - m.Option(mdb.LINK, _share_link(m, m.MergeLink(P(SHARE, m.Result())))) + m.Option(mdb.LINK, tcp.PublishLocalhost(m, m.MergeLink(P(SHARE, m.Result())))) }}, LOGIN: {Help: "登录", Hand: func(m *ice.Message, arg ...string) { m.EchoQRCode(m.Cmd(SHARE, mdb.CREATE, mdb.TYPE, LOGIN).Option(mdb.LINK)).ProcessInner() diff --git a/core/chat/header.go b/core/chat/header.go index 8df9573c..03d5251d 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -88,9 +88,11 @@ func init() { if m.Option(nfs.TO) != aaa.UserEmail(m, "") && !aaa.Right(m, aaa.EMAIL, m.Option(nfs.TO)) { return } - m.Options("volcano", web.UserHost(m), nfs.VERSION, web.RenderVersion(m)) m.Cmdy(web.SHARE, mdb.CREATE, mdb.TYPE, web.LOGIN, mdb.TEXT, tcp.PublishLocalhost(m, m.Option(ice.MSG_USERWEB))) - m.Cmdy(aaa.EMAIL, aaa.SEND, aaa.FROM, aaa.ADMIN, arg, aaa.CONTENT, nfs.Template(m, "email.html")) + aaa.SendEmail(m, aaa.ADMIN, m.Option("to"), "", m.Option("subject")) + + // m.Options("volcano", web.UserHost(m), nfs.VERSION, web.RenderVersion(m)) + // m.Cmdy(aaa.EMAIL, aaa.SEND, aaa.FROM, aaa.ADMIN, arg, aaa.CONTENT, nfs.Template(m, "email.html")) }}, aaa.LOGOUT: {Hand: aaa.SessLogout}, cli.QRCODE: {Hand: func(m *ice.Message, arg ...string) {