From 4398c83820e31aeec0476f490a9dd976cbd6c89b Mon Sep 17 00:00:00 2001 From: shaoying Date: Sun, 28 Jun 2020 23:40:25 +0800 Subject: [PATCH] opt some --- base/web/serve.go | 2 +- core/code/pprof.go | 5 +++-- go.mod | 9 ++++++++- go.sum | 15 +++++++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/base/web/serve.go b/base/web/serve.go index 1288938b..f7e7e2e4 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -71,7 +71,7 @@ func _serve_handle(key string, cmd *ice.Command, msg *ice.Message, w http.Respon } // 用户请求 - msg.Option(ice.MSG_USERWEB, msg.Conf(SHARE, "meta.domain")) + msg.Option(ice.MSG_USERWEB, kit.Select(msg.Conf(SHARE, "meta.domain"), r.Header.Get("Referer"))) msg.Option(ice.MSG_USERIP, r.Header.Get(ice.MSG_USERIP)) msg.Option(ice.MSG_USERUA, r.Header.Get("User-Agent")) msg.Option(ice.MSG_USERURL, r.URL.Path) diff --git a/core/code/pprof.go b/core/code/pprof.go index 28f771bc..728c7ad5 100644 --- a/core/code/pprof.go +++ b/core/code/pprof.go @@ -77,12 +77,13 @@ func _pprof_show(m *ice.Message, zone string, id string) { list = append(list, web.TYPE_SHELL+": "+strings.Join(cmd, " "), strings.Join(res, "\n")) // 结果展示 - p := kit.Format("%s:%s", m.Conf(web.SHARE, "meta.host"), m.Cmdx(tcp.PORT, "get")) + u := kit.ParseURL(m.Option(ice.MSG_USERWEB)) + p := kit.Format("%s:%s", u.Hostname(), m.Cmdx(tcp.PORT, "get")) m.Option(cli.CMD_STDOUT, "var/daemon/stdout") m.Option(cli.CMD_STDERR, "var/daemon/stderr") m.Cmd(cli.DAEMON, m.Confv(PPROF, "meta.pprof"), "-http="+p, val[BINNARY], msg.Append(kit.MDB_TEXT)) - url := "http://" + p + "/ui/top" + url := u.Scheme + "://" + p + "/ui/top" m.Cmd(web.FAVOR, favor, web.SPIDE, url, msg.Append(kit.MDB_TEXT)) m.Set(ice.MSG_RESULT).Echo(url).Echo(" \n").Echo("\n") m.Echo(strings.Join(list, "\n")).Echo("\n") diff --git a/go.mod b/go.mod index 1566b034..01e046ba 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,11 @@ module github.com/shylinux/icebergs go 1.13 -require github.com/shylinux/toolkits v0.1.6 +require ( + github.com/gomodule/redigo v2.0.0+incompatible // indirect + github.com/gorilla/websocket v1.4.2 + github.com/nareix/joy4 v0.0.0-20200507095837-05a4ffbb5369 + github.com/shylinux/toolkits v0.1.6 + github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e + github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 +) diff --git a/go.sum b/go.sum index f4d59a4f..d88edf42 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,17 @@ +github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= +github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/gomodule/redigo/redis v0.0.0-do-not-use h1:J7XIp6Kau0WoyT4JtXHT3Ei0gA1KkSc6bc87j9v9WIo= +github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s= +github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 h1:u9jwvcKbQpghIXgNl/EOL8hzhAFXh4ePrEP493W3tNA= +github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA= +github.com/nareix/joy4 v0.0.0-20200507095837-05a4ffbb5369 h1:Yp0zFEufLz0H7jzffb4UPXijavlyqlYeOg7dcyVUNnQ= +github.com/nareix/joy4 v0.0.0-20200507095837-05a4ffbb5369/go.mod h1:aFJ1ZwLjvHN4yEzE5Bkz8rD8/d8Vlj3UIuvz2yfET7I= github.com/shylinux/toolkits v0.1.6 h1:x+Bs+oijuS11TWGAsdCEgwDbCS35uJvnP4jYDETJqig= github.com/shylinux/toolkits v0.1.6/go.mod h1:Y68Ot6xOmo1bun67YvqC3chDGeU2gDxtsUnvVDGJm4g= +github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= +github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= +github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg= +github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y=