From 9f199dda2914c2faff8b3c1a0c2ebdfc6ad3ea6c Mon Sep 17 00:00:00 2001 From: shylinux Date: Sat, 1 Sep 2018 10:32:43 +0800 Subject: [PATCH] vps mod some --- src/contexts/web/web.go | 9 ++++----- usr/wiki/html5.js | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/contexts/web/web.go b/src/contexts/web/web.go index 2d5494e8..53d20aff 100644 --- a/src/contexts/web/web.go +++ b/src/contexts/web/web.go @@ -102,7 +102,7 @@ func (web *WEB) Trans(m *ctx.Message, key string, hand func(*ctx.Message, *ctx.C msg.Add("option", k, v) } - // msg.Log("cmd", "%s [] %v", key, msg.Meta["option"]) + msg.Log("cmd", "%s [] %v", key, msg.Meta["option"]) msg.Put("option", "request", r).Put("option", "response", w) hand(msg, msg.Target(), msg.Option("path")) @@ -125,9 +125,8 @@ func (web *WEB) Trans(m *ctx.Message, key string, hand func(*ctx.Message, *ctx.C // }}} func (web *WEB) ServeHTTP(w http.ResponseWriter, r *http.Request) { // {{{ - m := web.Message() - // .Log("info", "").Log("info", "%v %s %s", r.RemoteAddr, r.Method, r.URL) - // + m := web.Message().Log("info", "").Log("info", "%v %s %s", r.RemoteAddr, r.Method, r.URL) + if m.Confs("logheaders") { for k, v := range r.Header { m.Log("info", "%s: %v", k, v) @@ -884,7 +883,7 @@ var Index = &ctx.Context{Name: "web", Help: "应用中心", m.Option("username", m.Append("username")) //权限检查 - dir := m.Option("dir", path.Join(m.Cap("directory"), m.Option("username"), m.Option("dir", strings.TrimPrefix(m.Option("path"), "/index")))) + dir := m.Option("dir", path.Join(m.Cap("directory"), "local", m.Option("username"), m.Option("dir", strings.TrimPrefix(m.Option("path"), "/index")))) if check := m.Spawn(c).Cmd("/check", "command", "/index/", "dir", dir); !check.Results(0) { m.Copy(check, "append") return diff --git a/usr/wiki/html5.js b/usr/wiki/html5.js index 47aa43e6..8d7bd33e 100644 --- a/usr/wiki/html5.js +++ b/usr/wiki/html5.js @@ -1,4 +1,4 @@ -var canvas = document.getElementById("heart"); +var canvas = document.getElementById("heart");//{{{ var ctx = canvas.getContext('2d'); var main_angle = 30; @@ -74,7 +74,7 @@ var demo3 = document.getElementById("demo3"); var ctx3 = demo3.getContext("2d"); demo3.onclick = draw3; draw3() - +//}}} var current_ctx = {//{{{ big_scale: 1.25,