fix(database/gdb): add compatibility for old configiration with both Type and part of Link configurations (#4058)

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [gogf] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: https://github.com/gogf/gf#donators
+custom: # custom

.github/workflows/apollo/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       #APOLLO_PORTAL_DB_PASSWORD: 'apollo'
 
   apollo-db:
-    image: "loads/mysql:5.7"
+    image: "mysql:5.7"
     container_name: apollo-db
     environment:
       TZ: Asia/Shanghai
@@ -36,7 +36,7 @@ services:
       - apollo-dbdata
 
   apollo-dbdata:
-    image: "loads/alpine:3.8"
+    image: "alpine:3.8"
     container_name: apollo-dbdata
     volumes:
       - /var/lib/mysql

.github/workflows/ci-main.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Define the latest Go version requirement
+LATEST_GO_VERSION="1.23"
+
 coverage=$1
 
 # find all path that contains go.mod.
@@ -13,82 +16,39 @@ for file in `find . -name go.mod`; do
         continue 1
     fi
 
-    if [[ $file =~ "/testdata/" ]]; then
-        echo "ignore testdata path $file"
-        continue 1
-    fi
-
     # package kuhecm was moved to sub ci procedure.
     if [ "kubecm" = $(basename $dirpath) ]; then
         continue 1
     fi
 
-    # package consul needs golang >= v1.19
-    if [ "consul" = $(basename $dirpath) ]; then
-        if ! go version|grep -qE "go1.[2-9][0-9]"; then
-          echo "ignore consul as go version: $(go version)"
-          continue 1
+    # Check if it's a contrib directory or example directory
+    if [[ $dirpath =~ "/contrib/" ]] || [ "example" = $(basename $dirpath) ]; then
+        # Check if go version meets the requirement
+        if ! go version | grep -qE "go${LATEST_GO_VERSION}"; then
+            echo "ignore path $dirpath as go version is not ${LATEST_GO_VERSION}: $(go version)"
+            continue 1
+        fi
+        # If it's example directory, only build without tests
+        if [ "example" = $(basename $dirpath) ]; then
+            echo "the example directory only needs to be built, not unit tests and coverage tests."
+            cd $dirpath
+            go mod tidy
+            go build ./...
+            cd -
+            continue 1
         fi
     fi
 
-    # package etcd needs golang >= v1.19
-    if [ "etcd" = $(basename $dirpath) ]; then
-        if ! go version|grep -qE "go1.[2-9][0-9]"; then
-          echo "ignore etcd as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package polaris needs golang >= v1.19
-    if [ "polaris" = $(basename $dirpath) ]; then
-        if ! go version|grep -qE "go1.[2-9][0-9]"; then
-          echo "ignore polaris as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package example needs golang >= v1.20
-    if [ "example" = $(basename $dirpath) ]; then
-        if ! go version|grep -qE "go1.[2-9][1-9]"; then
-          echo "ignore example as go version: $(go version)"
-          continue 1
-        fi
-        echo "the example directory only needs to be built, not unit tests and coverage tests."
-        cd $dirpath
-        go mod tidy
-        go build ./...
-        cd -
+    if [[ $file =~ "/testdata/" ]]; then
+        echo "ignore testdata path $file"
         continue 1
     fi
 
-    # package otlpgrpc needs golang >= v1.20
-    if [ "otlpgrpc" = $(basename $dirpath) ]; then
-        if ! go version|grep -qE "go1.[2-9][0-9]"; then
-          echo "ignore otlpgrpc as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package otlphttp needs golang >= v1.20
-    if [ "otlphttp" = $(basename $dirpath) ]; then
-        if ! go version|grep -qE "go1.[2-9][0-9]"; then
-          echo "ignore otlphttp as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package otelmetric needs golang >= v1.20
-    if [ "otelmetric" = $(basename $dirpath) ]; then
-        if ! go version|grep -qE "go1.[2-9][0-9]"; then
-          echo "ignore otelmetric as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
     cd $dirpath
     go mod tidy
     go build ./...
-    # check coverage
+
+    # test with coverage
     if [ "${coverage}" = "coverage" ]; then
       go test ./... -race -coverprofile=coverage.out -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1
 

.github/workflows/ci-main.yml

@@ -37,9 +37,9 @@ jobs:
     # Service containers to run with `code-test`
     services:
       # Etcd service.
-      # docker run -d --name etcd -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes loads/etcd:3.4.24
+      # docker run -d --name etcd -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes bitnami/etcd:3.4.24
       etcd:
-        image: loads/etcd:3.4.24
+        image: bitnami/etcd:3.4.24
         env:
           ALLOW_NONE_AUTHENTICATION: yes
         ports:
@@ -47,7 +47,7 @@ jobs:
 
       # Redis backend server.
       redis:
-        image  : loads/redis:7.0
+        image  : redis:7.0
         options: >-
           --health-cmd      "redis-cli ping"
           --health-interval 10s
@@ -62,9 +62,9 @@ jobs:
       # -p 3306:3306 \
       # -e MYSQL_DATABASE=test \
       # -e MYSQL_ROOT_PASSWORD=12345678 \
-      # loads/mysql:5.7
+      # mysql:5.7
       mysql:
-        image: loads/mysql:5.7
+        image: mysql:5.7
         env:
           MYSQL_DATABASE     : test
           MYSQL_ROOT_PASSWORD: 12345678
@@ -73,7 +73,7 @@ jobs:
 
       # MariaDb backend server.
       mariadb:
-        image: loads/mariadb:10.4
+        image: mariadb:10.4
         env:
           MARIADB_DATABASE: test
           MARIADB_ROOT_PASSWORD: 12345678
@@ -87,9 +87,9 @@ jobs:
       # -e POSTGRES_USER=postgres \
       # -e POSTGRES_DB=test \
       # -v postgres:/Users/john/Temp/postgresql/data \
-      # loads/postgres:13
+      # postgres:17-alpine
       postgres:
-        image: loads/postgres:13
+        image: postgres:17-alpine
         env:
           POSTGRES_PASSWORD: 12345678
           POSTGRES_USER:     postgres
@@ -109,22 +109,19 @@ jobs:
       # -p 1433:1433 \
       # -e ACCEPT_EULA=Y \
       # -e SA_PASSWORD=LoremIpsum86 \
-      # -e MSSQL_DB=test \
       # -e MSSQL_USER=root \
       # -e MSSQL_PASSWORD=LoremIpsum86 \
-      # loads/mssqldocker:14.0.3391.2
+      # mcr.microsoft.com/mssql/server:2022-latest
       mssql:
-        image: loads/mssqldocker:14.0.3391.2
+        image: mcr.microsoft.com/mssql/server:2022-latest
         env:
-          ACCEPT_EULA:    Y
-          SA_PASSWORD:    LoremIpsum86
-          MSSQL_DB:       test
-          MSSQL_USER:     root
-          MSSQL_PASSWORD: LoremIpsum86
+          TZ: Asia/Shanghai
+          ACCEPT_EULA: Y
+          MSSQL_SA_PASSWORD: LoremIpsum86
         ports:
           - 1433:1433
         options: >-
-          --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P LoremIpsum86 -l 30 -Q \"SELECT 1\" || exit 1"
+          --health-cmd="/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P ${MSSQL_SA_PASSWORD} -N -C -l 30 -Q \"SELECT 1\" || exit 1"
           --health-start-period 10s
           --health-interval 10s
           --health-timeout 5s
@@ -184,7 +181,7 @@ jobs:
           - 5236:5236
 
       zookeeper:
-        image: loads/zookeeper:3.8
+        image: zookeeper:3.8
         ports:
           - 2181:2181
 

.github/workflows/golangci-lint.yml

@@ -79,4 +79,4 @@ jobs:
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git add .
           git commit -m "Apply gci import order changes"
-          git push
+          git push  origin HEAD:$(git rev-parse --abbrev-ref HEAD)

.github/workflows/nacos/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   nacos:
-    image: loads/nacos-server:v2.1.2
+    image: nacos/nacos-server:v2.1.2
     container_name: nacos
     env_file:
       - ./env/nacos.env

.gitignore

@@ -18,6 +18,7 @@ example/log
 go.work
 go.work.sum
 !cmd/gf/go.work
+.windsurfrules
 
 # Ignore for docs
 node_modules

.set_version.sh

@@ -43,6 +43,12 @@ for file in `find ${workdir} -name go.mod`; do
     goModPath=$(dirname $file)
     echo ""
     echo "processing dir: $goModPath"
+
+    if [[ $goModPath =~ "/testdata/" ]]; then
+        echo "ignore testdata path $goModPath"
+        continue 1
+    fi
+
     cd $goModPath
     if [ $goModPath = "./cmd/gf" ]; then
         mv go.work go.work.version.bak

Makefile

@@ -1,16 +1,20 @@
 SHELL := /bin/bash
 
+# execute "go mod tidy" on all folders that have go.mod file
 .PHONY: tidy
 tidy:
 	$(eval files=$(shell find . -name go.mod))
 	@set -e; \
 	for file in ${files}; do \
 		goModPath=$$(dirname $$file); \
-		cd $$goModPath; \
-		go mod tidy; \
-		cd -; \
+		if ! echo $$goModPath | grep -q "testdata"; then \
+			cd $$goModPath; \
+			go mod tidy; \
+			cd -; \
+		fi \
 	done
 
+# execute "golangci-lint" to check code style
 .PHONY: lint
 lint:
 	golangci-lint run -c .golangci.yml
@@ -22,5 +26,3 @@ version:
 	newVersion=$(to); \
 	./.set_version.sh ./ $$newVersion; \
 	echo "make version to=$(to) done"
-
-

README.MD

@@ -36,7 +36,7 @@ A powerful framework for faster, easier, and more efficient project development.
 💖 [Thanks to all the contributors who made GoFrame possible](https://github.com/gogf/gf/graphs/contributors) 💖
 
 <a href="https://github.com/gogf/gf/graphs/contributors">
-<img src="https://goframe.org/img/contributors.svg?version=v2.8.2" alt="goframe contributors"/>
+<img src="https://goframe.org/img/contributors.svg?version=v2.8.3" alt="goframe contributors"/>
 </a>
 
 # License

cmd/gf/go.mod

@@ -3,13 +3,13 @@ module github.com/gogf/gf/cmd/gf/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.2
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.3
+	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.3
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.3
+	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.3
+	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.3
+	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.3
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
 	github.com/olekukonko/tablewriter v0.0.5
 	golang.org/x/mod v0.17.0
@@ -23,7 +23,7 @@ require (
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fatih/color v1.17.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/glebarez/go-sqlite v1.21.2 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
@@ -35,10 +35,10 @@ require (
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/microsoft/go-mssqldb v1.7.1 // indirect
 	github.com/paulmach/orb v0.7.1 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
@@ -50,11 +50,11 @@ require (
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/crypto v0.30.0 // indirect
+	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/libc v1.22.5 // indirect
 	modernc.org/mathutil v1.5.0 // indirect

cmd/gf/go.sum

@@ -22,8 +22,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
-github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
@@ -39,6 +39,20 @@ 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.8.2 h1:4g5n8QdJA7ZEuDfWFeVQKMhul6RtOT89ObYAgVnxN+U=
+github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.2/go.mod h1:xW1mgNK0vTLfRSCnO0No8G4lCGNpXx1Jlhs6B1vzD+8=
+github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.2 h1:aNscErx5mcC28Q1L0MsZFFXybzLY/IJhskyiPAbxB78=
+github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.2/go.mod h1:yj6+Ds2BGzYcHthPvMnxhDRzq0o28HyO9E1Fsko0Lf8=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.2 h1:thK4DZT0irDrnhIxkap5JqBuBIJaXQ0IMvlIzuRGgVQ=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.2/go.mod h1:Vg7XaiwsQ27YmpDqzwCQ+yt10KntTvcP9iOoFL5DF40=
+github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.2 h1:ZukTXB9drVDmSdrFjCYHVzHj0kAvGKISrrW3WKU1xTg=
+github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.2/go.mod h1:wr+KA5h3+aJQk5XiA1qSNKxWBVrzlu8MVYKl1NqcQj4=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.2 h1:BsEBGoVfa4SPJ8GhNkH9PPtoSLydXK+VgcbpxyGF9Ps=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.2/go.mod h1:OSlAQeO7fZMbscxZomMCBcZWHSxpfeXIi6ELeKszSPU=
+github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.2 h1:144IdPDn6xyHVQ5aP4qsstFvNOLqvWyz+GtH3JD1rWg=
+github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.2/go.mod h1:xOgOp3SSdWHIEqviYC1kd3p6mJtfFkrcinBWdpgVUxc=
+github.com/gogf/gf/v2 v2.8.2 h1:4k641rn+hV1COAKygqsqcTm8+lDTkcO8HQ4iBv/uTFs=
+github.com/gogf/gf/v2 v2.8.2/go.mod h1:n++xPYGUUMadw6IygLEgGZqc6y6DRLrJKg5kqCrPLWY=
 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=
@@ -68,16 +82,16 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
+github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/microsoft/go-mssqldb v1.7.1 h1:KU/g8aWeM3Hx7IMOFpiwYiUkU+9zeISb4+tx3ScVfsM=
 github.com/microsoft/go-mssqldb v1.7.1/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
@@ -131,8 +145,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
+golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
@@ -141,13 +155,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/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.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
+golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -159,13 +173,13 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 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.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 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-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=

container/gpool/gpool_z_unit_test.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/gogf/gf/v2/container/gpool"
+	"github.com/gogf/gf/v2/container/gtype"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/test/gtest"
 )
@@ -20,10 +21,10 @@ var nf gpool.NewFunc = func() (i interface{}, e error) {
 	return "hello", nil
 }
 
-var assertIndex int = 0
+var assertIndex = gtype.NewInt(0)
 
 var ef gpool.ExpireFunc = func(i interface{}) {
-	assertIndex++
+	assertIndex.Add(1)
 	gtest.Assert(i, assertIndex)
 }
 
@@ -83,7 +84,7 @@ func Test_Gpool(t *testing.T) {
 		v2, err2 = p2.Get()
 		t.Assert(err2, nil)
 		t.Assert(v2, 0)
-		assertIndex = 0
+		assertIndex.Set(0)
 		p2.Close()
 		time.Sleep(3 * time.Second)
 		t.AssertNE(p2.Put(1), nil)

contrib/config/apollo/go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/apolloconfig/agollo/v4 v4.3.1
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 )
 
 require (

contrib/config/consul/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/consul/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/hashicorp/consul/api v1.24.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 )

contrib/config/kubecm/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	k8s.io/api v0.27.4
 	k8s.io/apimachinery v0.27.4
 	k8s.io/client-go v0.27.4

contrib/config/nacos/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/nacos-group/nacos-sdk-go/v2 v2.2.5
 )
 

contrib/config/nacos/nacos.go

@@ -23,10 +23,11 @@ import (
 
 // Config is the configuration object for nacos client.
 type Config struct {
-	ServerConfigs []constant.ServerConfig `v:"required"` // See constant.ServerConfig
-	ClientConfig  constant.ClientConfig   `v:"required"` // See constant.ClientConfig
-	ConfigParam   vo.ConfigParam          `v:"required"` // See vo.ConfigParam
-	Watch         bool                    // Watch watches remote configuration updates, which updates local configuration in memory immediately when remote configuration changes.
+	ServerConfigs  []constant.ServerConfig                     `v:"required"` // See constant.ServerConfig
+	ClientConfig   constant.ClientConfig                       `v:"required"` // See constant.ClientConfig
+	ConfigParam    vo.ConfigParam                              `v:"required"` // See vo.ConfigParam
+	Watch          bool                                        // Watch watches remote configuration updates, which updates local configuration in memory immediately when remote configuration changes.
+	OnConfigChange func(namespace, group, dataId, data string) // Configure change callback function
 }
 
 // Client implements gcfg.Adapter implementing using nacos service.
@@ -125,9 +126,11 @@ func (c *Client) addWatcher() error {
 	if !c.config.Watch {
 		return nil
 	}
-
 	c.config.ConfigParam.OnChange = func(namespace, group, dataId, data string) {
 		c.doUpdate(data)
+		if c.config.OnConfigChange != nil {
+			go c.config.OnConfigChange(namespace, group, dataId, data)
+		}
 	}
 
 	if err := c.client.ListenConfig(c.config.ConfigParam); err != nil {

contrib/config/nacos/nacos_test.go

@@ -7,11 +7,14 @@
 package nacos_test
 
 import (
+	"net/url"
 	"testing"
+	"time"
 
 	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
 	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/test/gtest"
@@ -34,6 +37,7 @@ var (
 		DataId: "config.toml",
 		Group:  "test",
 	}
+	configPublishUrl = "http://localhost:8848/nacos/v2/cs/config?type=toml&namespaceId=public&group=test&dataId=config.toml"
 )
 
 func TestNacos(t *testing.T) {
@@ -48,7 +52,6 @@ func TestNacos(t *testing.T) {
 		config.SetAdapter(adapter)
 
 		t.Assert(config.Available(ctx), true)
-
 		v, err := config.Get(ctx, `server.address`)
 		t.AssertNil(err)
 		t.Assert(v.String(), ":8000")
@@ -58,3 +61,41 @@ func TestNacos(t *testing.T) {
 		t.AssertGT(len(m), 0)
 	})
 }
+
+func TestNacosOnConfigChangeFunc(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		adapter, _ := nacos.New(ctx, nacos.Config{
+			ServerConfigs: []constant.ServerConfig{serverConfig},
+			ClientConfig:  clientConfig,
+			ConfigParam:   configParam,
+			Watch:         true,
+			OnConfigChange: func(namespace, group, dataId, data string) {
+				gtest.Assert("public", namespace)
+				gtest.Assert("test", group)
+				gtest.Assert("config.toml", dataId)
+				gtest.Assert("gf", g.Cfg().MustGet(gctx.GetInitCtx(), "app.name").String())
+			},
+		})
+		g.Cfg().SetAdapter(adapter)
+		t.Assert(g.Cfg().Available(ctx), true)
+		appName, err := g.Cfg().Get(ctx, "app.name")
+		t.AssertNil(err)
+		t.Assert(appName.String(), "")
+		c, err := g.Cfg().Data(ctx)
+		t.AssertNil(err)
+		j := gjson.New(c)
+		err = j.Set("app.name", "gf")
+		t.AssertNil(err)
+		res, err := j.ToTomlString()
+		t.AssertNil(err)
+		_, err = g.Client().Post(ctx, configPublishUrl+"&content="+url.QueryEscape(res))
+		t.AssertNil(err)
+		time.Sleep(5 * time.Second)
+		err = j.Remove("app")
+		t.AssertNil(err)
+		res2, err := j.ToTomlString()
+		t.AssertNil(err)
+		_, err = g.Client().Post(ctx, configPublishUrl+"&content="+url.QueryEscape(res2))
+		t.AssertNil(err)
+	})
+}

contrib/config/polaris/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/polarismesh/polaris-go v1.5.8
 )
 

contrib/drivers/clickhouse/clickhouse_z_unit_db_test.go

@@ -295,7 +295,7 @@ func Test_DB_Tables(t *testing.T) {
 		}
 
 		result, err := db.Tables(ctx)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for i := 0; i < len(tables); i++ {
 			find := false

contrib/drivers/clickhouse/go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.0.15
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/google/uuid v1.3.0
 	github.com/shopspring/decimal v1.3.1
 )

contrib/drivers/dm/dm_z_unit_basic_test.go

@@ -34,7 +34,7 @@ func TestTables(t *testing.T) {
 	}
 	gtest.C(t, func(t *gtest.T) {
 		result, err := db.Tables(ctx)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for i := 0; i < len(tables); i++ {
 			find := false
@@ -48,7 +48,7 @@ func TestTables(t *testing.T) {
 		}
 
 		result, err = dblink.Tables(ctx)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 		for i := 0; i < len(tables); i++ {
 			find := false
 			for j := 0; j < len(result); j++ {
@@ -95,7 +95,7 @@ func TestTableFields(t *testing.T) {
 		gtest.AssertNE(err, nil)
 
 		res, err := db.TableFields(ctx, tables)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for k, v := range expect {
 			_, ok := res[k]
@@ -205,7 +205,7 @@ func TestModelInsert(t *testing.T) {
 		}
 		// _, err := db.Schema(TestDBName).Model(table).Data(data).Insert()
 		_, err := db.Model(table).Insert(&data)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 	})
 
 	gtest.C(t, func(t *gtest.T) {
@@ -220,7 +220,7 @@ func TestModelInsert(t *testing.T) {
 		}
 		// _, err := db.Schema(TestDBName).Model(table).Data(data).Insert()
 		_, err := db.Model(table).Data(&data).Insert()
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 	})
 }
 
@@ -238,7 +238,7 @@ func TestDBInsert(t *testing.T) {
 			"UPDATED_TIME": gtime.Now(),
 		}
 		_, err := db.Insert(ctx, table, &data)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 	})
 }
 

contrib/drivers/dm/dm_z_unit_init_test.go

@@ -173,7 +173,7 @@ func createInitTable(table ...string) (name string) {
 		})
 	}
 	result, err := db.Schema(TestDBName).Insert(context.Background(), name, array.Slice())
-	gtest.Assert(err, nil)
+	gtest.AssertNil(err)
 
 	n, e := result.RowsAffected()
 	gtest.Assert(e, nil)

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.8.2
+	github.com/gogf/gf/v2 v2.8.3
 )
 
 require (

contrib/drivers/mssql/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/mssql/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/microsoft/go-mssqldb v1.7.1
 )
 

contrib/drivers/mssql/mssql_do_filter.go

@@ -18,12 +18,18 @@ import (
 )
 
 var (
-	orderBySqlTmp         = `SELECT %s %s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY`
-	withoutOrderBySqlTmp  = `SELECT %s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY`
 	selectWithOrderSqlTmp = `
-SELECT * FROM (SELECT ROW_NUMBER() OVER (ORDER BY %s) as ROW_NUMBER__, %s ) as TMP_ 
-WHERE TMP_.ROW_NUMBER__ > %d AND TMP_.ROW_NUMBER__ <= %d
-`
+SELECT * FROM (
+    SELECT ROW_NUMBER() OVER (ORDER BY %s) as ROW_NUMBER__, %s 
+    FROM (%s) as InnerQuery
+) as TMP_ 
+WHERE TMP_.ROW_NUMBER__ > %d AND TMP_.ROW_NUMBER__ <= %d`
+	selectWithoutOrderSqlTmp = `
+SELECT * FROM (
+    SELECT ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) as ROW_NUMBER__, %s 
+    FROM (%s) as InnerQuery
+) as TMP_ 
+WHERE TMP_.ROW_NUMBER__ > %d AND TMP_.ROW_NUMBER__ <= %d`
 )
 
 func init() {
@@ -32,6 +38,10 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
+	selectWithoutOrderSqlTmp, err = gdb.FormatMultiLineSqlToSingle(selectWithoutOrderSqlTmp)
+	if err != nil {
+		panic(err)
+	}
 }
 
 // DoFilter deals with the sql string before commits it to underlying sql driver.
@@ -98,14 +108,19 @@ func (d *Driver) handleSelectSqlReplacement(toBeCommittedSql string) (newSql str
 		return "", err
 	}
 
-	// SELECT and ORDER BY
+	// Extract SELECT part
 	selectStr := strings.TrimSpace(allMatch[1])
+
+	// Extract ORDER BY part
 	orderStr := ""
 	if len(allMatch[2]) > 0 {
 		orderStr = strings.TrimSpace(allMatch[2])
+		// Remove "ORDER BY" prefix as it will be used in OVER clause
+		orderStr = strings.TrimPrefix(orderStr, "ORDER BY")
+		orderStr = strings.TrimSpace(orderStr)
 	}
 
-	// LIMIT and OFFSET value
+	// Calculate LIMIT and OFFSET values
 	first, _ := strconv.Atoi(allMatch[3]) // LIMIT first parameter
 	limit := 0
 	if len(allMatch) > 4 && allMatch[4] != "" {
@@ -115,19 +130,26 @@ func (d *Driver) handleSelectSqlReplacement(toBeCommittedSql string) (newSql str
 		first = 0
 	}
 
+	// Build the final query
 	if orderStr != "" {
-		// have ORDER BY clause
+		// Have ORDER BY clause
 		newSql = fmt.Sprintf(
-			orderBySqlTmp,
-			selectStr, orderStr, first, limit,
+			selectWithOrderSqlTmp,
+			orderStr,                            // ORDER BY clause for ROW_NUMBER
+			"*",                                 // Select all columns
+			fmt.Sprintf("SELECT %s", selectStr), // Original SELECT
+			first,                               // OFFSET
+			first+limit,                         // OFFSET + LIMIT
 		)
 	} else {
-		// without ORDER BY clause
+		// Without ORDER BY clause
 		newSql = fmt.Sprintf(
-			withoutOrderBySqlTmp,
-			selectStr, first, limit,
+			selectWithoutOrderSqlTmp,
+			"*",                                 // Select all columns
+			fmt.Sprintf("SELECT %s", selectStr), // Original SELECT
+			first,                               // OFFSET
+			first+limit,                         // OFFSET + LIMIT
 		)
 	}
-
 	return newSql, nil
 }

contrib/drivers/mssql/mssql_do_filter_test.go

@@ -54,7 +54,6 @@ func TestDriver_DoFilter(t *testing.T) {
 }
 
 func TestDriver_handleSelectSqlReplacement(t *testing.T) {
-
 	gtest.C(t, func(t *gtest.T) {
 		d := &Driver{}
 
@@ -67,7 +66,7 @@ func TestDriver_handleSelectSqlReplacement(t *testing.T) {
 
 		// LIMIT query with offset and number of rows
 		inputSql = "SELECT * FROM User ORDER BY ID DESC LIMIT 100, 200"
-		expectedSql = "SELECT * FROM User ORDER BY ID DESC OFFSET 100 ROWS FETCH NEXT 200 ROWS ONLY"
+		expectedSql = "SELECT * FROM ( SELECT ROW_NUMBER() OVER (ORDER BY ID DESC) as ROW_NUMBER__, * FROM (SELECT * FROM User) as InnerQuery ) as TMP_ WHERE TMP_.ROW_NUMBER__ > 100 AND TMP_.ROW_NUMBER__ <= 300"
 		resultSql, err = d.handleSelectSqlReplacement(inputSql)
 		t.AssertNil(err)
 		t.Assert(resultSql, expectedSql)
@@ -88,42 +87,42 @@ func TestDriver_handleSelectSqlReplacement(t *testing.T) {
 
 		// LIMIT query with only rows
 		inputSql = "SELECT * FROM User LIMIT 50"
-		expectedSql = "SELECT * FROM User OFFSET 0 ROWS FETCH NEXT 50 ROWS ONLY"
+		expectedSql = "SELECT * FROM ( SELECT ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) as ROW_NUMBER__, * FROM (SELECT * FROM User) as InnerQuery ) as TMP_ WHERE TMP_.ROW_NUMBER__ > 0 AND TMP_.ROW_NUMBER__ <= 50"
 		resultSql, err = d.handleSelectSqlReplacement(inputSql)
 		t.AssertNil(err)
 		t.Assert(resultSql, expectedSql)
 
 		// LIMIT query without ORDER BY
 		inputSql = "SELECT * FROM User LIMIT 30"
-		expectedSql = "SELECT * FROM User OFFSET 0 ROWS FETCH NEXT 30 ROWS ONLY"
+		expectedSql = "SELECT * FROM ( SELECT ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) as ROW_NUMBER__, * FROM (SELECT * FROM User) as InnerQuery ) as TMP_ WHERE TMP_.ROW_NUMBER__ > 0 AND TMP_.ROW_NUMBER__ <= 30"
 		resultSql, err = d.handleSelectSqlReplacement(inputSql)
 		t.AssertNil(err)
 		t.Assert(resultSql, expectedSql)
 
 		// Complex query with ORDER BY and LIMIT
 		inputSql = "SELECT name, age FROM User WHERE age > 18 ORDER BY age ASC LIMIT 10, 5"
-		expectedSql = "SELECT name, age FROM User WHERE age > 18 ORDER BY age ASC OFFSET 10 ROWS FETCH NEXT 5 ROWS ONLY"
+		expectedSql = "SELECT * FROM ( SELECT ROW_NUMBER() OVER (ORDER BY age ASC) as ROW_NUMBER__, * FROM (SELECT name, age FROM User WHERE age > 18) as InnerQuery ) as TMP_ WHERE TMP_.ROW_NUMBER__ > 10 AND TMP_.ROW_NUMBER__ <= 15"
 		resultSql, err = d.handleSelectSqlReplacement(inputSql)
 		t.AssertNil(err)
 		t.Assert(resultSql, expectedSql)
 
 		// Complex conditional queries have limits
 		inputSql = "SELECT * FROM User WHERE age > 18 AND status = 'active' LIMIT 100, 50"
-		expectedSql = "SELECT * FROM User WHERE age > 18 AND status = 'active' OFFSET 100 ROWS FETCH NEXT 50 ROWS ONLY"
+		expectedSql = "SELECT * FROM ( SELECT ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) as ROW_NUMBER__, * FROM (SELECT * FROM User WHERE age > 18 AND status = 'active') as InnerQuery ) as TMP_ WHERE TMP_.ROW_NUMBER__ > 100 AND TMP_.ROW_NUMBER__ <= 150"
 		resultSql, err = d.handleSelectSqlReplacement(inputSql)
 		t.AssertNil(err)
 		t.Assert(resultSql, expectedSql)
 
 		// A LIMIT query that contains subquery
 		inputSql = "SELECT * FROM (SELECT * FROM User WHERE age > 18) AS subquery LIMIT 10"
-		expectedSql = "SELECT * FROM (SELECT * FROM User WHERE age > 18) AS subquery OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY"
+		expectedSql = "SELECT * FROM ( SELECT ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) as ROW_NUMBER__, * FROM (SELECT * FROM (SELECT * FROM User WHERE age > 18) AS subquery) as InnerQuery ) as TMP_ WHERE TMP_.ROW_NUMBER__ > 0 AND TMP_.ROW_NUMBER__ <= 10"
 		resultSql, err = d.handleSelectSqlReplacement(inputSql)
 		t.AssertNil(err)
 		t.Assert(resultSql, expectedSql)
 
 		// Queries with complex ORDER BY and LIMIT
 		inputSql = "SELECT name, age FROM User WHERE age > 18 ORDER BY age DESC, name ASC LIMIT 20, 10"
-		expectedSql = "SELECT name, age FROM User WHERE age > 18 ORDER BY age DESC, name ASC OFFSET 20 ROWS FETCH NEXT 10 ROWS ONLY"
+		expectedSql = "SELECT * FROM ( SELECT ROW_NUMBER() OVER (ORDER BY age DESC, name ASC) as ROW_NUMBER__, * FROM (SELECT name, age FROM User WHERE age > 18) as InnerQuery ) as TMP_ WHERE TMP_.ROW_NUMBER__ > 20 AND TMP_.ROW_NUMBER__ <= 30"
 		resultSql, err = d.handleSelectSqlReplacement(inputSql)
 		t.AssertNil(err)
 		t.Assert(resultSql, expectedSql)

contrib/drivers/mssql/mssql_z_unit_basic_test.go

@@ -29,7 +29,7 @@ func TestTables(t *testing.T) {
 		}
 
 		result, err := db.Tables(context.Background())
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for i := 0; i < len(tables); i++ {
 			find := false
@@ -42,8 +42,8 @@ func TestTables(t *testing.T) {
 			gtest.AssertEQ(find, true)
 		}
 
-		result, err = db.Tables(context.Background(), "test")
-		gtest.Assert(err, nil)
+		result, err = db.Tables(context.Background(), "master")
+		gtest.AssertNil(err)
 		for i := 0; i < len(tables); i++ {
 			find := false
 			for j := 0; j < len(result); j++ {
@@ -74,7 +74,7 @@ func TestTableFields(t *testing.T) {
 		}
 
 		res, err := db.TableFields(context.Background(), "t_user")
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for k, v := range expect {
 			_, ok := res[k]
@@ -88,8 +88,8 @@ func TestTableFields(t *testing.T) {
 			gtest.AssertEQ(res[k].Comment, v[5])
 		}
 
-		res, err = db.TableFields(context.Background(), "t_user", "test")
-		gtest.Assert(err, nil)
+		res, err = db.TableFields(context.Background(), "t_user", "master")
+		gtest.AssertNil(err)
 
 		for k, v := range expect {
 			_, ok := res[k]
@@ -124,7 +124,7 @@ func TestDoInsert(t *testing.T) {
 			"create_time": gtime.Now(),
 		}
 		_, err := db.Insert(context.Background(), "t_user", data)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 	})
 

contrib/drivers/mssql/mssql_z_unit_init_test.go

@@ -25,14 +25,9 @@ var (
 )
 
 const (
-	TableSize        = 10
-	TableName        = "t_user"
-	TestSchema1      = "test1"
-	TestSchema2      = "test2"
-	TableNamePrefix1 = "gf_"
-	TestDbUser       = "sa"
-	TestDbPass       = "LoremIpsum86"
-	CreateTime       = "2018-10-24 10:00:00"
+	TableSize  = 10
+	TestDbUser = "sa"
+	TestDbPass = "LoremIpsum86"
 )
 
 func init() {
@@ -41,7 +36,7 @@ func init() {
 		Port:             "1433",
 		User:             TestDbUser,
 		Pass:             TestDbPass,
-		Name:             "test",
+		Name:             "master",
 		Type:             "mssql",
 		Role:             "master",
 		Charset:          "utf8",
@@ -52,7 +47,7 @@ func init() {
 
 	nodeLink := gdb.ConfigNode{
 		Type: "mssql",
-		Name: "test",
+		Name: "master",
 		Link: fmt.Sprintf(
 			"mssql:%s:%s@tcp(%s:%s)/%s?encrypt=disable",
 			node.User, node.Pass, node.Host, node.Port, node.Name,
@@ -61,7 +56,8 @@ func init() {
 
 	nodeErr := gdb.ConfigNode{
 		Type: "mssql",
-		Link: fmt.Sprintf("user id=%s;password=%s;server=%s;port=%s;database=%s;encrypt=disable",
+		Link: fmt.Sprintf(
+			"mssql:%s:%s@tcp(%s:%s)/%s?encrypt=disable",
 			node.User, "node.Pass", node.Host, node.Port, node.Name),
 	}
 
@@ -130,7 +126,7 @@ func createInitTable(table ...string) (name string) {
 		})
 	}
 	result, err := db.Insert(context.Background(), name, array.Slice())
-	gtest.Assert(err, nil)
+	gtest.AssertNil(err)
 
 	n, e := result.RowsAffected()
 	gtest.Assert(e, nil)

contrib/drivers/mssql/mssql_z_unit_model_test.go

@@ -26,30 +26,31 @@ import (
 func Test_Page(t *testing.T) {
 	table := createInitTable()
 	defer dropTable(table)
-	// db.SetDebug(true)
-	result, err := db.Model(table).Page(1, 2).Order("id").All()
-	gtest.Assert(err, nil)
-	fmt.Println("page:1--------", result)
-	gtest.Assert(len(result), 2)
-	gtest.Assert(result[0]["ID"], 1)
-	gtest.Assert(result[1]["ID"], 2)
+	gtest.C(t, func(t *gtest.T) {
+		result, err := db.Model(table).Page(1, 2).Order("id").All()
+		t.AssertNil(err)
+		fmt.Println("page:1--------", result)
+		gtest.Assert(len(result), 2)
+		gtest.Assert(result[0]["ID"], 1)
+		gtest.Assert(result[1]["ID"], 2)
 
-	result, err = db.Model(table).Page(2, 2).Order("id").All()
-	gtest.Assert(err, nil)
-	fmt.Println("page: 2--------", result)
-	gtest.Assert(len(result), 2)
-	gtest.Assert(result[0]["ID"], 3)
-	gtest.Assert(result[1]["ID"], 4)
+		result, err = db.Model(table).Page(2, 2).Order("id").All()
+		t.AssertNil(err)
+		fmt.Println("page: 2--------", result)
+		gtest.Assert(len(result), 2)
+		gtest.Assert(result[0]["ID"], 3)
+		gtest.Assert(result[1]["ID"], 4)
 
-	result, err = db.Model(table).Page(3, 2).Order("id").All()
-	gtest.Assert(err, nil)
-	fmt.Println("page:3 --------", result)
-	gtest.Assert(len(result), 2)
-	gtest.Assert(result[0]["ID"], 5)
+		result, err = db.Model(table).Page(3, 2).Order("id").All()
+		t.AssertNil(err)
+		fmt.Println("page:3 --------", result)
+		gtest.Assert(len(result), 2)
+		gtest.Assert(result[0]["ID"], 5)
 
-	result, err = db.Model(table).Page(2, 3).All()
-	gtest.Assert(err, nil)
-	gtest.Assert(len(result), 3)
+		result, err = db.Model(table).Page(2, 3).All()
+		t.AssertNil(err)
+		gtest.Assert(len(result), 3)
+	})
 }
 
 func Test_Model_Insert(t *testing.T) {

contrib/drivers/mysql/go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/go-sql-driver/mysql v1.7.1
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 )
 
 require (

contrib/drivers/mysql/mysql_z_unit_init_test.go

@@ -44,18 +44,22 @@ func init() {
 	nodeDefault := gdb.ConfigNode{
 		ExecTimeout: time.Second * 2,
 		Link:        fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3306)/?loc=Local&parseTime=true", TestDbPass),
+		TranTimeout: time.Second * 3,
 	}
 	partitionDefault := gdb.ConfigNode{
-		Link:  fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
-		Debug: true,
+		Link:        fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
+		Debug:       true,
+		TranTimeout: time.Second * 3,
 	}
 	nodePrefix := gdb.ConfigNode{
-		Link: fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3306)/?loc=Local&parseTime=true", TestDbPass),
+		Link:        fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3306)/?loc=Local&parseTime=true", TestDbPass),
+		TranTimeout: time.Second * 3,
 	}
 	nodePrefix.Prefix = TableNamePrefix1
 
 	nodeInvalid := gdb.ConfigNode{
-		Link: fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
+		Link:        fmt.Sprintf("mysql:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
+		TranTimeout: time.Second * 3,
 	}
 	gdb.AddConfigNode("test", nodeDefault)
 	gdb.AddConfigNode("prefix", nodePrefix)

contrib/drivers/mysql/mysql_z_unit_issue_test.go

@@ -1556,3 +1556,37 @@ func Test_Issue2119(t *testing.T) {
 		}
 	})
 }
+
+// https://github.com/gogf/gf/issues/4034
+func Test_Issue4034(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		table := "issue4034"
+		array := gstr.SplitAndTrim(gtest.DataContent(`issue4034.sql`), ";")
+		for _, v := range array {
+			_, err := db.Exec(ctx, v)
+			t.AssertNil(err)
+		}
+		defer dropTable(table)
+
+		err := issue4034SaveDeviceAndToken(ctx, table)
+		t.AssertNil(err)
+	})
+}
+
+func issue4034SaveDeviceAndToken(ctx context.Context, table string) error {
+	return db.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+		if err := issue4034SaveAppDevice(ctx, table, tx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func issue4034SaveAppDevice(ctx context.Context, table string, tx gdb.TX) error {
+	_, err := db.Model(table).Safe().Ctx(ctx).TX(tx).Data(g.Map{
+		"passport": "111",
+		"password": "222",
+		"nickname": "333",
+	}).Save()
+	return err
+}

contrib/drivers/mysql/testdata/issue4034.sql

@@ -0,0 +1,8 @@
+CREATE TABLE issue4034 (
+    id INT PRIMARY KEY AUTO_INCREMENT,
+    passport VARCHAR(255),
+    password VARCHAR(255),
+    nickname VARCHAR(255),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+);

contrib/drivers/oracle/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/sijms/go-ora/v2 v2.7.10
 )
 

contrib/drivers/oracle/oracle_z_unit_basic_test.go

@@ -27,7 +27,7 @@ func Test_Tables(t *testing.T) {
 		}
 
 		result, err := db.Tables(ctx)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for i := 0; i < len(tables); i++ {
 			find := false
@@ -41,7 +41,7 @@ func Test_Tables(t *testing.T) {
 		}
 
 		result, err = db.Tables(ctx, TestSchema)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 		for i := 0; i < len(tables); i++ {
 			find := false
 			for j := 0; j < len(result); j++ {
@@ -76,7 +76,7 @@ func Test_Table_Fields(t *testing.T) {
 		gtest.AssertNE(err, nil)
 
 		res, err := db.TableFields(ctx, "t_user")
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for k, v := range expect {
 			_, ok := res[k]
@@ -88,7 +88,7 @@ func Test_Table_Fields(t *testing.T) {
 		}
 
 		res, err = db.TableFields(ctx, "t_user", TestSchema)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for k, v := range expect {
 			_, ok := res[k]
@@ -121,7 +121,7 @@ func Test_Do_Insert(t *testing.T) {
 			"CREATE_TIME": gtime.Now().String(),
 		}
 		_, err := db.Insert(ctx, "t_user", data)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 	})
 

contrib/drivers/oracle/oracle_z_unit_init_test.go

@@ -143,7 +143,7 @@ func createInitTable(table ...string) (name string) {
 		})
 	}
 	result, err := db.Insert(context.Background(), name, array.Slice())
-	gtest.Assert(err, nil)
+	gtest.AssertNil(err)
 
 	n, e := result.RowsAffected()
 	gtest.Assert(e, nil)

contrib/drivers/oracle/oracle_z_unit_model_test.go

@@ -132,27 +132,27 @@ func Test_Page(t *testing.T) {
 	table := createInitTable()
 	defer dropTable(table)
 	result, err := db.Model(table).Page(1, 2).Order("ID").All()
-	gtest.Assert(err, nil)
+	gtest.AssertNil(err)
 	fmt.Println("page:1--------", result)
 	gtest.Assert(len(result), 2)
 	gtest.Assert(result[0]["ID"], 1)
 	gtest.Assert(result[1]["ID"], 2)
 
 	result, err = db.Model(table).Page(2, 2).Order("ID").All()
-	gtest.Assert(err, nil)
+	gtest.AssertNil(err)
 	fmt.Println("page: 2--------", result)
 	gtest.Assert(len(result), 2)
 	gtest.Assert(result[0]["ID"], 3)
 	gtest.Assert(result[1]["ID"], 4)
 
 	result, err = db.Model(table).Page(3, 2).Order("ID").All()
-	gtest.Assert(err, nil)
+	gtest.AssertNil(err)
 	fmt.Println("page:3 --------", result)
 	gtest.Assert(len(result), 2)
 	gtest.Assert(result[0]["ID"], 5)
 
 	result, err = db.Model(table).Page(2, 3).All()
-	gtest.Assert(err, nil)
+	gtest.AssertNil(err)
 	gtest.Assert(len(result), 3)
 	gtest.Assert(result[0]["ID"], 4)
 	gtest.Assert(result[1]["ID"], 5)

contrib/drivers/pgsql/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/lib/pq v1.10.9
 )
 

contrib/drivers/pgsql/pgsql_convert.go

@@ -128,7 +128,7 @@ func (d *Driver) ConvertValueForLocal(ctx context.Context, fieldType string, fie
 		if err := result.Scan(fieldValue); err != nil {
 			return nil, err
 		}
-		return result, nil
+		return []string(result), nil
 
 	default:
 		return d.Core.ConvertValueForLocal(ctx, fieldType, fieldValue)

contrib/drivers/pgsql/pgsql_do_exec.go

@@ -64,12 +64,6 @@ func (d *Driver) DoExec(ctx context.Context, link gdb.Link, sql string, args ...
 
 	// Only the insert operation with primary key can execute the following code
 
-	if d.GetConfig().ExecTimeout > 0 {
-		var cancelFunc context.CancelFunc
-		ctx, cancelFunc = context.WithTimeout(ctx, d.GetConfig().ExecTimeout)
-		defer cancelFunc()
-	}
-
 	// Sql filtering.
 	sql, args = d.FormatSqlBeforeExecuting(sql, args)
 	sql, args, err = d.DoFilter(ctx, link, sql, args)

contrib/drivers/pgsql/pgsql_z_unit_db_test.go

@@ -282,7 +282,7 @@ func Test_DB_Tables(t *testing.T) {
 			createTable(v)
 		}
 		result, err := db.Tables(ctx)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 		for i := 0; i < len(tables); i++ {
 			find := false
 			for j := 0; j < len(result); j++ {
@@ -312,7 +312,7 @@ func Test_DB_TableFields(t *testing.T) {
 		}
 
 		res, err := db.TableFields(ctx, table)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for k, v := range expect {
 			_, ok := res[k]

contrib/drivers/pgsql/pgsql_z_unit_issue_test.go

@@ -171,3 +171,37 @@ func Test_Issue3668(t *testing.T) {
 		t.AssertNil(err)
 	})
 }
+
+type Issue4033Status int
+
+const (
+	Issue4033StatusA Issue4033Status = 1
+)
+
+func (s Issue4033Status) String() string {
+	return "somevalue"
+}
+
+func (s Issue4033Status) Int64() int64 {
+	return int64(s)
+}
+
+// https://github.com/gogf/gf/issues/4033
+func Test_Issue4033(t *testing.T) {
+	var (
+		sqlText = gtest.DataContent("issues", "issue4033.sql")
+		table   = "test_enum"
+	)
+	if _, err := db.Exec(ctx, sqlText); err != nil {
+		gtest.Fatal(err)
+	}
+	defer dropTable(table)
+
+	gtest.C(t, func(t *gtest.T) {
+		query := g.Map{
+			"status": g.Slice{Issue4033StatusA},
+		}
+		_, err := db.Model(table).Ctx(ctx).Where(query).All()
+		t.AssertNil(err)
+	})
+}

contrib/drivers/pgsql/testdata/issues/issue4033.sql

@@ -0,0 +1,5 @@
+CREATE TABLE test_enum (
+    id int8 NOT NULL,
+    status int2 DEFAULT 0 NOT NULL,
+    CONSTRAINT test_enum_pk PRIMARY KEY (id)
+);

contrib/drivers/sqlite/go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/glebarez/go-sqlite v1.21.2
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 )
 
 require (

contrib/drivers/sqlite/sqlite_z_unit_core_test.go

@@ -1553,7 +1553,7 @@ func Test_TableFields(t *testing.T) {
 		}
 
 		res, err := db.TableFields(context.Background(), tableName)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for k, v := range expect {
 			_, ok := res[k]

contrib/drivers/sqlitecgo/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/sqlitecgo/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/mattn/go-sqlite3 v1.14.17
 )
 

contrib/drivers/sqlitecgo/sqlitecgo_z_unit_core_test.go

@@ -1553,7 +1553,7 @@ func Test_TableFields(t *testing.T) {
 		}
 
 		res, err := db.TableFields(context.Background(), tableName)
-		gtest.Assert(err, nil)
+		gtest.AssertNil(err)
 
 		for k, v := range expect {
 			_, ok := res[k]

contrib/metric/otelmetric/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/metric/otelmetric/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/prometheus/client_golang v1.19.1
 	go.opentelemetry.io/contrib/instrumentation/runtime v0.49.0
 	go.opentelemetry.io/otel v1.24.0

contrib/nosql/redis/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/nosql/redis/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/redis/go-redis/v9 v9.7.0
 	go.opentelemetry.io/otel v1.24.0
 	go.opentelemetry.io/otel/trace v1.24.0

contrib/registry/consul/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/consul/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/hashicorp/consul/api v1.26.1
 )
 
@@ -12,7 +12,7 @@ require (
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fatih/color v1.17.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -24,7 +24,7 @@ require (
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -34,8 +34,8 @@ require (
 	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

contrib/registry/consul/go.sum

@@ -28,8 +28,8 @@ github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FM
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
-github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -103,8 +103,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
+github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -120,7 +120,7 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41 h1:WMszZWJG0XmzbK9FEmzH2TVcqYzFesusSIB41b8KHxY=
@@ -193,7 +193,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
+golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -220,15 +220,15 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 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.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 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.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

contrib/registry/etcd/etcd.go

@@ -33,6 +33,7 @@ type Registry struct {
 	lease        etcd3.Lease
 	keepaliveTTL time.Duration
 	logger       glog.ILogger
+	etcdConfig   etcd3.Config
 }
 
 // Option is the option for the etcd registry.
@@ -59,7 +60,7 @@ const (
 
 // New creates and returns a new etcd registry.
 // Support Etcd Address format: ip:port,ip:port...,ip:port@username:password
-func New(address string, option ...Option) gsvc.Registry {
+func New(address string, option ...Option) *Registry {
 	if address == "" {
 		panic(gerror.NewCode(gcode.CodeInvalidParameter, `invalid etcd address ""`))
 	}
@@ -110,7 +111,9 @@ func New(address string, option ...Option) gsvc.Registry {
 	if err != nil {
 		panic(gerror.Wrap(err, `create etcd client failed`))
 	}
-	return NewWithClient(client, option...)
+	r := NewWithClient(client, option...)
+	r.etcdConfig = cfg
+	return r
 }
 
 // NewWithClient creates and returns a new etcd registry with the given client.

contrib/registry/etcd/etcd_discovery.go

@@ -58,5 +58,5 @@ func (r *Registry) Search(ctx context.Context, in gsvc.SearchInput) ([]gsvc.Serv
 // Watch watches specified condition changes.
 // The `key` is the prefix of service key.
 func (r *Registry) Watch(ctx context.Context, key string) (gsvc.Watcher, error) {
-	return newWatcher(key, r.client)
+	return newWatcher(key, r.client, r.etcdConfig.DialTimeout)
 }

contrib/registry/etcd/etcd_registrar.go

@@ -8,21 +8,34 @@ package etcd
 
 import (
 	"context"
+	"time"
 
 	etcd3 "go.etcd.io/etcd/client/v3"
 
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/gsvc"
+	"github.com/gogf/gf/v2/util/grand"
 )
 
 // Register registers `service` to Registry.
 // Note that it returns a new Service if it changes the input Service with custom one.
 func (r *Registry) Register(ctx context.Context, service gsvc.Service) (gsvc.Service, error) {
 	service = NewService(service)
+	if err := r.doRegisterLease(ctx, service); err != nil {
+		return nil, err
+	}
+	return service, nil
+}
+
+func (r *Registry) doRegisterLease(ctx context.Context, service gsvc.Service) error {
 	r.lease = etcd3.NewLease(r.client)
+
+	ctx, cancel := context.WithTimeout(context.Background(), r.etcdConfig.DialTimeout)
+	defer cancel()
+
 	grant, err := r.lease.Grant(ctx, int64(r.keepaliveTTL.Seconds()))
 	if err != nil {
-		return nil, gerror.Wrapf(err, `etcd grant failed with keepalive ttl "%s"`, r.keepaliveTTL)
+		return gerror.Wrapf(err, `etcd grant failed with keepalive ttl "%s"`, r.keepaliveTTL)
 	}
 	var (
 		key   = service.GetKey()
@@ -30,7 +43,7 @@ func (r *Registry) Register(ctx context.Context, service gsvc.Service) (gsvc.Ser
 	)
 	_, err = r.client.Put(ctx, key, value, etcd3.WithLease(grant.ID))
 	if err != nil {
-		return nil, gerror.Wrapf(
+		return gerror.Wrapf(
 			err,
 			`etcd put failed with key "%s", value "%s", lease "%d"`,
 			key, value, grant.ID,
@@ -43,10 +56,10 @@ func (r *Registry) Register(ctx context.Context, service gsvc.Service) (gsvc.Ser
 	)
 	keepAliceCh, err := r.client.KeepAlive(context.Background(), grant.ID)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	go r.doKeepAlive(grant.ID, keepAliceCh)
-	return service, nil
+	go r.doKeepAlive(service, grant.ID, keepAliceCh)
+	return nil
 }
 
 // Deregister off-lines and removes `service` from the Registry.
@@ -59,12 +72,14 @@ func (r *Registry) Deregister(ctx context.Context, service gsvc.Service) error {
 }
 
 // doKeepAlive continuously keeps alive the lease from ETCD.
-func (r *Registry) doKeepAlive(leaseID etcd3.LeaseID, keepAliceCh <-chan *etcd3.LeaseKeepAliveResponse) {
+func (r *Registry) doKeepAlive(
+	service gsvc.Service, leaseID etcd3.LeaseID, keepAliceCh <-chan *etcd3.LeaseKeepAliveResponse,
+) {
 	var ctx = context.Background()
 	for {
 		select {
 		case <-r.client.Ctx().Done():
-			r.logger.Noticef(ctx, "keepalive done for lease id: %d", leaseID)
+			r.logger.Infof(ctx, "keepalive done for lease id: %d", leaseID)
 			return
 
 		case res, ok := <-keepAliceCh:
@@ -72,7 +87,21 @@ func (r *Registry) doKeepAlive(leaseID etcd3.LeaseID, keepAliceCh <-chan *etcd3.
 				// r.logger.Debugf(ctx, `keepalive loop: %v, %s`, ok, res.String())
 			}
 			if !ok {
-				r.logger.Noticef(ctx, `keepalive exit, lease id: %d`, leaseID)
+				r.logger.Warningf(ctx, `keepalive exit, lease id: %d, retry register`, leaseID)
+				// Re-register the service.
+				for {
+					if err := r.doRegisterLease(ctx, service); err != nil {
+						retryDuration := grand.D(time.Second, time.Second*3)
+						r.logger.Errorf(
+							ctx,
+							`keepalive retry register failed, will retry in %s: %+v`,
+							retryDuration, err,
+						)
+						time.Sleep(retryDuration)
+						continue
+					}
+					break
+				}
 				return
 			}
 		}

contrib/registry/etcd/etcd_watcher.go

@@ -8,9 +8,12 @@ package etcd
 
 import (
 	"context"
+	"time"
 
 	etcd3 "go.etcd.io/etcd/client/v3"
 
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/gsvc"
 )
 
@@ -27,17 +30,31 @@ type watcher struct {
 	kv        etcd3.KV
 }
 
-func newWatcher(key string, client *etcd3.Client) (*watcher, error) {
+func newWatcher(key string, client *etcd3.Client, dialTimeout time.Duration) (*watcher, error) {
 	w := &watcher{
 		key:     key,
 		watcher: etcd3.NewWatcher(client),
 		kv:      etcd3.NewKV(client),
 	}
+
+	// Create context with timeout
+	ctx, cancel := context.WithTimeout(context.Background(), dialTimeout)
+	defer cancel()
+
+	// Test connection first.
+	if _, err := client.Get(ctx, "ping"); err != nil {
+		return nil, gerror.WrapCode(gcode.CodeOperationFailed, err, "failed to connect to etcd")
+	}
+
 	w.ctx, w.cancel = context.WithCancel(context.Background())
 	w.watchChan = w.watcher.Watch(w.ctx, key, etcd3.WithPrefix(), etcd3.WithRev(0))
+
 	if err := w.watcher.RequestProgress(context.Background()); err != nil {
-		return nil, err
+		// Clean up
+		w.cancel()
+		return nil, gerror.WrapCode(gcode.CodeOperationFailed, err, "failed to establish watch connection")
 	}
+
 	return w, nil
 }
 

contrib/registry/etcd/go.mod

@@ -1,10 +1,10 @@
 module github.com/gogf/gf/contrib/registry/etcd/v2
 
-go 1.20
+go 1.22
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
-	go.etcd.io/etcd/client/v3 v3.5.7
+	github.com/gogf/gf/v2 v2.8.3
+	go.etcd.io/etcd/client/v3 v3.5.17
 	google.golang.org/grpc v1.59.0
 )
 
@@ -19,7 +19,7 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/magiconair/properties v1.8.9 // indirect
@@ -28,8 +28,8 @@ require (
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.17 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.24.0 // indirect

contrib/registry/etcd/go.sum

@@ -23,11 +23,10 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grokify/html-strip-tags-go v0.1.0 h1:03UrQLjAny8xci+R+qjCce/MYnpNXCtgzltlQbOBae4=
@@ -56,15 +55,16 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY=
-go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
-go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg=
-go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY=
-go.etcd.io/etcd/client/v3 v3.5.7 h1:u/OhpiuCgYY8awOHlhIhmGIGpxfBU/GZBUP3m/3/Iz4=
-go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw=
+go.etcd.io/etcd/api/v3 v3.5.17 h1:cQB8eb8bxwuxOilBpMJAEo8fAONyrdXTHUNcMd8yT1w=
+go.etcd.io/etcd/api/v3 v3.5.17/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4=
+go.etcd.io/etcd/client/pkg/v3 v3.5.17 h1:XxnDXAWq2pnxqx76ljWwiQ9jylbpC4rvkAeRVOUKKVw=
+go.etcd.io/etcd/client/pkg/v3 v3.5.17/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w=
+go.etcd.io/etcd/client/v3 v3.5.17 h1:o48sINNeWz5+pjy/Z0+HKpj/xSnBkuVhVvXkjEXbqZY=
+go.etcd.io/etcd/client/v3 v3.5.17/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo=
 go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
 go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
 go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
@@ -120,14 +120,13 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
 google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
 google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 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.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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=

contrib/registry/file/go.mod

@@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/registry/file/v2
 
 go 1.20
 
-require github.com/gogf/gf/v2 v2.8.2
+require github.com/gogf/gf/v2 v2.8.3
 
 require (
 	github.com/BurntSushi/toml v1.4.0 // indirect

contrib/registry/nacos/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/nacos/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/nacos-group/nacos-sdk-go/v2 v2.2.7
 )
 

contrib/registry/polaris/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/polaris/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/polarismesh/polaris-go v1.5.8
 )
 

contrib/registry/zookeeper/go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/go-zookeeper/zk v1.0.3
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	golang.org/x/sync v0.10.0
 )
 

contrib/rpc/grpcx/go.mod

@@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/rpc/grpcx/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/contrib/registry/file/v2 v2.8.2
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/contrib/registry/file/v2 v2.8.3
+	github.com/gogf/gf/v2 v2.8.3
 	go.opentelemetry.io/otel v1.24.0
 	go.opentelemetry.io/otel/trace v1.24.0
 	google.golang.org/grpc v1.64.1

contrib/sdk/httpclient/go.mod

@@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/sdk/httpclient/v2
 
 go 1.20
 
-require github.com/gogf/gf/v2 v2.8.2
+require github.com/gogf/gf/v2 v2.8.3
 
 require (
 	github.com/BurntSushi/toml v1.4.0 // indirect

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.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	go.opentelemetry.io/otel v1.24.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0

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.8.2
+	github.com/gogf/gf/v2 v2.8.3
 	go.opentelemetry.io/otel v1.24.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0

database/gdb/gdb.go

@@ -528,24 +528,53 @@ type dynamicConfig struct {
 
 // DoCommitInput is the input parameters for function DoCommit.
 type DoCommitInput struct {
-	Db            *sql.DB
-	Tx            *sql.Tx
-	Stmt          *sql.Stmt
-	Link          Link
-	Sql           string
-	Args          []interface{}
-	Type          SqlType
-	TxOptions     sql.TxOptions
+	// Db is the underlying database connection object.
+	Db *sql.DB
+
+	// Tx is the underlying transaction object.
+	Tx *sql.Tx
+
+	// Stmt is the prepared statement object.
+	Stmt *sql.Stmt
+
+	// Link is the common database function wrapper interface.
+	Link Link
+
+	// Sql is the SQL string to be executed.
+	Sql string
+
+	// Args is the arguments for SQL placeholders.
+	Args []interface{}
+
+	// Type indicates the type of SQL operation.
+	Type SqlType
+
+	// TxOptions specifies the transaction options.
+	TxOptions sql.TxOptions
+
+	// TxCancelFunc is the context cancel function for transaction.
+	TxCancelFunc context.CancelFunc
+
+	// IsTransaction indicates whether current operation is in transaction.
 	IsTransaction bool
 }
 
 // DoCommitOutput is the output parameters for function DoCommit.
 type DoCommitOutput struct {
-	Result    sql.Result  // Result is the result of exec statement.
-	Records   []Record    // Records is the result of query statement.
-	Stmt      *Stmt       // Stmt is the Statement object result for Prepare.
-	Tx        TX          // Tx is the transaction object result for Begin.
-	RawResult interface{} // RawResult is the underlying result, which might be sql.Result/*sql.Rows/*sql.Row.
+	// Result is the result of exec statement.
+	Result sql.Result
+
+	// Records is the result of query statement.
+	Records []Record
+
+	// Stmt is the Statement object result for Prepare.
+	Stmt *Stmt
+
+	// Tx is the transaction object result for Begin.
+	Tx TX
+
+	// RawResult is the underlying result, which might be sql.Result/*sql.Rows/*sql.Row.
+	RawResult interface{}
 }
 
 // Driver is the interface for integrating sql drivers into package gdb.
@@ -581,43 +610,84 @@ type Sql struct {
 
 // DoInsertOption is the input struct for function DoInsert.
 type DoInsertOption struct {
-	OnDuplicateStr string                 // Custom string for `on duplicated` statement.
-	OnDuplicateMap map[string]interface{} // Custom key-value map from `OnDuplicateEx` function for `on duplicated` statement.
-	OnConflict     []string               // Custom conflict key of upsert clause, if the database needs it.
-	InsertOption   InsertOption           // Insert operation in constant value.
-	BatchCount     int                    // Batch count for batch inserting.
+	// OnDuplicateStr is the custom string for `on duplicated` statement.
+	OnDuplicateStr string
+
+	// OnDuplicateMap is the custom key-value map from `OnDuplicateEx` function for `on duplicated` statement.
+	OnDuplicateMap map[string]interface{}
+
+	// OnConflict is the custom conflict key of upsert clause, if the database needs it.
+	OnConflict []string
+
+	// InsertOption is the insert operation in constant value.
+	InsertOption InsertOption
+
+	// BatchCount is the batch count for batch inserting.
+	BatchCount int
 }
 
 // TableField is the struct for table field.
 type TableField struct {
-	Index   int         // For ordering purpose as map is unordered.
-	Name    string      // Field name.
-	Type    string      // Field type. Eg: 'int(10) unsigned', 'varchar(64)'.
-	Null    bool        // Field can be null or not.
-	Key     string      // The index information(empty if it's not an index). Eg: PRI, MUL.
-	Default interface{} // Default value for the field.
-	Extra   string      // Extra information. Eg: auto_increment.
-	Comment string      // Field comment.
+	// Index is for ordering purpose as map is unordered.
+	Index int
+
+	// Name is the field name.
+	Name string
+
+	// Type is the field type. Eg: 'int(10) unsigned', 'varchar(64)'.
+	Type string
+
+	// Null is whether the field can be null or not.
+	Null bool
+
+	// Key is the index information(empty if it's not an index). Eg: PRI, MUL.
+	Key string
+
+	// Default is the default value for the field.
+	Default interface{}
+
+	// Extra is the extra information. Eg: auto_increment.
+	Extra string
+
+	// Comment is the field comment.
+	Comment string
 }
 
-// Counter  is the type for update count.
+// Counter is the type for update count.
 type Counter struct {
+	// Field is the field name.
 	Field string
+
+	// Value is the value.
 	Value float64
 }
 
 type (
-	Raw    string                   // Raw is a raw sql that will not be treated as argument but as a direct sql part.
-	Value  = *gvar.Var              // Value is the field value type.
-	Record map[string]Value         // Record is the row record of the table.
-	Result []Record                 // Result is the row record array.
-	Map    = map[string]interface{} // Map is alias of map[string]interface{}, which is the most common usage map type.
-	List   = []Map                  // List is type of map array.
+	// Raw is a raw sql that will not be treated as argument but as a direct sql part.
+	Raw string
+
+	// Value is the field value type.
+	Value = *gvar.Var
+
+	// Record is the row record of the table.
+	Record map[string]Value
+
+	// Result is the row record array.
+	Result []Record
+
+	// Map is alias of map[string]interface{}, which is the most common usage map type.
+	Map = map[string]interface{}
+
+	// List is type of map array.
+	List = []Map
 )
 
 type CatchSQLManager struct {
+	// SQLArray is the array of sql.
 	SQLArray *garray.StrArray
-	DoCommit bool // DoCommit marks it will be committed to underlying driver or not.
+
+	// DoCommit marks it will be committed to underlying driver or not.
+	DoCommit bool
 }
 
 const (

database/gdb/gdb_core.go

@@ -92,7 +92,6 @@ func (c *Core) GetCtxTimeout(ctx context.Context, timeoutType ctxTimeoutType) (c
 		if c.db.GetConfig().PrepareTimeout > 0 {
 			return context.WithTimeout(ctx, config.PrepareTimeout)
 		}
-
 	case ctxTimeoutTypeTrans:
 		if c.db.GetConfig().TranTimeout > 0 {
 			return context.WithTimeout(ctx, config.TranTimeout)

database/gdb/gdb_core_config.go

@@ -7,6 +7,7 @@
 package gdb
 
 import (
+	"fmt"
 	"sync"
 	"time"
 
@@ -27,36 +28,126 @@ type ConfigGroup []ConfigNode
 
 // ConfigNode is configuration for one node.
 type ConfigNode struct {
-	Host                 string        `json:"host"`                 // Host of server, ip or domain like: 127.0.0.1, localhost
-	Port                 string        `json:"port"`                 // Port, it's commonly 3306.
-	User                 string        `json:"user"`                 // Authentication username.
-	Pass                 string        `json:"pass"`                 // Authentication password.
-	Name                 string        `json:"name"`                 // Default used database name.
-	Type                 string        `json:"type"`                 // Database type: mysql, mariadb, sqlite, mssql, pgsql, oracle, clickhouse, dm.
-	Link                 string        `json:"link"`                 // (Optional) Custom link information for all configuration in one single string.
-	Extra                string        `json:"extra"`                // (Optional) Extra configuration according the registered third-party database driver.
-	Role                 string        `json:"role"`                 // (Optional, "master" in default) Node role, used for master-slave mode: master, slave.
-	Debug                bool          `json:"debug"`                // (Optional) Debug mode enables debug information logging and output.
-	Prefix               string        `json:"prefix"`               // (Optional) Table prefix.
-	DryRun               bool          `json:"dryRun"`               // (Optional) Dry run, which does SELECT but no INSERT/UPDATE/DELETE statements.
-	Weight               int           `json:"weight"`               // (Optional) Weight for load balance calculating, it's useless if there's just one node.
-	Charset              string        `json:"charset"`              // (Optional, "utf8" in default) Custom charset when operating on database.
-	Protocol             string        `json:"protocol"`             // (Optional, "tcp" in default) See net.Dial for more information which networks are available.
-	Timezone             string        `json:"timezone"`             // (Optional) Sets the time zone for displaying and interpreting time stamps.
-	Namespace            string        `json:"namespace"`            // (Optional) Namespace for some databases. Eg, in pgsql, the `Name` acts as the `catalog`, the `NameSpace` acts as the `schema`.
-	MaxIdleConnCount     int           `json:"maxIdle"`              // (Optional) Max idle connection configuration for underlying connection pool.
-	MaxOpenConnCount     int           `json:"maxOpen"`              // (Optional) Max open connection configuration for underlying connection pool.
-	MaxConnLifeTime      time.Duration `json:"maxLifeTime"`          // (Optional) Max amount of time a connection may be idle before being closed.
-	QueryTimeout         time.Duration `json:"queryTimeout"`         // (Optional) Max query time for per dql.
-	ExecTimeout          time.Duration `json:"execTimeout"`          // (Optional) Max exec time for dml.
-	TranTimeout          time.Duration `json:"tranTimeout"`          // (Optional) Max exec time for a transaction.
-	PrepareTimeout       time.Duration `json:"prepareTimeout"`       // (Optional) Max exec time for prepare operation.
-	CreatedAt            string        `json:"createdAt"`            // (Optional) The field name of table for automatic-filled created datetime.
-	UpdatedAt            string        `json:"updatedAt"`            // (Optional) The field name of table for automatic-filled updated datetime.
-	DeletedAt            string        `json:"deletedAt"`            // (Optional) The field name of table for automatic-filled updated datetime.
-	TimeMaintainDisabled bool          `json:"timeMaintainDisabled"` // (Optional) Disable the automatic time maintaining feature.
+	// Host specifies the server address, can be either IP address or domain name
+	// Example: "127.0.0.1", "localhost"
+	Host string `json:"host"`
+
+	// Port specifies the server port number
+	// Default is typically "3306" for MySQL
+	Port string `json:"port"`
+
+	// User specifies the authentication username for database connection
+	User string `json:"user"`
+
+	// Pass specifies the authentication password for database connection
+	Pass string `json:"pass"`
+
+	// Name specifies the default database name to be used
+	Name string `json:"name"`
+
+	// Type specifies the database type
+	// Example: mysql, mariadb, sqlite, mssql, pgsql, oracle, clickhouse, dm.
+	Type string `json:"type"`
+
+	// Link provides custom connection string that combines all configuration in one string
+	// Optional field
+	Link string `json:"link"`
+
+	// Extra provides additional configuration options for third-party database drivers
+	// Optional field
+	Extra string `json:"extra"`
+
+	// Role specifies the node role in master-slave setup
+	// Optional field, defaults to "master"
+	// Available values: "master", "slave"
+	Role Role `json:"role"`
+
+	// Debug enables debug mode for logging and output
+	// Optional field
+	Debug bool `json:"debug"`
+
+	// Prefix specifies the table name prefix
+	// Optional field
+	Prefix string `json:"prefix"`
+
+	// DryRun enables simulation mode where SELECT statements are executed
+	// but INSERT/UPDATE/DELETE statements are not
+	// Optional field
+	DryRun bool `json:"dryRun"`
+
+	// Weight specifies the node weight for load balancing calculations
+	// Optional field, only effective in multi-node setups
+	Weight int `json:"weight"`
+
+	// Charset specifies the character set for database operations
+	// Optional field, defaults to "utf8"
+	Charset string `json:"charset"`
+
+	// Protocol specifies the network protocol for database connection
+	// Optional field, defaults to "tcp"
+	// See net.Dial for available network protocols
+	Protocol string `json:"protocol"`
+
+	// Timezone sets the time zone for timestamp interpretation and display
+	// Optional field
+	Timezone string `json:"timezone"`
+
+	// Namespace specifies the schema namespace for certain databases
+	// Optional field, e.g., in PostgreSQL, Name is the catalog and Namespace is the schema
+	Namespace string `json:"namespace"`
+
+	// MaxIdleConnCount specifies the maximum number of idle connections in the pool
+	// Optional field
+	MaxIdleConnCount int `json:"maxIdle"`
+
+	// MaxOpenConnCount specifies the maximum number of open connections in the pool
+	// Optional field
+	MaxOpenConnCount int `json:"maxOpen"`
+
+	// MaxConnLifeTime specifies the maximum lifetime of a connection
+	// Optional field
+	MaxConnLifeTime time.Duration `json:"maxLifeTime"`
+
+	// QueryTimeout specifies the maximum execution time for DQL operations
+	// Optional field
+	QueryTimeout time.Duration `json:"queryTimeout"`
+
+	// ExecTimeout specifies the maximum execution time for DML operations
+	// Optional field
+	ExecTimeout time.Duration `json:"execTimeout"`
+
+	// TranTimeout specifies the maximum execution time for a transaction block
+	// Optional field
+	TranTimeout time.Duration `json:"tranTimeout"`
+
+	// PrepareTimeout specifies the maximum execution time for prepare operations
+	// Optional field
+	PrepareTimeout time.Duration `json:"prepareTimeout"`
+
+	// CreatedAt specifies the field name for automatic timestamp on record creation
+	// Optional field
+	CreatedAt string `json:"createdAt"`
+
+	// UpdatedAt specifies the field name for automatic timestamp on record updates
+	// Optional field
+	UpdatedAt string `json:"updatedAt"`
+
+	// DeletedAt specifies the field name for automatic timestamp on record deletion
+	// Optional field
+	DeletedAt string `json:"deletedAt"`
+
+	// TimeMaintainDisabled controls whether automatic time maintenance is disabled
+	// Optional field
+	TimeMaintainDisabled bool `json:"timeMaintainDisabled"`
 }
 
+type Role string
+
+const (
+	RoleMaster Role = "master"
+	RoleSlave  Role = "slave"
+)
+
 const (
 	DefaultGroupName = "default" // Default group name.
 )
@@ -291,14 +382,22 @@ func (c *Core) GetSchema() string {
 }
 
 func parseConfigNodeLink(node *ConfigNode) (*ConfigNode, error) {
-	var match []string
-	if node.Link != "" {
-		match, _ = gregex.MatchString(linkPattern, node.Link)
+	var (
+		link  = node.Link
+		match []string
+	)
+	if link != "" {
+		// To be compatible with old configuration,
+		// it checks and converts the link to new configuration.
+		if node.Type != "" && !gstr.HasPrefix(link, node.Type+":") {
+			link = fmt.Sprintf("%s:%s", node.Type, link)
+		}
+		match, _ = gregex.MatchString(linkPattern, link)
 		if len(match) <= 5 {
 			return nil, gerror.NewCodef(
 				gcode.CodeInvalidParameter,
 				`invalid link configuration: %s, shuold be pattern like: %s`,
-				node.Link, linkPatternDescription,
+				link, linkPatternDescription,
 			)
 		}
 		node.Type = match[1]
@@ -322,7 +421,6 @@ func parseConfigNodeLink(node *ConfigNode) (*ConfigNode, error) {
 		if len(match) > 6 && match[7] != "" {
 			node.Extra = match[7]
 		}
-		node.Link = ""
 	}
 	if node.Extra != "" {
 		if m, _ := gstr.Parse(node.Extra); len(m) > 0 {

database/gdb/gdb_core_txcore.go

@@ -20,13 +20,30 @@ import (
 
 // TXCore is the struct for transaction management.
 type TXCore struct {
-	db               DB              // db is the current gdb database manager.
-	tx               *sql.Tx         // tx is the raw and underlying transaction manager.
-	ctx              context.Context // ctx is the context for this transaction only.
-	master           *sql.DB         // master is the raw and underlying database manager.
-	transactionId    string          // transactionId is a unique id generated by this object for this transaction.
-	transactionCount int             // transactionCount marks the times that Begins.
-	isClosed         bool            // isClosed marks this transaction has already been committed or rolled back.
+	// db is the database management interface that implements the DB interface,
+	// providing access to database operations and configuration.
+	db DB
+	// tx is the underlying SQL transaction object from database/sql package,
+	// which manages the actual transaction operations.
+	tx *sql.Tx
+	// ctx is the context specific to this transaction,
+	// which can be used for timeout control and cancellation.
+	ctx context.Context
+	// master is the underlying master database connection pool,
+	// used for direct database operations when needed.
+	master *sql.DB
+	// transactionId is a unique identifier for this transaction instance,
+	// used for tracking and debugging purposes.
+	transactionId string
+	// transactionCount tracks the number of nested transaction begins,
+	// used for managing transaction nesting depth.
+	transactionCount int
+	// isClosed indicates whether this transaction has been finalized
+	// through either a commit or rollback operation.
+	isClosed bool
+	// cancelFunc is the context cancellation function associated with ctx,
+	// used to cancel the transaction context when needed.
+	cancelFunc context.CancelFunc
 }
 
 // transactionKeyForNestedPoint forms and returns the transaction key at current save point.
@@ -73,6 +90,7 @@ func (tx *TXCore) Commit() error {
 		Tx:            tx.tx,
 		Sql:           "COMMIT",
 		Type:          SqlTypeTXCommit,
+		TxCancelFunc:  tx.cancelFunc,
 		IsTransaction: true,
 	})
 	if err == nil {
@@ -94,6 +112,7 @@ func (tx *TXCore) Rollback() error {
 		Tx:            tx.tx,
 		Sql:           "ROLLBACK",
 		Type:          SqlTypeTXRollback,
+		TxCancelFunc:  tx.cancelFunc,
 		IsTransaction: true,
 	})
 	if err == nil {

database/gdb/gdb_core_underlying.go

@@ -51,12 +51,6 @@ func (c *Core) DoQuery(ctx context.Context, link Link, sql string, args ...inter
 		}
 	}
 
-	if c.db.GetConfig().QueryTimeout > 0 {
-		var cancelFunc context.CancelFunc
-		ctx, cancelFunc = context.WithTimeout(ctx, c.db.GetConfig().QueryTimeout)
-		defer cancelFunc()
-	}
-
 	// Sql filtering.
 	sql, args = c.FormatSqlBeforeExecuting(sql, args)
 	sql, args, err = c.db.DoFilter(ctx, link, sql, args)
@@ -115,12 +109,6 @@ func (c *Core) DoExec(ctx context.Context, link Link, sql string, args ...interf
 		}
 	}
 
-	if c.db.GetConfig().ExecTimeout > 0 {
-		var cancelFunc context.CancelFunc
-		ctx, cancelFunc = context.WithTimeout(ctx, c.db.GetConfig().ExecTimeout)
-		defer cancelFunc()
-	}
-
 	// SQL filtering.
 	sql, args = c.FormatSqlBeforeExecuting(sql, args)
 	sql, args, err = c.db.DoFilter(ctx, link, sql, args)
@@ -183,11 +171,10 @@ func (c *Core) DoCommit(ctx context.Context, in DoCommitInput) (out DoCommitOutp
 	ctx, span := tr.Start(ctx, string(in.Type), trace.WithSpanKind(trace.SpanKindInternal))
 	defer span.End()
 
-	// Execution cased by type.
+	// Execution by type.
 	switch in.Type {
 	case SqlTypeBegin:
 		ctx, cancelFuncForTimeout = c.GetCtxTimeout(ctx, ctxTimeoutTypeTrans)
-		defer cancelFuncForTimeout()
 		formattedSql = fmt.Sprintf(
 			`%s (IosolationLevel: %s, ReadOnly: %t)`,
 			formattedSql, in.TxOptions.Isolation.String(), in.TxOptions.ReadOnly,
@@ -199,15 +186,22 @@ func (c *Core) DoCommit(ctx context.Context, in DoCommitInput) (out DoCommitOutp
 				ctx:           context.WithValue(ctx, transactionIdForLoggerCtx, transactionIdGenerator.Add(1)),
 				master:        in.Db,
 				transactionId: guid.S(),
+				cancelFunc:    cancelFuncForTimeout,
 			}
 			ctx = out.Tx.GetCtx()
 		}
 		out.RawResult = sqlTx
 
 	case SqlTypeTXCommit:
+		if in.TxCancelFunc != nil {
+			defer in.TxCancelFunc()
+		}
 		err = in.Tx.Commit()
 
 	case SqlTypeTXRollback:
+		if in.TxCancelFunc != nil {
+			defer in.TxCancelFunc()
+		}
 		err = in.Tx.Rollback()
 
 	case SqlTypeExecContext:

database/gdb/gdb_func.go

@@ -856,20 +856,9 @@ func handleSliceAndStructArgsForSql(
 				return s
 			})
 
-		default:
+			// Special struct handling.
+		case reflect.Struct:
 			switch oldArg.(type) {
-			// Do not append Raw arg to args but directly into the sql.
-			case Raw, *Raw:
-				var counter = 0
-				newSql = gstr.ReplaceFunc(newSql, `?`, func(s string) string {
-					counter++
-					if counter == index+insertHolderCount+1 {
-						return gconv.String(oldArg)
-					}
-					return s
-				})
-				continue
-
 			// The underlying driver supports time.Time/*time.Time types.
 			case time.Time, *time.Time:
 				newArgs = append(newArgs, oldArg)
@@ -892,6 +881,24 @@ func handleSliceAndStructArgsForSql(
 				}
 			}
 			newArgs = append(newArgs, oldArg)
+
+		default:
+			switch oldArg.(type) {
+			// Do not append Raw arg to args but directly into the sql.
+			case Raw, *Raw:
+				var counter = 0
+				newSql = gstr.ReplaceFunc(newSql, `?`, func(s string) string {
+					counter++
+					if counter == index+insertHolderCount+1 {
+						return gconv.String(oldArg)
+					}
+					return s
+				})
+				continue
+
+			default:
+			}
+			newArgs = append(newArgs, oldArg)
 		}
 	}
 	return

database/gdb/gdb_z_mysql_internal_test.go

@@ -278,6 +278,23 @@ func Test_parseConfigNodeLink_WithType(t *testing.T) {
 		t.Assert(newNode.Charset, `utf8`)
 		t.Assert(newNode.Protocol, `unix`)
 	})
+	gtest.C(t, func(t *gtest.T) {
+		node := &ConfigNode{
+			Type: "mysql",
+			Link: "username:password@unix(/tmp/mysql.sock)/dbname",
+		}
+		newNode, err := parseConfigNodeLink(node)
+		t.AssertNil(err)
+		t.Assert(newNode.Type, `mysql`)
+		t.Assert(newNode.User, `username`)
+		t.Assert(newNode.Pass, `password`)
+		t.Assert(newNode.Host, `/tmp/mysql.sock`)
+		t.Assert(newNode.Port, ``)
+		t.Assert(newNode.Name, `dbname`)
+		t.Assert(newNode.Extra, ``)
+		t.Assert(newNode.Charset, `utf8`)
+		t.Assert(newNode.Protocol, `unix`)
+	})
 }
 
 func Test_Func_doQuoteWord(t *testing.T) {

example/go.mod

@@ -1,25 +1,25 @@
 module github.com/gogf/gf/example
 
-go 1.21
+go 1.22
 
 require (
-	github.com/gogf/gf/contrib/config/apollo/v2 v2.8.2
-	github.com/gogf/gf/contrib/config/consul/v2 v2.8.2
-	github.com/gogf/gf/contrib/config/kubecm/v2 v2.8.2
-	github.com/gogf/gf/contrib/config/nacos/v2 v2.8.2
-	github.com/gogf/gf/contrib/config/polaris/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.2
-	github.com/gogf/gf/contrib/metric/otelmetric/v2 v2.8.2
-	github.com/gogf/gf/contrib/nosql/redis/v2 v2.8.2
-	github.com/gogf/gf/contrib/registry/consul/v2 v2.8.2
-	github.com/gogf/gf/contrib/registry/etcd/v2 v2.8.2
-	github.com/gogf/gf/contrib/registry/file/v2 v2.8.2
-	github.com/gogf/gf/contrib/registry/nacos/v2 v2.8.2
-	github.com/gogf/gf/contrib/registry/polaris/v2 v2.8.2
-	github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.8.2
-	github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.8.2
-	github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.8.2
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/contrib/config/apollo/v2 v2.8.3
+	github.com/gogf/gf/contrib/config/consul/v2 v2.8.3
+	github.com/gogf/gf/contrib/config/kubecm/v2 v2.8.3
+	github.com/gogf/gf/contrib/config/nacos/v2 v2.8.3
+	github.com/gogf/gf/contrib/config/polaris/v2 v2.8.3
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.3
+	github.com/gogf/gf/contrib/metric/otelmetric/v2 v2.8.3
+	github.com/gogf/gf/contrib/nosql/redis/v2 v2.8.3
+	github.com/gogf/gf/contrib/registry/consul/v2 v2.8.3
+	github.com/gogf/gf/contrib/registry/etcd/v2 v2.8.3
+	github.com/gogf/gf/contrib/registry/file/v2 v2.8.3
+	github.com/gogf/gf/contrib/registry/nacos/v2 v2.8.3
+	github.com/gogf/gf/contrib/registry/polaris/v2 v2.8.3
+	github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.8.3
+	github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.8.3
+	github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.8.3
+	github.com/gogf/gf/v2 v2.8.3
 	github.com/hashicorp/consul/api v1.26.1
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/nacos-group/nacos-sdk-go/v2 v2.2.7
@@ -32,7 +32,7 @@ require (
 	go.opentelemetry.io/otel/exporters/prometheus v0.46.0
 	go.opentelemetry.io/otel/sdk v1.29.0
 	golang.org/x/time v0.6.0
-	google.golang.org/grpc v1.67.1
+	google.golang.org/grpc v1.68.1
 	google.golang.org/protobuf v1.34.2
 	k8s.io/client-go v0.27.4
 )
@@ -125,9 +125,9 @@ require (
 	github.com/spf13/viper v1.8.1 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.7 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.17 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.17 // indirect
 	go.opentelemetry.io/contrib/instrumentation/runtime v0.49.0 // indirect
 	go.opentelemetry.io/otel/metric v1.29.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect
@@ -138,7 +138,7 @@ require (
 	golang.org/x/crypto v0.30.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
 	golang.org/x/net v0.32.0 // indirect
-	golang.org/x/oauth2 v0.22.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/term v0.27.0 // indirect

example/go.sum

@@ -731,14 +731,14 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/api/v3 v3.5.7 h1:sbcmosSVesNrWOJ58ZQFitHMdncusIifYcrBfwrlJSY=
-go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
+go.etcd.io/etcd/api/v3 v3.5.17 h1:cQB8eb8bxwuxOilBpMJAEo8fAONyrdXTHUNcMd8yT1w=
+go.etcd.io/etcd/api/v3 v3.5.17/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/pkg/v3 v3.5.7 h1:y3kf5Gbp4e4q7egZdn5T7W9TSHUvkClN6u+Rq9mEOmg=
-go.etcd.io/etcd/client/pkg/v3 v3.5.7/go.mod h1:o0Abi1MK86iad3YrWhgUsbGx1pmTS+hrORWc2CamuhY=
+go.etcd.io/etcd/client/pkg/v3 v3.5.17 h1:XxnDXAWq2pnxqx76ljWwiQ9jylbpC4rvkAeRVOUKKVw=
+go.etcd.io/etcd/client/pkg/v3 v3.5.17/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
-go.etcd.io/etcd/client/v3 v3.5.7 h1:u/OhpiuCgYY8awOHlhIhmGIGpxfBU/GZBUP3m/3/Iz4=
-go.etcd.io/etcd/client/v3 v3.5.7/go.mod h1:sOWmj9DZUMyAngS7QQwCyAXXAL6WhgTOPLNS/NabQgw=
+go.etcd.io/etcd/client/v3 v3.5.17 h1:o48sINNeWz5+pjy/Z0+HKpj/xSnBkuVhVvXkjEXbqZY=
+go.etcd.io/etcd/client/v3 v3.5.17/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -928,8 +928,8 @@ golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7Lm
 golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
 golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
-golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
-golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
+golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1334,8 +1334,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu
 google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
+google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

example/registry/etcd/grpc/client/client.go

@@ -7,8 +7,10 @@
 package main
 
 import (
+	"context"
+	"time"
+
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
 
 	"github.com/gogf/gf/contrib/registry/etcd/v2"
 	"github.com/gogf/gf/contrib/rpc/grpcx/v2"
@@ -20,14 +22,23 @@ func main() {
 	grpcx.Resolver.Register(etcd.New("127.0.0.1:2379"))
 
 	var (
-		ctx    = gctx.New()
 		conn   = grpcx.Client.MustNewGrpcClientConn("demo")
 		client = protobuf.NewGreeterClient(conn)
 	)
-	res, err := client.SayHello(ctx, &protobuf.HelloRequest{Name: "World"})
-	if err != nil {
-		g.Log().Error(ctx, err)
-		return
+
+	for {
+		func() {
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
+			defer cancel()
+			res, err := client.SayHello(ctx, &protobuf.HelloRequest{Name: "World"})
+			if err != nil {
+				g.Log().Errorf(ctx, `%+v`, err)
+			} else {
+				g.Log().Debug(ctx, "Response:", res.Message)
+			}
+		}()
+
+		time.Sleep(time.Second)
 	}
-	g.Log().Debug(ctx, "Response:", res.Message)
+
 }

internal/httputil/httputils.go

@@ -38,7 +38,9 @@ func BuildParams(params interface{}, noUrlEncode ...bool) (encodedParamStr strin
 		}
 	}
 	// Else converts it to map and does the url encoding.
-	m, urlEncode := gconv.Map(params), true
+	m, urlEncode := gconv.Map(params, gconv.MapOption{
+		OmitEmpty: true,
+	}), true
 	if len(m) == 0 {
 		return gconv.String(params)
 	}

internal/httputil/httputils_test.go

@@ -36,3 +36,18 @@ func TestBuildParams(t *testing.T) {
 		t.Assert(gstr.Contains(params, "b"), false)
 	})
 }
+
+// https://github.com/gogf/gf/issues/4023
+func TestIssue4023(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		type HttpGetRequest struct {
+			Key1 string `json:"key1"`
+			Key2 string `json:"key2,omitempty"`
+		}
+		r := &HttpGetRequest{
+			Key1: "value1",
+		}
+		params := httputil.BuildParams(r)
+		t.Assert(params, "key1=value1")
+	})
+}

net/gipv4/gipv4.go

@@ -10,34 +10,40 @@
 package gipv4
 
 import (
-	"fmt"
+	"net"
 	"strconv"
-
-	"github.com/gogf/gf/v2/text/gregex"
+	"strings"
 )
 
 // Validate checks whether given `ip` a valid IPv4 address.
 func Validate(ip string) bool {
-	return gregex.IsMatchString(`^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$`, ip)
+	parsed := net.ParseIP(ip)
+	return parsed != nil && parsed.To4() != nil
 }
 
 // ParseAddress parses `address` to its ip and port.
 // Eg: 192.168.1.1:80 -> 192.168.1.1, 80
 func ParseAddress(address string) (string, int) {
-	match, err := gregex.MatchString(`^(.+):(\d+)$`, address)
-	if err == nil {
-		i, _ := strconv.Atoi(match[2])
-		return match[1], i
+	host, port, err := net.SplitHostPort(address)
+	if err != nil {
+		return "", 0
 	}
-	return "", 0
+	portInt, err := strconv.Atoi(port)
+	if err != nil {
+		return "", 0
+	}
+	return host, portInt
 }
 
 // GetSegment returns the segment of given ip address.
 // Eg: 192.168.2.102 -> 192.168.2
 func GetSegment(ip string) string {
-	match, err := gregex.MatchString(`^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$`, ip)
-	if err != nil || len(match) < 4 {
+	if !Validate(ip) {
 		return ""
 	}
-	return fmt.Sprintf("%s.%s.%s", match[1], match[2], match[3])
+	segments := strings.Split(ip, ".")
+	if len(segments) != 4 {
+		return ""
+	}
+	return strings.Join(segments[:3], ".")
 }

net/gipv4/gipv4_ip.go

@@ -24,10 +24,11 @@ func GetIpArray() (ips []string, err error) {
 	}
 	for _, address := range interfaceAddr {
 		ipNet, isValidIpNet := address.(*net.IPNet)
-		if isValidIpNet && !ipNet.IP.IsLoopback() {
-			if ipNet.IP.To4() != nil {
-				ips = append(ips, ipNet.IP.String())
-			}
+		if !(isValidIpNet && !ipNet.IP.IsLoopback()) {
+			continue
+		}
+		if ipNet.IP.To4() != nil {
+			ips = append(ips, ipNet.IP.String())
 		}
 	}
 	return ips, nil

net/gipv4/gipv4_z_unit_ip_test.go

@@ -0,0 +1,81 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gipv4_test
+
+import (
+	"testing"
+
+	"github.com/gogf/gf/v2/net/gipv4"
+	"github.com/gogf/gf/v2/test/gtest"
+)
+
+func TestGetIpArray(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		ips, err := gipv4.GetIpArray()
+		t.AssertNil(err)
+		t.AssertGT(len(ips), 0)
+		for _, ip := range ips {
+			t.Assert(gipv4.Validate(ip), true)
+		}
+	})
+}
+
+func TestMustGetIntranetIp(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		defer func() {
+			if r := recover(); r != nil {
+				t.Errorf("MustGetIntranetIp() panicked: %v", r)
+			}
+		}()
+		ip := gipv4.MustGetIntranetIp()
+		t.Assert(gipv4.IsIntranet(ip), true)
+	})
+}
+
+func TestGetIntranetIp(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		ip, err := gipv4.GetIntranetIp()
+		t.AssertNil(err)
+		t.AssertNE(ip, "")
+		t.Assert(gipv4.IsIntranet(ip), true)
+	})
+}
+
+func TestGetIntranetIpArray(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		ips, err := gipv4.GetIntranetIpArray()
+		t.AssertNil(err)
+		t.AssertGT(len(ips), 0)
+		for _, ip := range ips {
+			t.Assert(gipv4.IsIntranet(ip), true)
+		}
+	})
+}
+
+func TestIsIntranet(t *testing.T) {
+	tests := []struct {
+		ip       string
+		expected bool
+	}{
+		{"127.0.0.1", true},
+		{"10.0.0.1", true},
+		{"172.16.0.1", true},
+		{"172.31.255.255", true},
+		{"192.168.0.1", true},
+		{"192.168.255.255", true},
+		{"8.8.8.8", false},
+		{"172.32.0.1", false},
+		{"256.256.256.256", false},
+	}
+
+	gtest.C(t, func(t *gtest.T) {
+		for _, test := range tests {
+			result := gipv4.IsIntranet(test.ip)
+			t.Assert(result, test.expected)
+		}
+	})
+}

net/gipv4/gipv4_z_unit_lookup_test.go

@@ -0,0 +1,30 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gipv4_test
+
+import (
+	"testing"
+
+	"github.com/gogf/gf/v2/net/gipv4"
+	"github.com/gogf/gf/v2/test/gtest"
+)
+
+func TestGetHostByName(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		ip, err := gipv4.GetHostByName("localhost")
+		t.AssertNil(err)
+		t.Assert(ip, "127.0.0.1")
+	})
+}
+
+func TestGetHostsByName(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		ips, err := gipv4.GetHostsByName("localhost")
+		t.AssertNil(err)
+		t.AssertIN("127.0.0.1", ips)
+	})
+}

net/gipv4/gipv4_z_unit_mac_test.go

@@ -0,0 +1,36 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gipv4_test
+
+import (
+	"testing"
+
+	"github.com/gogf/gf/v2/net/gipv4"
+	"github.com/gogf/gf/v2/test/gtest"
+)
+
+func TestGetMac(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		mac, err := gipv4.GetMac()
+		t.AssertNil(err)
+		t.AssertNE(mac, "")
+		// MAC addresses are typically 17 characters in length
+		t.Assert(len(mac), 17)
+	})
+}
+
+func TestGetMacArray(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		macs, err := gipv4.GetMacArray()
+		t.AssertNil(err)
+		t.AssertGT(len(macs), 0)
+		for _, mac := range macs {
+			// MAC addresses are typically 17 characters in length
+			t.Assert(len(mac), 17)
+		}
+	})
+}

net/gipv4/gipv4_z_unit_test.go

@@ -0,0 +1,81 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gipv4_test
+
+import (
+	"testing"
+
+	"github.com/gogf/gf/v2/net/gipv4"
+	"github.com/gogf/gf/v2/test/gtest"
+)
+
+func TestValidate(t *testing.T) {
+	tests := []struct {
+		ip       string
+		expected bool
+	}{
+		{"192.168.1.1", true},
+		{"255.255.255.255", true},
+		{"0.0.0.0", true},
+		{"256.256.256.256", false},
+		{"192.168.1", false},
+		{"abc.def.ghi.jkl", false},
+		{"19216811", false},
+		{"abcdefghijkl", false},
+	}
+
+	gtest.C(t, func(t *gtest.T) {
+		for _, test := range tests {
+			result := gipv4.Validate(test.ip)
+			t.Assert(result, test.expected)
+		}
+	})
+}
+
+func TestParseAddress(t *testing.T) {
+	tests := []struct {
+		address      string
+		expectedIP   string
+		expectedPort int
+	}{
+		{"192.168.1.1:80", "192.168.1.1", 80},
+		{"10.0.0.1:8080", "10.0.0.1", 8080},
+		{"127.0.0.1:65535", "127.0.0.1", 65535},
+		{"invalid:address", "", 0},
+		{"192.168.1.1", "", 0},
+		{"19216811", "", 0},
+	}
+
+	gtest.C(t, func(t *gtest.T) {
+		for _, test := range tests {
+			ip, port := gipv4.ParseAddress(test.address)
+			t.Assert(ip, test.expectedIP)
+			t.Assert(port, test.expectedPort)
+		}
+	})
+}
+
+func TestGetSegment(t *testing.T) {
+	tests := []struct {
+		ip       string
+		expected string
+	}{
+		{"192.168.2.102", "192.168.2"},
+		{"10.0.0.1", "10.0.0"},
+		{"255.255.255.255", "255.255.255"},
+		{"invalid.ip.address", ""},
+		{"123", ""},
+		{"192.168.2.102.123", ""},
+	}
+
+	gtest.C(t, func(t *gtest.T) {
+		for _, test := range tests {
+			result := gipv4.GetSegment(test.ip)
+			t.Assert(result, test.expected)
+		}
+	})
+}

net/gudp/gudp_z_unit_test.go

@@ -99,14 +99,6 @@ func Test_Basic(t *testing.T) {
 			t.AssertNil(err)
 		}
 	})
-	// gudp.SendRecv
-	gtest.C(t, func(t *gtest.T) {
-		for i := 0; i < 100; i++ {
-			result, err := gudp.SendRecv(s.GetListenedAddress(), []byte(gconv.String(i)), -1)
-			t.AssertNil(err)
-			t.Assert(string(result), fmt.Sprintf(`> %d`, i))
-		}
-	})
 }
 
 // If the read buffer size is less than the sent package size,

version.go

@@ -2,5 +2,5 @@ package gf
 
 const (
 	// VERSION is the current GoFrame version.
-	VERSION = "v2.8.2"
+	VERSION = "v2.8.3"
 )