From 70e91d382266c00dd41df8c27b851bd3c988d2a3 Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 29 Jan 2024 10:56:54 +0800 Subject: [PATCH] add some --- base/aaa/email.go | 2 +- base/aaa/role.go | 2 +- base/web/share.go | 2 +- base/web/token.go | 2 +- misc/webview/webview.go | 14 +++++++++++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/base/aaa/email.go b/base/aaa/email.go index 1cb727a1..c35768db 100644 --- a/base/aaa/email.go +++ b/base/aaa/email.go @@ -49,7 +49,7 @@ func init() { auth := smtp.PlainAuth("", msg.Append(USERNAME), msg.Append(PASSWORD), kit.Split(msg.Append(SERVICE), ice.DF)[0]) m.Logs(EMAIL, SEND, string(content)).Warn(smtp.SendMail(msg.Append(SERVICE), auth, msg.Append(USERNAME), kit.Split(m.Option(TO)), content)) }}, - }, mdb.DevDataAction("name,service,username,password"), mdb.HashAction(mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,service,username", ice.ACTION, SEND)), Hand: func(m *ice.Message, arg ...string) { + }, mdb.DevDataAction("name,service,username,password"), mdb.ImportantHashAction(mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,service,username", ice.ACTION, SEND)), Hand: func(m *ice.Message, arg ...string) { if mdb.HashSelect(m, arg...); len(arg) == 0 && m.Length() == 0 { m.EchoInfoButton(ice.Info.Template(m, "email.html"), mdb.CREATE, mdb.DEV_REQUEST) } else if len(arg) == 0 { diff --git a/base/aaa/role.go b/base/aaa/role.go index 104416eb..7fa0226e 100644 --- a/base/aaa/role.go +++ b/base/aaa/role.go @@ -125,7 +125,7 @@ func init() { m.Push(ice.CMD, cmd).Push("actions", kit.Join(action)) }) }}, - }, mdb.HashAction(mdb.SHORT, mdb.NAME)), Hand: func(m *ice.Message, arg ...string) { + }, mdb.ImportantHashAction(mdb.SHORT, mdb.NAME)), Hand: func(m *ice.Message, arg ...string) { _role_list(m, kit.Select("", arg, 0), kit.Slice(arg, 1)...).PushAction(mdb.DELETE) }}, }) diff --git a/base/web/share.go b/base/web/share.go index 8243d4b9..f1a72857 100644 --- a/base/web/share.go +++ b/base/web/share.go @@ -120,7 +120,7 @@ func init() { RenderMain(m) } }}, - }, mdb.HashAction(mdb.FIELD, "time,hash,type,name,text,usernick,username,userrole", mdb.EXPIRE, mdb.DAYS)), Hand: func(m *ice.Message, arg ...string) { + }, mdb.ImportantHashAction(mdb.FIELD, "time,hash,type,name,text,usernick,username,userrole", mdb.EXPIRE, mdb.DAYS)), Hand: func(m *ice.Message, arg ...string) { if kit.IsIn(m.Option(ice.MSG_USERROLE), aaa.ROOT, aaa.TECH) || len(arg) > 0 && arg[0] != "" { mdb.HashSelect(m, arg...) } diff --git a/base/web/token.go b/base/web/token.go index 34a0adb7..c3cbc020 100644 --- a/base/web/token.go +++ b/base/web/token.go @@ -16,7 +16,7 @@ const TOKEN = "token" func init() { Index.MergeCommands(ice.Commands{ - TOKEN: {Help: "令牌桶", Actions: mdb.HashAction(mdb.SHORT, mdb.UNIQ, mdb.EXPIRE, mdb.MONTH)}, + TOKEN: {Help: "令牌桶", Actions: mdb.ImportantHashAction(mdb.SHORT, mdb.UNIQ, mdb.EXPIRE, mdb.MONTH)}, }) } diff --git a/misc/webview/webview.go b/misc/webview/webview.go index f17d42c9..8be38097 100644 --- a/misc/webview/webview.go +++ b/misc/webview/webview.go @@ -1,6 +1,9 @@ package webview import ( + "fmt" + "io" + "os" "path" "strings" @@ -93,9 +96,18 @@ func Run(cb func(*WebView) ice.Any) { } kit.If(!view.Menu(), func() { view.navigate(ice.Pulse.Cmdv(web.SPIDE, ice.OPS, web.CLIENT_ORIGIN)) }) } + +var log io.WriteCloser + +func Log(str string, arg ...ice.Any) { fmt.Fprintln(log, kit.Format(str, arg...), kit.FileLine(2, 3)) } + func RunServe() { kit.Setenv(cli.PATH, "/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin") - kit.Chdir(kit.HomePath(ice.CONTEXTS)) + for _, p := range []string{ice.Info.Make.Path, kit.HomePath(ice.CONTEXTS)} { + kit.Chdir(p) + log, _ = os.Create(path.Join(p, "webview.log")) + Log("what %v", p) + } wait := make(chan bool, 1) ice.Pulse.Optionv(web.SERVE_START, func() { wait <- true }) go ice.Run(ice.SERVE, ice.START)