diff --git a/.golangci.yml b/.golangci.yml
index 6a5fae5d6..43ec0e31f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,6 @@
version: "2"
run:
concurrency: 4
- go: "1.25"
modules-download-mode: readonly
issues-exit-code: 2
tests: false
diff --git a/.make_version.sh b/.make_version.sh
index 4d759fb2a..c036b3ae9 100755
--- a/.make_version.sh
+++ b/.make_version.sh
@@ -1,19 +1,16 @@
#!/usr/bin/env bash
-# Function to detect OS and set sed parameters
-setup_sed() {
+# Function to run sed in-place with OS-specific options
+sed_inplace() {
if [[ "$OSTYPE" == "darwin"* ]]; then
- # macOS
- SED_INPLACE="sed -i ''"
+ # macOS - requires empty string after -i
+ sed -i '' "$@"
else
# Linux/Windows Git Bash
- SED_INPLACE="sed -i"
+ sed -i "$@"
fi
}
-# Initialize sed command
-setup_sed
-
if [ $# -ne 2 ]; then
echo "Parameter exception, please execute in the format of $0 [directory] [version number]"
echo "PS๏ผ$0 ./ v2.4.0"
@@ -43,10 +40,11 @@ fi
if [[ true ]]; then
# Use sed to replace the version number in version.go
- $SED_INPLACE 's/VERSION = ".*"/VERSION = "'${newVersion}'"/' version.go
+ sed_inplace 's/VERSION = ".*"/VERSION = "'${newVersion}'"/' version.go
# Use sed to replace the version number in README.MD
- $SED_INPLACE 's/version=[^"]*/version='${newVersion}'/' README.MD
+ sed_inplace 's/version=[^"]*/version='${newVersion}'/' README.MD
+ sed_inplace 's/version=[^"]*/version='${newVersion}'/' README.zh_CN.MD
fi
if [ -f "go.work" ]; then
@@ -70,6 +68,8 @@ for file in `find ${workdir} -name go.mod`; do
fi
cd $goModPath
+
+ # Add replace directive for local development.
if [ $goModPath = "./cmd/gf" ]; then
mv go.work go.work.version.bak
go mod edit -replace github.com/gogf/gf/v2=../../
@@ -81,20 +81,20 @@ for file in `find ${workdir} -name go.mod`; do
go mod edit -replace github.com/gogf/gf/contrib/drivers/sqlite/v2=../../contrib/drivers/sqlite
fi
# Remove indirect dependencies
- sed -i '/\/\/ indirect/d' go.mod
+ sed_inplace '/\/\/ indirect/d' go.mod
go mod tidy
# Remove toolchain line if exists
- $SED_INPLACE '/^toolchain/d' go.mod
+ sed_inplace '/^toolchain/d' go.mod
- # Upgrading only GoFrame related libraries, sometimes even if a version number is specified,
+ # Upgrading only GoFrame related libraries, sometimes even if a version number is specified,
# it may not be possible to successfully upgrade. Please confirm before submitting the code
go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf"
- go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" | xargs -L1 go get -v
+ go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" | xargs -L1 go get -v
# Remove indirect dependencies
- sed -i '/\/\/ indirect/d' go.mod
+ sed_inplace '/\/\/ indirect/d' go.mod
go mod tidy
# Remove toolchain line if exists
- $SED_INPLACE '/^toolchain/d' go.mod
+ sed_inplace '/^toolchain/d' go.mod
if [ $goModPath = "./cmd/gf" ]; then
go mod edit -dropreplace github.com/gogf/gf/v2
go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/clickhouse/v2
diff --git a/README.MD b/README.MD
index d06eda44a..cbb5531d5 100644
--- a/README.MD
+++ b/README.MD
@@ -45,7 +45,7 @@ go get -u github.com/gogf/gf/v2
๐ [Thanks to all the contributors who made GoFrame possible](https://github.com/gogf/gf/graphs/contributors) ๐
-
+
## License
diff --git a/README.zh_CN.MD b/README.zh_CN.MD
index f707b1a97..49cb6558d 100644
--- a/README.zh_CN.MD
+++ b/README.zh_CN.MD
@@ -45,7 +45,7 @@ go get -u github.com/gogf/gf/v2
๐ [ๆ่ฐขๆๆไฝฟ GoFrame ๆไธบๅฏ่ฝ็่ดก็ฎ่
](https://github.com/gogf/gf/graphs/contributors) ๐
-
+
## ่ฎธๅฏ่ฏ
diff --git a/cmd/gf/go.mod b/cmd/gf/go.mod
index 1f50688fa..935dd5fa9 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.23.0
require (
- github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8
- github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8
- github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8
- github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8
- github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8
- github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.0
+ github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.0
+ github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
+ github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.0
+ github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0
+ github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.0
+ github.com/gogf/gf/v2 v2.10.0
github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
github.com/olekukonko/tablewriter v1.1.0
github.com/schollz/progressbar/v3 v3.15.0
diff --git a/cmd/gf/go.sum b/cmd/gf/go.sum
index a596009f1..dd9c07361 100644
--- a/cmd/gf/go.sum
+++ b/cmd/gf/go.sum
@@ -46,20 +46,6 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8 h1:L72OB2HPuZSHtJ2ipBzI+62rGGDRdwYjequ1v+zctpg=
-github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8/go.mod h1:D0UySg70Bd264F5AScYmz1Hl8vjzlUJ7YvqBJc5OFbo=
-github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8 h1:DT5zHfo9/VkbJ+TF7kUasvv4dbU5uctoj+JGbrzgdYE=
-github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8/go.mod h1:cDd91Zd8LxFF+xxOflRRqw0WTTCpAJ0nf0KKRA+nvTE=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8 h1:XZ4Ya/50xpjf81+4genr33iJXR2dxJmqYKxGyXlLRqA=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8/go.mod h1:wtm2NJb/L3CbDOmyUc7TsOpWHTCMakg1QRG7B/oKrRs=
-github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8 h1:ZrqABJsUnhNDz8VAem1XXONBTywl6r+GHQH05i+4W1g=
-github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8/go.mod h1:YTFyeVk2Rgu/JMUhFxkjYzWaBc+yZ6wAvY54XVZoNko=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8 h1:Dc227FD1uf9nNBPFEjMEgIoAJbAgeYeNrOrjviDgPzY=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8/go.mod h1:o3EpB4Ti3+x/axzRMJg2k7TrLiWZiSTxP0v64LBkk5k=
-github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8 h1:LHEhzsBfIo8xHvOUuLDQW1q7Qix1vnBabH/iivCRghs=
-github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8/go.mod h1:SX6dRONaJGafzCoMIrn8CkRM4fIvtmJRt/aYclUHy3Q=
-github.com/gogf/gf/v2 v2.9.8 h1:El0HwksTzeRk0DQV4Lh7S9DbsIwKInhHSHGcH7qJumM=
-github.com/gogf/gf/v2 v2.9.8/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM=
github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
diff --git a/contrib/config/apollo/go.mod b/contrib/config/apollo/go.mod
index 4782834cf..b999186ae 100644
--- a/contrib/config/apollo/go.mod
+++ b/contrib/config/apollo/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/apolloconfig/agollo/v4 v4.3.1
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
)
require (
diff --git a/contrib/config/consul/go.mod b/contrib/config/consul/go.mod
index 7c7003c95..5ba7dec64 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.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 243d4f33b..29f385884 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.24.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
k8s.io/api v0.33.4
k8s.io/apimachinery v0.33.4
k8s.io/client-go v0.33.4
diff --git a/contrib/config/nacos/go.mod b/contrib/config/nacos/go.mod
index 851f2a78e..d7b93fcb9 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/nacos-group/nacos-sdk-go/v2 v2.3.3
)
diff --git a/contrib/config/polaris/go.mod b/contrib/config/polaris/go.mod
index 316e98a12..4927e22d8 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/polarismesh/polaris-go v1.6.1
)
diff --git a/contrib/drivers/clickhouse/go.mod b/contrib/drivers/clickhouse/go.mod
index 37940d8e5..5dce348e6 100644
--- a/contrib/drivers/clickhouse/go.mod
+++ b/contrib/drivers/clickhouse/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/ClickHouse/clickhouse-go/v2 v2.0.15
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/google/uuid v1.6.0
github.com/shopspring/decimal v1.3.1
)
diff --git a/contrib/drivers/dm/go.mod b/contrib/drivers/dm/go.mod
index affe6ec4a..2987c4f1f 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.9.8
+ github.com/gogf/gf/v2 v2.10.0
)
require (
diff --git a/contrib/drivers/gaussdb/go.mod b/contrib/drivers/gaussdb/go.mod
index 2a6f906ea..8ae06adc1 100644
--- a/contrib/drivers/gaussdb/go.mod
+++ b/contrib/drivers/gaussdb/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
require (
gitee.com/opengauss/openGauss-connector-go-pq v1.0.7
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/google/uuid v1.6.0
)
diff --git a/contrib/drivers/mariadb/go.mod b/contrib/drivers/mariadb/go.mod
index 2dc871cab..0ef253f11 100644
--- a/contrib/drivers/mariadb/go.mod
+++ b/contrib/drivers/mariadb/go.mod
@@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/drivers/mariadb/v2
go 1.23.0
require (
- github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
+ github.com/gogf/gf/v2 v2.10.0
)
require (
diff --git a/contrib/drivers/mssql/go.mod b/contrib/drivers/mssql/go.mod
index e6f9c58f8..7eb986e9b 100644
--- a/contrib/drivers/mssql/go.mod
+++ b/contrib/drivers/mssql/go.mod
@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/mssql/v2
go 1.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/microsoft/go-mssqldb v1.7.1
)
diff --git a/contrib/drivers/mysql/go.mod b/contrib/drivers/mysql/go.mod
index 7ea870802..e74d1e9cb 100644
--- a/contrib/drivers/mysql/go.mod
+++ b/contrib/drivers/mysql/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/go-sql-driver/mysql v1.7.1
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
)
require (
diff --git a/contrib/drivers/oceanbase/go.mod b/contrib/drivers/oceanbase/go.mod
index 98a192c0d..07f306473 100644
--- a/contrib/drivers/oceanbase/go.mod
+++ b/contrib/drivers/oceanbase/go.mod
@@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/drivers/oceanbase/v2
go 1.23.0
require (
- github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
+ github.com/gogf/gf/v2 v2.10.0
)
require (
diff --git a/contrib/drivers/oracle/go.mod b/contrib/drivers/oracle/go.mod
index 57966aca3..bea017151 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.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 6803cf891..ed2dcac3a 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/google/uuid v1.6.0
github.com/lib/pq v1.10.9
)
diff --git a/contrib/drivers/sqlite/go.mod b/contrib/drivers/sqlite/go.mod
index a30cd83b1..5a00b9bd8 100644
--- a/contrib/drivers/sqlite/go.mod
+++ b/contrib/drivers/sqlite/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/glebarez/go-sqlite v1.21.2
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
)
require (
diff --git a/contrib/drivers/sqlitecgo/go.mod b/contrib/drivers/sqlitecgo/go.mod
index c95dfc713..7ab263c9c 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/mattn/go-sqlite3 v1.14.17
)
diff --git a/contrib/drivers/tidb/go.mod b/contrib/drivers/tidb/go.mod
index d99277e80..485bbbe5d 100644
--- a/contrib/drivers/tidb/go.mod
+++ b/contrib/drivers/tidb/go.mod
@@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/drivers/tidb/v2
go 1.23.0
require (
- github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
+ github.com/gogf/gf/v2 v2.10.0
)
require (
diff --git a/contrib/metric/otelmetric/go.mod b/contrib/metric/otelmetric/go.mod
index cac8ccb97..1cd686b90 100644
--- a/contrib/metric/otelmetric/go.mod
+++ b/contrib/metric/otelmetric/go.mod
@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/metric/otelmetric/v2
go 1.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/prometheus/client_golang v1.23.2
go.opentelemetry.io/contrib/instrumentation/runtime v0.63.0
go.opentelemetry.io/otel v1.38.0
diff --git a/contrib/nosql/redis/go.mod b/contrib/nosql/redis/go.mod
index 86136d113..d35a4c15e 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/redis/go-redis/v9 v9.12.1
go.opentelemetry.io/otel v1.38.0
go.opentelemetry.io/otel/trace v1.38.0
diff --git a/contrib/registry/consul/go.mod b/contrib/registry/consul/go.mod
index 54dc594cd..11c6b912e 100644
--- a/contrib/registry/consul/go.mod
+++ b/contrib/registry/consul/go.mod
@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/consul/v2
go 1.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/hashicorp/consul/api v1.26.1
)
diff --git a/contrib/registry/etcd/go.mod b/contrib/registry/etcd/go.mod
index 19c03a35e..0d1c01c9c 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
go.etcd.io/etcd/client/v3 v3.5.17
google.golang.org/grpc v1.59.0
)
diff --git a/contrib/registry/file/go.mod b/contrib/registry/file/go.mod
index e30d05b7f..e6659d59f 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.23.0
-require github.com/gogf/gf/v2 v2.9.8
+require github.com/gogf/gf/v2 v2.10.0
require (
github.com/BurntSushi/toml v1.5.0 // indirect
diff --git a/contrib/registry/nacos/go.mod b/contrib/registry/nacos/go.mod
index 81afa3eba..b1975d482 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/nacos-group/nacos-sdk-go/v2 v2.3.5
)
diff --git a/contrib/registry/polaris/go.mod b/contrib/registry/polaris/go.mod
index 2d1936bef..4193c5448 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
github.com/polarismesh/polaris-go v1.6.1
)
diff --git a/contrib/registry/zookeeper/go.mod b/contrib/registry/zookeeper/go.mod
index ec609970a..c9766789d 100644
--- a/contrib/registry/zookeeper/go.mod
+++ b/contrib/registry/zookeeper/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
require (
github.com/go-zookeeper/zk v1.0.3
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
golang.org/x/sync v0.16.0
)
diff --git a/contrib/rpc/grpcx/go.mod b/contrib/rpc/grpcx/go.mod
index 93df1b77d..3494a8dce 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.23.0
require (
- github.com/gogf/gf/contrib/registry/file/v2 v2.9.8
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/contrib/registry/file/v2 v2.10.0
+ github.com/gogf/gf/v2 v2.10.0
go.opentelemetry.io/otel v1.38.0
go.opentelemetry.io/otel/trace v1.38.0
google.golang.org/grpc v1.64.1
diff --git a/contrib/sdk/httpclient/go.mod b/contrib/sdk/httpclient/go.mod
index 87276699f..0f1f129e0 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.23.0
-require github.com/gogf/gf/v2 v2.9.8
+require github.com/gogf/gf/v2 v2.10.0
require (
github.com/BurntSushi/toml v1.5.0 // indirect
diff --git a/contrib/trace/otlpgrpc/go.mod b/contrib/trace/otlpgrpc/go.mod
index ff176b4bf..dcf2eb3e1 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
go.opentelemetry.io/otel v1.38.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
diff --git a/contrib/trace/otlphttp/go.mod b/contrib/trace/otlphttp/go.mod
index 814957e2f..e3ec9ba05 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.23.0
require (
- github.com/gogf/gf/v2 v2.9.8
+ github.com/gogf/gf/v2 v2.10.0
go.opentelemetry.io/otel v1.38.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0
diff --git a/encoding/gjson/gjson_api_new_load_content.go b/encoding/gjson/gjson_api_new_load_content.go
index 5ae5c6f9e..209b9554d 100644
--- a/encoding/gjson/gjson_api_new_load_content.go
+++ b/encoding/gjson/gjson_api_new_load_content.go
@@ -224,7 +224,6 @@ func loadContentWithOptions(data []byte, options Options) (*Json, error) {
return NewWithOptions(decodedData, options), nil
default:
-
}
// ignore some duplicated types, like js and yml,
// which are not necessary shown in error message.
diff --git a/util/gvalid/gvalid.go b/util/gvalid/gvalid.go
index 0559210d2..0b2177154 100644
--- a/util/gvalid/gvalid.go
+++ b/util/gvalid/gvalid.go
@@ -76,7 +76,7 @@ var (
}
// regular expression object for single rule
// which is compiled just once and of repeatable usage.
- ruleRegex, _ = regexp.Compile(singleRulePattern)
+ ruleRegex = regexp.MustCompile(singleRulePattern)
// decorativeRuleMap defines all rules that are just marked rules which have neither functional meaning
// nor error messages.
diff --git a/version.go b/version.go
index 0d52ed59e..e10b7c477 100644
--- a/version.go
+++ b/version.go
@@ -2,5 +2,5 @@ package gf
const (
// VERSION is the current GoFrame version.
- VERSION = "v2.9.8"
+ VERSION = "v2.10.0"
)