From 7975e391f05328a63b497df0536f0e046ef18eb8 Mon Sep 17 00:00:00 2001 From: John Guo Date: Mon, 18 Dec 2023 20:59:09 +0800 Subject: [PATCH] Version/v2.6.0 (#3213) --- cmd/gf/go.mod | 14 +++++----- cmd/gf/internal/cmd/gendao/gendao.go | 2 +- .../internal/cmd/genpbentity/genpbentity.go | 2 +- contrib/config/apollo/go.mod | 2 +- contrib/config/consul/go.mod | 2 +- contrib/config/kubecm/go.mod | 2 +- contrib/config/nacos/go.mod | 2 +- contrib/config/polaris/go.mod | 2 +- contrib/drivers/clickhouse/go.mod | 2 +- contrib/drivers/dm/go.mod | 2 +- contrib/drivers/mssql/go.mod | 2 +- contrib/drivers/mysql/go.mod | 2 +- contrib/drivers/oracle/go.mod | 2 +- contrib/drivers/pgsql/go.mod | 2 +- contrib/drivers/sqlite/go.mod | 2 +- contrib/drivers/sqlitecgo/go.mod | 2 +- contrib/nosql/redis/go.mod | 2 +- contrib/registry/etcd/go.mod | 2 +- contrib/registry/file/go.mod | 2 +- contrib/registry/nacos/go.mod | 2 +- contrib/registry/polaris/go.mod | 2 +- contrib/registry/zookeeper/go.mod | 2 +- contrib/rpc/grpcx/go.mod | 4 +-- contrib/sdk/httpclient/go.mod | 2 +- contrib/trace/jaeger/go.mod | 2 +- contrib/trace/otlpgrpc/go.mod | 2 +- contrib/trace/otlphttp/go.mod | 2 +- example/go.mod | 28 +++++++++---------- version.go | 2 +- 29 files changed, 49 insertions(+), 49 deletions(-) diff --git a/cmd/gf/go.mod b/cmd/gf/go.mod index 9a9faae1fe7..3f7bcff4009 100644 --- a/cmd/gf/go.mod +++ b/cmd/gf/go.mod @@ -3,13 +3,13 @@ module github.com/gogf/gf/cmd/gf/v2 go 1.18 require ( - github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.6.0-beta - github.com/gogf/gf/contrib/drivers/mssql/v2 v2.6.0-beta - github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.0-beta - github.com/gogf/gf/contrib/drivers/oracle/v2 v2.6.0-beta - github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.6.0-beta - github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.6.0-beta - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.6.0 + github.com/gogf/gf/contrib/drivers/mssql/v2 v2.6.0 + github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.0 + github.com/gogf/gf/contrib/drivers/oracle/v2 v2.6.0 + github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.6.0 + github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.6.0 + github.com/gogf/gf/v2 v2.6.0 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f github.com/olekukonko/tablewriter v0.0.5 golang.org/x/mod v0.9.0 diff --git a/cmd/gf/internal/cmd/gendao/gendao.go b/cmd/gf/internal/cmd/gendao/gendao.go index 37f9ac551f3..765c63a441b 100644 --- a/cmd/gf/internal/cmd/gendao/gendao.go +++ b/cmd/gf/internal/cmd/gendao/gendao.go @@ -182,7 +182,7 @@ type ( Group string `name:"group" short:"g" brief:"{CGenDaoBriefGroup}" d:"default"` Prefix string `name:"prefix" short:"f" brief:"{CGenDaoBriefPrefix}"` RemovePrefix string `name:"removePrefix" short:"r" brief:"{CGenDaoBriefRemovePrefix}"` - RemoveFieldPrefix string `name:"removeFieldPrefix" short:"fr" brief:"{CGenDaoBriefRemoveFieldPrefix}"` + RemoveFieldPrefix string `name:"removeFieldPrefix" short:"rf" brief:"{CGenDaoBriefRemoveFieldPrefix}"` JsonCase string `name:"jsonCase" short:"j" brief:"{CGenDaoBriefJsonCase}" d:"CamelLower"` ImportPrefix string `name:"importPrefix" short:"i" brief:"{CGenDaoBriefImportPrefix}"` DaoPath string `name:"daoPath" short:"d" brief:"{CGenDaoBriefDaoPath}" d:"dao"` diff --git a/cmd/gf/internal/cmd/genpbentity/genpbentity.go b/cmd/gf/internal/cmd/genpbentity/genpbentity.go index 624c450c264..055d241b8bf 100644 --- a/cmd/gf/internal/cmd/genpbentity/genpbentity.go +++ b/cmd/gf/internal/cmd/genpbentity/genpbentity.go @@ -38,7 +38,7 @@ type ( Tables string `name:"tables" short:"t" brief:"{CGenPbEntityBriefTables}"` Prefix string `name:"prefix" short:"f" brief:"{CGenPbEntityBriefPrefix}"` RemovePrefix string `name:"removePrefix" short:"r" brief:"{CGenPbEntityBriefRemovePrefix}"` - RemoveFieldPrefix string `name:"removeFieldPrefix" short:"fr" brief:"{CGenPbEntityBriefRemoveFieldPrefix}"` + RemoveFieldPrefix string `name:"removeFieldPrefix" short:"rf" brief:"{CGenPbEntityBriefRemoveFieldPrefix}"` NameCase string `name:"nameCase" short:"n" brief:"{CGenPbEntityBriefNameCase}" d:"Camel"` JsonCase string `name:"jsonCase" short:"j" brief:"{CGenPbEntityBriefJsonCase}" d:"CamelLower"` Option string `name:"option" short:"o" brief:"{CGenPbEntityBriefOption}"` diff --git a/contrib/config/apollo/go.mod b/contrib/config/apollo/go.mod index 1c2171cdb1e..4aa84d471a8 100644 --- a/contrib/config/apollo/go.mod +++ b/contrib/config/apollo/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/apolloconfig/agollo/v4 v4.3.1 - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 ) require ( diff --git a/contrib/config/consul/go.mod b/contrib/config/consul/go.mod index 907314f91a3..0c7dff58cbc 100644 --- a/contrib/config/consul/go.mod +++ b/contrib/config/consul/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/consul/v2 go 1.19 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 github.com/hashicorp/consul/api v1.24.0 github.com/hashicorp/go-cleanhttp v0.5.2 ) diff --git a/contrib/config/kubecm/go.mod b/contrib/config/kubecm/go.mod index cd7162dfc6f..fa6d4e84ef2 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.19 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 k8s.io/api v0.27.4 k8s.io/apimachinery v0.27.4 k8s.io/client-go v0.27.4 diff --git a/contrib/config/nacos/go.mod b/contrib/config/nacos/go.mod index bbc4a44612a..e614e98b83d 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.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 github.com/nacos-group/nacos-sdk-go v1.1.4 ) diff --git a/contrib/config/polaris/go.mod b/contrib/config/polaris/go.mod index 00b065558bb..2242775ac0d 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.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 github.com/polarismesh/polaris-go v1.5.5 ) diff --git a/contrib/drivers/clickhouse/go.mod b/contrib/drivers/clickhouse/go.mod index ac63af72925..c66bfd3d005 100644 --- a/contrib/drivers/clickhouse/go.mod +++ b/contrib/drivers/clickhouse/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/ClickHouse/clickhouse-go/v2 v2.0.15 - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 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 1b87b9593b2..6f9ecf5c963 100644 --- a/contrib/drivers/dm/go.mod +++ b/contrib/drivers/dm/go.mod @@ -6,7 +6,7 @@ replace github.com/gogf/gf/v2 => ../../../ require ( gitee.com/chunanyong/dm v1.8.12 - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 ) require ( diff --git a/contrib/drivers/mssql/go.mod b/contrib/drivers/mssql/go.mod index f910c220e65..4252772b974 100644 --- a/contrib/drivers/mssql/go.mod +++ b/contrib/drivers/mssql/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/denisenkom/go-mssqldb v0.12.3 - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 ) require ( diff --git a/contrib/drivers/mysql/go.mod b/contrib/drivers/mysql/go.mod index 618c6417c73..22c847fc626 100644 --- a/contrib/drivers/mysql/go.mod +++ b/contrib/drivers/mysql/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/go-sql-driver/mysql v1.7.1 - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 ) require ( diff --git a/contrib/drivers/oracle/go.mod b/contrib/drivers/oracle/go.mod index 1dad9a248ab..1498db14d1a 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.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 github.com/sijms/go-ora/v2 v2.7.10 ) diff --git a/contrib/drivers/pgsql/go.mod b/contrib/drivers/pgsql/go.mod index b6f82b5e4e5..192908b3da2 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.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 github.com/lib/pq v1.10.9 ) diff --git a/contrib/drivers/sqlite/go.mod b/contrib/drivers/sqlite/go.mod index 840fa0764b0..82ecdaaefee 100644 --- a/contrib/drivers/sqlite/go.mod +++ b/contrib/drivers/sqlite/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/glebarez/go-sqlite v1.21.2 - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 ) require ( diff --git a/contrib/drivers/sqlitecgo/go.mod b/contrib/drivers/sqlitecgo/go.mod index 392f7e381de..599f16a8d8c 100644 --- a/contrib/drivers/sqlitecgo/go.mod +++ b/contrib/drivers/sqlitecgo/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/sqlitecgo/v2 go 1.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 github.com/mattn/go-sqlite3 v1.14.17 ) diff --git a/contrib/nosql/redis/go.mod b/contrib/nosql/redis/go.mod index f7029eb4e2f..ba1b467545c 100644 --- a/contrib/nosql/redis/go.mod +++ b/contrib/nosql/redis/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/nosql/redis/v2 go 1.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 github.com/redis/go-redis/v9 v9.2.1 go.opentelemetry.io/otel v1.14.0 go.opentelemetry.io/otel/trace v1.14.0 diff --git a/contrib/registry/etcd/go.mod b/contrib/registry/etcd/go.mod index a036cd9adba..8967d52106f 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.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 go.etcd.io/etcd/client/v3 v3.5.7 ) diff --git a/contrib/registry/file/go.mod b/contrib/registry/file/go.mod index 1f950ab51bc..0b879e3ba9f 100644 --- a/contrib/registry/file/go.mod +++ b/contrib/registry/file/go.mod @@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/registry/file/v2 go 1.18 -require github.com/gogf/gf/v2 v2.6.0-beta +require github.com/gogf/gf/v2 v2.6.0 require ( github.com/BurntSushi/toml v1.2.0 // indirect diff --git a/contrib/registry/nacos/go.mod b/contrib/registry/nacos/go.mod index 0055ac90c68..b61a463a2f3 100644 --- a/contrib/registry/nacos/go.mod +++ b/contrib/registry/nacos/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/nacos/v2 go 1.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 github.com/joy999/nacos-sdk-go v0.0.0-20231120071639-10a34b3e7288 ) diff --git a/contrib/registry/polaris/go.mod b/contrib/registry/polaris/go.mod index cbc70976e9a..55b82a1c092 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.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 github.com/polarismesh/polaris-go v1.5.5 ) diff --git a/contrib/registry/zookeeper/go.mod b/contrib/registry/zookeeper/go.mod index fad7faa5ab4..c9cc2c6141a 100644 --- a/contrib/registry/zookeeper/go.mod +++ b/contrib/registry/zookeeper/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/go-zookeeper/zk v1.0.3 - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 golang.org/x/sync v0.4.0 ) diff --git a/contrib/rpc/grpcx/go.mod b/contrib/rpc/grpcx/go.mod index 593fe01987d..aced4f90f4f 100644 --- a/contrib/rpc/grpcx/go.mod +++ b/contrib/rpc/grpcx/go.mod @@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/rpc/grpcx/v2 go 1.18 require ( - github.com/gogf/gf/contrib/registry/file/v2 v2.6.0-beta - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/contrib/registry/file/v2 v2.6.0 + github.com/gogf/gf/v2 v2.6.0 go.opentelemetry.io/otel v1.14.0 go.opentelemetry.io/otel/trace v1.14.0 google.golang.org/grpc v1.57.2 diff --git a/contrib/sdk/httpclient/go.mod b/contrib/sdk/httpclient/go.mod index 5de6891c484..9d558be432c 100644 --- a/contrib/sdk/httpclient/go.mod +++ b/contrib/sdk/httpclient/go.mod @@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/sdk/httpclient/v2 go 1.18 -require github.com/gogf/gf/v2 v2.6.0-beta +require github.com/gogf/gf/v2 v2.6.0 require ( github.com/BurntSushi/toml v1.2.0 // indirect diff --git a/contrib/trace/jaeger/go.mod b/contrib/trace/jaeger/go.mod index 0de613f6466..582db1e2552 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.18 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 go.opentelemetry.io/otel v1.14.0 go.opentelemetry.io/otel/exporters/jaeger v1.14.0 go.opentelemetry.io/otel/sdk v1.14.0 diff --git a/contrib/trace/otlpgrpc/go.mod b/contrib/trace/otlpgrpc/go.mod index 7962c8a252a..407a1619259 100644 --- a/contrib/trace/otlpgrpc/go.mod +++ b/contrib/trace/otlpgrpc/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlpgrpc/v2 go 1.20 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 go.opentelemetry.io/otel v1.19.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 diff --git a/contrib/trace/otlphttp/go.mod b/contrib/trace/otlphttp/go.mod index 3c110331d99..d26e1ff5889 100644 --- a/contrib/trace/otlphttp/go.mod +++ b/contrib/trace/otlphttp/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlphttp/v2 go 1.20 require ( - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/v2 v2.6.0 go.opentelemetry.io/otel v1.19.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 diff --git a/example/go.mod b/example/go.mod index 26a4c0eff2b..dc200d27e07 100644 --- a/example/go.mod +++ b/example/go.mod @@ -3,21 +3,21 @@ module github.com/gogf/gf/example go 1.20 require ( - github.com/gogf/gf/contrib/config/apollo/v2 v2.6.0-beta - github.com/gogf/gf/contrib/config/consul/v2 v2.6.0-beta - github.com/gogf/gf/contrib/config/kubecm/v2 v2.6.0-beta - github.com/gogf/gf/contrib/config/nacos/v2 v2.6.0-beta - github.com/gogf/gf/contrib/config/polaris/v2 v2.6.0-beta - github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.0-beta - github.com/gogf/gf/contrib/nosql/redis/v2 v2.6.0-beta - github.com/gogf/gf/contrib/registry/etcd/v2 v2.6.0-beta - github.com/gogf/gf/contrib/registry/file/v2 v2.6.0-beta + github.com/gogf/gf/contrib/config/apollo/v2 v2.6.0 + github.com/gogf/gf/contrib/config/consul/v2 v2.6.0 + github.com/gogf/gf/contrib/config/kubecm/v2 v2.6.0 + github.com/gogf/gf/contrib/config/nacos/v2 v2.6.0 + github.com/gogf/gf/contrib/config/polaris/v2 v2.6.0 + github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.0 + github.com/gogf/gf/contrib/nosql/redis/v2 v2.6.0 + github.com/gogf/gf/contrib/registry/etcd/v2 v2.6.0 + github.com/gogf/gf/contrib/registry/file/v2 v2.6.0 github.com/gogf/gf/contrib/registry/nacos/v2 v2.5.6 - github.com/gogf/gf/contrib/registry/polaris/v2 v2.6.0-beta - github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.6.0-beta - github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.6.0-beta - github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.6.0-beta - github.com/gogf/gf/v2 v2.6.0-beta + github.com/gogf/gf/contrib/registry/polaris/v2 v2.6.0 + github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.6.0 + github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.6.0 + github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.6.0 + github.com/gogf/gf/v2 v2.6.0 github.com/hashicorp/consul/api v1.24.0 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/nacos-group/nacos-sdk-go v1.1.4 diff --git a/version.go b/version.go index 12825ec9cef..2f9e499ba7c 100644 --- a/version.go +++ b/version.go @@ -2,5 +2,5 @@ package gf const ( // VERSION is the current GoFrame version. - VERSION = "v2.6.0-beta" + VERSION = "v2.6.0" )