From c29fa9c0bb882d8f093b5069ae606eb147f8732f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Sat, 13 Aug 2022 09:34:44 +0800 Subject: [PATCH] - update --- http.go | 4 +-- url.go | 70 ----------------------------------------------------- url_test.go | 12 --------- 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 url.go delete mode 100644 url_test.go diff --git a/http.go b/http.go index 3a1329b..4c2f928 100644 --- a/http.go +++ b/http.go @@ -7,9 +7,9 @@ import ( "encoding/json" "errors" "fmt" - "go.dtapp.net/golog" "go.dtapp.net/gostring" "go.dtapp.net/gotime" + "go.dtapp.net/gotrace_id" "io" "io/ioutil" "net/http" @@ -207,7 +207,7 @@ func request(app *App, ctx context.Context) (httpResponse Response, err error) { } // 跟踪编号 - traceId := golog.GetTraceIdContext(ctx) + traceId := gotrace_id.GetTraceIdContext(ctx) if traceId == "" { traceId = gostring.GetUuId() } diff --git a/url.go b/url.go deleted file mode 100644 index 0d3ad79..0000000 --- a/url.go +++ /dev/null @@ -1,70 +0,0 @@ -package gorequest - -import ( - "net/url" - "strings" -) - -// ResponseUrlParse 返回参数 -type ResponseUrlParse struct { - Uri string `json:"uri"` // URI - Urn string `json:"urn"` // URN - Url string `json:"url"` // URL - Scheme string `json:"scheme"` // 协议 - Host string `json:"host"` // 主机 - Hostname string `json:"hostname"` // 主机名 - Port string `json:"port"` // 端口 - Path string `json:"path"` // 路径 - RawQuery string `json:"raw_query"` // 参数 ? - Fragment string `json:"fragment"` // 片段 # -} - -// UriParse 解析URl -func UriParse(input string) (resp ResponseUrlParse) { - parse, err := url.Parse(input) - if err != nil { - return - } - resp.Uri = input - resp.Urn = parse.Host + parse.Path - resp.Url = parse.Scheme + "://" + parse.Host + parse.Path - resp.Scheme = parse.Scheme - resp.Host = parse.Host - resp.Hostname = parse.Hostname() - resp.Port = parse.Port() - resp.Path = parse.Path - resp.RawQuery = parse.RawQuery - resp.Fragment = parse.Fragment - return -} - -// UriFilterExcludeQueryString 过滤掉url中的参数 -func UriFilterExcludeQueryString(uri string) string { - URL, _ := url.Parse(uri) - clearUri := strings.ReplaceAll(uri, URL.RawQuery, "") - clearUri = strings.TrimRight(clearUri, "?") - return strings.TrimRight(clearUri, "/") -} - -// LenCode 编码 -func LenCode(s string) string { - escape := url.QueryEscape(s) - return escape -} - -// DeCode 解码 -func DeCode(s string) string { - unescape, _ := url.QueryUnescape(s) - return unescape -} - -// ParseQuery 获取URL参数 https://studygolang.com/articles/2876 -func ParseQuery(s string) map[string][]string { - u, err := url.Parse(s) - if err != nil { - return nil - } - urlParam := u.RawQuery - m, _ := url.ParseQuery(urlParam) - return m -} diff --git a/url_test.go b/url_test.go deleted file mode 100644 index 9760381..0000000 --- a/url_test.go +++ /dev/null @@ -1,12 +0,0 @@ -package gorequest - -import "testing" - -func TestUrlParse(t *testing.T) { - t.Logf("%+v", UriParse("https://api.dtapp.net/ip?ip=127.0.0.1#history")) - t.Logf("%+v", UriParse("https://test:abcd123@golangbyexample.com:8000/tutorials/intro?type=advance&compact=false#history")) - t.Logf("%+v", UriFilterExcludeQueryString("/")) - t.Logf("%+v", UriFilterExcludeQueryString("/favicon.ico")) - t.Logf("%+v", UriFilterExcludeQueryString("/ip")) - t.Logf("%+v", UriFilterExcludeQueryString("/ip?ip=127.0.0.1")) -}