diff --git a/http.go b/http.go index 6f975ef..0c06223 100644 --- a/http.go +++ b/http.go @@ -14,7 +14,7 @@ import ( "time" ) -const Version = "1.0.9" +const Version = "1.0.10" // Response 返回内容 type Response struct { diff --git a/url.go b/url.go index 45e7ecd..1becfa8 100644 --- a/url.go +++ b/url.go @@ -5,27 +5,31 @@ import ( ) 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"` // 端口 - HostPath string `json:"host_path"` // 主机加路径 Path string `json:"path"` // 路径 RawQuery string `json:"raw_query"` // 参数 ? Fragment string `json:"fragment"` // 片段 # } -// UrlParse 解析URl -func UrlParse(inputUrl string) (resp ResponseUrlParse) { - parse, err := url.Parse(inputUrl) +// 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.HostPath = parse.Host + parse.Path resp.Path = parse.Path resp.RawQuery = parse.RawQuery resp.Fragment = parse.Fragment