From ec6032233009b3fb180d55803d4f7979715e3619 Mon Sep 17 00:00:00 2001 From: shy Date: Wed, 3 Jan 2024 16:59:57 +0800 Subject: [PATCH] opt some --- base/web/space.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/base/web/space.go b/base/web/space.go index 41492792..f1d7ba8e 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -68,11 +68,15 @@ func _space_fork(m *ice.Message) { addr := kit.Select(m.R.RemoteAddr, m.R.Header.Get(ice.MSG_USERADDR)) text := strings.ReplaceAll(kit.Select(addr, m.Option(mdb.TEXT)), "%2F", nfs.PS) name := kit.ReplaceAll(kit.Select(addr, m.Option(mdb.NAME)), "[", "_", "]", "_", nfs.DF, "_", nfs.PT, "_") - if kit.IsIn(m.Option(mdb.TYPE), PORTAL, aaa.LOGIN) && len(m.Option(mdb.NAME)) == 32 && kit.IsIn(mdb.HashSelects(m.Spawn(), name).Append(aaa.IP), "", m.Option(ice.MSG_USERIP)) { - } else if mdb.HashSelect(m.Spawn(), name).Length() > 0 || !(IsLocalHost(m) || m.Option(TOKEN) != "" && m.Cmdv(TOKEN, m.Option(TOKEN), mdb.TIME) > m.Time()) { + if kit.IsIn(m.Option(mdb.TYPE), WORKER) && IsLocalHost(m) || m.Option(TOKEN) != "" && m.Cmdv(TOKEN, m.Option(TOKEN), mdb.TIME) > m.Time() { + + } else if kit.IsIn(m.Option(mdb.TYPE), PORTAL, aaa.LOGIN) && len(name) == 32 && kit.IsIn(mdb.HashSelects(m.Spawn(), name).Append(aaa.IP), "", m.Option(ice.MSG_USERIP)) { + + } else { name, text = kit.Hashs(name), kit.Select(addr, m.Option(mdb.NAME), m.Option(mdb.TEXT)) } + if kit.IsIn(m.Option(mdb.TYPE), WORKER, PORTAL) && tcp.IsLocalHost(m, m.Option(ice.MSG_USERIP)) { aaa.SessAuth(m, kit.Dict(m.Cmd(aaa.USER, m.Option(ice.MSG_USERNAME, ice.Info.Username)).AppendSimple())) } else if m.Option(TOKEN) != "" {