version v2.4.2 (#2679)

ignore binary building if option Build is empty for command build

.github/workflows/build_and_test.sh

@@ -20,9 +20,9 @@ for file in `find . -name go.mod`; do
         fi
     fi
 
-    # package example needs golang >= v1.18
+    # package example needs golang >= v1.19
     if [ "example" = $(basename $dirpath) ]; then
-        if ! go version|grep -q "1.18"; then
+        if ! go version|grep -q "1.19"; then
           echo "ignore example as go version: $(go version)"
           continue 1
         fi
@@ -31,7 +31,23 @@ for file in `find . -name go.mod`; do
     # package cmd/gf needs golang >= v1.18
     if [ "gf" = $(basename $dirpath) ]; then
         if ! go version|grep -q "1.18"; then
-          echo "ignore example as go version: $(go version)"
+          echo "ignore cmd/gf as go version: $(go version)"
+          continue 1
+        fi
+    fi
+
+    # package otlpgrpc needs golang >= v1.20
+    if [ "otlpgrpc" = $(basename $dirpath) ]; then
+        if ! go version|grep -q "1.20"; then
+          echo "ignore otlpgrpc as go version: $(go version)"
+          continue 1
+        fi
+    fi
+
+    # package otlphttp needs golang >= v1.20
+    if [ "otlphttp" = $(basename $dirpath) ]; then
+        if ! go version|grep -q "1.20"; then
+          echo "ignore otlphttp as go version: $(go version)"
           continue 1
         fi
     fi

.github/workflows/cli.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set Up Golang Environment
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.3
+          go-version: 1.20.4
       
       - name: Build CLI Binary
         run: |

.github/workflows/gf.yml

@@ -120,13 +120,16 @@ jobs:
           - 9001:9001
 
       # Polaris backend server.
-      # docker run -d --name polaris -p 8090:8090 -p 8091:8091 -p 8093:8093 loads/polaris-server-standalone:1.11.2
+      # docker run -d --name polaris -p 8090:8090 -p 8091:8091 -p 8093:8093  -p 9090:9090 -p 9091:9091 loads/polaris-server-standalone:1.11.2
+      # docker run -d --name polaris -p 8090:8090 -p 8091:8091 -p 8093:8093  -p 9090:9090 -p 9091:9091 loads/polaris-standalone:v1.16.3
       polaris:
-        image: loads/polaris-server-standalone:1.11.2
+        image: loads/polaris-standalone:v1.16.4
         ports:
           - 8090:8090
           - 8091:8091
           - 8093:8093
+          - 9090:9090
+          - 9091:9091
 
       # Oracle 11g server
       oracle-server:
@@ -153,7 +156,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [ "1.15", "1.16", "1.17", "1.18" ]
+        go-version: [ "1.15", "1.16", "1.17", "1.18", "1.19", "1.20" ]
         goarch: [ "386", "amd64" ]
 
     steps:

.github/workflows/gitee-sync.yml

@@ -0,0 +1,28 @@
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "*"
+
+name: Sync to Gitee
+jobs:
+  run:
+    name: Run
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Mirror Github to Gitee
+        uses: Yikun/hub-mirror-action@v1.2
+        with:
+          src: github/gogf
+          dst: gitee/johng
+          dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+          dst_token: ${{ secrets.GITEE_TOKEN }}
+          src_account_type: org
+          dst_account_type: user
+          timeout: 600
+          debug: true
+          force_update: true
+          static_list: "gf"

.github/workflows/golangci-lint.yml

@@ -36,7 +36,7 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go-version: [1.15.x,1.16.x,1.17.x,1.18.x]
+        go-version: [1.15.x,1.16.x,1.17.x,1.18.x,1.19.x,1.20.x]
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:

.github/workflows/tag.yml

@@ -19,18 +19,6 @@ jobs:
       - name: Checkout Github Code
         uses: actions/checkout@v3
 
-#      - name: Update Dependencies
-#        run: make gftidy
-#
-#      - name: Commit & Push Changes
-#        uses: actions-js/push@master
-#        with:
-#          github_token: ${{ secrets.GITHUB_TOKEN }}
-#          branch: master
-#          author_name:  TagRobot
-#          author_email: tagrobot@goframe.org
-#          message: "auto update version to ${{ github.ref_name }}"
-
       - name: Auto Creating Tags For Contrib Packages
         run: |
           git config --global user.email "tagrobot@goframe.org"

Makefile

@@ -15,21 +15,29 @@ tidy:
 lint:
 	golangci-lint run
 
-gftidy:
-	$(eval files=$(shell find . -name go.mod))
+# make version to=v2.4.0
+.PHONY: version
+version:
+	$(eval files=$(shell find . -name go.mod)) 
 	@set -e; \
-	# GITHUB_REF_NAME=v2.4.0; \
-	if [[ $$GITHUB_REF_NAME =~ "v" ]]; then \
-		latestVersion=$$GITHUB_REF_NAME; \
+	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 "" ; \
 			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; \
@@ -37,4 +45,6 @@ gftidy:
 			go mod tidy; \
 			cd -; \
 		fi \
-	done
+	done
+
+

README.MD

@@ -1,9 +1,9 @@
 # GoFrame
 
 <div align=center>
-<img src="https://goframe.org/statics/image/gf-head-large.png" width="100"/>
+<img src="https://goframe.org/statics/image/logo2.png?v=1" width="300"/>
 
-[![Go Doc](https://godoc.org/github.com/gogf/gf?status.svg)](https://godoc.org/github.com/gogf/gf)
+[![Go Reference](https://pkg.go.dev/badge/github.com/gogf/gf/v2.svg)](https://pkg.go.dev/github.com/gogf/gf/v2)
 [![GoFrame CI](https://github.com/gogf/gf/actions/workflows/gf.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/gf.yml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/gogf/gf/v2)](https://goreportcard.com/report/github.com/gogf/gf/v2)
 [![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf)

cmd/gf/gfcmd/gfcmd.go

@@ -0,0 +1,111 @@
+// 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 gfcmd
+
+import (
+	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
+
+	"context"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gcfg"
+	"github.com/gogf/gf/v2/os/gcmd"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/text/gstr"
+)
+
+const (
+	cliFolderName = `hack`
+)
+
+// Command manages the CLI command of `gf`.
+type Command struct {
+	*gcmd.Command
+}
+
+// Run starts running the command according the command line arguments and options.
+func (c *Command) Run(ctx context.Context) {
+	defer func() {
+		if exception := recover(); exception != nil {
+			if err, ok := exception.(error); ok {
+				mlog.Print(err.Error())
+			} else {
+				panic(exception)
+			}
+		}
+	}()
+
+	// CLI configuration, using the `hack/config.yaml` in priority.
+	if path, _ := gfile.Search(cliFolderName); path != "" {
+		if adapter, ok := g.Cfg().GetAdapter().(*gcfg.AdapterFile); ok {
+			if err := adapter.SetPath(path); err != nil {
+				mlog.Fatal(err)
+			}
+		}
+	}
+
+	// zsh alias "git fetch" conflicts checks.
+	handleZshAlias()
+
+	// -y option checks.
+	allyes.Init()
+
+	// just run.
+	if err := c.RunWithError(ctx); err != nil {
+		// Exit with error message and exit code 1.
+		// It is very important to exit the command process with code 1.
+		mlog.Fatalf(`%+v`, err)
+	}
+}
+
+// GetCommand retrieves and returns the root command of CLI `gf`.
+func GetCommand(ctx context.Context) (*Command, error) {
+	root, err := gcmd.NewFromObject(cmd.GF)
+	if err != nil {
+		panic(err)
+	}
+	err = root.AddObject(
+		cmd.Up,
+		cmd.Env,
+		cmd.Fix,
+		cmd.Run,
+		cmd.Gen,
+		cmd.Tpl,
+		cmd.Init,
+		cmd.Pack,
+		cmd.Build,
+		cmd.Docker,
+		cmd.Install,
+		cmd.Version,
+	)
+	if err != nil {
+		return nil, err
+	}
+	command := &Command{
+		root,
+	}
+	return command, nil
+}
+
+// zsh alias "git fetch" conflicts checks.
+func handleZshAlias() {
+	if home, err := gfile.Home(); err == nil {
+		zshPath := gfile.Join(home, ".zshrc")
+		if gfile.Exists(zshPath) {
+			var (
+				aliasCommand = `alias gf=gf`
+				content      = gfile.GetContents(zshPath)
+			)
+			if !gstr.Contains(content, aliasCommand) {
+				_ = gfile.PutContentsAppend(zshPath, "\n"+aliasCommand+"\n")
+			}
+		}
+	}
+}

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/clickhouse/v2 v2.3.3
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.3.3
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.3.3
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.3.3
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.3.3
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.3.3
-	github.com/gogf/gf/v2 v2.3.3
+	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.4.2
+	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.4.2
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.4.2
+	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.4.2
+	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.4.2
+	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.4.2
+	github.com/gogf/gf/v2 v2.4.2
+	github.com/minio/selfupdate v0.6.0
 	github.com/olekukonko/tablewriter v0.0.5
 	golang.org/x/tools v0.7.0
 )
 
 require (
+	aead.dev/minisign v0.2.0 // 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

cmd/gf/go.sum

@@ -1,3 +1,5 @@
+aead.dev/minisign v0.2.0 h1:kAWrq/hBRu4AARY6AlciO83xhNnW9UaC8YipS2uhLPk=
+aead.dev/minisign v0.2.0/go.mod h1:zdq6LdSd9TbuSxchxwhpA9zEb9YXcVGoE8JakuiGaIQ=
 github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
 github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
@@ -63,6 +65,8 @@ github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/Qd
 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/minio/selfupdate v0.6.0 h1:i76PgT0K5xO9+hjzKcacQtO7+MjJ4JKA8Ak8XQ9DDwU=
+github.com/minio/selfupdate v0.6.0/go.mod h1:bO02GTIPCMQFTEvE5h4DjYB58bCoZ35XLeBf0buTDdM=
 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=
@@ -105,6 +109,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 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=
@@ -124,16 +130,20 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 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-20191026070338-33540a1f6037/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=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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=
@@ -143,6 +153,7 @@ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBc
 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-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 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=

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 (

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 (
@@ -123,7 +129,7 @@ type cBuildInput struct {
 	VarMap        g.Map  `short:"r"  name:"varMap"  brief:"custom built embedded variable into binary"`
 	PackSrc       string `short:"ps" name:"packSrc" brief:"pack one or more folders into one go file before building"`
 	PackDst       string `short:"pd" name:"packDst" brief:"temporary go file path for pack, this go file will be automatically removed after built" d:"internal/packed/build_pack_data.go"`
-	ExitWhenError bool   `short:"ew" name:"exitWhenError" brief:"exit building when any error occurs, default is false" orphan:"true"`
+	ExitWhenError bool   `short:"ew" name:"exitWhenError" brief:"exit building when any error occurs, specially for multiple arch and system buildings. default is false" orphan:"true"`
 	DumpENV       bool   `short:"de" name:"dumpEnv" brief:"dump current go build environment before building binary" orphan:"true"`
 }
 
@@ -137,7 +143,7 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e
 
 	mlog.SetHeaderPrint(true)
 
-	mlog.Debugf(`build input: %+v`, in)
+	mlog.Debugf(`build command input: %+v`, in)
 	// Necessary check.
 	if gproc.SearchBinary("go") == "" {
 		mlog.Fatalf(`command "go" not found in your environment, please install golang first to proceed this command`)
@@ -298,7 +304,7 @@ buildDone:
 	return
 }
 
-// getBuildInVarMapJson retrieves and returns the custom build-in variables in configuration
+// getBuildInVarStr retrieves and returns the custom build-in variables in configuration
 // file as json.
 func (c cBuild) getBuildInVarStr(ctx context.Context, in cBuildInput) string {
 	buildInVarMap := in.VarMap

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 (
@@ -72,10 +78,10 @@ func init() {
 
 type cDockerInput struct {
 	g.Meta      `name:"docker" config:"gfcli.docker"`
-	Main        string   `name:"MAIN" arg:"true" brief:"{cDockerMainBrief}"  d:"main.go"`
+	Main        string   `name:"MAIN" arg:"true" brief:"{cDockerMainBrief}" d:"main.go"`
 	File        string   `name:"file"        short:"f"  brief:"{cDockerFileBrief}"  d:"manifest/docker/Dockerfile"`
 	Shell       string   `name:"shell"       short:"s"  brief:"{cDockerShellBrief}" d:"manifest/docker/docker.sh"`
-	Build       string   `name:"build"       short:"b"  brief:"{cDockerBuildBrief}" d:"-a amd64 -s linux"`
+	Build       string   `name:"build"       short:"b"  brief:"{cDockerBuildBrief}"`
 	Tag         string   `name:"tag"         short:"t"  brief:"{cDockerTagBrief}"`
 	TagName     string   `name:"tagName"     short:"tn" brief:"{cDockerTagNameBrief}"     v:"required-with:TagPrefixes"`
 	TagPrefixes []string `name:"tagPrefixes" short:"tp" brief:"{cDockerTagPrefixesBrief}" v:"required-with:TagName"`
@@ -91,17 +97,23 @@ func (c cDocker) Index(ctx context.Context, in cDockerInput) (out *cDockerOutput
 		mlog.Fatalf(`command "docker" not found in your environment, please install docker first to proceed this command`)
 	}
 
+	mlog.Debugf(`docker command input: %+v`, in)
+
 	// Binary build.
-	in.Build += " --exit"
-	if in.Main != "" {
-		if err = gproc.ShellRun(ctx, fmt.Sprintf(`gf build %s %s`, in.Main, in.Build)); err != nil {
-			return
+	if in.Main != "" && in.Build != "" {
+		in.Build += " --exitWhenError"
+		if in.Main != "" {
+			if err = gproc.ShellRun(ctx, fmt.Sprintf(`gf build %s %s`, in.Main, in.Build)); err != nil {
+				mlog.Debugf(`build binary failed with error: %+v`, err)
+				return
+			}
 		}
 	}
 
 	// Shell executing.
 	if in.Shell != "" && gfile.Exists(in.Shell) {
 		if err = c.exeDockerShell(ctx, in.Shell); err != nil {
+			mlog.Debugf(`build docker failed with error: %+v`, err)
 			return
 		}
 	}

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"
 )

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"

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

cmd/gf/internal/cmd/cmd_gen_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 cmd
 
 import (

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
+)

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"

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"

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 (

cmd/gf/internal/cmd/cmd_init.go

@@ -1,8 +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 (
 	"context"
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/gogf/gf/v2/frame/g"
@@ -10,6 +17,7 @@ import (
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/os/gres"
+	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
@@ -37,6 +45,10 @@ gf init my-mono-repo -m
 name for the project. It will create a folder with NAME in current directory.
 The NAME will also be the module name for the project.
 `
+	// cInitGitDir the git directory
+	cInitGitDir = ".git"
+	// cInitGitignore the gitignore file
+	cInitGitignore = ".gitignore"
 )
 
 func init() {
@@ -57,17 +69,22 @@ type cInitInput struct {
 type cInitOutput struct{}
 
 func (c cInit) Index(ctx context.Context, in cInitInput) (out *cInitOutput, err error) {
+	var (
+		overwrote = false
+	)
 	if !gfile.IsEmpty(in.Name) && !allyes.Check() {
 		s := gcmd.Scanf(`the folder "%s" is not empty, files might be overwrote, continue? [y/n]: `, in.Name)
 		if strings.EqualFold(s, "n") {
 			return
 		}
+		overwrote = true
 	}
 	mlog.Print("initializing...")
 
 	// Create project folder and files.
 	var (
 		templateRepoName string
+		gitignoreFile    = in.Name + "/" + cInitGitignore
 	)
 	if in.Mono {
 		templateRepoName = cInitMonoRepo
@@ -81,14 +98,35 @@ func (c cInit) Index(ctx context.Context, in cInitInput) (out *cInitOutput, err
 		return
 	}
 
+	// build ignoreFiles from the .gitignore file
+	ignoreFiles := make([]string, 0, 10)
+	ignoreFiles = append(ignoreFiles, cInitGitDir)
+	if overwrote {
+		err = gfile.ReadLines(gitignoreFile, func(line string) error {
+			// Add only hidden files or directories
+			// If other directories are added, it may cause the entire directory to be ignored
+			// such as 'main' in the .gitignore file, but the path is 'D:\main\my-project'
+			if line != "" && strings.HasPrefix(line, ".") {
+				ignoreFiles = append(ignoreFiles, line)
+			}
+			return nil
+		})
+
+		// if not found the .gitignore file will skip os.ErrNotExist error
+		if err != nil && !os.IsNotExist(err) {
+			return
+		}
+	}
+
 	// Replace template name to project name.
-	err = gfile.ReplaceDir(
-		cInitRepoPrefix+templateRepoName,
-		gfile.Basename(gfile.RealPath(in.Name)),
-		in.Name,
-		"*",
-		true,
-	)
+	err = gfile.ReplaceDirFunc(func(path, content string) string {
+		for _, ignoreFile := range ignoreFiles {
+			if strings.Contains(path, ignoreFile) {
+				return content
+			}
+		}
+		return gstr.Replace(gfile.GetContents(path), cInitRepoPrefix+templateRepoName, gfile.Basename(gfile.RealPath(in.Name)))
+	}, in.Name, "*", true)
 	if err != nil {
 		return
 	}

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 (

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 (

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 (

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, ",")

cmd/gf/internal/cmd/cmd_up.go

@@ -1,13 +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 (
 	"context"
 	"fmt"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
-	"github.com/gogf/gf/v2/container/gset"
 	"runtime"
 
+	"github.com/minio/selfupdate"
+
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
+	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gproc"
@@ -117,6 +125,8 @@ func (c cUp) doUpgradeVersion(ctx context.Context, in cUpInput) (out *doUpgradeV
 		if gfile.Exists(goModPath) {
 			var packages []Package
 			err = gfile.ReadLines(goModPath, func(line string) error {
+				line = gstr.Trim(line)
+				line = gstr.TrimLeftStr(line, "require ")
 				line = gstr.Trim(line)
 				if gstr.HasPrefix(line, gfPackage) {
 					array := gstr.SplitAndTrim(line, " ")
@@ -167,6 +177,11 @@ func (c cUp) doUpgradeCLI(ctx context.Context) (err error) {
 		)
 		localSaveFilePath = gfile.SelfPath() + "~"
 	)
+
+	if runtime.GOOS == "windows" {
+		downloadUrl += ".exe"
+	}
+
 	mlog.Printf(`start downloading "%s" to "%s", it may take some time`, downloadUrl, localSaveFilePath)
 	err = utils.HTTPDownloadFileWithPercent(downloadUrl, localSaveFilePath)
 	if err != nil {
@@ -184,17 +199,14 @@ func (c cUp) doUpgradeCLI(ctx context.Context) (err error) {
 		mlog.Fatalf(`download "%s" to "%s" failed`, downloadUrl, localSaveFilePath)
 	}
 
-	// It replaces self binary with new version cli binary.
-	switch runtime.GOOS {
-	case "windows":
-		if err := gfile.Rename(localSaveFilePath, gfile.SelfPath()); err != nil {
-			mlog.Fatalf(`install failed: %s`, err.Error())
-		}
-
-	default:
-		if err := gfile.PutBytes(gfile.SelfPath(), gfile.GetBytes(localSaveFilePath)); err != nil {
-			mlog.Fatalf(`install failed: %s`, err.Error())
-		}
+	newFile, err := gfile.Open(localSaveFilePath)
+	if err != nil {
+		return err
+	}
+	// selfupdate
+	err = selfupdate.Apply(newFile, selfupdate.Options{})
+	if err != nil {
+		return err
 	}
 	return
 }

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 (

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 (

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 (

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 (

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 (

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 (

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 {
@@ -50,7 +57,7 @@ func generateStructDefinition(ctx context.Context, in generateStructDefinitionIn
 	return buffer.String()
 }
 
-// generateStructFieldForModel generates and returns the attribute definition for specified field.
+// generateStructFieldDefinition generates and returns the attribute definition for specified field.
 func generateStructFieldDefinition(
 	ctx context.Context, field *gdb.TableField, in generateStructDefinitionInput,
 ) []string {

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"`
+		Prefixes []string `name:"prefixes" short:"x"  dc:"only exports packages that starts with specified prefixes"`
+	}
+	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 for enums: %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.Prefixes)
+	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 enums go file: %s`, in.Path)
+	mlog.Print("done!")
+	return
+}

cmd/gf/internal/cmd/genenums/genenums_parser.go

@@ -0,0 +1,146 @@
+// 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{}
+	prefixes  []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(prefixes []string) *EnumsParser {
+	return &EnumsParser{
+		enums:     make([]EnumItem, 0),
+		parsedPkg: make(map[string]struct{}),
+		prefixes:  prefixes,
+	}
+}
+
+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 prefixes.
+	if len(p.prefixes) > 0 {
+		var hasPrefix bool
+		for _, prefix := range p.prefixes {
+			if hasPrefix = gstr.HasPrefix(pkg.ID, prefix); hasPrefix {
+				break
+			}
+		}
+		if !hasPrefix {
+			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)
+}

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 (

cmd/gf/internal/cmd/genpb/genpb_controller.go

@@ -1,8 +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 genpb
 
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/frame/g"
@@ -79,7 +86,7 @@ func (c CGenPb) parseControllers(filePath string) ([]generateCtrl, error) {
 		func(match []string) string {
 			ctrl := generateCtrl{
 				Name:    match[1],
-				Package: gfile.Basename(gfile.Dir(gfile.Dir(filePath))),
+				Package: strings.ReplaceAll(gfile.Basename(gfile.Dir(gfile.Dir(filePath))), "-", "_"),
 				Version: gfile.Basename(gfile.Dir(filePath)),
 				Methods: make([]generateCtrlMethod, 0),
 			}

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 (

cmd/gf/internal/cmd/genpbentity/genpbentity.go

@@ -1,10 +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 genpbentity
 
 import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/olekukonko/tablewriter"
 	"strings"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
@@ -18,6 +23,7 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/olekukonko/tablewriter"
 )
 
 type (
@@ -311,9 +317,9 @@ func generateMessageFieldForPbEntity(index int, field *gdb.TableField, in CGenPb
 		gdb.LocalTypeUint64Slice: "repeated uint64",
 		gdb.LocalTypeInt64Bytes:  "repeated int64",
 		gdb.LocalTypeUint64Bytes: "repeated uint64",
-		gdb.LocalTypeFloat32:     "float32",
-		gdb.LocalTypeFloat64:     "float64",
-		gdb.LocalTypeBytes:       "[]byte",
+		gdb.LocalTypeFloat32:     "float",
+		gdb.LocalTypeFloat64:     "double",
+		gdb.LocalTypeBytes:       "bytes",
 		gdb.LocalTypeBool:        "bool",
 		gdb.LocalTypeJson:        "string",
 		gdb.LocalTypeJsonb:       "string",

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 (

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 (

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 (

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 (

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 = `

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 = `

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 = `

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})
+}
+`

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 = `

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 = `

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 = `

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

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 (
@@ -105,6 +111,8 @@ func (s serviceInstall) Run(ctx context.Context) (err error) {
 			)
 			if input != "" {
 				inputID = gconv.Int(input)
+			} else {
+				break
 			}
 			// Check if out of range.
 			if inputID >= len(paths) || inputID < 0 {
@@ -142,7 +150,7 @@ func (s serviceInstall) IsInstalled() (*serviceInstallAvailablePath, bool) {
 	return nil, false
 }
 
-// getGoPathBinFilePath retrieves ad returns the GOPATH/bin path for binary.
+// getGoPathBin retrieves ad returns the GOPATH/bin path for binary.
 func (s serviceInstall) getGoPathBin() string {
 	if goPath := genv.Get(`GOPATH`).String(); goPath != "" {
 		return gfile.Join(goPath, "bin")

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 (

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 (

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 (

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"
 )
 

cmd/gf/main.go

@@ -1,92 +1,28 @@
+// 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 (
-	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
-
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcfg"
-	"github.com/gogf/gf/v2/os/gcmd"
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v2/gfcmd"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-)
-
-const (
-	cliFolderName = `hack`
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {
-	defer func() {
-		if exception := recover(); exception != nil {
-			if err, ok := exception.(error); ok {
-				mlog.Print(err.Error())
-			} else {
-				panic(exception)
-			}
-		}
-	}()
-
-	// CLI configuration.
-	if path, _ := gfile.Search(cliFolderName); path != "" {
-		if adapter, ok := g.Cfg().GetAdapter().(*gcfg.AdapterFile); ok {
-			if err := adapter.SetPath(path); err != nil {
-				mlog.Fatal(err)
-			}
-		}
-	}
-
-	// zsh alias "git fetch" conflicts checks.
-	handleZshAlias()
-
-	// -y option checks.
-	allyes.Init()
-
 	var (
-		ctx = gctx.New()
+		ctx = gctx.GetInitCtx()
 	)
-	command, err := gcmd.NewFromObject(cmd.GF)
+	command, err := gfcmd.GetCommand(ctx)
 	if err != nil {
-		panic(err)
+		mlog.Fatalf(`%+v`, err)
 	}
-	err = command.AddObject(
-		cmd.Up,
-		cmd.Env,
-		cmd.Fix,
-		cmd.Run,
-		cmd.Gen,
-		cmd.Tpl,
-		cmd.Init,
-		cmd.Pack,
-		cmd.Build,
-		cmd.Docker,
-		cmd.Install,
-		cmd.Version,
-	)
-	if err != nil {
-		panic(err)
-	}
-	err = command.RunWithError(ctx)
-	if err != nil {
-		panic(err)
-	}
-}
-
-// zsh alias "git fetch" conflicts checks.
-func handleZshAlias() {
-	if home, err := gfile.Home(); err == nil {
-		zshPath := gfile.Join(home, ".zshrc")
-		if gfile.Exists(zshPath) {
-			var (
-				aliasCommand = `alias gf=gf`
-				content      = gfile.GetContents(zshPath)
-			)
-			if !gstr.Contains(content, aliasCommand) {
-				_ = gfile.PutContentsAppend(zshPath, "\n"+aliasCommand+"\n")
-			}
-		}
+	if command == nil {
+		panic(gerror.New(`retrieve root command failed for "gf"`))
 	}
+	command.Run(ctx)
 }

container/garray/garray_normal_any.go

@@ -795,11 +795,9 @@ func (a *Array) UnmarshalValue(value interface{}) error {
 	return nil
 }
 
-// Filter `filter func(value interface{}, index int) bool` filter array, value
-// means the value of the current element, the index of the current original
-// color of value, when the custom function returns True, the element will be
-// filtered, otherwise it will not be filtered, `Filter` function returns a new
-// array, will not modify the original array.
+// 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()

container/garray/garray_normal_int.go

@@ -788,11 +788,9 @@ func (a *IntArray) UnmarshalValue(value interface{}) error {
 	return nil
 }
 
-// Filter `filter func(value int, index int) bool` filter array, value
-// means the value of the current element, the index of the current original
-// color of value, when the custom function returns True, the element will be
-// filtered, otherwise it will not be filtered, `Filter` function returns a new
-// array, will not modify the original array.
+// 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()

container/garray/garray_normal_str.go

@@ -799,11 +799,9 @@ func (a *StrArray) UnmarshalValue(value interface{}) error {
 	return nil
 }
 
-// Filter `filter func(value string, index int) bool` filter array, value
-// means the value of the current element, the index of the current original
-// color of value, when the custom function returns True, the element will be
-// filtered, otherwise it will not be filtered, `Filter` function returns a new
-// array, will not modify the original array.
+// 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()

container/garray/garray_sorted_any.go

@@ -761,11 +761,9 @@ func (a *SortedArray) FilterNil() *SortedArray {
 	return a
 }
 
-// Filter `filter func(value interface{}, index int) bool` filter array, value
-// means the value of the current element, the index of the current original
-// color of value, when the custom function returns True, the element will be
-// filtered, otherwise it will not be filtered, `Filter` function returns a new
-// array, will not modify the original array.
+// 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()

container/garray/garray_sorted_int.go

@@ -709,11 +709,9 @@ func (a *SortedIntArray) UnmarshalValue(value interface{}) (err error) {
 	return err
 }
 
-// Filter `filter func(value int, index int) bool` filter array, value
-// means the value of the current element, the index of the current original
-// color of value, when the custom function returns True, the element will be
-// filtered, otherwise it will not be filtered, `Filter` function returns a new
-// array, will not modify the original array.
+// 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()

container/garray/garray_sorted_str.go

@@ -722,11 +722,9 @@ func (a *SortedStrArray) UnmarshalValue(value interface{}) (err error) {
 	return err
 }
 
-// Filter `filter func(value string, index int) bool` filter array, value
-// means the value of the current element, the index of the current original
-// color of value, when the custom function returns True, the element will be
-// filtered, otherwise it will not be filtered, `Filter` function returns a new
-// array, will not modify the original array.
+// 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()

container/garray/garray_z_unit_normal_int_test.go

@@ -642,6 +642,7 @@ func TestIntArray_Json(t *testing.T) {
 
 		a2 := garray.NewIntArray()
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.IntArray
@@ -660,6 +661,7 @@ func TestIntArray_Json(t *testing.T) {
 
 		a2 := garray.NewIntArray()
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.IntArray

container/garray/garray_z_unit_normal_str_test.go

@@ -654,6 +654,7 @@ func TestStrArray_Json(t *testing.T) {
 
 		a2 := garray.NewStrArray()
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.StrArray
@@ -672,6 +673,7 @@ func TestStrArray_Json(t *testing.T) {
 
 		a2 := garray.NewStrArray()
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s1)
 
 		var a3 garray.StrArray

container/garray/garray_z_unit_sorted_any_test.go

@@ -710,6 +710,7 @@ func TestSortedArray_Json(t *testing.T) {
 
 		a2 := garray.NewSortedArray(gutil.ComparatorString)
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s2)
 
 		var a3 garray.SortedArray
@@ -730,6 +731,7 @@ func TestSortedArray_Json(t *testing.T) {
 
 		a2 := garray.NewSortedArray(gutil.ComparatorString)
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s2)
 
 		var a3 garray.SortedArray

container/garray/garray_z_unit_sorted_int_test.go

@@ -613,6 +613,7 @@ func TestSortedIntArray_Json(t *testing.T) {
 
 		a2 := garray.NewSortedIntArray()
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s2)
 
 		var a3 garray.SortedIntArray
@@ -632,6 +633,7 @@ func TestSortedIntArray_Json(t *testing.T) {
 
 		a2 := garray.NewSortedIntArray()
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s2)
 
 		var a3 garray.SortedIntArray

container/garray/garray_z_unit_sorted_str_test.go

@@ -622,6 +622,7 @@ func TestSortedStrArray_Json(t *testing.T) {
 
 		a2 := garray.NewSortedStrArray()
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s2)
 		t.Assert(a2.Interfaces(), s2)
 
@@ -643,6 +644,7 @@ func TestSortedStrArray_Json(t *testing.T) {
 
 		a2 := garray.NewSortedStrArray()
 		err1 = json.UnmarshalUseNumber(b2, &a2)
+		t.AssertNil(err1)
 		t.Assert(a2.Slice(), s2)
 		t.Assert(a2.Interfaces(), s2)
 

container/glist/glist_z_unit_test.go

@@ -631,10 +631,7 @@ func TestList_IteratorAsc(t *testing.T) {
 		l.PushFronts(a1)
 		e1 := l.Back()
 		fun1 := func(e *Element) bool {
-			if gconv.Int(e1.Value) > 2 {
-				return true
-			}
-			return false
+			return gconv.Int(e1.Value) > 2
 		}
 		checkList(t, l, []interface{}{4, 3, 6, 5, 2, 1})
 		l.IteratorAsc(fun1)
@@ -649,10 +646,7 @@ func TestList_IteratorDesc(t *testing.T) {
 		l.PushFronts(a1)
 		e1 := l.Back()
 		fun1 := func(e *Element) bool {
-			if gconv.Int(e1.Value) > 6 {
-				return true
-			}
-			return false
+			return gconv.Int(e1.Value) > 6
 		}
 		l.IteratorDesc(fun1)
 		t.Assert(l.Len(), 4)
@@ -667,10 +661,7 @@ func TestList_Iterator(t *testing.T) {
 		l.PushFronts(a1)
 		e1 := l.Back()
 		fun1 := func(e *Element) bool {
-			if gconv.String(e1.Value) > "c" {
-				return true
-			}
-			return false
+			return gconv.String(e1.Value) > "c"
 		}
 		checkList(t, l, []interface{}{"e", "d", "c", "b", "a"})
 		l.Iterator(fun1)

container/gqueue/gqueue_z_example_test.go

@@ -102,7 +102,7 @@ func ExampleQueue_Close() {
 	fmt.Println(q.Len())
 	fmt.Println(q.Pop())
 
-	// Output:
+	// May Output:
 	// 0
 	// <nil>
 }

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 )
 
 replace github.com/gogf/gf/v2 => ../../../

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 	k8s.io/api v0.25.2
 	k8s.io/apimachinery v0.25.2
 	k8s.io/client-go v0.25.2

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 	github.com/nacos-group/nacos-sdk-go v1.1.2
 )
 

contrib/config/polaris/go.mod

@@ -3,8 +3,13 @@ module github.com/gogf/gf/contrib/config/polaris/v2
 go 1.15
 
 require (
-	github.com/gogf/gf/v2 v2.3.3
-	github.com/polarismesh/polaris-go v1.3.0
+	github.com/gogf/gf/v2 v2.4.2
+	github.com/polarismesh/polaris-go v1.4.3
 )
 
 replace github.com/gogf/gf/v2 => ../../../
+
+replace (
+	golang.org/x/net v0.2.0 => golang.org/x/net v0.0.0-20221019024206-cb67ada4b0ad
+	golang.org/x/sys v0.2.0 => golang.org/x/sys v0.0.0-20220906165534-d0df966e6959
+)

contrib/config/polaris/go.sum

@@ -227,8 +227,10 @@ 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.3.0 h1:KZKX//ow4OPPoS5+s7h07ptprg+2AcNVGrN6WakC9QM=
-github.com/polarismesh/polaris-go v1.3.0/go.mod h1:HsN0ierETIujHpmnnYJ3qkwQw4QGAECuHvBZTDaw1tI=
+github.com/polarismesh/polaris-go v1.4.3 h1:Ka2ancA4BCLt4pxhEJdRIHMWaj+wkwtw+4AlrSI24c0=
+github.com/polarismesh/polaris-go v1.4.3/go.mod h1:ymxU5F20Bs99P+jvt5tbLn5guOEt1JmT4i69AOmZSVI=
+github.com/polarismesh/specification v1.2.1 h1:NcFoinO+aSWIOIyKTAhvEbjaPvZAAm5/DwJAL2FGdXs=
+github.com/polarismesh/specification v1.2.1/go.mod h1:rDvMMtl5qebPmqiBLNa5Ps0XtwkP31ZLirbH4kXA0YU=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
@@ -276,6 +278,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -302,6 +305,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -333,8 +337,9 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -364,12 +369,14 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 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.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20221019024206-cb67ada4b0ad h1:Zx6wVVDwwNJFWXNIvDi7o952w3/1ckSwYk/7eykRmjM=
+golang.org/x/net v0.0.0-20221019024206-cb67ada4b0ad/go.mod h1:RpDiru2p0u2F0lLpEoqnP2+7xs0ifAuOcJ442g6GU2s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -386,6 +393,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/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.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -430,11 +438,13 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220906165534-d0df966e6959 h1:qSa+Hg9oBe6UJXrznE+yYvW51V9UbyIj/nj/KpDigo8=
+golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -445,8 +455,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2 h1:GLw7MR8AfAG2GmGcmVgObFOHXYypgGjnGno25RDwn3Y=
 golang.org/x/text v0.3.8-0.20211105212822-18b340fc7af2/go.mod h1:EFNZuWvGYxIRUEX+K8UmCFwYmZjqcrnq15ZuVldZkZ0=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -492,8 +503,9 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 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=
@@ -568,8 +580,8 @@ google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ=
-google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
+google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -583,8 +595,9 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

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)
+	})
+}

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 	github.com/google/uuid v1.3.0
 	github.com/shopspring/decimal v1.3.1
 )

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 )

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 )
 
 replace github.com/gogf/gf/v2 => ../../../

contrib/drivers/mssql/mssql.go

@@ -20,6 +20,7 @@ import (
 	"strings"
 
 	_ "github.com/denisenkom/go-mssqldb"
+
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
@@ -285,7 +286,6 @@ ORDER BY a.id,a.colorder`,
 	}
 	fields = make(map[string]*gdb.TableField)
 	for i, m := range result {
-
 		fields[m["Field"].String()] = &gdb.TableField{
 			Index:   i,
 			Name:    m["Field"].String(),

contrib/drivers/mssql/mssql_z_basic_test.go

@@ -256,7 +256,6 @@ func Test_DB_Insert(t *testing.T) {
 		t.Assert(one["PASSPORT"].String(), "t4")
 		t.Assert(one["PASSWORD"].String(), "25d55ad283aa400af464c76d713c07ad")
 		t.Assert(one["NICKNAME"].String(), "name_4")
-		t.Assert(one["CREATE_TIME"].GTime(), timeNow)
 
 		// batch with Insert
 		timeNow = gtime.Now()
@@ -286,7 +285,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)
 	})
 }
 

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)

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 )
 
 replace github.com/gogf/gf/v2 => ../../../

contrib/drivers/mysql/mysql.go

@@ -76,6 +76,7 @@ func (d *Driver) Open(config *gdb.ConfigNode) (db *sql.DB, err error) {
 			source, _ = gregex.ReplaceString(`/([\w\.\-]+)+`, "/"+config.Name, source)
 		}
 	} else {
+		// TODO: Do not set charset when charset is not specified (in v2.5.0)
 		source = fmt.Sprintf(
 			"%s:%s@%s(%s:%s)/%s?charset=%s",
 			config.User, config.Pass, config.Protocol, config.Host, config.Port, config.Name, config.Charset,

contrib/drivers/mysql/mysql_feature_model_do_test.go

@@ -128,7 +128,7 @@ 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 {

contrib/drivers/mysql/mysql_issue_test.go

@@ -664,3 +664,99 @@ CREATE TABLE %s (
 		t.AssertNil(err3)
 	})
 }
+
+// https://github.com/gogf/gf/issues/2561
+func Test_Issue2561(t *testing.T) {
+	table := createTable()
+	defer dropTable(table)
+
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			g.Meta     `orm:"do:true"`
+			Id         interface{}
+			Passport   interface{}
+			Password   interface{}
+			Nickname   interface{}
+			CreateTime interface{}
+		}
+		data := g.Slice{
+			User{
+				Id:       1,
+				Passport: "user_1",
+			},
+			User{
+				Id:       2,
+				Password: "pass_2",
+			},
+			User{
+				Id:       3,
+				Password: "pass_3",
+			},
+		}
+		result, err := db.Model(table).Data(data).Insert()
+		t.AssertNil(err)
+		m, _ := result.LastInsertId()
+		t.Assert(m, 3)
+
+		n, _ := result.RowsAffected()
+		t.Assert(n, 3)
+
+		one, err := db.Model(table).WherePri(1).One()
+		t.AssertNil(err)
+		t.Assert(one[`id`], `1`)
+		t.Assert(one[`passport`], `user_1`)
+		t.Assert(one[`password`], ``)
+		t.Assert(one[`nickname`], ``)
+		t.Assert(one[`create_time`], ``)
+
+		one, err = db.Model(table).WherePri(2).One()
+		t.AssertNil(err)
+		t.Assert(one[`id`], `2`)
+		t.Assert(one[`passport`], ``)
+		t.Assert(one[`password`], `pass_2`)
+		t.Assert(one[`nickname`], ``)
+		t.Assert(one[`create_time`], ``)
+
+		one, err = db.Model(table).WherePri(3).One()
+		t.AssertNil(err)
+		t.Assert(one[`id`], `3`)
+		t.Assert(one[`passport`], ``)
+		t.Assert(one[`password`], `pass_3`)
+		t.Assert(one[`nickname`], ``)
+		t.Assert(one[`create_time`], ``)
+	})
+}
+
+// https://github.com/gogf/gf/issues/2439
+func Test_Issue2439(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		array := gstr.SplitAndTrim(gtest.DataContent(`issue2439.sql`), ";")
+		for _, v := range array {
+			if _, err := db.Exec(ctx, v); err != nil {
+				gtest.Error(err)
+			}
+		}
+		defer dropTable("a")
+		defer dropTable("b")
+		defer dropTable("c")
+
+		orm := db.Model("a")
+		orm = orm.InnerJoin(
+			"c", "a.id=c.id",
+		)
+		orm = orm.InnerJoinOnField("b", "id")
+		whereFormat := fmt.Sprintf(
+			"(`%s`.`%s` LIKE ?) ",
+			"b", "name",
+		)
+		orm = orm.WhereOrf(
+			whereFormat,
+			"%a%",
+		)
+		r, err := orm.All()
+		t.AssertNil(err)
+		t.Assert(len(r), 1)
+		t.Assert(r[0]["id"], 2)
+		t.Assert(r[0]["name"], "a")
+	})
+}

contrib/drivers/mysql/testdata/issue2439.sql

@@ -0,0 +1,19 @@
+CREATE TABLE `a`  (
+    `id` int(11) NOT NULL AUTO_INCREMENT,
+    PRIMARY KEY (id) USING BTREE
+) ENGINE = InnoDB;
+INSERT INTO `a` (`id`) VALUES ('2');
+
+CREATE TABLE `b`  (
+    `id` int(11) NOT NULL AUTO_INCREMENT,
+    `name` varchar(255) NOT NULL ,
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB;
+INSERT INTO `b` (`id`, `name`) VALUES ('2', 'a');
+INSERT INTO `b` (`id`, `name`) VALUES ('3', 'b');
+
+CREATE TABLE `c`  (
+    `id` int(11) NOT NULL AUTO_INCREMENT,
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB;
+INSERT INTO `c` (`id`) VALUES ('2');

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 	github.com/sijms/go-ora/v2 v2.4.20
 )
 

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 	github.com/lib/pq v1.10.4
 )
 

contrib/drivers/pgsql/pgsql.go

@@ -17,6 +17,8 @@ import (
 	"fmt"
 	"strings"
 
+	_ "github.com/lib/pq"
+
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
@@ -25,7 +27,6 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/gutil"
-	_ "github.com/lib/pq"
 )
 
 // Driver is the driver for postgresql database.
@@ -273,9 +274,10 @@ ORDER BY
 // Also see DriverMysql.TableFields.
 func (d *Driver) TableFields(ctx context.Context, table string, schema ...string) (fields map[string]*gdb.TableField, err error) {
 	var (
-		result       gdb.Result
-		link         gdb.Link
-		usedSchema   = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
+		result     gdb.Result
+		link       gdb.Link
+		usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
+		// TODO duplicated `id` result?
 		structureSql = fmt.Sprintf(`
 SELECT a.attname AS field, t.typname AS type,a.attnotnull as null,
     (case when d.contype is not null then 'pri' else '' end)  as key
@@ -302,16 +304,27 @@ ORDER BY a.attnum`,
 		return nil, err
 	}
 	fields = make(map[string]*gdb.TableField)
-	for i, m := range result {
-		fields[m["field"].String()] = &gdb.TableField{
-			Index:   i,
-			Name:    m["field"].String(),
+	var (
+		index = 0
+		name  string
+		ok    bool
+	)
+	for _, m := range result {
+		name = m["field"].String()
+		// Filter duplicated fields.
+		if _, ok = fields[name]; ok {
+			continue
+		}
+		fields[name] = &gdb.TableField{
+			Index:   index,
+			Name:    name,
 			Type:    m["type"].String(),
 			Null:    !m["null"].Bool(),
 			Key:     m["key"].String(),
 			Default: m["default_value"].Val(),
 			Comment: m["comment"].String(),
 		}
+		index++
 	}
 	return fields, nil
 }

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 )
 
 replace github.com/gogf/gf/v2 => ../../../

contrib/drivers/sqlite/sqlite_model_test.go

@@ -20,6 +20,8 @@ import (
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/encoding/gjson"
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/gogf/gf/v2/os/gtime"
@@ -571,6 +573,100 @@ func Test_Model_All(t *testing.T) {
 	})
 }
 
+func Test_Model_AllAndCount(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	tableName2 := "user_" + gtime.Now().TimestampNanoStr()
+	if _, err := db.Exec(ctx, fmt.Sprintf(`
+	CREATE TABLE %s (
+		id         INTEGER       PRIMARY KEY AUTOINCREMENT
+									UNIQUE
+									NOT NULL,
+		name       varchar(45) NULL,
+		age        int(10)
+	);
+	`, tableName2,
+	)); err != nil {
+		gtest.AssertNil(err)
+	}
+	defer dropTable(tableName2)
+	r, err := db.Insert(ctx, tableName2, g.Map{
+		"id":   1,
+		"name": "table2_1",
+		"age":  18,
+	})
+	gtest.AssertNil(err)
+	n, _ := r.RowsAffected()
+	gtest.Assert(n, 1)
+
+	// AllAndCount with all data
+	gtest.C(t, func(t *gtest.T) {
+		result, count, err := db.Model(table).AllAndCount(false)
+		t.AssertNil(err)
+		t.Assert(len(result), TableSize)
+		t.Assert(count, TableSize)
+	})
+	// AllAndCount with no data
+	gtest.C(t, func(t *gtest.T) {
+		result, count, err := db.Model(table).Where("id<0").AllAndCount(false)
+		t.Assert(result, nil)
+		t.AssertNil(err)
+		t.Assert(count, 0)
+	})
+	// AllAndCount with page
+	gtest.C(t, func(t *gtest.T) {
+		result, count, err := db.Model(table).Page(1, 5).AllAndCount(false)
+		t.AssertNil(err)
+		t.Assert(len(result), 5)
+		t.Assert(count, TableSize)
+	})
+	// AllAndCount with normal result
+	gtest.C(t, func(t *gtest.T) {
+		result, count, err := db.Model(table).Where("id=?", 1).AllAndCount(false)
+		t.AssertNil(err)
+		t.Assert(count, 1)
+		t.Assert(result[0]["id"], 1)
+		t.Assert(result[0]["nickname"], "name_1")
+		t.Assert(result[0]["passport"], "user_1")
+	})
+	// AllAndCount with distinct
+	gtest.C(t, func(t *gtest.T) {
+		result, count, err := db.Model(table).Fields("DISTINCT nickname").AllAndCount(true)
+		t.AssertNil(err)
+		t.Assert(count, TableSize)
+		t.Assert(result[0]["nickname"], "name_1")
+		t.AssertNil(result[0]["id"])
+	})
+	// AllAndCount with Join
+	gtest.C(t, func(t *gtest.T) {
+		all, count, err := db.Model(table).As("u1").
+			LeftJoin(tableName2, "u2", "u2.id=u1.id").
+			Fields("u1.passport,u1.id,u2.name,u2.age").
+			Where("u1.id<2").
+			AllAndCount(false)
+		t.AssertNil(err)
+		t.Assert(len(all), 1)
+		t.Assert(len(all[0]), 4)
+		t.Assert(all[0]["id"], 1)
+		t.Assert(all[0]["age"], 18)
+		t.Assert(all[0]["name"], "table2_1")
+		t.Assert(all[0]["passport"], "user_1")
+		t.Assert(count, 1)
+	})
+	// AllAndCount with Join return CodeDbOperationError
+	gtest.C(t, func(t *gtest.T) {
+		all, count, err := db.Model(table).As("u1").
+			LeftJoin(tableName2, "u2", "u2.id=u1.id").
+			Fields("u1.passport,u1.id,u2.name,u2.age").
+			Where("u1.id<2").
+			AllAndCount(true)
+		t.AssertNE(err, nil)
+		t.AssertEQ(gerror.Code(err), gcode.CodeDbOperationError)
+		t.Assert(count, 0)
+		t.Assert(all, nil)
+	})
+}
+
 func Test_Model_Fields(t *testing.T) {
 	tableName1 := createInitTable()
 	defer dropTable(tableName1)
@@ -1080,6 +1176,169 @@ func Test_Model_Scan(t *testing.T) {
 	})
 }
 
+func Test_Model_ScanAndCount(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	tableName2 := "user_" + gtime.Now().TimestampNanoStr()
+	if _, err := db.Exec(ctx, fmt.Sprintf(`
+	CREATE TABLE %s (
+		id         INTEGER       PRIMARY KEY AUTOINCREMENT
+									UNIQUE
+									NOT NULL,
+		name       varchar(45) NULL,
+		age        int(10)
+	);
+	`, tableName2,
+	)); err != nil {
+		gtest.AssertNil(err)
+	}
+	defer dropTable(tableName2)
+	r, err := db.Insert(ctx, tableName2, g.Map{
+		"id":   1,
+		"name": "table2_1",
+		"age":  18,
+	})
+	gtest.AssertNil(err)
+	n, _ := r.RowsAffected()
+	gtest.Assert(n, 1)
+
+	// ScanAndCount with normal struct result
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		user := new(User)
+		var count int
+		err := db.Model(table).Where("id=1").ScanAndCount(user, &count, true)
+		t.AssertNil(err)
+		t.Assert(user.NickName, "name_1")
+		t.Assert(user.CreateTime.String(), CreateTime)
+		t.Assert(count, 1)
+	})
+	// ScanAndCount with normal array result
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		var users []User
+		var count int
+		err := db.Model(table).Order("id asc").ScanAndCount(&users, &count, true)
+		t.AssertNil(err)
+		t.Assert(len(users), TableSize)
+		t.Assert(users[0].Id, 1)
+		t.Assert(users[1].Id, 2)
+		t.Assert(users[2].Id, 3)
+		t.Assert(users[0].NickName, "name_1")
+		t.Assert(users[1].NickName, "name_2")
+		t.Assert(users[2].NickName, "name_3")
+		t.Assert(users[0].CreateTime.String(), CreateTime)
+		t.Assert(count, len(users))
+	})
+	// sql.ErrNoRows
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime *gtime.Time
+		}
+		var (
+			user  = new(User)
+			users = new([]*User)
+		)
+		var count1 int
+		var count2 int
+		err1 := db.Model(table).Where("id < 0").ScanAndCount(user, &count1, true)
+		err2 := db.Model(table).Where("id < 0").ScanAndCount(users, &count2, true)
+		t.Assert(count1, 0)
+		t.Assert(count2, 0)
+		t.Assert(err1, nil)
+		t.Assert(err2, nil)
+	})
+	// ScanAndCount with page
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		var users []User
+		var count int
+		err := db.Model(table).Order("id asc").Page(1, 3).ScanAndCount(&users, &count, true)
+		t.AssertNil(err)
+		t.Assert(len(users), 3)
+		t.Assert(count, TableSize)
+	})
+	// ScanAndCount with distinct
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			Id         int
+			Passport   string
+			Password   string
+			NickName   string
+			CreateTime gtime.Time
+		}
+		var users []User
+		var count int
+		err = db.Model(table).Fields("distinct id").ScanAndCount(&users, &count, true)
+		t.AssertNil(err)
+		t.Assert(len(users), 10)
+		t.Assert(count, TableSize)
+		t.Assert(users[0].Id, 1)
+	})
+	// ScanAndCount with join
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			Id       int
+			Passport string
+			Name     string
+			Age      int
+		}
+		var users []User
+		var count int
+		err = db.Model(table).As("u1").
+			LeftJoin(tableName2, "u2", "u2.id=u1.id").
+			Fields("u1.passport,u1.id,u2.name,u2.age").
+			Where("u1.id<2").
+			ScanAndCount(&users, &count, false)
+		t.AssertNil(err)
+		t.Assert(len(users), 1)
+		t.Assert(count, 1)
+		t.AssertEQ(users[0].Name, "table2_1")
+	})
+	// ScanAndCount with join return CodeDbOperationError
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			Id       int
+			Passport string
+			Name     string
+			Age      int
+		}
+		var users []User
+		var count int
+		err = db.Model(table).As("u1").
+			LeftJoin(tableName2, "u2", "u2.id=u1.id").
+			Fields("u1.passport,u1.id,u2.name,u2.age").
+			Where("u1.id<2").
+			ScanAndCount(&users, &count, true)
+		t.AssertNE(err, nil)
+		t.Assert(gerror.Code(err), gcode.CodeDbOperationError)
+		t.Assert(count, 0)
+		t.AssertEQ(users, nil)
+	})
+}
+
 func Test_Model_Scan_NilSliceAttrWhenNoRecordsFound(t *testing.T) {
 	table := createTable()
 	defer dropTable(table)

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 	go.opentelemetry.io/otel v1.7.0
 	go.opentelemetry.io/otel/trace v1.7.0
 )

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.3.3
+	github.com/gogf/gf/v2 v2.4.2
 	go.etcd.io/etcd/client/v3 v3.5.4
 )
 

contrib/registry/file/file.go

@@ -19,10 +19,11 @@ var (
 )
 
 const (
-	updateAtKey           = "UpdateAt"
-	serviceTTL            = 20 * time.Second
-	serviceUpdateInterval = 10 * time.Second
-	defaultSeparator      = "#"
+	updateAtKey                      = "UpdateAt"
+	serviceTTL                       = 20 * time.Second
+	serviceUpdateInterval            = 10 * time.Second
+	defaultSeparator                 = "#"
+	defaultEndpointHostPortDelimiter = "-"
 )
 
 // Registry implements interface Registry using file.