diff --git a/body.go b/body.go index 0879550..002444c 100644 --- a/body.go +++ b/body.go @@ -6,7 +6,7 @@ import ( "fmt" "net/url" - "gitee.com/baixudong/bson" + "gitee.com/baixudong/gson" "gitee.com/baixudong/tools" "github.com/tidwall/gjson" ) @@ -81,7 +81,7 @@ func newBody(val any, valType bodyType, dataMap map[string][]string) (*bytes.Rea return nil, fmt.Errorf("未知的content-type:%d", valType) } default: - result, err := bson.Decode(value) + result, err := gson.Decode(value) if err != nil { return nil, err } diff --git a/cookies.go b/cookies.go index 77748f7..b2ba73f 100644 --- a/cookies.go +++ b/cookies.go @@ -6,7 +6,7 @@ import ( "net/http" - "gitee.com/baixudong/bson" + "gitee.com/baixudong/gson" "github.com/tidwall/gjson" ) @@ -102,7 +102,7 @@ func any2Cookies(val any) (Cookies, error) { } return cookies, nil default: - jsonData, err := bson.Decode(cooks) + jsonData, err := gson.Decode(cooks) if err != nil { return nil, err } diff --git a/go.mod b/go.mod index d9dfc53..c72b187 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.21.1 require ( gitee.com/baixudong/bar v0.0.0-20230923032414-c19cc384edeb - gitee.com/baixudong/bs4 v0.0.0-20230923032731-cc82de4893bd - gitee.com/baixudong/bson v0.0.0-20230926055556-209f126c0a34 + gitee.com/baixudong/bs4 v0.0.0-20230927062753-f5145bca0107 + gitee.com/baixudong/gson v0.0.0-20230927012642-1a9793aacd4a gitee.com/baixudong/ja3 v0.0.0-20230923032211-164f4a779e92 gitee.com/baixudong/net v0.0.0-20230923032225-d53725e7011a gitee.com/baixudong/re v0.0.0-20230809033040-360c1d945e59 @@ -27,7 +27,9 @@ require ( github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/gaukas/godicttls v0.0.4 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/gobwas/ws v1.2.1 // indirect github.com/goccy/go-json v0.10.2 // indirect + github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect github.com/google/uuid v1.3.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.0 // indirect @@ -35,6 +37,7 @@ require ( github.com/mattn/go-isatty v0.0.19 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/onsi/ginkgo/v2 v2.12.1 // indirect github.com/quic-go/quic-go v0.39.0 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect diff --git a/go.sum b/go.sum index 947ad8f..86e738f 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,10 @@ gitee.com/baixudong/bar v0.0.0-20230923032414-c19cc384edeb h1:mqsOumc9CnMEYOefPz gitee.com/baixudong/bar v0.0.0-20230923032414-c19cc384edeb/go.mod h1:vrjSAS99QLVH3l/S7ZJ/flF+4e+9ayHZ3h9SC1mDVv4= gitee.com/baixudong/blog v0.0.0-20230923032533-d83e7cb672f7 h1:QDS4QkH6BHy95RnoGJVSlOdpwpSjZrdne0jqIuIEEd4= gitee.com/baixudong/blog v0.0.0-20230923032533-d83e7cb672f7/go.mod h1:CRRC/3rq5rR/0+3MUuuxP3BX2gj8aR0SM0gumsd0pUk= -gitee.com/baixudong/bs4 v0.0.0-20230923032731-cc82de4893bd h1:VRARwvyRElX8hP5qLwWEa9SNK4a5/DTWDetFSrqdjS8= -gitee.com/baixudong/bs4 v0.0.0-20230923032731-cc82de4893bd/go.mod h1:55+G5f0Ty3jVeMnMe3ta1pWcfpgGXRfb3go/jWcIHVQ= -gitee.com/baixudong/bson v0.0.0-20230926055556-209f126c0a34 h1:s3VYx86Nh3khU3m2AbgYVCHPkA8M1Q2RsWLuI1YsxNM= -gitee.com/baixudong/bson v0.0.0-20230926055556-209f126c0a34/go.mod h1:dPr7kBl98n0KQ4pseNdKjUWSI5Bz+0Cow9w2PJvYXJ4= +gitee.com/baixudong/bs4 v0.0.0-20230927062753-f5145bca0107 h1:WKJaX19tpsdJIaPdjw6U0i/YD4h6aFAMVpj3fnHO07E= +gitee.com/baixudong/bs4 v0.0.0-20230927062753-f5145bca0107/go.mod h1:qpnFEEUdMFASmQsbXHRUoiTbxLgBRX3AjqCqJU81MT4= +gitee.com/baixudong/bson v0.0.0-20230926055331-1f714a0c27cc h1:WxvbxAZMthFF1yk+8vUjXP+FhzaYB8YZ6P1sbdIZGxU= +gitee.com/baixudong/bson v0.0.0-20230926055331-1f714a0c27cc/go.mod h1:l0UcOwUDvIi+7mujD+eJpbD3LK2dYLAxnP8oKHuKwNg= gitee.com/baixudong/ja3 v0.0.0-20230923032211-164f4a779e92 h1:NsVQh2jjeqDTnGJFDVcRuUCPqUFkmJIFqZ2jbPqbsgM= gitee.com/baixudong/ja3 v0.0.0-20230923032211-164f4a779e92/go.mod h1:FCRp6/ZVtb/3MLMgDk1kUo1+D8sHb46PbSj5JSKPbsc= gitee.com/baixudong/kinds v0.0.0-20230809033013-c3d6d3479f8c h1:MZewpjU0+82TcA+nHrcAbbgZhTCqVH2I5zwYBWJ4v54= @@ -63,12 +63,15 @@ github.com/go-playground/validator/v10 v10.15.4 h1:zMXza4EpOdooxPel5xDqXEdXG5r+W github.com/go-playground/validator/v10 v10.15.4/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= +github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= +github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gobwas/ws v1.2.1 h1:F2aeBZrm2NDsc7vbovKrWSogd4wvfAxg0FQ89/iqOTk= +github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= @@ -81,8 +84,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ= +github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -112,8 +115,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= -github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= +github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= +github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= diff --git a/headers.go b/headers.go index 42910b3..c2ba74c 100644 --- a/headers.go +++ b/headers.go @@ -5,7 +5,7 @@ import ( "net/http" - "gitee.com/baixudong/bson" + "gitee.com/baixudong/gson" "github.com/tidwall/gjson" ) @@ -47,7 +47,7 @@ func (obj *RequestOption) initHeaders() error { obj.Headers = head return nil default: - jsonData, err := bson.Decode(headers) + jsonData, err := gson.Decode(headers) if err != nil { return err } diff --git a/response.go b/response.go index 94717d2..f95c690 100644 --- a/response.go +++ b/response.go @@ -16,7 +16,7 @@ import ( "gitee.com/baixudong/bar" "gitee.com/baixudong/bs4" - "gitee.com/baixudong/bson" + "gitee.com/baixudong/gson" "gitee.com/baixudong/tools" "gitee.com/baixudong/websocket" ) @@ -203,8 +203,8 @@ func (obj *Response) Map() (map[string]any, error) { } // 尝试将请求解析成gjson, 如果传值将会解析到val中返回的gjson为空struct -func (obj *Response) Json(vals ...any) (*bson.Client, error) { - return bson.Decode(obj.Content(), vals...) +func (obj *Response) Json(vals ...any) (*gson.Client, error) { + return gson.Decode(obj.Content(), vals...) } // 返回内容的字符串形式