From 41afe67200f8d27de3431d81c460cae17dc1505c Mon Sep 17 00:00:00 2001 From: LXY1226 <767763591@qq.com> Date: Wed, 5 Aug 2020 08:45:19 +0800 Subject: [PATCH] Restore to net/http --- go.mod | 1 - go.sum | 12 -------- utils/http.go | 84 ++++++++++++++++++++++++++++++--------------------- 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index ea638fff..0bf68ec6 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,5 @@ go 1.14 require ( github.com/golang/protobuf v1.4.2 - github.com/valyala/fasthttp v1.15.1 google.golang.org/protobuf v1.25.0 ) diff --git a/go.sum b/go.sum index 1d0e3327..fef7d0b8 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDafo4= -github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -25,14 +23,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/klauspost/compress v1.10.7 h1:7rix8v8GpI3ZBb0nSozFRgbtXKv+hOe+qfEpZqybrAg= -github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.15.1 h1:eRb5jzWhbCn/cGu3gNJMcOfPUfXgXCcQIOHjh9ajAS8= -github.com/valyala/fasthttp v1.15.1/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -42,15 +33,12 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/utils/http.go b/utils/http.go index e442f928..d2d10562 100644 --- a/utils/http.go +++ b/utils/http.go @@ -1,47 +1,61 @@ package utils import ( - "github.com/valyala/fasthttp" - "sync" + "bytes" + "compress/gzip" + "io/ioutil" + "net/http" + "strings" ) -var reqPool = sync.Pool{New: func() interface{} { - req := new(fasthttp.Request) - req.Header.Set("User-Agent", "QQ/8.2.0.1296 CFNetwork/1126") - req.Header.Set("Net-Type", "Wifi") - return req -}} - -func HttpGetBytes(url string) (data []byte, err error) { - req := reqPool.Get().(*fasthttp.Request) - resp := fasthttp.AcquireResponse() - req.Header.SetMethod("GET") - req.SetRequestURI(url) - err = fasthttp.Do(req, resp) +func HttpGetBytes(url string) ([]byte, error) { + req, err := http.NewRequest("GET", url, nil) if err != nil { - goto end + return nil, err } - data = resp.Body() -end: - reqPool.Put(req) - fasthttp.ReleaseResponse(resp) - return + req.Header["User-Agent"] = []string{"QQ/8.2.0.1296 CFNetwork/1126"} + req.Header["Net-Type"] = []string{"Wifi"} + resp, err := http.DefaultClient.Do(req) + if err != nil { + return nil, err + } + defer resp.Body.Close() + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + return nil, err + } + if strings.Contains(resp.Header.Get("Content-Encoding"), "gzip") { + buffer := bytes.NewBuffer(body) + r, _ := gzip.NewReader(buffer) + defer r.Close() + unCom, err := ioutil.ReadAll(r) + return unCom, err + } + return body, nil } -func HttpPostBytes(url string, body []byte) (data []byte, err error) { - req := reqPool.Get().(*fasthttp.Request) - resp := fasthttp.AcquireResponse() - req.Header.SetMethod("POST") - req.SetRequestURI(url) - req.SetBody(body) - err = fasthttp.Do(req, resp) +func HttpPostBytes(url string, data []byte) ([]byte, error) { + req, err := http.NewRequest("POST", url, bytes.NewReader(data)) if err != nil { - goto end + return nil, err } - data = resp.Body() -end: - req.ResetBody() - reqPool.Put(req) - fasthttp.ReleaseResponse(resp) - return + req.Header["User-Agent"] = []string{"QQ/8.2.0.1296 CFNetwork/1126"} + req.Header["Net-Type"] = []string{"Wifi"} + resp, err := http.DefaultClient.Do(req) + if err != nil { + return nil, err + } + defer resp.Body.Close() + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + return nil, err + } + if strings.Contains(resp.Header.Get("Content-Encoding"), "gzip") { + buffer := bytes.NewBuffer(body) + r, _ := gzip.NewReader(buffer) + defer r.Close() + unCom, err := ioutil.ReadAll(r) + return unCom, err + } + return body, nil }