diff --git a/base/aaa/offer.go b/base/aaa/offer.go index ecc0a368..320c84c4 100644 --- a/base/aaa/offer.go +++ b/base/aaa/offer.go @@ -26,7 +26,8 @@ func init() { return } msg := m.Cmd("", m.Option(mdb.HASH)) - m.Cmd(USER, mdb.CREATE, USERNAME, msg.Option(EMAIL)) + ls := kit.Split(msg.Option(EMAIL), ice.AT) + m.Cmd(USER, mdb.CREATE, USERNAME, msg.Option(EMAIL), USERNICK, ls[0], USERZONE, ls[1]) m.ProcessOpen(kit.MergeURL2(m.Option(ice.MSG_USERWEB), ice.PS, ice.MSG_SESSID, SessCreate(m, msg.Option(EMAIL)))) mdb.HashModify(m, m.OptionSimple(mdb.HASH), mdb.STATUS, ACCEPT) }}, diff --git a/base/nfs/cat.go b/base/nfs/cat.go index 616df8e4..db7bff44 100644 --- a/base/nfs/cat.go +++ b/base/nfs/cat.go @@ -136,11 +136,11 @@ func init() { Index.MergeCommands(ice.Commands{ CAT: {Name: "cat path auto", Help: "文件", Actions: ice.MergeActions(ice.Actions{ ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { aaa.White(m, ice.SRC_MAIN_JS, ice.SRC_MAIN_GO, ice.SRC_MAIN_SHY) }}, - }, mdb.AutoConfig(SOURCE, kit.DictList( + }, ice.Actions{ice.CTX_INIT: mdb.AutoConfig(SOURCE, kit.DictList( HTML, CSS, JS, GO, SH, SHY, CSV, JSON, PY, MD, TXT, XML, YML, ZML, IML, "license", "makefile", "configure", "conf", - ))), Hand: func(m *ice.Message, arg ...string) { + ))}), Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 || strings.HasSuffix(arg[0], ice.PS) { m.Cmdy(DIR, arg) return diff --git a/base/web/dream.go b/base/web/dream.go index 6391ccb9..b3a5e38e 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -6,6 +6,7 @@ import ( "strings" ice "shylinux.com/x/icebergs" + "shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/cli" "shylinux.com/x/icebergs/base/ctx" "shylinux.com/x/icebergs/base/gdb" @@ -42,7 +43,7 @@ func _dream_show(m *ice.Message, name string) { } defer m.ProcessOpen(MergePod(m, m.Option(mdb.NAME, name))) p := path.Join(ice.USR_LOCAL_WORK, name) - if pid := m.Cmdx(nfs.CAT, path.Join(p, ice.Info.PidPath)); pid != "" && nfs.ExistsFile(m, "/proc/"+pid) { + if pid := m.Cmdx(nfs.CAT, path.Join(p, ice.Info.PidPath), kit.Dict(ice.MSG_USERROLE, aaa.TECH)); pid != "" && nfs.ExistsFile(m, "/proc/"+pid) { m.Info("already exists %v", pid) return } else if m.Cmd(SPACE, name).Length() > 0 {