version v2.4.0 (#2595 )

improve auto retrieving of ip addresses for service registering (#2593 )
fix: fix typo and go-staticcheck S1002 warning (#2590 )
2026-06-08 18:47:45 +08:00 · 2023-04-24 11:44:19 +08:00 · 2023-04-23 21:58:17 +08:00 · 2023-04-21 10:13:59 +08:00 · 2023-04-20 16:30:42 +08:00 · 2023-04-18 10:09:07 +08:00
131 changed files with 1742 additions and 207 deletions
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@ -16,12 +16,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Github Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      
      - name: Set Up Golang Environment
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v4
        with:
-          go-version: 1.17
+          go-version: 1.20.3
      
      - name: Build CLI Binary
        run: |
@ -47,18 +47,18 @@ jobs:

      - name: Create Github Release
        id: create_release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          tag_name:     ${{ github.ref }}
-          release_name: GoFrame Release ${{ github.ref }}
+          name: GoFrame Release ${{ github.ref }}
          draft:        false
          prerelease:   false
      
      - name: Upload Release Asset
        id:   upload-release-asset
-        uses: alexellis/upload-assets@0.2.2
+        uses: alexellis/upload-assets@0.4.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
--- a/.github/workflows/gf.yml
+++ b/.github/workflows/gf.yml
@ -66,7 +66,9 @@ jobs:
          - 3306:3306

      # PostgreSQL backend server.
-      # docker run -d --name postgres -p 5432:5432 -e POSTGRES_PASSWORD=12345678 -e POSTGRES_USER=postgres -e POSTGRES_DB=test -v postgres:/Users/john/Temp/postgresql/data loads/postgres:13
+      # docker run -d --name postgres -p 5432:5432 \
+      # -e POSTGRES_PASSWORD=12345678 -e POSTGRES_USER=postgres -e POSTGRES_DB=test \
+      # -v postgres:/Users/john/Temp/postgresql/data loads/postgres:13
      postgres:
        image: loads/postgres:13
        env:
@ -84,6 +86,13 @@ jobs:
          --health-retries 5

      # MSSQL backend server.
+      # docker run -d --name mssql -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
      mssql:
        image: loads/mssqldocker:14.0.3391.2
        env:
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@ -17,9 +17,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Github Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

-      - name: Auto Creating Tags
+      - name: Auto Creating Tags For Contrib Packages
        run: |
          git config --global user.email "tagrobot@goframe.org"
          git config --global user.name  "TagRobot"
--- a/.golangci.yml
+++ b/.golangci.yml
@ -135,7 +135,7 @@ linters-settings:
  goconst:
    # Minimal length of string constant.
    # Default: 3
-    min-len: 2
+    min-len: 4
    # Minimum occurrences of constant string count to trigger issue.
    # Default: 3
    # For subsequent optimization, the value is reduced.
--- a/39
+++ b/39
@ -1,4 +1,4 @@
-
+SHELL := /bin/bash

 .PHONY: tidy
 tidy:
@ -13,4 +13,39 @@ tidy:

 .PHONY: lint
 lint:
-	golangci-lint run
+	golangci-lint run
+
+# make version to=v2.4.0
+.PHONY: version
+version:
+	$(eval files=$(shell find . -name go.mod))
+	@set -e; \
+	newVersion=$(to); \
+	echo "The version will be set to $$newVersion"; \
+	if [[ $$newVersion =~ "v" ]]; then \
+		latestVersion=$$newVersion; \
+		echo "package gf" > version.go; \
+		echo "" >> version.go; \
+		echo "const (" >> version.go; \
+		echo -e "\t// VERSION is the current GoFrame version." >> version.go; \
+		echo -e "\tVERSION = \"$$latestVersion\"" >> version.go; \
+		echo ")" >> version.go; \
+	else \
+		latestVersion=latest; \
+	fi; \
+	for file in ${files}; do \
+		goModPath=$$(dirname $$file); \
+		if [[ $$goModPath =~ "./contrib" || $$goModPath =~ "./cmd/gf" || $$goModPath =~ "./example" ]]; then \
+			echo ""; \
+			echo "processing dir: $$goModPath"; \
+			# Do not modify the order of any of the following sentences \
+			cd $$goModPath; \
+			go mod tidy; \
+			go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@$$latestVersion{{end}}" -m all | grep "^github.com/gogf/gf/contrib" | xargs -L1 go get -v; \
+			go get -v github.com/gogf/gf/v2@$$latestVersion; \
+			go mod tidy; \
+			cd -; \
+		fi \
+	done
+
+
--- a/cmd/gf/go.mod
+++ b/cmd/gf/go.mod
@ -3,18 +3,20 @@ module github.com/gogf/gf/cmd/gf/v2
 go 1.18

 require (
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.1.0
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.1.0
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.1.0
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.1.0
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.1.0
-	github.com/gogf/gf/v2 v2.2.2
+	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.4.0
+	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.4.0
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.4.0
+	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.4.0
+	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.4.0
+	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.4.0
+	github.com/gogf/gf/v2 v2.4.0
 	github.com/olekukonko/tablewriter v0.0.5
-	golang.org/x/tools v0.2.0
+	golang.org/x/tools v0.7.0
 )

 require (
-	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/BurntSushi/toml v1.1.0 // indirect
+	github.com/ClickHouse/clickhouse-go/v2 v2.0.15 // indirect
 	github.com/clbanning/mxj/v2 v2.5.5 // indirect
 	github.com/denisenkom/go-mssqldb v0.11.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
@ -32,16 +34,19 @@ require (
 	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/paulmach/orb v0.7.1 // indirect
+	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sijms/go-ora/v2 v2.4.20 // indirect
 	go.opentelemetry.io/otel v1.7.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.7.0 // indirect
 	go.opentelemetry.io/otel/trace v1.7.0 // indirect
 	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/mod v0.6.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/libc v1.16.8 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
@ -50,6 +55,7 @@ require (
 )

 replace (
+	github.com/gogf/gf/contrib/drivers/clickhouse/v2 => ../../contrib/drivers/clickhouse/
 	github.com/gogf/gf/contrib/drivers/mssql/v2 => ../../contrib/drivers/mssql/
 	github.com/gogf/gf/contrib/drivers/mysql/v2 => ../../contrib/drivers/mysql/
 	github.com/gogf/gf/contrib/drivers/oracle/v2 => ../../contrib/drivers/oracle/
--- a/cmd/gf/go.sum
+++ b/cmd/gf/go.sum
@ -1,8 +1,13 @@
+github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
 github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
-github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
+github.com/ClickHouse/clickhouse-go/v2 v2.0.15 h1:lLAZliqrZEygkxosLaW1qHyeTb4Ho7fVCZ0WKCpLocU=
+github.com/ClickHouse/clickhouse-go/v2 v2.0.15/go.mod h1:Z21o82zD8FFqefOQDg93c0XITlxGbTsWQuRm588Azkk=
+github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
+github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
 github.com/clbanning/mxj/v2 v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E=
 github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
+github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisenkom/go-mssqldb v0.11.0 h1:9rHa233rhdOyrz2GcP9NM+gi2psgJZ4GWDpL/7ND8HI=
@ -19,20 +24,32 @@ github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grokify/html-strip-tags-go v0.0.1 h1:0fThFwLbW7P/kOiTBs03FsJSV9RM2M/Q/MOnCQxKMo0=
 github.com/grokify/html-strip-tags-go v0.0.1/go.mod h1:2Su6romC5/1VXOQMaWL2yb618ARB8iVo6/DR99A6d78=
+github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
@ -44,20 +61,40 @@ github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615/go.mod h1:Ad7oeElCZqA1Ufj0U9/liOF4BtVepxRcTvr2ey7zTvM=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/paulmach/orb v0.7.1 h1:Zha++Z5OX/l168sqHK3k4z18LDvr+YAO/VjK0ReQ9rU=
+github.com/paulmach/orb v0.7.1/go.mod h1:FWRlTgl88VI1RBx/MkrwWDRhQ96ctqMCh8boXhmqB/A=
+github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE=
+github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
+github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
+github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/sijms/go-ora/v2 v2.4.20 h1:9e3z7VLBQXRAHGiIda1GEFtRhfxata0LghyMZqvLKew=
 github.com/sijms/go-ora/v2 v2.4.20/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
+github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM=
 go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
 go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0=
@ -70,22 +107,28 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
-golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
+golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-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.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-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.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 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=
+golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -95,29 +138,36 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2/go.mod h1:EFNZuWvGYxIRUEX+K8UmCFwYmZjqcrnq15ZuVldZkZ0=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
-golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
-golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
+golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 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.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 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=
--- a/cmd/gf/internal/cmd/cmd.go
+++ b/cmd/gf/internal/cmd/cmd.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
--- a/cmd/gf/internal/cmd/cmd_build.go
+++ b/cmd/gf/internal/cmd/cmd_build.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
--- a/cmd/gf/internal/cmd/cmd_docker.go
+++ b/cmd/gf/internal/cmd/cmd_docker.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
--- a/cmd/gf/internal/cmd/cmd_env.go
+++ b/cmd/gf/internal/cmd/cmd_env.go
@ -1,14 +1,21 @@
+// Copyright GoFrame gf 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 cmd

 import (
 	"bytes"
 	"context"

+	"github.com/olekukonko/tablewriter"
+
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/olekukonko/tablewriter"

 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
--- a/cmd/gf/internal/cmd/cmd_fix.go
+++ b/cmd/gf/internal/cmd/cmd_fix.go
@ -1,7 +1,14 @@
+// Copyright GoFrame gf 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 cmd

 import (
 	"context"
+
 	"github.com/gogf/gf/v2/os/gproc"

 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
--- a/cmd/gf/internal/cmd/cmd_gen.go
+++ b/cmd/gf/internal/cmd/cmd_gen.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
@ -12,6 +18,7 @@ var (
 type cGen struct {
 	g.Meta `name:"gen" brief:"{cGenBrief}" dc:"{cGenDc}"`
 	cGenDao
+	cGenEnums
 	cGenPb
 	cGenPbEntity
 	cGenService
--- a/cmd/gf/internal/cmd/cmd_gen_dao.go
+++ b/cmd/gf/internal/cmd/cmd_gen_dao.go
@ -1,6 +1,13 @@
+// Copyright GoFrame gf 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 cmd

 import (
+	_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
 	_ "github.com/gogf/gf/contrib/drivers/mssql/v2"
 	_ "github.com/gogf/gf/contrib/drivers/mysql/v2"
 	_ "github.com/gogf/gf/contrib/drivers/oracle/v2"
--- a/cmd/gf/internal/cmd/cmd_gen_enums.go
+++ b/cmd/gf/internal/cmd/cmd_gen_enums.go
@ -0,0 +1,15 @@
+// Copyright GoFrame gf 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 cmd
+
+import (
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genenums"
+)
+
+type (
+	cGenEnums = genenums.CGenEnums
+)
--- a/cmd/gf/internal/cmd/cmd_gen_pb.go
+++ b/cmd/gf/internal/cmd/cmd_gen_pb.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import "github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpb"
--- a/cmd/gf/internal/cmd/cmd_gen_pbentity.go
+++ b/cmd/gf/internal/cmd/cmd_gen_pbentity.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import "github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpbentity"
--- a/cmd/gf/internal/cmd/cmd_gen_service.go
+++ b/cmd/gf/internal/cmd/cmd_gen_service.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
--- a/cmd/gf/internal/cmd/cmd_init.go
+++ b/cmd/gf/internal/cmd/cmd_init.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
--- a/cmd/gf/internal/cmd/cmd_install.go
+++ b/cmd/gf/internal/cmd/cmd_install.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
--- a/cmd/gf/internal/cmd/cmd_pack.go
+++ b/cmd/gf/internal/cmd/cmd_pack.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
--- a/cmd/gf/internal/cmd/cmd_run.go
+++ b/cmd/gf/internal/cmd/cmd_run.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
--- a/cmd/gf/internal/cmd/cmd_tpl.go
+++ b/cmd/gf/internal/cmd/cmd_tpl.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
@ -33,7 +39,7 @@ like json/xml/yaml/toml/ini.
 	cTplParseEg    = `
 gf tpl parse -p ./template -v values.json -r
 gf tpl parse -p ./template -v values.json -n *.tpl -r
-gf tpl parse -p ./template -v values.json -d '${,}}' -r
+gf tpl parse -p ./template -v values.json -d '${{,}}' -r
 gf tpl parse -p ./template -v values.json -o ./template.parsed
 `
 	cTplSupportValuesFilePattern = `*.json,*.xml,*.yaml,*.yml,*.toml,*.ini`
@ -63,7 +69,7 @@ func init() {
 }

 func (c *cTpl) Parse(ctx context.Context, in cTplParseInput) (out *cTplParseOutput, err error) {
-	if in.Output == "" && in.Replace == false {
+	if in.Output == "" && !in.Replace {
 		return nil, gerror.New(`parameter output and replace should not be both empty`)
 	}
 	delimiters := gstr.SplitAndTrim(in.Delimiters, ",")
--- a/cmd/gf/internal/cmd/cmd_up.go
+++ b/cmd/gf/internal/cmd/cmd_up.go
@ -1,11 +1,18 @@
+// Copyright GoFrame gf 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 cmd

 import (
 	"context"
 	"fmt"
+	"runtime"
+
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/container/gset"
-	"runtime"

 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
--- a/cmd/gf/internal/cmd/cmd_version.go
+++ b/cmd/gf/internal/cmd/cmd_version.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 cmd

 import (
--- a/cmd/gf/internal/cmd/gendao/gendao.go
+++ b/cmd/gf/internal/cmd/gendao/gendao.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 gendao

 import (
--- a/cmd/gf/internal/cmd/gendao/gendao_clear.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_clear.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 gendao

 import (
--- a/cmd/gf/internal/cmd/gendao/gendao_dao.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_dao.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 gendao

 import (
--- a/cmd/gf/internal/cmd/gendao/gendao_do.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_do.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 gendao

 import (
--- a/cmd/gf/internal/cmd/gendao/gendao_entity.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_entity.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 gendao

 import (
--- a/cmd/gf/internal/cmd/gendao/gendao_structure.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_structure.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 gendao

 import (
@ -5,11 +11,12 @@ import (
 	"context"
 	"fmt"

+	"github.com/olekukonko/tablewriter"
+
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/olekukonko/tablewriter"
 )

 type generateStructDefinitionInput struct {
--- a/cmd/gf/internal/cmd/genenums/genenums.go
+++ b/cmd/gf/internal/cmd/genenums/genenums.go
@ -0,0 +1,83 @@
+// Copyright GoFrame gf 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 genenums
+
+import (
+	"context"
+	"golang.org/x/tools/go/packages"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gtag"
+)
+
+type (
+	CGenEnums      struct{}
+	CGenEnumsInput struct {
+		g.Meta `name:"enums" config:"{CGenEnumsConfig}" brief:"{CGenEnumsBrief}" eg:"{CGenEnumsEg}"`
+		Src    string `name:"src"    short:"s"  dc:"source folder path to be parsed" d:"."`
+		Path   string `name:"path"   short:"p"  dc:"output go file path storing enums content" d:"internal/boot/boot_enums.go"`
+		Prefix string `name:"prefix" short:"x"  dc:"only exports packages that starts with specified prefix"`
+	}
+	CGenEnumsOutput struct{}
+)
+
+const (
+	CGenEnumsConfig = `gfcli.gen.enums`
+	CGenEnumsBrief  = `parse go files in current project and generate enums go file`
+	CGenEnumsEg     = `
+gf gen enums
+gf gen enums -p internal/boot/boot_enums.go
+gf gen enums -p internal/boot/boot_enums.go -s .
+gf gen enums -x github.com/gogf
+`
+)
+
+func init() {
+	gtag.Sets(g.MapStrStr{
+		`CGenEnumsEg`:     CGenEnumsEg,
+		`CGenEnumsBrief`:  CGenEnumsBrief,
+		`CGenEnumsConfig`: CGenEnumsConfig,
+	})
+}
+
+func (c CGenEnums) Enums(ctx context.Context, in CGenEnumsInput) (out *CGenEnumsOutput, err error) {
+	realPath := gfile.RealPath(in.Src)
+	if realPath == "" {
+		mlog.Fatalf(`source folder path "%s" does not exist`, in.Src)
+	}
+	err = gfile.Chdir(realPath)
+	if err != nil {
+		mlog.Fatal(err)
+	}
+	mlog.Printf(`scanning: %s`, realPath)
+	cfg := &packages.Config{
+		Dir:   realPath,
+		Mode:  pkgLoadMode,
+		Tests: false,
+	}
+	pkgs, err := packages.Load(cfg)
+	if err != nil {
+		mlog.Fatal(err)
+	}
+	p := NewEnumsParser(in.Prefix)
+	p.ParsePackages(pkgs)
+	var enumsContent = gstr.ReplaceByMap(consts.TemplateGenEnums, g.MapStrStr{
+		"{PackageName}": gfile.Basename(gfile.Dir(in.Path)),
+		"{EnumsJson}":   "`" + p.Export() + "`",
+	})
+	enumsContent = gstr.Trim(enumsContent)
+	if err = gfile.PutContents(in.Path, enumsContent); err != nil {
+		return
+	}
+	mlog.Printf(`generated: %s`, in.Path)
+	mlog.Print("done!")
+	return
+}
--- a/cmd/gf/internal/cmd/genenums/genenums_parser.go
+++ b/cmd/gf/internal/cmd/genenums/genenums_parser.go
@ -0,0 +1,140 @@
+// Copyright GoFrame gf 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 genenums
+
+import (
+	"go/constant"
+	"go/types"
+	"golang.org/x/tools/go/packages"
+
+	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+const pkgLoadMode = 0xffffff
+
+type EnumsParser struct {
+	enums     []EnumItem
+	parsedPkg map[string]struct{}
+	prefix    string
+}
+
+type EnumItem struct {
+	Name  string
+	Value string
+	Kind  constant.Kind // String/Int/Bool/Float/Complex/Unknown
+	Type  string        // Pkg.ID + TypeName
+}
+
+var standardPackages = make(map[string]struct{})
+
+func init() {
+	stdPackages, err := packages.Load(nil, "std")
+	if err != nil {
+		panic(err)
+	}
+	for _, p := range stdPackages {
+		standardPackages[p.ID] = struct{}{}
+	}
+}
+
+func NewEnumsParser(prefix string) *EnumsParser {
+	return &EnumsParser{
+		enums:     make([]EnumItem, 0),
+		parsedPkg: make(map[string]struct{}),
+		prefix:    prefix,
+	}
+}
+
+func (p *EnumsParser) ParsePackages(pkgs []*packages.Package) {
+	for _, pkg := range pkgs {
+		p.ParsePackage(pkg)
+	}
+}
+
+func (p *EnumsParser) ParsePackage(pkg *packages.Package) {
+	// Ignore std packages.
+	if _, ok := standardPackages[pkg.ID]; ok {
+		return
+	}
+	// Ignore pared packages.
+	if _, ok := p.parsedPkg[pkg.ID]; ok {
+		return
+	}
+	p.parsedPkg[pkg.ID] = struct{}{}
+	// Only parse specified prefix.
+	if p.prefix != "" {
+		if !gstr.HasPrefix(pkg.ID, p.prefix) {
+			return
+		}
+	}
+
+	var (
+		scope = pkg.Types.Scope()
+		names = scope.Names()
+	)
+	for _, name := range names {
+		con, ok := scope.Lookup(name).(*types.Const)
+		if !ok {
+			// Only constants can be enums.
+			continue
+		}
+		if !con.Exported() {
+			// Ignore unexported values.
+			continue
+		}
+
+		var enumType = con.Type().String()
+		if !gstr.Contains(enumType, "/") {
+			// Ignore std types.
+			continue
+		}
+		var (
+			enumName  = con.Name()
+			enumValue = con.Val().ExactString()
+			enumKind  = con.Val().Kind()
+		)
+		if con.Val().Kind() == constant.String {
+			enumValue = constant.StringVal(con.Val())
+		}
+		p.enums = append(p.enums, EnumItem{
+			Name:  enumName,
+			Value: enumValue,
+			Type:  enumType,
+			Kind:  enumKind,
+		})
+
+	}
+	for _, im := range pkg.Imports {
+		p.ParsePackage(im)
+	}
+}
+
+func (p *EnumsParser) Export() string {
+	var typeEnumMap = make(map[string][]interface{})
+	for _, enum := range p.enums {
+		if typeEnumMap[enum.Type] == nil {
+			typeEnumMap[enum.Type] = make([]interface{}, 0)
+		}
+		var value interface{}
+		switch enum.Kind {
+		case constant.Int:
+			value = gconv.Int64(enum.Value)
+		case constant.String:
+			value = enum.Value
+		case constant.Float:
+			value = gconv.Float64(enum.Value)
+		case constant.Bool:
+			value = gconv.Bool(enum.Value)
+		default:
+			value = enum.Value
+		}
+		typeEnumMap[enum.Type] = append(typeEnumMap[enum.Type], value)
+	}
+	return gjson.MustEncodeString(typeEnumMap)
+}
--- a/cmd/gf/internal/cmd/genpb/genpb.go
+++ b/cmd/gf/internal/cmd/genpb/genpb.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 genpb

 import (
--- a/cmd/gf/internal/cmd/genpb/genpb_controller.go
+++ b/cmd/gf/internal/cmd/genpb/genpb_controller.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 genpb

 import (
--- a/cmd/gf/internal/cmd/genpb/genpb_tag.go
+++ b/cmd/gf/internal/cmd/genpb/genpb_tag.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 genpb

 import (
--- a/cmd/gf/internal/cmd/genpbentity/genpbentity.go
+++ b/cmd/gf/internal/cmd/genpbentity/genpbentity.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 genpbentity

 import (
--- a/cmd/gf/internal/cmd/genservice/genservice.go
+++ b/cmd/gf/internal/cmd/genservice/genservice.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 genservice

 import (
--- a/cmd/gf/internal/cmd/genservice/genservice_calculate.go
+++ b/cmd/gf/internal/cmd/genservice/genservice_calculate.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 genservice

 import (
--- a/cmd/gf/internal/cmd/genservice/genservice_generate.go
+++ b/cmd/gf/internal/cmd/genservice/genservice_generate.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 genservice

 import (
--- a/cmd/gf/internal/consts/consts.go
+++ b/cmd/gf/internal/consts/consts.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 consts

 const (
--- a/cmd/gf/internal/consts/consts_gen_dao_template_dao.go
+++ b/cmd/gf/internal/consts/consts_gen_dao_template_dao.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 consts

 const TemplateGenDaoIndexContent = `
--- a/cmd/gf/internal/consts/consts_gen_dao_template_do.go
+++ b/cmd/gf/internal/consts/consts_gen_dao_template_do.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 consts

 const TemplateGenDaoDoContent = `
--- a/cmd/gf/internal/consts/consts_gen_dao_template_entity.go
+++ b/cmd/gf/internal/consts/consts_gen_dao_template_entity.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 consts

 const TemplateGenDaoEntityContent = `
--- a/cmd/gf/internal/consts/consts_gen_enums_template.go
+++ b/cmd/gf/internal/consts/consts_gen_enums_template.go
@ -0,0 +1,23 @@
+// Copyright GoFrame gf 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 consts
+
+const TemplateGenEnums = `
+// ================================================================================
+// Code generated by GoFrame CLI tool. DO NOT EDIT.
+// ================================================================================
+
+package {PackageName}
+
+import (
+	"github.com/gogf/gf/v2/util/gtag"
+)
+
+func init() {
+	gtag.SetGlobalEnums({EnumsJson})
+}
+`
--- a/cmd/gf/internal/consts/consts_gen_pbentity_template.go
+++ b/cmd/gf/internal/consts/consts_gen_pbentity_template.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 consts

 const TemplatePbEntityMessageContent = `
--- a/cmd/gf/internal/consts/consts_gen_service_template.go
+++ b/cmd/gf/internal/consts/consts_gen_service_template.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 consts

 const TemplateGenServiceContentHead = `
--- a/cmd/gf/internal/consts/consts_gen_service_template_logic.go
+++ b/cmd/gf/internal/consts/consts_gen_service_template_logic.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 consts

 const TemplateGenServiceLogicContent = `
--- a/cmd/gf/internal/packed/packed.go
+++ b/cmd/gf/internal/packed/packed.go
@ -1 +1,7 @@
+// Copyright GoFrame gf 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 packed
--- a/cmd/gf/internal/service/install.go
+++ b/cmd/gf/internal/service/install.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 service

 import (
--- a/cmd/gf/internal/utility/allyes/allyes.go
+++ b/cmd/gf/internal/utility/allyes/allyes.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 allyes

 import (
--- a/cmd/gf/internal/utility/mlog/mlog.go
+++ b/cmd/gf/internal/utility/mlog/mlog.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 mlog

 import (
--- a/cmd/gf/internal/utility/utils/utils.go
+++ b/cmd/gf/internal/utility/utils/utils.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 utils

 import (
--- a/cmd/gf/internal/utility/utils/utils_http_download.go
+++ b/cmd/gf/internal/utility/utils/utils_http_download.go
@ -1,14 +1,21 @@
+// Copyright GoFrame gf 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 utils

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/errors/gerror"
 	"io"
 	"net/http"
 	"os"
 	"strconv"
 	"time"

+	"github.com/gogf/gf/v2/errors/gerror"
+
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

--- a/cmd/gf/main.go
+++ b/cmd/gf/main.go
@ -1,3 +1,9 @@
+// Copyright GoFrame gf 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 main

 import (
--- a/container/garray/garray_normal_any.go
+++ b/container/garray/garray_normal_any.go
@ -233,13 +233,26 @@ func (a *Array) doRemoveWithoutLock(index int) (value interface{}, found bool) {
 // RemoveValue removes an item by value.
 // It returns true if value is found in the array, or else false if not found.
 func (a *Array) RemoveValue(value interface{}) bool {
-	if i := a.Search(value); i != -1 {
-		a.Remove(i)
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	if i := a.doSearchWithoutLock(value); i != -1 {
+		a.doRemoveWithoutLock(i)
 		return true
 	}
 	return false
 }

+// RemoveValues removes multiple items by `values`.
+func (a *Array) RemoveValues(values ...interface{}) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for _, value := range values {
+		if i := a.doSearchWithoutLock(value); i != -1 {
+			a.doRemoveWithoutLock(i)
+		}
+	}
+}
+
 // PushLeft pushes one or multiple items to the beginning of array.
 func (a *Array) PushLeft(value ...interface{}) *Array {
 	a.mu.Lock()
@ -487,6 +500,10 @@ func (a *Array) Contains(value interface{}) bool {
 func (a *Array) Search(value interface{}) int {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
+	return a.doSearchWithoutLock(value)
+}
+
+func (a *Array) doSearchWithoutLock(value interface{}) int {
 	if len(a.array) == 0 {
 		return -1
 	}
@ -778,6 +795,22 @@ func (a *Array) UnmarshalValue(value interface{}) error {
 	return nil
 }

+// Filter iterates array and filters elements using custom callback function.
+// It removes the element from array if callback function `filter` returns true,
+// it or else does nothing and continues iterating.
+func (a *Array) Filter(filter func(index int, value interface{}) bool) *Array {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for i := 0; i < len(a.array); {
+		if filter(i, a.array[i]) {
+			a.array = append(a.array[:i], a.array[i+1:]...)
+		} else {
+			i++
+		}
+	}
+	return a
+}
+
 // FilterNil removes all nil value of the array.
 func (a *Array) FilterNil() *Array {
 	a.mu.Lock()
--- a/container/garray/garray_normal_int.go
+++ b/container/garray/garray_normal_int.go
@ -228,13 +228,26 @@ func (a *IntArray) doRemoveWithoutLock(index int) (value int, found bool) {
 // RemoveValue removes an item by value.
 // It returns true if value is found in the array, or else false if not found.
 func (a *IntArray) RemoveValue(value int) bool {
-	if i := a.Search(value); i != -1 {
-		_, found := a.Remove(i)
-		return found
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	if i := a.doSearchWithoutLock(value); i != -1 {
+		a.doRemoveWithoutLock(i)
+		return true
 	}
 	return false
 }

+// RemoveValues removes multiple items by `values`.
+func (a *IntArray) RemoveValues(values ...int) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for _, value := range values {
+		if i := a.doSearchWithoutLock(value); i != -1 {
+			a.doRemoveWithoutLock(i)
+		}
+	}
+}
+
 // PushLeft pushes one or multiple items to the beginning of array.
 func (a *IntArray) PushLeft(value ...int) *IntArray {
 	a.mu.Lock()
@ -497,6 +510,10 @@ func (a *IntArray) Contains(value int) bool {
 func (a *IntArray) Search(value int) int {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
+	return a.doSearchWithoutLock(value)
+}
+
+func (a *IntArray) doSearchWithoutLock(value int) int {
 	if len(a.array) == 0 {
 		return -1
 	}
@ -771,6 +788,22 @@ func (a *IntArray) UnmarshalValue(value interface{}) error {
 	return nil
 }

+// Filter iterates array and filters elements using custom callback function.
+// It removes the element from array if callback function `filter` returns true,
+// it or else does nothing and continues iterating.
+func (a *IntArray) Filter(filter func(index int, value int) bool) *IntArray {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for i := 0; i < len(a.array); {
+		if filter(i, a.array[i]) {
+			a.array = append(a.array[:i], a.array[i+1:]...)
+		} else {
+			i++
+		}
+	}
+	return a
+}
+
 // FilterEmpty removes all zero value of the array.
 func (a *IntArray) FilterEmpty() *IntArray {
 	a.mu.Lock()
--- a/container/garray/garray_normal_str.go
+++ b/container/garray/garray_normal_str.go
@ -222,6 +222,17 @@ func (a *StrArray) RemoveValue(value string) bool {
 	return false
 }

+// RemoveValues removes multiple items by `values`.
+func (a *StrArray) RemoveValues(values ...string) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for _, value := range values {
+		if i := a.doSearchWithoutLock(value); i != -1 {
+			a.doRemoveWithoutLock(i)
+		}
+	}
+}
+
 // PushLeft pushes one or multiple items to the beginning of array.
 func (a *StrArray) PushLeft(value ...string) *StrArray {
 	a.mu.Lock()
@ -499,6 +510,10 @@ func (a *StrArray) ContainsI(value string) bool {
 func (a *StrArray) Search(value string) int {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
+	return a.doSearchWithoutLock(value)
+}
+
+func (a *StrArray) doSearchWithoutLock(value string) int {
 	if len(a.array) == 0 {
 		return -1
 	}
@ -784,6 +799,22 @@ func (a *StrArray) UnmarshalValue(value interface{}) error {
 	return nil
 }

+// Filter iterates array and filters elements using custom callback function.
+// It removes the element from array if callback function `filter` returns true,
+// it or else does nothing and continues iterating.
+func (a *StrArray) Filter(filter func(index int, value string) bool) *StrArray {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for i := 0; i < len(a.array); {
+		if filter(i, a.array[i]) {
+			a.array = append(a.array[:i], a.array[i+1:]...)
+		} else {
+			i++
+		}
+	}
+	return a
+}
+
 // FilterEmpty removes all empty string value of the array.
 func (a *StrArray) FilterEmpty() *StrArray {
 	a.mu.Lock()
--- a/container/garray/garray_sorted_any.go
+++ b/container/garray/garray_sorted_any.go
@ -216,6 +216,17 @@ func (a *SortedArray) RemoveValue(value interface{}) bool {
 	return false
 }

+// RemoveValues removes an item by `values`.
+func (a *SortedArray) RemoveValues(values ...interface{}) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for _, value := range values {
+		if i, r := a.binSearch(value, false); r == 0 {
+			a.doRemoveWithoutLock(i)
+		}
+	}
+}
+
 // PopLeft pops and returns an item from the beginning of array.
 // Note that if the array is empty, the `found` is false.
 func (a *SortedArray) PopLeft() (value interface{}, found bool) {
@ -470,7 +481,7 @@ func (a *SortedArray) binSearch(value interface{}, lock bool) (index int, result

 // SetUnique sets unique mark to the array,
 // which means it does not contain any repeated items.
-// It also do unique check, remove all repeated items.
+// It also does unique check, remove all repeated items.
 func (a *SortedArray) SetUnique(unique bool) *SortedArray {
 	oldUnique := a.unique
 	a.unique = unique
@ -750,6 +761,22 @@ func (a *SortedArray) FilterNil() *SortedArray {
 	return a
 }

+// Filter iterates array and filters elements using custom callback function.
+// It removes the element from array if callback function `filter` returns true,
+// it or else does nothing and continues iterating.
+func (a *SortedArray) Filter(filter func(index int, value interface{}) bool) *SortedArray {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for i := 0; i < len(a.array); {
+		if filter(i, a.array[i]) {
+			a.array = append(a.array[:i], a.array[i+1:]...)
+		} else {
+			i++
+		}
+	}
+	return a
+}
+
 // FilterEmpty removes all empty value of the array.
 // Values like: 0, nil, false, "", len(slice/map/chan) == 0 are considered empty.
 func (a *SortedArray) FilterEmpty() *SortedArray {
--- a/container/garray/garray_sorted_int.go
+++ b/container/garray/garray_sorted_int.go
@ -202,6 +202,17 @@ func (a *SortedIntArray) RemoveValue(value int) bool {
 	return false
 }

+// RemoveValues removes an item by `values`.
+func (a *SortedIntArray) RemoveValues(values ...int) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for _, value := range values {
+		if i, r := a.binSearch(value, false); r == 0 {
+			a.doRemoveWithoutLock(i)
+		}
+	}
+}
+
 // PopLeft pops and returns an item from the beginning of array.
 // Note that if the array is empty, the `found` is false.
 func (a *SortedIntArray) PopLeft() (value int, found bool) {
@ -698,6 +709,22 @@ func (a *SortedIntArray) UnmarshalValue(value interface{}) (err error) {
 	return err
 }

+// Filter iterates array and filters elements using custom callback function.
+// It removes the element from array if callback function `filter` returns true,
+// it or else does nothing and continues iterating.
+func (a *SortedIntArray) Filter(filter func(index int, value int) bool) *SortedIntArray {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for i := 0; i < len(a.array); {
+		if filter(i, a.array[i]) {
+			a.array = append(a.array[:i], a.array[i+1:]...)
+		} else {
+			i++
+		}
+	}
+	return a
+}
+
 // FilterEmpty removes all zero value of the array.
 func (a *SortedIntArray) FilterEmpty() *SortedIntArray {
 	a.mu.Lock()
--- a/container/garray/garray_sorted_str.go
+++ b/container/garray/garray_sorted_str.go
@ -188,6 +188,17 @@ func (a *SortedStrArray) RemoveValue(value string) bool {
 	return false
 }

+// RemoveValues removes an item by `values`.
+func (a *SortedStrArray) RemoveValues(values ...string) {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for _, value := range values {
+		if i, r := a.binSearch(value, false); r == 0 {
+			a.doRemoveWithoutLock(i)
+		}
+	}
+}
+
 // PopLeft pops and returns an item from the beginning of array.
 // Note that if the array is empty, the `found` is false.
 func (a *SortedStrArray) PopLeft() (value string, found bool) {
@ -711,6 +722,22 @@ func (a *SortedStrArray) UnmarshalValue(value interface{}) (err error) {
 	return err
 }

+// Filter iterates array and filters elements using custom callback function.
+// It removes the element from array if callback function `filter` returns true,
+// it or else does nothing and continues iterating.
+func (a *SortedStrArray) Filter(filter func(index int, value string) bool) *SortedStrArray {
+	a.mu.Lock()
+	defer a.mu.Unlock()
+	for i := 0; i < len(a.array); {
+		if filter(i, a.array[i]) {
+			a.array = append(a.array[:i], a.array[i+1:]...)
+		} else {
+			i++
+		}
+	}
+	return a
+}
+
 // FilterEmpty removes all empty string value of the array.
 func (a *SortedStrArray) FilterEmpty() *SortedStrArray {
 	a.mu.Lock()
--- a/container/garray/garray_z_example_normal_any_test.go
+++ b/container/garray/garray_z_example_normal_any_test.go
@ -9,6 +9,8 @@ package garray_test
 import (
 	"fmt"

+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
 )
@ -261,6 +263,21 @@ func ExampleArray_Merge() {
 	// [1 2 1 2 3 4 5 6 7 8 9 0]
 }

+func ExampleArray_Filter() {
+	array1 := garray.NewFrom(g.Slice{0, 1, 2, nil, "", g.Slice{}, "john"})
+	array2 := garray.NewFrom(g.Slice{0, 1, 2, nil, "", g.Slice{}, "john"})
+	fmt.Printf("%#v\n", array1.Filter(func(index int, value interface{}) bool {
+		return empty.IsNil(value)
+	}).Slice())
+	fmt.Printf("%#v\n", array2.Filter(func(index int, value interface{}) bool {
+		return empty.IsEmpty(value)
+	}).Slice())
+
+	// Output:
+	// []interface {}{0, 1, 2, "", []interface {}{}, "john"}
+	// []interface {}{1, 2, "john"}
+}
+
 func ExampleArray_FilterEmpty() {
 	array1 := garray.NewFrom(g.Slice{0, 1, 2, nil, "", g.Slice{}, "john"})
 	array2 := garray.NewFrom(g.Slice{0, 1, 2, nil, "", g.Slice{}, "john"})
--- a/container/garray/garray_z_example_normal_int_test.go
+++ b/container/garray/garray_z_example_normal_int_test.go
@ -9,6 +9,8 @@ package garray_test
 import (
 	"fmt"

+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
@ -699,6 +701,25 @@ func ExampleIntArray_UnmarshalValue() {
 	// &{john [96,98,97]}
 }

+func ExampleIntArray_Filter() {
+	array1 := garray.NewIntArrayFrom(g.SliceInt{10, 40, 50, 0, 0, 0, 60})
+	array2 := garray.NewIntArrayFrom(g.SliceInt{10, 4, 51, 5, 45, 50, 56})
+	fmt.Println(array1.Filter(func(index int, value int) bool {
+		return empty.IsEmpty(value)
+	}))
+	fmt.Println(array2.Filter(func(index int, value int) bool {
+		return value%2 == 0
+	}))
+	fmt.Println(array2.Filter(func(index int, value int) bool {
+		return value%2 == 1
+	}))
+
+	// Output:
+	// [10,40,50,60]
+	// [51,5,45]
+	// []
+}
+
 func ExampleIntArray_FilterEmpty() {
 	s := garray.NewIntArrayFrom(g.SliceInt{10, 40, 50, 0, 0, 0, 60})
 	fmt.Println(s)
--- a/container/garray/garray_z_example_normal_str_test.go
+++ b/container/garray/garray_z_example_normal_str_test.go
@ -8,6 +8,9 @@ package garray_test

 import (
 	"fmt"
+	"strings"
+
+	"github.com/gogf/gf/v2/internal/empty"

 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
@ -622,6 +625,22 @@ func ExampleStrArray_UnmarshalValue() {
 	// &{john ["Math","English","Sport"]}
 }

+func ExampleStrArray_Filter() {
+	s := garray.NewStrArrayFrom(g.SliceStr{"Math", "English", "Sport"})
+	s1 := garray.NewStrArrayFrom(g.SliceStr{"a", "b", "", "c", "", "", "d"})
+	fmt.Println(s1.Filter(func(index int, value string) bool {
+		return empty.IsEmpty(value)
+	}))
+
+	fmt.Println(s.Filter(func(index int, value string) bool {
+		return strings.Contains(value, "h")
+	}))
+
+	// Output:
+	// ["a","b","c","d"]
+	// ["Sport"]
+}
+
 func ExampleStrArray_FilterEmpty() {
 	s := garray.NewStrArrayFrom(g.SliceStr{"a", "b", "", "c", "", "", "d"})
 	fmt.Println(s.FilterEmpty())
--- a/container/garray/garray_z_example_sorted_str_test.go
+++ b/container/garray/garray_z_example_sorted_str_test.go
@ -9,6 +9,8 @@ package garray_test
 import (
 	"fmt"

+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
@ -552,6 +554,18 @@ func ExampleSortedStrArray_UnmarshalValue() {
 	// &{john ["Math","English","Sport"]}
 }

+func ExampleSortedStrArray_Filter() {
+	s := garray.NewSortedStrArrayFrom(g.SliceStr{"b", "a", "", "c", "", "", "d"})
+	fmt.Println(s)
+	fmt.Println(s.Filter(func(index int, value string) bool {
+		return empty.IsEmpty(value)
+	}))
+
+	// Output:
+	// ["","","","a","b","c","d"]
+	// ["a","b","c","d"]
+}
+
 func ExampleSortedStrArray_FilterEmpty() {
 	s := garray.NewSortedStrArrayFrom(g.SliceStr{"b", "a", "", "c", "", "", "d"})
 	fmt.Println(s)
--- a/container/garray/garray_z_unit_normal_any_test.go
+++ b/container/garray/garray_z_unit_normal_any_test.go
@ -12,6 +12,8 @@ import (
 	"testing"
 	"time"

+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
@ -750,6 +752,15 @@ func TestArray_RemoveValue(t *testing.T) {
 	})
 }

+func TestArray_RemoveValues(t *testing.T) {
+	slice := g.Slice{"a", "b", "d", "c"}
+	array := garray.NewArrayFrom(slice)
+	gtest.C(t, func(t *gtest.T) {
+		array.RemoveValues("a", "b", "c")
+		t.Assert(array.Slice(), g.Slice{"d"})
+	})
+}
+
 func TestArray_UnmarshalValue(t *testing.T) {
 	type V struct {
 		Name  string
@ -791,6 +802,36 @@ func TestArray_FilterNil(t *testing.T) {
 	})
 }

+func TestArray_Filter(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		values := g.Slice{0, 1, 2, 3, 4, "", g.Slice{}}
+		array := garray.NewArrayFromCopy(values)
+		t.Assert(array.Filter(func(index int, value interface{}) bool {
+			return empty.IsNil(value)
+		}).Slice(), values)
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewArrayFromCopy(g.Slice{nil, 1, 2, 3, 4, nil})
+		t.Assert(array.Filter(func(index int, value interface{}) bool {
+			return empty.IsNil(value)
+		}), g.Slice{1, 2, 3, 4})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewArrayFrom(g.Slice{0, 1, 2, 3, 4, "", g.Slice{}})
+
+		t.Assert(array.Filter(func(index int, value interface{}) bool {
+			return empty.IsEmpty(value)
+		}), g.Slice{1, 2, 3, 4})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewArrayFrom(g.Slice{1, 2, 3, 4})
+
+		t.Assert(array.Filter(func(index int, value interface{}) bool {
+			return empty.IsEmpty(value)
+		}), g.Slice{1, 2, 3, 4})
+	})
+}
+
 func TestArray_FilterEmpty(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		array := garray.NewArrayFrom(g.Slice{0, 1, 2, 3, 4, "", g.Slice{}})
--- a/container/garray/garray_z_unit_normal_int_test.go
+++ b/container/garray/garray_z_unit_normal_int_test.go
@ -12,6 +12,8 @@ import (
 	"testing"
 	"time"

+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
@ -765,6 +767,15 @@ func TestIntArray_RemoveValue(t *testing.T) {
 	})
 }

+func TestIntArray_RemoveValues(t *testing.T) {
+	slice := g.SliceInt{10, 20, 30, 40}
+	array := garray.NewIntArrayFrom(slice)
+	gtest.C(t, func(t *gtest.T) {
+		array.RemoveValues(10, 20, 40)
+		t.Assert(array.Slice(), g.SliceInt{30})
+	})
+}
+
 func TestIntArray_UnmarshalValue(t *testing.T) {
 	type V struct {
 		Name  string
@ -794,6 +805,34 @@ func TestIntArray_UnmarshalValue(t *testing.T) {
 	// })
 }

+func TestIntArray_Filter(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewIntArrayFrom(g.SliceInt{0, 1, 2, 3, 4, 0})
+		t.Assert(array.Filter(func(index int, value int) bool {
+			return empty.IsEmpty(value)
+		}), g.SliceInt{1, 2, 3, 4})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewIntArrayFrom(g.SliceInt{1, 2, 3, 4})
+		t.Assert(array.Filter(func(index int, value int) bool {
+			return empty.IsEmpty(value)
+
+		}), g.SliceInt{1, 2, 3, 4})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewIntArrayFrom(g.SliceInt{1, 2, 3, 4})
+		t.Assert(array.Filter(func(index int, value int) bool {
+			return value%2 == 0
+		}), g.SliceInt{1, 3})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewIntArrayFrom(g.SliceInt{1, 2, 3, 4})
+		t.Assert(array.Filter(func(index int, value int) bool {
+			return value%2 == 1
+		}), g.SliceInt{2, 4})
+	})
+}
+
 func TestIntArray_FilterEmpty(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		array := garray.NewIntArrayFrom(g.SliceInt{0, 1, 2, 3, 4, 0})
--- a/container/garray/garray_z_unit_normal_str_test.go
+++ b/container/garray/garray_z_unit_normal_str_test.go
@ -13,6 +13,8 @@ import (
 	"testing"
 	"time"

+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
@ -776,6 +778,15 @@ func TestStrArray_RemoveValue(t *testing.T) {
 	})
 }

+func TestStrArray_RemoveValues(t *testing.T) {
+	slice := g.SliceStr{"a", "b", "d", "c"}
+	array := garray.NewStrArrayFrom(slice)
+	gtest.C(t, func(t *gtest.T) {
+		array.RemoveValues("a", "b", "c")
+		t.Assert(array.Slice(), g.SliceStr{"d"})
+	})
+}
+
 func TestStrArray_UnmarshalValue(t *testing.T) {
 	type V struct {
 		Name  string
@ -804,6 +815,20 @@ func TestStrArray_UnmarshalValue(t *testing.T) {
 		t.Assert(v.Array.Slice(), g.SliceStr{"1", "2", "3"})
 	})
 }
+func TestStrArray_Filter(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewStrArrayFrom(g.SliceStr{"", "1", "2", "0"})
+		t.Assert(array.Filter(func(index int, value string) bool {
+			return empty.IsEmpty(value)
+		}), g.SliceStr{"1", "2", "0"})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewStrArrayFrom(g.SliceStr{"1", "2"})
+		t.Assert(array.Filter(func(index int, value string) bool {
+			return empty.IsEmpty(value)
+		}), g.SliceStr{"1", "2"})
+	})
+}

 func TestStrArray_FilterEmpty(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
--- a/container/garray/garray_z_unit_sorted_any_test.go
+++ b/container/garray/garray_z_unit_sorted_any_test.go
@ -13,6 +13,8 @@ import (
 	"testing"
 	"time"

+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
@ -869,6 +871,15 @@ func TestSortedArray_RemoveValue(t *testing.T) {
 	})
 }

+func TestSortedArray_RemoveValues(t *testing.T) {
+	slice := g.Slice{"a", "b", "d", "c"}
+	array := garray.NewSortedArrayFrom(slice, gutil.ComparatorString)
+	gtest.C(t, func(t *gtest.T) {
+		array.RemoveValues("a", "b", "c")
+		t.Assert(array.Slice(), g.SliceStr{"d"})
+	})
+}
+
 func TestSortedArray_UnmarshalValue(t *testing.T) {
 	type V struct {
 		Name  string
@ -897,6 +908,33 @@ func TestSortedArray_UnmarshalValue(t *testing.T) {
 		t.Assert(v.Array.Slice(), g.Slice{1, 2, 3})
 	})
 }
+func TestSortedArray_Filter(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		values := g.Slice{0, 1, 2, 3, 4, "", g.Slice{}}
+		array := garray.NewSortedArrayFromCopy(values, gutil.ComparatorInt)
+		t.Assert(array.Filter(func(index int, value interface{}) bool {
+			return empty.IsNil(value)
+		}).Slice(), g.Slice{0, "", g.Slice{}, 1, 2, 3, 4})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewSortedArrayFromCopy(g.Slice{nil, 1, 2, 3, 4, nil}, gutil.ComparatorInt)
+		t.Assert(array.Filter(func(index int, value interface{}) bool {
+			return empty.IsNil(value)
+		}), g.Slice{1, 2, 3, 4})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewSortedArrayFrom(g.Slice{0, 1, 2, 3, 4, "", g.Slice{}}, gutil.ComparatorInt)
+		t.Assert(array.Filter(func(index int, value interface{}) bool {
+			return empty.IsEmpty(value)
+		}), g.Slice{1, 2, 3, 4})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewSortedArrayFrom(g.Slice{1, 2, 3, 4}, gutil.ComparatorInt)
+		t.Assert(array.Filter(func(index int, value interface{}) bool {
+			return empty.IsEmpty(value)
+		}), g.Slice{1, 2, 3, 4})
+	})
+}

 func TestSortedArray_FilterNil(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
--- a/container/garray/garray_z_unit_sorted_int_test.go
+++ b/container/garray/garray_z_unit_sorted_int_test.go
@ -12,6 +12,8 @@ import (
 	"testing"
 	"time"

+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
@ -737,6 +739,15 @@ func TestSortedIntArray_RemoveValue(t *testing.T) {
 	})
 }

+func TestSortedIntArray_RemoveValues(t *testing.T) {
+	slice := g.SliceInt{10, 20, 30, 40}
+	array := garray.NewSortedIntArrayFrom(slice)
+	gtest.C(t, func(t *gtest.T) {
+		array.RemoveValues(10, 40, 20)
+		t.Assert(array.Slice(), g.SliceInt{30})
+	})
+}
+
 func TestSortedIntArray_UnmarshalValue(t *testing.T) {
 	type V struct {
 		Name  string
@ -765,6 +776,20 @@ func TestSortedIntArray_UnmarshalValue(t *testing.T) {
 		t.Assert(v.Array.Slice(), g.Slice{1, 2, 3})
 	})
 }
+func TestSortedIntArray_Filter(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewSortedIntArrayFrom(g.SliceInt{0, 1, 2, 3, 4, 0})
+		t.Assert(array.Filter(func(index int, value int) bool {
+			return empty.IsEmpty(value)
+		}), g.SliceInt{1, 2, 3, 4})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewSortedIntArrayFrom(g.SliceInt{1, 2, 3, 4})
+		t.Assert(array.Filter(func(index int, value int) bool {
+			return empty.IsEmpty(value)
+		}), g.SliceInt{1, 2, 3, 4})
+	})
+}

 func TestSortedIntArray_FilterEmpty(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
--- a/container/garray/garray_z_unit_sorted_str_test.go
+++ b/container/garray/garray_z_unit_sorted_str_test.go
@ -12,6 +12,8 @@ import (
 	"testing"
 	"time"

+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
@ -749,6 +751,15 @@ func TestSortedStrArray_RemoveValue(t *testing.T) {
 	})
 }

+func TestSortedStrArray_RemoveValues(t *testing.T) {
+	slice := g.SliceStr{"a", "b", "d", "c"}
+	array := garray.NewSortedStrArrayFrom(slice)
+	gtest.C(t, func(t *gtest.T) {
+		array.RemoveValues("a", "b", "c")
+		t.Assert(array.Slice(), g.SliceStr{"d"})
+	})
+}
+
 func TestSortedStrArray_UnmarshalValue(t *testing.T) {
 	type V struct {
 		Name  string
@ -777,6 +788,20 @@ func TestSortedStrArray_UnmarshalValue(t *testing.T) {
 		t.Assert(v.Array.Slice(), g.SliceStr{"1", "2", "3"})
 	})
 }
+func TestSortedStrArray_Filter(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewSortedStrArrayFrom(g.SliceStr{"", "1", "2", "0"})
+		t.Assert(array.Filter(func(index int, value string) bool {
+			return empty.IsEmpty(value)
+		}), g.SliceStr{"0", "1", "2"})
+	})
+	gtest.C(t, func(t *gtest.T) {
+		array := garray.NewSortedStrArrayFrom(g.SliceStr{"1", "2"})
+		t.Assert(array.Filter(func(index int, value string) bool {
+			return empty.IsEmpty(value)
+		}), g.SliceStr{"1", "2"})
+	})
+}

 func TestSortedStrArray_FilterEmpty(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
--- a/container/gqueue/gqueue.go
+++ b/container/gqueue/gqueue.go
@ -27,7 +27,6 @@ import (
 // Queue is a concurrent-safe queue built on doubly linked list and channel.
 type Queue struct {
 	limit  int              // Limit for queue size.
-	length *gtype.Int64     // Queue length.
 	list   *glist.List      // Underlying list structure for data maintaining.
 	closed *gtype.Bool      // Whether queue is closed.
 	events chan struct{}    // Events for data writing.
@ -45,7 +44,6 @@ const (
 func New(limit ...int) *Queue {
 	q := &Queue{
 		closed: gtype.NewBool(),
-		length: gtype.NewInt64(),
 	}
 	if len(limit) > 0 && limit[0] > 0 {
 		q.limit = limit[0]
@ -62,7 +60,6 @@ func New(limit ...int) *Queue {
 // Push pushes the data `v` into the queue.
 // Note that it would panic if Push is called after the queue is closed.
 func (q *Queue) Push(v interface{}) {
-	q.length.Add(1)
 	if q.limit > 0 {
 		q.C <- v
 	} else {
@ -76,9 +73,7 @@ func (q *Queue) Push(v interface{}) {
 // Pop pops an item from the queue in FIFO way.
 // Note that it would return nil immediately if Pop is called after the queue is closed.
 func (q *Queue) Pop() interface{} {
-	item := <-q.C
-	q.length.Add(-1)
-	return item
+	return <-q.C
 }

 // Close closes the queue.
@ -101,13 +96,18 @@ func (q *Queue) Close() {
 }

 // Len returns the length of the queue.
-// Note that the result might not be accurate as there's an
+// Note that the result might not be accurate if using unlimited queue size as there's an
 // asynchronous channel reading the list constantly.
 func (q *Queue) Len() (length int64) {
-	return q.length.Val()
+	bufferedSize := int64(len(q.C))
+	if q.limit > 0 {
+		return bufferedSize
+	}
+	return int64(q.list.Size()) + bufferedSize
 }

 // Size is alias of Len.
+// Deprecated: use Len instead.
 func (q *Queue) Size() int64 {
 	return q.Len()
 }
@ -123,14 +123,11 @@ func (q *Queue) asyncLoopFromListToChannel() {
 	for !q.closed.Val() {
 		<-q.events
 		for !q.closed.Val() {
-			if length := q.list.Len(); length > 0 {
-				if length > defaultBatchSize {
-					length = defaultBatchSize
-				}
-				for _, v := range q.list.PopFronts(length) {
-					// When q.C is closed, it will panic here, especially q.C is being blocked for writing.
-					// If any error occurs here, it will be caught by recover and be ignored.
-					q.C <- v
+			if bufferLength := q.list.Len(); bufferLength > 0 {
+				// When q.C is closed, it will panic here, especially q.C is being blocked for writing.
+				// If any error occurs here, it will be caught by recover and be ignored.
+				for i := 0; i < bufferLength; i++ {
+					q.C <- q.list.PopFront()
 				}
 			} else {
 				break
--- a/container/gqueue/gqueue_z_unit_test.go
+++ b/container/gqueue/gqueue_z_unit_test.go
@ -18,14 +18,31 @@ import (

 func TestQueue_Len(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
-		max := 100
-		for n := 10; n < max; n++ {
-			q1 := gqueue.New(max)
-			for i := 0; i < max; i++ {
+		var (
+			maxNum   = 100
+			maxTries = 100
+		)
+		for n := 10; n < maxTries; n++ {
+			q1 := gqueue.New(maxNum)
+			for i := 0; i < maxNum; i++ {
 				q1.Push(i)
 			}
-			t.Assert(q1.Len(), max)
-			t.Assert(q1.Size(), max)
+			t.Assert(q1.Len(), maxNum)
+			t.Assert(q1.Size(), maxNum)
+		}
+	})
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			maxNum   = 100
+			maxTries = 100
+		)
+		for n := 10; n < maxTries; n++ {
+			q1 := gqueue.New()
+			for i := 0; i < maxNum; i++ {
+				q1.Push(i)
+			}
+			t.AssertLE(q1.Len(), maxNum)
+			t.AssertLE(q1.Size(), maxNum)
 		}
 	})
 }
@ -71,3 +88,19 @@ func TestQueue_Close(t *testing.T) {
 		q1.Close()
 	})
 }
+
+func Test_Issue2509(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		q := gqueue.New()
+		q.Push(1)
+		q.Push(2)
+		q.Push(3)
+		t.AssertLE(q.Len(), 3)
+		t.Assert(<-q.C, 1)
+		t.AssertLE(q.Len(), 2)
+		t.Assert(<-q.C, 2)
+		t.AssertLE(q.Len(), 1)
+		t.Assert(<-q.C, 3)
+		t.Assert(q.Len(), 0)
+	})
+}
--- a/container/gvar/gvar.go
+++ b/container/gvar/gvar.go
@ -28,7 +28,7 @@ type Var struct {
 // The optional parameter `safe` specifies whether Var is used in concurrent-safety,
 // which is false in default.
 func New(value interface{}, safe ...bool) *Var {
-	if len(safe) > 0 && !safe[0] {
+	if len(safe) > 0 && safe[0] {
 		return &Var{
 			value: gtype.NewInterface(value),
 			safe:  true,
--- a/contrib/config/apollo/go.mod
+++ b/contrib/config/apollo/go.mod
@ -4,7 +4,7 @@ go 1.15

 require (
 	github.com/apolloconfig/agollo/v4 v4.1.1
-	github.com/gogf/gf/v2 v2.1.4
+	github.com/gogf/gf/v2 v2.4.0
 )

 replace github.com/gogf/gf/v2 => ../../../
--- a/contrib/config/kubecm/go.mod
+++ b/contrib/config/kubecm/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2
 go 1.18

 require (
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 	k8s.io/api v0.25.2
 	k8s.io/apimachinery v0.25.2
 	k8s.io/client-go v0.25.2
--- a/contrib/config/nacos/go.mod
+++ b/contrib/config/nacos/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2
 go 1.15

 require (
-	github.com/gogf/gf/v2 v2.2.1
+	github.com/gogf/gf/v2 v2.4.0
 	github.com/nacos-group/nacos-sdk-go v1.1.2
 )

--- a/contrib/config/polaris/go.mod
+++ b/contrib/config/polaris/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2
 go 1.15

 require (
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 	github.com/polarismesh/polaris-go v1.3.0
 )

--- a/contrib/drivers/clickhouse/clickhouse_issue_test.go
+++ b/contrib/drivers/clickhouse/clickhouse_issue_test.go
@ -0,0 +1,43 @@
+// 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 clickhouse
+
+import (
+	"github.com/shopspring/decimal"
+	"testing"
+
+	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+func Test_Issue2584(t *testing.T) {
+	type TDecimal struct {
+		F1 *decimal.Decimal `json:"f1"`
+	}
+
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			p1    = TDecimal{}
+			data1 = g.Map{"f1": gvar.New(1111.111)}
+			err   = gconv.Scan(data1, &p1)
+		)
+		t.AssertNil(err)
+		t.Assert(p1.F1, 1111.111)
+	})
+
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			p2    = TDecimal{}
+			data2 = g.Map{"f1": gvar.New("2222.222")}
+			err   = gconv.Scan(data2, &p2)
+		)
+		t.AssertNil(err)
+		t.Assert(p2.F1, 2222.222)
+	})
+}
--- a/contrib/drivers/clickhouse/go.mod
+++ b/contrib/drivers/clickhouse/go.mod
@ -4,7 +4,7 @@ go 1.15

 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.0.15
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 	github.com/google/uuid v1.3.0
 	github.com/shopspring/decimal v1.3.1
 )
--- a/contrib/drivers/dm/go.mod
+++ b/contrib/drivers/dm/go.mod
@ -6,5 +6,5 @@ replace github.com/gogf/gf/v2 => ../../../

 require (
 	gitee.com/chunanyong/dm v1.8.10
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 )
--- a/contrib/drivers/mssql/go.mod
+++ b/contrib/drivers/mssql/go.mod
@ -4,7 +4,7 @@ go 1.15

 require (
 	github.com/denisenkom/go-mssqldb v0.11.0
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 )

 replace github.com/gogf/gf/v2 => ../../../
--- a/contrib/drivers/mssql/mssql_z_basic_test.go
+++ b/contrib/drivers/mssql/mssql_z_basic_test.go
@ -286,7 +286,6 @@ func Test_DB_Insert(t *testing.T) {
 		t.Assert(one["PASSPORT"].String(), "t200")
 		t.Assert(one["PASSWORD"].String(), "25d55ad283aa400af464c76d71qw07ad")
 		t.Assert(one["NICKNAME"].String(), "T200")
-		t.Assert(one["CREATE_TIME"].GTime(), timeNow)
 	})
 }

--- a/contrib/drivers/mssql/mssql_z_model_test.go
+++ b/contrib/drivers/mssql/mssql_z_model_test.go
@ -25,7 +25,7 @@ import (
 func TestPage(t *testing.T) {
 	table := createInitTable()
 	defer dropTable(table)
-	db.SetDebug(true)
+	//db.SetDebug(true)
 	result, err := db.Model(table).Page(1, 2).Order("id").All()
 	gtest.Assert(err, nil)
 	fmt.Println("page:1--------", result)
--- a/contrib/drivers/mysql/go.mod
+++ b/contrib/drivers/mysql/go.mod
@ -4,7 +4,7 @@ go 1.15

 require (
 	github.com/go-sql-driver/mysql v1.6.0
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 )

 replace github.com/gogf/gf/v2 => ../../../
--- a/contrib/drivers/mysql/mysql_feature_model_builder_test.go
+++ b/contrib/drivers/mysql/mysql_feature_model_builder_test.go
@ -125,3 +125,17 @@ func Test_Model_Builder(t *testing.T) {
 		t.Assert(args, []interface{}{1})
 	})
 }
+
+func Test_Safe_Builder(t *testing.T) {
+	// test whether m.Builder() is chain safe
+	gtest.C(t, func(t *gtest.T) {
+		b := db.Model().Builder()
+		b.Where("id", 1)
+		_, args := b.Build()
+		t.AssertNil(args)
+
+		b = b.Where("id", 1)
+		_, args = b.Build()
+		t.Assert(args, g.Slice{1})
+	})
+}
--- a/contrib/drivers/mysql/mysql_feature_model_do_test.go
+++ b/contrib/drivers/mysql/mysql_feature_model_do_test.go
@ -11,6 +11,7 @@ import (

 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/gconv"
 )

 func Test_Model_Insert_Data_DO(t *testing.T) {
@ -46,7 +47,7 @@ func Test_Model_Insert_Data_DO(t *testing.T) {
 	})
 }

-func Test_Model_Insert_Data_LIst_DO(t *testing.T) {
+func Test_Model_Insert_Data_List_DO(t *testing.T) {
 	table := createTable()
 	defer dropTable(table)

@ -124,6 +125,50 @@ func Test_Model_Update_Data_DO(t *testing.T) {
 	})
 }

+func Test_Model_Update_Pointer_Data_DO(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	db.SetDebug(true)
+	gtest.C(t, func(t *gtest.T) {
+		type NN string
+		type Req struct {
+			Id       int
+			Passport *string
+			Password *string
+			Nickname *NN
+		}
+		type UserDo struct {
+			g.Meta     `orm:"do:true"`
+			Id         interface{}
+			Passport   interface{}
+			Password   interface{}
+			Nickname   interface{}
+			CreateTime interface{}
+		}
+		var (
+			nickname = NN("nickname_111")
+			req      = Req{
+				Password: gconv.PtrString("12345678"),
+				Nickname: &nickname,
+			}
+			data = UserDo{
+				Passport: req.Passport,
+				Password: req.Password,
+				Nickname: req.Nickname,
+			}
+		)
+
+		_, err := db.Model(table).Data(data).WherePri(1).Update()
+		t.AssertNil(err)
+
+		one, err := db.Model(table).WherePri(1).One()
+		t.AssertNil(err)
+		t.Assert(one[`id`], `1`)
+		t.Assert(one[`password`], `12345678`)
+		t.Assert(one[`nickname`], `nickname_111`)
+	})
+}
+
 func Test_Model_Where_DO(t *testing.T) {
 	table := createInitTable()
 	defer dropTable(table)
@ -183,7 +228,7 @@ func Test_Model_Insert_Data_ForDao(t *testing.T) {
 	})
 }

-func Test_Model_Insert_Data_LIst_ForDao(t *testing.T) {
+func Test_Model_Insert_Data_List_ForDao(t *testing.T) {
 	table := createTable()
 	defer dropTable(table)

--- a/contrib/drivers/oracle/go.mod
+++ b/contrib/drivers/oracle/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2
 go 1.17

 require (
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 	github.com/sijms/go-ora/v2 v2.4.20
 )

--- a/contrib/drivers/pgsql/go.mod
+++ b/contrib/drivers/pgsql/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2
 go 1.15

 require (
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 	github.com/lib/pq v1.10.4
 )

--- a/contrib/drivers/sqlite/go.mod
+++ b/contrib/drivers/sqlite/go.mod
@ -4,7 +4,7 @@ go 1.15

 require (
 	github.com/glebarez/go-sqlite v1.17.3
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 )

 replace github.com/gogf/gf/v2 => ../../../
--- a/contrib/nosql/redis/go.mod
+++ b/contrib/nosql/redis/go.mod
@ -4,7 +4,7 @@ go 1.15

 require (
 	github.com/go-redis/redis/v8 v8.11.5
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 	go.opentelemetry.io/otel v1.7.0
 	go.opentelemetry.io/otel/trace v1.7.0
 )
--- a/contrib/registry/etcd/go.mod
+++ b/contrib/registry/etcd/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/etcd/v2
 go 1.15

 require (
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 	go.etcd.io/etcd/client/v3 v3.5.4
 )

--- a/contrib/registry/file/file_z_basic_test.go
+++ b/contrib/registry/file/file_z_basic_test.go
--- a/contrib/registry/file/file_z_http_test.go
+++ b/contrib/registry/file/file_z_http_test.go
@ -0,0 +1,50 @@
+// 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 file_test
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/gogf/gf/contrib/registry/file/v2"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/net/gsvc"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/guid"
+)
+
+var ctx = gctx.GetInitCtx()
+
+func Test_HTTP_Registry(t *testing.T) {
+	var (
+		svcName = guid.S()
+		dirPath = gfile.Temp(svcName)
+	)
+	defer gfile.Remove(dirPath)
+	gsvc.SetRegistry(file.New(dirPath))
+
+	s := g.Server(svcName)
+	s.BindHandler("/http-registry", func(r *ghttp.Request) {
+		r.Response.Write(svcName)
+	})
+	s.SetDumpRouterMap(false)
+	s.Start()
+	defer s.Shutdown()
+
+	time.Sleep(100 * time.Millisecond)
+
+	gtest.C(t, func(t *gtest.T) {
+		client := g.Client()
+		client.SetPrefix(fmt.Sprintf("http://%s", svcName))
+		// GET
+		t.Assert(client.GetContent(ctx, "/http-registry"), svcName)
+	})
+}
--- a/contrib/registry/file/go.mod
+++ b/contrib/registry/file/go.mod
@ -2,6 +2,6 @@ module github.com/gogf/gf/contrib/registry/file/v2

 go 1.15

-require github.com/gogf/gf/v2 v2.0.0
+require github.com/gogf/gf/v2 v2.4.0

 replace github.com/gogf/gf/v2 => ../../../
--- a/contrib/registry/polaris/go.mod
+++ b/contrib/registry/polaris/go.mod
@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/polaris/v2
 go 1.15

 require (
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/v2 v2.4.0
 	github.com/polarismesh/polaris-go v1.3.0
 )

--- a/contrib/registry/polaris/go.sum
+++ b/contrib/registry/polaris/go.sum
@ -227,8 +227,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/polarismesh/polaris-go v1.2.0-beta.3 h1:sqN50VGign37xVFp9nrN1RoLXacsB0QfRYUtuCWMJGI=
-github.com/polarismesh/polaris-go v1.2.0-beta.3/go.mod h1:HsN0ierETIujHpmnnYJ3qkwQw4QGAECuHvBZTDaw1tI=
 github.com/polarismesh/polaris-go v1.3.0 h1:KZKX//ow4OPPoS5+s7h07ptprg+2AcNVGrN6WakC9QM=
 github.com/polarismesh/polaris-go v1.3.0/go.mod h1:HsN0ierETIujHpmnnYJ3qkwQw4QGAECuHvBZTDaw1tI=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
--- a/contrib/registry/zookeeper/go.mod
+++ b/contrib/registry/zookeeper/go.mod
@ -4,7 +4,7 @@ go 1.15

 require (
 	github.com/go-zookeeper/zk v1.0.3
-	github.com/gogf/gf/v2 v2.2.2
+	github.com/gogf/gf/v2 v2.4.0
 	golang.org/x/sync v0.1.0
 )

--- a/contrib/rpc/grpcx/go.mod
+++ b/contrib/rpc/grpcx/go.mod
@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/rpc/grpcx/v2
 go 1.15

 require (
-	github.com/gogf/gf/contrib/registry/file/v2 v2.3.3
-	github.com/gogf/gf/v2 v2.0.0
+	github.com/gogf/gf/contrib/registry/file/v2 v2.4.0
+	github.com/gogf/gf/v2 v2.4.0
 	go.opentelemetry.io/otel v1.10.0
 	go.opentelemetry.io/otel/trace v1.10.0
 	golang.org/x/net v0.0.0-20220919232410-f2f64ebce3c1 // indirect
--- a/contrib/rpc/grpcx/grpcx_grpc_server.go
+++ b/contrib/rpc/grpcx/grpcx_grpc_server.go
@ -7,6 +7,7 @@
 package grpcx

 import (
+	"context"
 	"fmt"
 	"net"
 	"os"
@ -25,6 +26,7 @@ import (
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
 )

 // GrpcServer is the server for GRPC protocol.
@ -104,19 +106,19 @@ func (s *GrpcServer) Run() {
 	// Create listener to bind listening ip and port.
 	s.listener, err = net.Listen("tcp", s.config.Address)
 	if err != nil {
-		s.config.Logger.Fatalf(ctx, `%+v`, err)
+		s.Logger().Fatalf(ctx, `%+v`, err)
 	}

 	// Start listening.
 	go func() {
 		if err = s.Server.Serve(s.listener); err != nil {
-			s.config.Logger.Fatalf(ctx, `%+v`, err)
+			s.Logger().Fatalf(ctx, `%+v`, err)
 		}
 	}()

 	// Service register.
 	s.doServiceRegister()
-	s.config.Logger.Infof(
+	s.Logger().Infof(
 		ctx,
 		"pid[%d]: grpc server started listening on [%s]",
 		gproc.Pid(), s.GetListenedAddress(),
@ -147,7 +149,7 @@ func (s *GrpcServer) doSignalListen() {
 			syscall.SIGKILL,
 			syscall.SIGTERM,
 			syscall.SIGABRT:
-			s.config.Logger.Infof(ctx, "signal received: %s, gracefully shutting down", sig.String())
+			s.Logger().Infof(ctx, "signal received: %s, gracefully shutting down", sig.String())
 			s.doServiceDeregister()
 			time.Sleep(time.Second)
 			s.Stop()
@ -156,6 +158,11 @@ func (s *GrpcServer) doSignalListen() {
 	}
 }

+// Logger is alias of GetLogger.
+func (s *GrpcServer) Logger() *glog.Logger {
+	return s.config.Logger
+}
+
 // doServiceRegister registers current service to Registry.
 func (s *GrpcServer) doServiceRegister() {
 	if s.registrar == nil {
@ -176,15 +183,19 @@ func (s *GrpcServer) doServiceRegister() {
 	for i, service := range s.services {
 		service = &gsvc.LocalService{
 			Name:      service.GetName(),
-			Endpoints: s.calculateListenedEndpoints(),
+			Endpoints: s.calculateListenedEndpoints(ctx),
 			Metadata:  service.GetMetadata(),
 		}
 		service.GetMetadata().Sets(gsvc.Metadata{
 			gsvc.MDProtocol: protocol,
 		})
-		s.config.Logger.Debugf(ctx, `service register: %+v`, service)
+		s.Logger().Debugf(ctx, `service register: %+v`, service)
+		if len(service.GetEndpoints()) == 0 {
+			s.Logger().Warningf(ctx, `no endpoints found to register service, abort service registering`)
+			return
+		}
 		if service, err = s.registrar.Register(ctx, service); err != nil {
-			s.config.Logger.Fatalf(ctx, `%+v`, err)
+			s.Logger().Fatalf(ctx, `%+v`, err)
 		}
 		s.services[i] = service
 	}
@ -197,9 +208,9 @@ func (s *GrpcServer) doServiceDeregister() {
 	}
 	var ctx = gctx.GetInitCtx()
 	for _, service := range s.services {
-		s.config.Logger.Debugf(ctx, `service deregister: %+v`, service)
+		s.Logger().Debugf(ctx, `service deregister: %+v`, service)
 		if err := s.registrar.Deregister(ctx, service); err != nil {
-			s.config.Logger.Errorf(ctx, `%+v`, err)
+			s.Logger().Errorf(ctx, `%+v`, err)
 		}
 	}
 }
@ -249,22 +260,59 @@ func (s *GrpcServer) GetListenedPort() int {
 	return -1
 }

-func (s *GrpcServer) calculateListenedEndpoints() gsvc.Endpoints {
+func (s *GrpcServer) calculateListenedEndpoints(ctx context.Context) gsvc.Endpoints {
 	var (
-		address      = s.config.Address
-		endpoints    = make(gsvc.Endpoints, 0)
-		listenedPort = s.GetListenedPort()
-		listenedIps  []string
+		configAddr = s.config.Address
+		endpoints  = make(gsvc.Endpoints, 0)
 	)
-	var addrArray = gstr.Split(address, ":")
-	switch addrArray[0] {
-	case "0.0.0.0", "":
-		listenedIps = []string{gipv4.MustGetIntranetIp()}
-	default:
-		listenedIps = []string{addrArray[0]}
-	}
-	for _, ip := range listenedIps {
-		endpoints = append(endpoints, gsvc.NewEndpoint(fmt.Sprintf(`%s:%d`, ip, listenedPort)))
+	for _, address := range gstr.SplitAndTrim(configAddr, ",") {
+		var (
+			addrArray     = gstr.Split(address, ":")
+			listenedIps   []string
+			listenedPorts []int
+		)
+		// IPs.
+		switch addrArray[0] {
+		case "127.0.0.1":
+			// Nothing to do.
+		case "0.0.0.0", "":
+			intranetIps, err := gipv4.GetIntranetIpArray()
+			if err != nil {
+				s.Logger().Errorf(ctx, `error retrieving intranet ip: %+v`, err)
+				return nil
+			}
+			// If no intranet ips found, it uses all ips that can be retrieved,
+			// it may include internet ip.
+			if len(intranetIps) == 0 {
+				allIps, err := gipv4.GetIpArray()
+				if err != nil {
+					s.Logger().Errorf(ctx, `error retrieving ip from current node: %+v`, err)
+					return nil
+				}
+				s.Logger().Noticef(
+					ctx,
+					`no intranet ip found, using internet ip to register service: %v`,
+					allIps,
+				)
+				listenedIps = allIps
+				break
+			}
+			listenedIps = intranetIps
+		default:
+			listenedIps = []string{addrArray[0]}
+		}
+		// Ports.
+		switch addrArray[1] {
+		case "0":
+			listenedPorts = []int{s.GetListenedPort()}
+		default:
+			listenedPorts = []int{gconv.Int(addrArray[1])}
+		}
+		for _, ip := range listenedIps {
+			for _, port := range listenedPorts {
+				endpoints = append(endpoints, gsvc.NewEndpoint(fmt.Sprintf(`%s:%d`, ip, port)))
+			}
+		}
 	}
 	return endpoints
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Guo	894f202b75	version v2.4.0 (#2595 )	2023-04-24 11:44:19 +08:00
John Guo	9171585b2c	improve auto retrieving of ip addresses for service registering (#2593 )	2023-04-23 21:58:17 +08:00
feranwq	23d8ef32a3	fix: fix typo and go-staticcheck S1002 warning (#2590 )	2023-04-21 10:13:59 +08:00
John Guo	a031e112e5	add command `gen enums` (#2591 )	2023-04-20 16:30:42 +08:00
John Guo	da8297d770	improve `AddObject` to support `Command/*Command` parameter for package `gcmd` (#2587 )	2023-04-18 10:09:07 +08:00
John Guo	3991eb053c	fix issue #2584 (#2586 )	2023-04-17 17:44:24 +08:00
John Guo	6fb26c44d7	fix issue converting values to custom type pointers (#2585 )	2023-04-17 16:34:36 +08:00
HaiLaz	fdc027734c	add command `make version to` in Makefile (#2579 )	2023-04-14 10:09:19 +08:00
John Guo	32a7f6a0f0	feature/v2.4.0-rc4 (#2578 ) * v2.4.0-rc3 * v2.4.0-rc4	2023-04-12 22:01:24 +08:00
John Guo	5bbec48679	v2.4.0-rc2 (#2575 )	2023-04-12 21:14:03 +08:00
John Guo	d4b9ee4c61	version updates to v2.4.0-rc (#2574 ) version updates	2023-04-12 20:24:20 +08:00
刘志铭	50b5cd50bc	fix issue in New when creating concurrent-safety var for package gvar (#2573 )	2023-04-12 17:38:06 +08:00
John Guo	53afbd0f05	uf case update for contrib/drivers/mysql (#2569 )	2023-04-12 15:36:44 +08:00
star liu	b6874eb66d	update cli build action (#2563 )	2023-04-12 11:54:15 +08:00
John Guo	7ff7de4643	inherit context from http.Request for ghttp.Request (#2550 )	2023-04-12 11:54:06 +08:00
John Guo	5f148632d2	fix missing trace id in gctx.GetInitCtx (#2562 )	2023-04-12 10:35:24 +08:00
wsy998	c1325ef9a3	Add Filter function to garray (#2541 )	2023-04-12 10:15:11 +08:00
John Guo	d788b7ff5e	fix issue #2529 #2487 (#2548 )	2023-04-12 10:14:14 +08:00
alaywn	66d0663dc5	add `clickhouse` support in command `gf gen dao` (#2557 )	2023-04-12 10:14:04 +08:00
John Guo	a56524ee05	add `RemoveValues` for package `garray` (#2568 ) add RemoveValues for package garray	2023-04-12 10:12:28 +08:00
John Guo	1aa9f2809e	improve stream response for http (#2564 )	2023-04-12 10:12:11 +08:00
HaiLaz	261672e84c	feat: automatic update gf for contrib (#2551 )	2023-04-11 21:13:29 +08:00
John Guo	6a4e39e815	change temp dir to os.TempDir for package gfile (#2547 )	2023-03-29 11:58:20 +08:00
dependabot[bot]	4af9ce8a81	Bump golang.org/x/crypto from 0.0.0-20200622213623-75b288015ac9 to 0.1.0 in /cmd/gf (#2546 )	2023-03-28 20:03:07 +08:00
HaiLaz	5f146720fe	fix: unified go.mod dependent version (#2452 )	2023-03-28 09:25:29 +08:00
忆灬凝	67e6772d88	comment updates for gdb.Builder (#2513 )	2023-03-28 09:23:08 +08:00
John Guo	12e9febe9e	fix issue #2516 (#2531 ) * fix issue #2516 * golang ci configuration updates * add example for default value of http request	2023-03-22 20:14:57 +08:00
John Guo	676022eeb6	fix issue #2509 (#2530 )	2023-03-21 22:10:41 +08:00
XG	3a8fc1e70d	optimize the handling of the `SIGUSR1` signal (#2532 ) optimize the handling of the SIGUSR1 signal	2023-03-21 21:26:49 +08:00