From 502d158bc012fb4eb5beee33e3cdd99460eaccd9 Mon Sep 17 00:00:00 2001 From: hailaz <739476267@qq.com> Date: Mon, 1 Sep 2025 15:33:50 +0800 Subject: [PATCH] fix: version 2.9.2 (#4405) --- cmd/gf/go.mod | 14 ++++++------ cmd/gf/go.sum | 14 ------------ 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/metric/otelmetric/go.mod | 2 +- contrib/nosql/redis/go.mod | 2 +- contrib/registry/consul/go.mod | 2 +- contrib/registry/etcd/go.mod | 2 +- contrib/registry/file/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/otlpgrpc/go.mod | 2 +- contrib/trace/otlphttp/go.mod | 2 +- database/gdb/gdb.go | 7 ++++++ database/gdb/gdb_core.go | 2 +- database/gdb/gdb_core_transaction.go | 15 +++++++------ net/ghttp/ghttp_request_param_page.go | 2 +- net/ghttp/ghttp_server.go | 4 ++-- os/gtimer/gtimer_timer_loop.go | 31 ++++++++++++--------------- version.go | 2 +- 33 files changed, 67 insertions(+), 74 deletions(-) diff --git a/cmd/gf/go.mod b/cmd/gf/go.mod index 085a1b775..e636cb1c3 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.1 - github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.1 - github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.1 - github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.1 - github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.1 - github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.1 - github.com/gogf/gf/v2 v2.9.1 + github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.2 + github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.2 + github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.2 + github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.2 + github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.2 + github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.2 + github.com/gogf/gf/v2 v2.9.2 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f github.com/olekukonko/tablewriter v1.0.9 github.com/schollz/progressbar/v3 v3.15.0 diff --git a/cmd/gf/go.sum b/cmd/gf/go.sum index 5b79d4851..ed101ab87 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.1 h1:EAYuBB2nDPZWN+wKTKYpmWPYyCKxUyZcjquKjw7amdo= -github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.1/go.mod h1:QkxWqj9uav2b0zYHTL3Ac0BIb82Q2VLQsEJ6NDLJERg= -github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.1 h1:86FNKYA7rQtUEsCmvl3zKPw7DhP0Vu7/XdmOqmQAWUQ= -github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.1/go.mod h1:1ylAGGQIOSls8tD9sGVgCcD11SVdueKJlt1+N4Y/RBA= -github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.1 h1:UrIXxkF33h3g8CUdZ/L1iHsoTa10Y+V5STLvpN2JrPQ= -github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.1/go.mod h1:U7no2FsvJGVI5TGVZxrPnVrQlz6WVgGNyOY/4ZcpQ84= -github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.1 h1:igxxdHCFEbMFC5Ia5JtqgrF7IGd2dcPC4fjOhQK2zmY= -github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.1/go.mod h1:5jiSUr3yMkmiDp2hhIlP8J49UOj05huS8/1li0DUV58= -github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.1 h1:mcKTrjzr4TGZCPMmbJwrY4+gPNotwoDEE58gOP3r+u4= -github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.1/go.mod h1:+dX7qOcgEHAXkgMU8inzdaXz56VQ5YFNdzuUEi92OWc= -github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.1 h1:uDkIljyGxi4XJ7ozHICZcWZArEajAxI63lugrmE0fZ8= -github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.1/go.mod h1:iNRez3vilRhMsZ1KsUPWD1B6BfaZNORqOXaKTDKoPa8= -github.com/gogf/gf/v2 v2.9.1 h1:KN3RLlSTSWZ48PXeDj6tlnxivPy0XvVC3K4vesbWpLI= -github.com/gogf/gf/v2 v2.9.1/go.mod h1:Zh0N1Q/H1D0stcFYDLMutLFQQ4g0uGBtxUvm6iMSWFQ= 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 c6cc01f36..35d203ca1 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.1 + github.com/gogf/gf/v2 v2.9.2 ) require ( diff --git a/contrib/config/consul/go.mod b/contrib/config/consul/go.mod index cef150da1..d33340062 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.1 + github.com/gogf/gf/v2 v2.9.2 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 40a29553b..a9db97aa1 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.1 + github.com/gogf/gf/v2 v2.9.2 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 d93a9470e..1fea8bc14 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/nacos-group/nacos-sdk-go/v2 v2.2.5 ) diff --git a/contrib/config/polaris/go.mod b/contrib/config/polaris/go.mod index 7a2e23a5d..ec9fb2019 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/polarismesh/polaris-go v1.6.1 ) diff --git a/contrib/drivers/clickhouse/go.mod b/contrib/drivers/clickhouse/go.mod index 770222966..ff77bd450 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.1 + github.com/gogf/gf/v2 v2.9.2 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 bd7eef4d0..533817b86 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.1 + github.com/gogf/gf/v2 v2.9.2 ) require ( diff --git a/contrib/drivers/mssql/go.mod b/contrib/drivers/mssql/go.mod index 273220a4c..13fa8b2af 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/microsoft/go-mssqldb v1.7.1 ) diff --git a/contrib/drivers/mysql/go.mod b/contrib/drivers/mysql/go.mod index 9c3cc7374..ea56beb0e 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.1 + github.com/gogf/gf/v2 v2.9.2 ) require ( diff --git a/contrib/drivers/oracle/go.mod b/contrib/drivers/oracle/go.mod index 73af74b28..23c490297 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/sijms/go-ora/v2 v2.7.10 ) diff --git a/contrib/drivers/pgsql/go.mod b/contrib/drivers/pgsql/go.mod index c155a2e6e..f73261e7b 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/lib/pq v1.10.9 ) diff --git a/contrib/drivers/sqlite/go.mod b/contrib/drivers/sqlite/go.mod index 10dde6011..04a6f95b2 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.1 + github.com/gogf/gf/v2 v2.9.2 ) require ( diff --git a/contrib/drivers/sqlitecgo/go.mod b/contrib/drivers/sqlitecgo/go.mod index e32ca9e9d..78226653a 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/mattn/go-sqlite3 v1.14.17 ) diff --git a/contrib/metric/otelmetric/go.mod b/contrib/metric/otelmetric/go.mod index 3c53e7508..9be6f9ff5 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/prometheus/client_golang v1.23.0 go.opentelemetry.io/contrib/instrumentation/runtime v0.62.0 go.opentelemetry.io/otel v1.37.0 diff --git a/contrib/nosql/redis/go.mod b/contrib/nosql/redis/go.mod index de39a3adc..ebe7240e9 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/redis/go-redis/v9 v9.12.1 go.opentelemetry.io/otel v1.37.0 go.opentelemetry.io/otel/trace v1.37.0 diff --git a/contrib/registry/consul/go.mod b/contrib/registry/consul/go.mod index dda4aa42b..9b0664a15 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/hashicorp/consul/api v1.26.1 ) diff --git a/contrib/registry/etcd/go.mod b/contrib/registry/etcd/go.mod index 02f0e5346..223e48ba9 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.1 + github.com/gogf/gf/v2 v2.9.2 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 3892b3cc5..03931a748 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.1 +require github.com/gogf/gf/v2 v2.9.2 require ( github.com/BurntSushi/toml v1.5.0 // indirect diff --git a/contrib/registry/polaris/go.mod b/contrib/registry/polaris/go.mod index a5232b592..1331701e9 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.1 + github.com/gogf/gf/v2 v2.9.2 github.com/polarismesh/polaris-go v1.6.1 ) diff --git a/contrib/registry/zookeeper/go.mod b/contrib/registry/zookeeper/go.mod index bba0d9ed9..134815b8b 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.1 + github.com/gogf/gf/v2 v2.9.2 golang.org/x/sync v0.16.0 ) diff --git a/contrib/rpc/grpcx/go.mod b/contrib/rpc/grpcx/go.mod index 1dadf0ace..38e962323 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.1 - github.com/gogf/gf/v2 v2.9.1 + github.com/gogf/gf/contrib/registry/file/v2 v2.9.2 + github.com/gogf/gf/v2 v2.9.2 go.opentelemetry.io/otel v1.37.0 go.opentelemetry.io/otel/trace v1.37.0 google.golang.org/grpc v1.64.1 diff --git a/contrib/sdk/httpclient/go.mod b/contrib/sdk/httpclient/go.mod index 18c1a0220..08d9d183c 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.1 +require github.com/gogf/gf/v2 v2.9.2 require ( github.com/BurntSushi/toml v1.5.0 // indirect diff --git a/contrib/trace/otlpgrpc/go.mod b/contrib/trace/otlpgrpc/go.mod index acad6fb00..de4340886 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.1 + github.com/gogf/gf/v2 v2.9.2 go.opentelemetry.io/otel v1.37.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 diff --git a/contrib/trace/otlphttp/go.mod b/contrib/trace/otlphttp/go.mod index 0502f06f6..e0babd582 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.1 + github.com/gogf/gf/v2 v2.9.2 go.opentelemetry.io/otel v1.37.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 diff --git a/database/gdb/gdb.go b/database/gdb/gdb.go index e9560a224..c19ce828d 100644 --- a/database/gdb/gdb.go +++ b/database/gdb/gdb.go @@ -716,6 +716,13 @@ const ( linkPatternDescription = `type:username:password@protocol(host:port)/dbname?param1=value1&...¶mN=valueN` ) +// Context key types to avoid collisions +type ctxKey string + +const ( + ctxKeyWrappedByGetCtxTimeout ctxKey = "WrappedByGetCtxTimeout" +) + type ctxTimeoutType int const ( diff --git a/database/gdb/gdb_core.go b/database/gdb/gdb_core.go index 6de04ab7b..725935265 100644 --- a/database/gdb/gdb_core.go +++ b/database/gdb/gdb_core.go @@ -76,7 +76,7 @@ func (c *Core) GetCtxTimeout(ctx context.Context, timeoutType ctxTimeoutType) (c if ctx == nil { ctx = c.db.GetCtx() } else { - ctx = context.WithValue(ctx, "WrappedByGetCtxTimeout", nil) + ctx = context.WithValue(ctx, ctxKeyWrappedByGetCtxTimeout, nil) } var config = c.db.GetConfig() switch timeoutType { diff --git a/database/gdb/gdb_core_transaction.go b/database/gdb/gdb_core_transaction.go index c4cbfa616..fd59f16b7 100644 --- a/database/gdb/gdb_core_transaction.go +++ b/database/gdb/gdb_core_transaction.go @@ -57,10 +57,13 @@ type TxOptions struct { ReadOnly bool } +// Context key types for transaction to avoid collisions +type transactionCtxKey string + const ( - transactionPointerPrefix = "transaction" - contextTransactionKeyPrefix = "TransactionObjectForGroup_" - transactionIdForLoggerCtx = "TransactionId" + transactionPointerPrefix = "transaction" + contextTransactionKeyPrefix = "TransactionObjectForGroup_" + transactionIdForLoggerCtx transactionCtxKey = "TransactionId" ) var transactionIdGenerator = gtype.NewUint64() @@ -286,7 +289,7 @@ func TXFromCtx(ctx context.Context, group string) TX { return nil } -// transactionKeyForContext forms and returns a string for storing transaction object of certain database group into context. -func transactionKeyForContext(group string) string { - return contextTransactionKeyPrefix + group +// transactionKeyForContext forms and returns a key for storing transaction object of certain database group into context. +func transactionKeyForContext(group string) transactionCtxKey { + return transactionCtxKey(contextTransactionKeyPrefix + group) } diff --git a/net/ghttp/ghttp_request_param_page.go b/net/ghttp/ghttp_request_param_page.go index 4cd366d42..b99d38406 100644 --- a/net/ghttp/ghttp_request_param_page.go +++ b/net/ghttp/ghttp_request_param_page.go @@ -11,7 +11,7 @@ import ( "github.com/gogf/gf/v2/text/gregex" "github.com/gogf/gf/v2/text/gstr" - "github.com/gogf/gf/v2/util/gpage" + "github.com/gogf/gf/v2/util/gpage" //nolint:staticcheck ) // GetPage creates and returns the pagination object for given `totalSize` and `pageSize`. diff --git a/net/ghttp/ghttp_server.go b/net/ghttp/ghttp_server.go index b29c1ba8d..57af5c3fb 100644 --- a/net/ghttp/ghttp_server.go +++ b/net/ghttp/ghttp_server.go @@ -345,9 +345,9 @@ func (s *Server) doRouterMapDump() { item.Middleware, ) } - table.Append(data) + _ = table.Append(data) } - table.Render() + _ = table.Render() s.config.Logger.Header(false).Printf(ctx, "\n%s", buffer.String()) } } diff --git a/os/gtimer/gtimer_timer_loop.go b/os/gtimer/gtimer_timer_loop.go index 080366233..830c04a08 100644 --- a/os/gtimer/gtimer_timer_loop.go +++ b/os/gtimer/gtimer_timer_loop.go @@ -15,24 +15,21 @@ func (t *Timer) loop() { timerIntervalTicker = time.NewTicker(t.options.Interval) ) defer timerIntervalTicker.Stop() - for { - select { - case <-timerIntervalTicker.C: - // Check the timer status. - switch t.status.Val() { - case StatusRunning: - // Timer proceeding. - if currentTimerTicks = t.ticks.Add(1); currentTimerTicks >= t.queue.NextPriority() { - t.proceed(currentTimerTicks) - } - - case StatusStopped: - // Do nothing. - - case StatusClosed: - // Timer exits. - return + for range timerIntervalTicker.C { + // Check the timer status. + switch t.status.Val() { + case StatusRunning: + // Timer proceeding. + if currentTimerTicks = t.ticks.Add(1); currentTimerTicks >= t.queue.NextPriority() { + t.proceed(currentTimerTicks) } + + case StatusStopped: + // Do nothing. + + case StatusClosed: + // Timer exits. + return } } } diff --git a/version.go b/version.go index 4397b0fdb..4e9495f42 100644 --- a/version.go +++ b/version.go @@ -2,5 +2,5 @@ package gf const ( // VERSION is the current GoFrame version. - VERSION = "v2.9.1" + VERSION = "v2.9.2" )