diff --git a/base/aaa/offer.go b/base/aaa/offer.go index fea8d453..0c790d9a 100644 --- a/base/aaa/offer.go +++ b/base/aaa/offer.go @@ -24,11 +24,11 @@ func init() { ) Index.MergeCommands(ice.Commands{ OFFER: {Help: "邀请", Role: VOID, Meta: kit.Dict( - ice.CTX_TRANS, kit.Dict(html.INPUT, kit.Dict("inviter", "邀请人")), + ice.CTX_TRANS, kit.Dict(html.INPUT, kit.Dict("from", "发自", "inviter", "邀请人")), ), Actions: ice.MergeActions(ice.Actions{ - mdb.CREATE: {Name: "create email*='shy@shylinux.com' subject content", Help: "邀请", Hand: func(m *ice.Message, arg ...string) { + mdb.CREATE: {Name: "create from*=admin email*='shy@shylinux.com' subject content", Help: "邀请", Hand: func(m *ice.Message, arg ...string) { h := mdb.HashCreate(m.Spawn(), m.OptionSimple(EMAIL, SUBJECT, CONTENT), INVITER, m.Option(ice.MSG_USERNAME), mdb.STATUS, INVITE) - SendEmail(m.Options("link", m.Cmdx("host", "publish", m.MergePodCmd("", "", mdb.HASH, h))), "", "", "") + SendEmail(m.Options("link", m.Cmdx("host", "publish", m.MergePodCmd("", "", mdb.HASH, h))), m.Option(FROM), "", "") }}, ACCEPT: {Help: "接受", Role: VOID, Hand: func(m *ice.Message, arg ...string) { if m.Warn(m.Option(mdb.HASH) == "", ice.ErrNotValid, mdb.HASH) { diff --git a/base/web/dream.go b/base/web/dream.go index 3d007195..651abd3e 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -69,7 +69,7 @@ func _dream_more_list(m *ice.Message) *ice.Message { defer m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), "")) case MASTER: if spide, ok := list[value[mdb.NAME]]; ok { - value[mdb.ICON] = spide[mdb.ICON] + value[mdb.ICON] = kit.Select(value[mdb.ICON], spide[mdb.ICON]) } value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT]) msg := gdb.Event(m.Spawn(value), DREAM_TABLES) diff --git a/lock.go b/lock.go index a5477d67..ec7e4074 100644 --- a/lock.go +++ b/lock.go @@ -1,6 +1,8 @@ package ice import ( + "strings" + kit "shylinux.com/x/toolkits" ) @@ -74,6 +76,7 @@ func (m *Message) setDetail(key string, arg ...string) *Message { } func (m *Message) Optionv(key string, arg ...Any) Any { key = kit.Select(MSG_OPTION, key) + key = strings.ReplaceAll(key, "*", "") var unlock func() if len(arg) > 0 { unlock = m.lock.Lock()