diff --git a/Makefile b/Makefile index 49629ed09..2bc823ed4 100644 --- a/Makefile +++ b/Makefile @@ -13,4 +13,22 @@ tidy: .PHONY: lint lint: - golangci-lint run \ No newline at end of file + golangci-lint run + +gftidy: + $(eval files=$(shell find . -name go.mod)) + @set -e; \ + for file in ${files}; do \ + goModPath=$$(dirname $$file); \ + echo "Processing dir: $$goModPath"; \ + if [[ $$goModPath =~ ".git" || $$goModPath == "." ]] ; then \ + echo "Skip path"; \ + elif [[ $$goModPath =~ "./cmd/gf" || $$goModPath =~ "./example" ]] ; then \ + echo "Skip path"; \ + else \ + cd $$goModPath; \ + go get -u -v github.com/gogf/gf/v2; \ + go mod tidy; \ + cd -; \ + fi \ + done \ No newline at end of file diff --git a/cmd/gf/go.mod b/cmd/gf/go.mod index d02f53e2b..4fe7e4345 100644 --- a/cmd/gf/go.mod +++ b/cmd/gf/go.mod @@ -3,18 +3,18 @@ module github.com/gogf/gf/cmd/gf/v2 go 1.18 require ( - github.com/gogf/gf/contrib/drivers/mssql/v2 v2.1.0 - github.com/gogf/gf/contrib/drivers/mysql/v2 v2.1.0 - github.com/gogf/gf/contrib/drivers/oracle/v2 v2.1.0 - github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.1.0 - github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.1.0 - github.com/gogf/gf/v2 v2.2.2 + github.com/gogf/gf/contrib/drivers/mssql/v2 v2.3.3 + github.com/gogf/gf/contrib/drivers/mysql/v2 v2.3.3 + github.com/gogf/gf/contrib/drivers/oracle/v2 v2.3.3 + github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.3.3 + github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.3.3 + github.com/gogf/gf/v2 v2.3.3 github.com/olekukonko/tablewriter v0.0.5 - golang.org/x/tools v0.2.0 + golang.org/x/tools v0.7.0 ) require ( - github.com/BurntSushi/toml v1.2.1 // indirect + github.com/BurntSushi/toml v1.1.0 // indirect github.com/clbanning/mxj/v2 v2.5.5 // indirect github.com/denisenkom/go-mssqldb v0.11.0 // indirect github.com/fatih/color v1.13.0 // indirect @@ -37,12 +37,12 @@ require ( go.opentelemetry.io/otel v1.7.0 // indirect go.opentelemetry.io/otel/sdk v1.7.0 // indirect go.opentelemetry.io/otel/trace v1.7.0 // indirect - golang.org/x/crypto v0.1.0 // indirect - golang.org/x/mod v0.6.0 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect + golang.org/x/mod v0.9.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect modernc.org/libc v1.16.8 // indirect modernc.org/mathutil v1.4.1 // indirect modernc.org/memory v1.1.1 // indirect diff --git a/cmd/gf/go.sum b/cmd/gf/go.sum index dd4f9d93e..79a71f8be 100644 --- a/cmd/gf/go.sum +++ b/cmd/gf/go.sum @@ -1,6 +1,5 @@ +github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/clbanning/mxj/v2 v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E= github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= @@ -67,20 +66,19 @@ go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= -golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= -golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -97,21 +95,21 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2/go.mod h1:EFNZuWvGYxIRUEX+K8UmCFwYmZjqcrnq15ZuVldZkZ0= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= -golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -119,9 +117,8 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc= diff --git a/contrib/config/apollo/go.mod b/contrib/config/apollo/go.mod index 02cb81488..0226c8e1b 100644 --- a/contrib/config/apollo/go.mod +++ b/contrib/config/apollo/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/apolloconfig/agollo/v4 v4.1.1 - github.com/gogf/gf/v2 v2.1.4 + github.com/gogf/gf/v2 v2.3.3 ) replace github.com/gogf/gf/v2 => ../../../ diff --git a/contrib/config/kubecm/go.mod b/contrib/config/kubecm/go.mod index 6449411e0..c3d4a2c29 100644 --- a/contrib/config/kubecm/go.mod +++ b/contrib/config/kubecm/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2 go 1.18 require ( - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 k8s.io/api v0.25.2 k8s.io/apimachinery v0.25.2 k8s.io/client-go v0.25.2 diff --git a/contrib/config/nacos/go.mod b/contrib/config/nacos/go.mod index b91679818..1293f7a14 100644 --- a/contrib/config/nacos/go.mod +++ b/contrib/config/nacos/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2 go 1.15 require ( - github.com/gogf/gf/v2 v2.2.1 + github.com/gogf/gf/v2 v2.3.3 github.com/nacos-group/nacos-sdk-go v1.1.2 ) diff --git a/contrib/config/polaris/go.mod b/contrib/config/polaris/go.mod index 275de0380..dc63d8c6c 100644 --- a/contrib/config/polaris/go.mod +++ b/contrib/config/polaris/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2 go 1.15 require ( - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 github.com/polarismesh/polaris-go v1.3.0 ) diff --git a/contrib/drivers/clickhouse/go.mod b/contrib/drivers/clickhouse/go.mod index 58dffb2f9..ebd7c934a 100644 --- a/contrib/drivers/clickhouse/go.mod +++ b/contrib/drivers/clickhouse/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/ClickHouse/clickhouse-go/v2 v2.0.15 - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 github.com/google/uuid v1.3.0 github.com/shopspring/decimal v1.3.1 ) diff --git a/contrib/drivers/dm/go.mod b/contrib/drivers/dm/go.mod index d158a95db..553864ab9 100644 --- a/contrib/drivers/dm/go.mod +++ b/contrib/drivers/dm/go.mod @@ -6,5 +6,5 @@ replace github.com/gogf/gf/v2 => ../../../ require ( gitee.com/chunanyong/dm v1.8.10 - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 ) diff --git a/contrib/drivers/mssql/go.mod b/contrib/drivers/mssql/go.mod index 8f3dd7530..7cb5e12fc 100644 --- a/contrib/drivers/mssql/go.mod +++ b/contrib/drivers/mssql/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/denisenkom/go-mssqldb v0.11.0 - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 ) replace github.com/gogf/gf/v2 => ../../../ diff --git a/contrib/drivers/mysql/go.mod b/contrib/drivers/mysql/go.mod index 846ca6eda..280e597e8 100644 --- a/contrib/drivers/mysql/go.mod +++ b/contrib/drivers/mysql/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/go-sql-driver/mysql v1.6.0 - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 ) replace github.com/gogf/gf/v2 => ../../../ diff --git a/contrib/drivers/oracle/go.mod b/contrib/drivers/oracle/go.mod index 4101ef2f1..d750c13cf 100644 --- a/contrib/drivers/oracle/go.mod +++ b/contrib/drivers/oracle/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2 go 1.17 require ( - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 github.com/sijms/go-ora/v2 v2.4.20 ) diff --git a/contrib/drivers/pgsql/go.mod b/contrib/drivers/pgsql/go.mod index 502c078f1..459e6181a 100644 --- a/contrib/drivers/pgsql/go.mod +++ b/contrib/drivers/pgsql/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2 go 1.15 require ( - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 github.com/lib/pq v1.10.4 ) diff --git a/contrib/drivers/sqlite/go.mod b/contrib/drivers/sqlite/go.mod index 9f060eb9a..7011baaeb 100644 --- a/contrib/drivers/sqlite/go.mod +++ b/contrib/drivers/sqlite/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/glebarez/go-sqlite v1.17.3 - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 ) replace github.com/gogf/gf/v2 => ../../../ diff --git a/contrib/nosql/redis/go.mod b/contrib/nosql/redis/go.mod index 4e2671514..60cad215a 100644 --- a/contrib/nosql/redis/go.mod +++ b/contrib/nosql/redis/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/go-redis/redis/v8 v8.11.5 - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/trace v1.7.0 ) diff --git a/contrib/registry/etcd/go.mod b/contrib/registry/etcd/go.mod index 6e091bf56..7d9dcd348 100644 --- a/contrib/registry/etcd/go.mod +++ b/contrib/registry/etcd/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/etcd/v2 go 1.15 require ( - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 go.etcd.io/etcd/client/v3 v3.5.4 ) diff --git a/contrib/registry/file/go.mod b/contrib/registry/file/go.mod index f3734e7ab..cf882a9e2 100644 --- a/contrib/registry/file/go.mod +++ b/contrib/registry/file/go.mod @@ -2,6 +2,6 @@ module github.com/gogf/gf/contrib/registry/file/v2 go 1.15 -require github.com/gogf/gf/v2 v2.0.0 +require github.com/gogf/gf/v2 v2.3.3 replace github.com/gogf/gf/v2 => ../../../ diff --git a/contrib/registry/polaris/go.mod b/contrib/registry/polaris/go.mod index 60016124d..14b0f2b4f 100644 --- a/contrib/registry/polaris/go.mod +++ b/contrib/registry/polaris/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/polaris/v2 go 1.15 require ( - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 github.com/polarismesh/polaris-go v1.3.0 ) diff --git a/contrib/registry/polaris/go.sum b/contrib/registry/polaris/go.sum index d599a334a..78feefc14 100644 --- a/contrib/registry/polaris/go.sum +++ b/contrib/registry/polaris/go.sum @@ -227,8 +227,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polarismesh/polaris-go v1.2.0-beta.3 h1:sqN50VGign37xVFp9nrN1RoLXacsB0QfRYUtuCWMJGI= -github.com/polarismesh/polaris-go v1.2.0-beta.3/go.mod h1:HsN0ierETIujHpmnnYJ3qkwQw4QGAECuHvBZTDaw1tI= github.com/polarismesh/polaris-go v1.3.0 h1:KZKX//ow4OPPoS5+s7h07ptprg+2AcNVGrN6WakC9QM= github.com/polarismesh/polaris-go v1.3.0/go.mod h1:HsN0ierETIujHpmnnYJ3qkwQw4QGAECuHvBZTDaw1tI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= diff --git a/contrib/registry/zookeeper/go.mod b/contrib/registry/zookeeper/go.mod index 4798ffc1f..1443ce6f8 100644 --- a/contrib/registry/zookeeper/go.mod +++ b/contrib/registry/zookeeper/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/go-zookeeper/zk v1.0.3 - github.com/gogf/gf/v2 v2.2.2 + github.com/gogf/gf/v2 v2.3.3 golang.org/x/sync v0.1.0 ) diff --git a/contrib/rpc/grpcx/go.mod b/contrib/rpc/grpcx/go.mod index 83ccc4754..da2e5e09a 100644 --- a/contrib/rpc/grpcx/go.mod +++ b/contrib/rpc/grpcx/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/gogf/gf/contrib/registry/file/v2 v2.3.3 - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 go.opentelemetry.io/otel v1.10.0 go.opentelemetry.io/otel/trace v1.10.0 golang.org/x/net v0.0.0-20220919232410-f2f64ebce3c1 // indirect diff --git a/contrib/trace/jaeger/go.mod b/contrib/trace/jaeger/go.mod index 921eb884d..ee1ba8f9f 100644 --- a/contrib/trace/jaeger/go.mod +++ b/contrib/trace/jaeger/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/jaeger/v2 go 1.15 require ( - github.com/gogf/gf/v2 v2.0.0 + github.com/gogf/gf/v2 v2.3.3 go.opentelemetry.io/otel v1.7.0 go.opentelemetry.io/otel/exporters/jaeger v1.7.0 go.opentelemetry.io/otel/sdk v1.7.0 diff --git a/example/go.mod b/example/go.mod index 1a9b431b9..379bb9b20 100644 --- a/example/go.mod +++ b/example/go.mod @@ -3,20 +3,18 @@ module github.com/gogf/gf/example go 1.15 require ( - github.com/gogf/gf/contrib/config/apollo/v2 v2.0.0 - github.com/gogf/gf/contrib/config/kubecm/v2 v2.0.0 - github.com/gogf/gf/contrib/config/nacos/v2 v2.2.6 - github.com/gogf/gf/contrib/config/polaris/v2 v2.0.0 - github.com/gogf/gf/contrib/drivers/mysql/v2 v2.0.0 - github.com/gogf/gf/contrib/nosql/redis/v2 v2.2.6 - github.com/gogf/gf/contrib/registry/etcd/v2 v2.2.6 + github.com/gogf/gf/contrib/config/apollo/v2 v2.3.3 + github.com/gogf/gf/contrib/config/kubecm/v2 v2.3.3 + github.com/gogf/gf/contrib/config/nacos/v2 v2.3.3 + github.com/gogf/gf/contrib/config/polaris/v2 v2.3.3 + github.com/gogf/gf/contrib/drivers/mysql/v2 v2.3.3 + github.com/gogf/gf/contrib/nosql/redis/v2 v2.3.3 + github.com/gogf/gf/contrib/registry/etcd/v2 v2.3.3 github.com/gogf/gf/contrib/registry/file/v2 v2.3.3 - github.com/gogf/gf/contrib/registry/polaris/v2 v2.0.0 - github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.0.0 - github.com/gogf/gf/contrib/trace/jaeger/v2 v2.0.0 - github.com/gogf/gf/v2 v2.2.1 - github.com/gogo/protobuf v1.3.2 - github.com/golang/protobuf v1.5.2 + github.com/gogf/gf/contrib/registry/polaris/v2 v2.3.3 + github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.3.3 + github.com/gogf/gf/contrib/trace/jaeger/v2 v2.3.3 + github.com/gogf/gf/v2 v2.3.3 github.com/nacos-group/nacos-sdk-go v1.1.2 github.com/polarismesh/polaris-go v1.3.0 google.golang.org/grpc v1.49.0 diff --git a/example/go.sum b/example/go.sum index b66b86615..0cd1b9a58 100644 --- a/example/go.sum +++ b/example/go.sum @@ -188,8 +188,8 @@ github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogf/gf/contrib/config/nacos/v2 v2.2.6 h1:QQLN9bB9vFPFvROWM2uSchsHDaMr6ciNjrWY9xuZlIk= -github.com/gogf/gf/contrib/config/nacos/v2 v2.2.6/go.mod h1:phuuQsfTgyMdEENfotnk22ZrEu48pO7rjho158bZsD0= +github.com/gogf/gf/contrib/config/nacos/v2 v2.3.3 h1:eGXzJ4pOdkqIJlJoe2PP3KShxcFYeF+WUC5ABLVu39k= +github.com/gogf/gf/contrib/config/nacos/v2 v2.3.3/go.mod h1:phuuQsfTgyMdEENfotnk22ZrEu48pO7rjho158bZsD0= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -442,7 +442,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polarismesh/polaris-go v1.2.0-beta.3/go.mod h1:HsN0ierETIujHpmnnYJ3qkwQw4QGAECuHvBZTDaw1tI= github.com/polarismesh/polaris-go v1.3.0 h1:KZKX//ow4OPPoS5+s7h07ptprg+2AcNVGrN6WakC9QM= github.com/polarismesh/polaris-go v1.3.0/go.mod h1:HsN0ierETIujHpmnnYJ3qkwQw4QGAECuHvBZTDaw1tI= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=