Merge branch 'release/v1.2.1'

This commit is contained in:
huangsimin 2020-04-02 14:04:52 +08:00
commit 9f581dfae4
2 changed files with 7 additions and 3 deletions

6
go.mod
View File

@ -1,13 +1,13 @@
module github.com/474420502/requests
go 1.13
go 1.14
replace golang.org/x/net => github.com/golang/net v0.0.0-20191209160850-c0dbc17a3553
replace golang.org/x/net => github.com/golang/net v0.0.0-20191126235420-ef20fe5d7933
require (
github.com/474420502/gjson v1.1.3
github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484
github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 // indirect
github.com/tidwall/match v1.0.1 // indirect
golang.org/x/net v0.0.0-00010101000000-000000000000
golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933
)

4
go.sum
View File

@ -6,11 +6,15 @@ github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy0
github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484 h1:aBgSK7SOjFeL1wfzfbIb/pkPpfRr6EP7b1Af4o/xkpU=
github.com/elazarl/goproxy/ext v0.0.0-20191011121108-aa519ddbe484/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
github.com/golang/net v0.0.0-20191126235420-ef20fe5d7933 h1:wamD69QvdLXWy6hDB8pOXCNXH5fzaoAs17Zl4yOARQU=
github.com/golang/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
github.com/golang/net v0.0.0-20191209160850-c0dbc17a3553 h1:VChqxxcWJRNva3fY40u7VmDkRtWRBka24Djowq6iL30=
github.com/golang/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933 h1:e6HwijUxhDe+hPNjZQQn9bA5PW3vNmnN64U2ZW759Lk=
golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=