From 40ded7360bdec697d521d5251acce31154ef98e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=9E=9A=E7=87=8A=28Yaoshen=20Wang=29?= Date: Mon, 21 Sep 2020 15:42:18 +0800 Subject: [PATCH] use func (*URL) Parse to ResolveURL --- tool/util.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tool/util.go b/tool/util.go index 2d950cd..2523db5 100644 --- a/tool/util.go +++ b/tool/util.go @@ -4,7 +4,6 @@ import ( "fmt" "net/url" "os" - "path" "path/filepath" "strings" ) @@ -21,17 +20,11 @@ func CurrentDir(joinPath ...string) (string, error) { } func ResolveURL(u *url.URL, p string) string { - if strings.HasPrefix(p, "https://") || strings.HasPrefix(p, "http://") { - return p - } - var baseURL string - if strings.Index(p, "/") == 0 { - baseURL = u.Scheme + "://" + u.Host - } else { - tU := u.String() - baseURL = tU[0:strings.LastIndex(tU, "/")] + var Url, err = u.Parse(p) + if err != nil { + panic(err) } - return baseURL + path.Join("/", p) + return Url.String() } func DrawProgressBar(prefix string, proportion float32, width int, suffix ...string) {