improve codeql config

# Conflicts:
#	.github/workflows/ci-main.sh
#	.github/workflows/ci-main.yml
#	.github/workflows/ci-sub.yml
#	.github/workflows/golangci-lint.yml
#	README.MD
#	contrib/metric/otelmetric/go.mod
#	contrib/metric/otelmetric/go.sum
#	go.mod
#	go.sum
#	net/ghttp/ghttp_z_unit_feature_middleware_basic_test.go

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

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

.github/workflows/ci-main.sh

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

.github/workflows/ci-main.yml

@@ -37,9 +37,9 @@ jobs:
     # Service containers to run with `code-test`
     services:
       # Etcd service.
-      # docker run -d --name etcd -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes bitnami/etcd:3.4.24
+      # docker run -d --name etcd -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes loads/etcd:3.4.24
       etcd:
-        image: bitnami/etcd:3.4.24
+        image: loads/etcd:3.4.24
         env:
           ALLOW_NONE_AUTHENTICATION: yes
         ports:
@@ -47,7 +47,7 @@ jobs:
 
       # Redis backend server.
       redis:
-        image  : redis:7.0
+        image  : loads/redis:7.0
         options: >-
           --health-cmd      "redis-cli ping"
           --health-interval 10s
@@ -62,9 +62,9 @@ jobs:
       # -p 3306:3306 \
       # -e MYSQL_DATABASE=test \
       # -e MYSQL_ROOT_PASSWORD=12345678 \
-      # mysql:5.7
+      # loads/mysql:5.7
       mysql:
-        image: mysql:5.7
+        image: loads/mysql:5.7
         env:
           MYSQL_DATABASE     : test
           MYSQL_ROOT_PASSWORD: 12345678
@@ -73,7 +73,7 @@ jobs:
 
       # MariaDb backend server.
       mariadb:
-        image: mariadb:10.4
+        image: loads/mariadb:10.4
         env:
           MARIADB_DATABASE: test
           MARIADB_ROOT_PASSWORD: 12345678
@@ -87,9 +87,9 @@ jobs:
       # -e POSTGRES_USER=postgres \
       # -e POSTGRES_DB=test \
       # -v postgres:/Users/john/Temp/postgresql/data \
-      # postgres:17-alpine
+      # loads/postgres:13
       postgres:
-        image: postgres:17-alpine
+        image: loads/postgres:13
         env:
           POSTGRES_PASSWORD: 12345678
           POSTGRES_USER:     postgres
@@ -184,14 +184,14 @@ jobs:
           - 5236:5236
 
       zookeeper:
-        image: zookeeper:3.8
+        image: loads/zookeeper:3.8
         ports:
           - 2181:2181
 
     strategy:
       matrix:
-        go-version: [ "1.20", "1.21", "1.22", "1.23" ]
-        goarch: [ "386", "amd64" ]
+        go-version: ["1.22", "1.23" ]
+        goarch: ["386", "amd64" ]
 
     steps:
     # TODO: szenius/set-timezone update to node16
@@ -223,7 +223,7 @@ jobs:
         cache-dependency-path: '**/go.sum'
 
     - name: Install Protoc
-      uses: arduino/setup-protoc@v2
+      uses: arduino/setup-protoc@v3
       with:
         version: "29.x"
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-sub.yml

@@ -37,8 +37,8 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [ "1.20", "1.21", "1.22", "1.23" ]
-        goarch: [ "386", "amd64" ]
+        go-version: [ "1.22", "1.23" ]
+        goarch: [ "386","amd64" ]
 
     steps:
     - name: Setup Timezone

.github/workflows/codeql.yml

@@ -0,0 +1,92 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "master", "develop", "personal/**", "feature/**", "enhance/**", "fix/**" ]
+  pull_request:
+    branches: [ "master", "develop", "personal/**", "feature/**", "enhance/**", "fix/**" ]
+  schedule:
+    - cron: '43 20 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: go
+            build-mode: autobuild
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      # If the analyze step fails for one of the languages you are analyzing with
+      # "We were unable to automatically build your code", modify the matrix above
+      # to set the build mode to "manual" for that language. Then modify this step
+      # to build your code.
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      - if: matrix.build-mode == 'manual'
+        shell: bash
+        run: |
+          echo 'If you are using a "manual" build mode for one or more of the' \
+            'languages you are analyzing, replace this with the commands to build' \
+            'your code, for example:'
+          echo '  make bootstrap'
+          echo '  make release'
+          exit 1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"

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

@@ -3,7 +3,7 @@ version: '3.7'
 services:
 
   consul-server:
-    image: consul:1.15
+    image: loads/consul:1.15
     container_name: consul-server
     restart: always
     volumes:
@@ -17,7 +17,7 @@ services:
     command: "agent"
 
   consul-client:
-    image: consul:1.15
+    image: loads/consul:1.15
     container_name: consul-client
     restart: always
     volumes:

.github/workflows/doc-build.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set Up Golang Environment
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23.4
+          go-version: 1.22.5
           cache: false
       - name: download goframe docs
         run: ./download.sh

.github/workflows/golangci-lint.yml

@@ -14,7 +14,6 @@ on:
       - feature/**
       - enhance/**
       - fix/**
-      - feat/**
   pull_request:
     branches:
       - master
@@ -23,13 +22,12 @@ on:
       - feature/**
       - enhance/**
       - fix/**
-      - feat/**
 
 jobs:
   golangci:
     strategy:
       matrix:
-        go-version: [ 'stable' ]
+        go-version: [ '1.22', '1.23' ]
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
@@ -42,41 +40,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          # Required: specify the golangci-lint version without the patch version to always use the latest patch.
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: v1.62.2
-          only-new-issues: true
-          github-token: ${{ secrets.GITHUB_TOKEN }}
           args: --timeout 3m0s
-      - name: Install gci
-        run: go install github.com/daixiang0/gci@latest
-      - name: Run gci
-        run: |
-          gci write --custom-order \
-          --skip-generated \
-          --skip-vendor \
-          -s standard \
-          -s blank \
-          -s default \
-          -s dot \
-          -s "prefix(github.com/gogf/gf/v2)" \
-          -s "prefix(github.com/gogf/gf/cmd)" \
-          -s "prefix(github.com/gogf/gf/contrib)" \
-          -s "prefix(github.com/gogf/gf/example)" \
-          ./
-      - name: Check for changes
-        # Check if the event is a push or a pull request from a forked repository
-        if: github.event_name == 'push'|| (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true)
-        run: |
-          if [[ -n "$(git status --porcelain)" ]]; then
-          echo "HAS_CHANGES=true" >> $GITHUB_ENV
-          else
-          echo "HAS_CHANGES=false" >> $GITHUB_ENV
-          fi
-      - name: Commit and push changes
-        if: env.HAS_CHANGES == 'true'
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add .
-          git commit -m "Apply gci import order changes"
-          git push  origin HEAD:$(git rev-parse --abbrev-ref HEAD)

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

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

.github/workflows/release.yml

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

.github/workflows/sonarcloud.yaml

@@ -34,7 +34,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.4.0 # v2.4.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif

.gitignore

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

.golangci.yml

@@ -40,11 +40,9 @@ linters:
     - errcheck      # Errcheck is a program for checking for unchecked errors in go programs.
     - errchkjson    # Checks types passed to the JSON encoding functions. Reports unsupported types and optionally reports occasions, where the check for the returned error can be omitted.
     - funlen        # Tool for detection of long functions
-    - gofmt         # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
-    - goimports     # Check import statements are formatted according to the 'goimport' command. Reformat imports in autofix mode.
-    - gci           # Gci controls Go package import order and makes it always deterministic.
     - goconst       # Finds repeated strings that could be replaced by a constant
     - gocritic      # Provides diagnostics that check for bugs, performance and style issues.
+    - gofmt         # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
     - gosimple      # Linter for Go source code that specializes in simplifying code
     - govet         # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
     - misspell      # Finds commonly misspelled English words in comments
@@ -81,51 +79,7 @@ linters-settings:
     locale: US
     ignore-words:
       - cancelled
-  # https://golangci-lint.run/usage/linters/#gofmt
-  gofmt:
-    # Simplify code: gofmt with `-s` option.
-    # Default: true
-    simplify: true
-    # Apply the rewrite rules to the source before reformatting.
-    # https://pkg.go.dev/cmd/gofmt
-    # Default: []
-    rewrite-rules: [ ]
-      # - pattern: 'interface{}'
-      #   replacement: 'any'
-      # - pattern: 'a[b:len(a)]'
-      #   replacement: 'a[b:]'
-  goimports:
-    # A comma-separated list of prefixes, which, if set, checks import paths
-    # with the given prefixes are grouped after 3rd-party packages.
-    # Default: ""
-    local-prefixes: github.com/gogf/gf/v2
-  gci:
-    # Section configuration to compare against.
-    # Section names are case-insensitive and may contain parameters in ().
-    # The default order of sections is `standard > default > custom > blank > dot > alias > localmodule`,
-    # If `custom-order` is `true`, it follows the order of `sections` option.
-    # Default: ["standard", "default"]
-    sections:
-      - standard # Standard section: captures all standard packages.
-      - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
-      - default # Default section: contains all imports that could not be matched to another section type.
-      - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
-      # - alias # Alias section: contains all alias imports. This section is not present unless explicitly enabled.
-      # - localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
-      - prefix(github.com/gogf/gf) # Custom section: groups all imports with the specified Prefix.
-      - prefix(github.com/gogf/gf/cmd) # Custom section: groups all imports with the specified Prefix.
-      - prefix(github.com/gogf/gfcontrib) # Custom section: groups all imports with the specified Prefix.
-      - prefix(github.com/gogf/gf/example) # Custom section: groups all imports with the specified Prefix.
-    # Skip generated files.
-    # Default: true
-    skip-generated: true
-    # Enable custom order of sections.
-    # If `true`, make the section order the same as the order of `sections`.
-    # Default: false
-    custom-order: true
-    # Drops lexical ordering for custom sections.
-    # Default: false
-    no-lex-order: false
+
   # https://golangci-lint.run/usage/linters/#revive
   # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
   revive:
@@ -305,3 +259,16 @@ linters-settings:
     # Default: ["*"]
     checks: [ "all","-SA1019","-SA4015","-SA1029","-SA1016","-SA9003","-SA4006","-SA6003" ]
 
+  # https://golangci-lint.run/usage/linters/#gofmt
+  gofmt:
+    # Simplify code: gofmt with `-s` option.
+    # Default: true
+    simplify: true
+    # Apply the rewrite rules to the source before reformatting.
+    # https://pkg.go.dev/cmd/gofmt
+    # Default: []
+    rewrite-rules: [ ]
+      # - pattern: 'interface{}'
+      #   replacement: 'any'
+      # - pattern: 'a[b:len(a)]'
+      #   replacement: 'a[b:]'

.set_version.sh

@@ -27,11 +27,12 @@ if [[ $? -ne 0 ]]; then
 fi
 
 if [[ true ]]; then
-    # Use sed to replace the version number in version.go
-    sed -i '' 's/VERSION = ".*"/VERSION = "'${newVersion}'"/' version.go
-
-    # Use sed to replace the version number in README.MD
-    sed -i '' 's/version=[^"]*/version='${newVersion}'/' README.MD
+    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 = \"${newVersion}\"" >> version.go
+    echo ")" >> version.go
 fi
 
 if [ -f "go.work" ]; then

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 GoFrame Team https://goframe.org
+Copyright (c) 2017 john@goframe.org https://goframe.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -13,7 +13,7 @@ tidy:
 
 .PHONY: lint
 lint:
-	golangci-lint run -c .golangci.yml
+	golangci-lint run
 
 # make version to=v2.4.0
 .PHONY: version

README.MD

@@ -1,6 +1,7 @@
 
+
 <div align=center>
-<img src="https://goframe.org/img/logo_full.png" width="300" alt="goframe gf logo"/>
+<img src="https://goframe.org/img/logo_full.png" width="300"/>
 
 [![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/ci-main.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/ci-main.yml)
@@ -36,7 +37,7 @@ A powerful framework for faster, easier, and more efficient project development.
 💖 [Thanks to all the contributors who made GoFrame possible](https://github.com/gogf/gf/graphs/contributors) 💖
 
 <a href="https://github.com/gogf/gf/graphs/contributors">
-<img src="https://goframe.org/img/contributors.svg?version=v2.8.2" alt="goframe contributors"/>
+<img src="https://goframe.org/img/contributors.svg?ver=1" />
 </a>
 
 # License

cmd/gf/gfcmd/gfcmd.go

@@ -4,15 +4,12 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package gfcmd provides the management of CLI commands for `gf` tool.
 package gfcmd
 
 import (
 	"context"
 	"runtime"
 
-	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
-
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -22,11 +19,14 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
+	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
-const cliFolderName = `hack`
+const (
+	cliFolderName = `hack`
+)
 
 // Command manages the CLI command of `gf`.
 // This struct can be globally accessible and extended with custom struct.

cmd/gf/go.mod

@@ -1,15 +1,15 @@
 module github.com/gogf/gf/cmd/gf/v2
 
-go 1.20
+go 1.18
 
 require (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.2
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.2
-	github.com/gogf/gf/v2 v2.8.2
+	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.1
+	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.1
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.1
+	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.1
+	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.1
+	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.1
+	github.com/gogf/gf/v2 v2.8.1
 	github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
 	github.com/olekukonko/tablewriter v0.0.5
 	golang.org/x/mod v0.17.0

cmd/gf/go.work

@@ -1,4 +1,4 @@
-go 1.20
+go 1.18
 
 use (
 	./

cmd/gf/internal/cmd/cmd.go

@@ -4,7 +4,6 @@
 // If a copy of the MIT was not distributed with this file,
 // You can obtain one at https://github.com/gogf/gf.
 
-// Package cmd provides the management of CLI commands for `gf` tool.
 package cmd
 
 import (
@@ -20,8 +19,9 @@ import (
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
-// GF is the management object for `gf` command line tool.
-var GF = cGF{}
+var (
+	GF = cGF{}
+)
 
 type cGF struct {
 	g.Meta `name:"gf" ad:"{cGFAd}"`

cmd/gf/internal/cmd/cmd_doc.go

@@ -16,11 +16,10 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/encoding/gcompress"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 const (

cmd/gf/internal/cmd/cmd_fix.go

@@ -9,14 +9,14 @@ package cmd
 import (
 	"context"
 
+	"github.com/gogf/gf/v2/os/gproc"
+	"github.com/gogf/gf/v2/text/gregex"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gproc"
-	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (

cmd/gf/internal/cmd/cmd_init.go

@@ -12,6 +12,9 @@ import (
 	"os"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
+	"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/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gfile"
@@ -19,10 +22,6 @@ import (
 	"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"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 var (

cmd/gf/internal/cmd/cmd_up.go

@@ -13,15 +13,14 @@ import (
 
 	"github.com/gogf/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"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 var (

cmd/gf/internal/cmd/cmd_z_unit_gen_ctrl_test.go

@@ -10,12 +10,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genctrl"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genctrl"
 )
 
 func Test_Gen_Ctrl_Default(t *testing.T) {

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_test.go

@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
@@ -19,8 +20,6 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
 )
 
 func Test_Gen_Dao_Default(t *testing.T) {

cmd/gf/internal/cmd/cmd_z_unit_gen_pb_test.go

@@ -10,12 +10,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpb"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/guid"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpb"
 )
 
 func TestGenPbIssue3882(t *testing.T) {
@@ -49,42 +48,3 @@ func TestGenPbIssue3882(t *testing.T) {
 		t.Assert(gstr.Contains(genContent, exceptText), true)
 	})
 }
-
-// This issue only occurs when executing multiple times
-// and the subsequent OutputApi is the parent directory of the previous execution
-func TestGenPbIssue3953(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			outputPath     = gfile.Temp(guid.S())
-			outputApiPath  = filepath.Join(outputPath, "api")
-			outputCtrlPath = filepath.Join(outputPath, "controller")
-
-			protobufFolder = gtest.DataPath("issue", "3953")
-			in             = genpb.CGenPbInput{
-				Path:       protobufFolder,
-				OutputApi:  outputApiPath,
-				OutputCtrl: outputCtrlPath,
-			}
-			err error
-		)
-		err = gfile.Mkdir(outputApiPath)
-		t.AssertNil(err)
-		err = gfile.Mkdir(outputCtrlPath)
-		t.AssertNil(err)
-		defer gfile.Remove(outputPath)
-
-		_, err = genpb.CGenPb{}.Pb(ctx, in)
-		// do twice,and set outputApi to outputPath
-		in.OutputApi = outputPath
-		_, err = genpb.CGenPb{}.Pb(ctx, in)
-		t.AssertNil(err)
-
-		var (
-			genContent = gfile.GetContents(filepath.Join(outputApiPath, "issue3953.pb.go"))
-			// The old version would have appeared `v:"required" v:"required"`
-			// but the new version of the code will appear `v:"required"` only once
-			notExceptText = `v:"required" v:"required"`
-		)
-		t.Assert(gstr.Contains(genContent, notExceptText), false)
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_gen_pbentity_test.go

@@ -11,13 +11,12 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpbentity"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpbentity"
 )
 
 func Test_Gen_Pbentity_Default(t *testing.T) {

cmd/gf/internal/cmd/cmd_z_unit_gen_service_test.go

@@ -10,12 +10,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genservice"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genservice"
 )
 
 func Test_Gen_Service_Default(t *testing.T) {
@@ -58,7 +57,6 @@ func Test_Gen_Service_Default(t *testing.T) {
 		t.AssertNil(err)
 		t.Assert(files, []string{
 			dstFolder + filepath.FromSlash("/article.go"),
-			dstFolder + filepath.FromSlash("/base.go"),
 			dstFolder + filepath.FromSlash("/delivery.go"),
 			dstFolder + filepath.FromSlash("/user.go"),
 		})
@@ -67,7 +65,6 @@ func Test_Gen_Service_Default(t *testing.T) {
 		testPath := gtest.DataPath("genservice", "service")
 		expectFiles := []string{
 			testPath + filepath.FromSlash("/article.go"),
-			testPath + filepath.FromSlash("/base.go"),
 			testPath + filepath.FromSlash("/delivery.go"),
 			testPath + filepath.FromSlash("/user.go"),
 		}

cmd/gf/internal/cmd/genctrl/genctrl_calculate.go

@@ -7,11 +7,10 @@
 package genctrl
 
 import (
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 func (c CGenCtrl) getApiItemsInSrc(apiModuleFolderPath string) (items []apiItem, err error) {

cmd/gf/internal/cmd/genctrl/genctrl_generate_ctrl.go

@@ -11,13 +11,12 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"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/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type controllerGenerator struct{}

cmd/gf/internal/cmd/genctrl/genctrl_generate_ctrl_clear.go

@@ -9,10 +9,9 @@ package genctrl
 import (
 	"fmt"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type controllerClearer struct{}

cmd/gf/internal/cmd/genctrl/genctrl_generate_interface.go

@@ -10,16 +10,15 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"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/gmap"
 	"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/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type apiInterfaceGenerator struct{}

cmd/gf/internal/cmd/genctrl/genctrl_generate_sdk.go

@@ -10,14 +10,13 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"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/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type apiSdkGenerator struct{}

cmd/gf/internal/cmd/gendao/gendao.go

@@ -13,6 +13,7 @@ import (
 
 	"golang.org/x/mod/modfile"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
@@ -23,7 +24,6 @@ import (
 	"github.com/gogf/gf/v2/util/gtag"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 const (

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

@@ -8,24 +8,22 @@ 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"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 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:"api"`
-		Path     string   `name:"path"     short:"p"  dc:"output go file path storing enums content" d:"internal/packed/packed_enums.go"`
+		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{}
@@ -36,8 +34,8 @@ const (
 	CGenEnumsBrief  = `parse go files in current project and generate enums go file`
 	CGenEnumsEg     = `
 gf gen enums
-gf gen enums -p internal/packed/packed_enums.go
-gf gen enums -p internal/packed/packed_enums.go -s .
+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
 `
 )

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

@@ -9,7 +9,6 @@ package genenums
 import (
 	"go/constant"
 	"go/types"
-
 	"golang.org/x/tools/go/packages"
 
 	"github.com/gogf/gf/v2/encoding/gjson"

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

@@ -9,12 +9,11 @@ package genpb
 import (
 	"context"
 
+	"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/os/gproc"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type (

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

@@ -11,12 +11,11 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type generateControllerInput struct {

cmd/gf/internal/cmd/genpb/genpb_tag.go

@@ -10,14 +10,13 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type generateStructTagInput struct {
@@ -72,10 +71,6 @@ func (c CGenPb) doTagReplacement(ctx context.Context, content string) (string, e
 			if !lineTagMap.IsEmpty() {
 				tagContent := c.listMapToStructTag(lineTagMap)
 				lineTagMap.Clear()
-				// If already have it, don't add it anymore
-				if gstr.Contains(gstr.StrTill(line, "` //"), tagContent) {
-					continue
-				}
 				line, _ = gregex.ReplaceString("`(.+)`", fmt.Sprintf("`$1 %s`", tagContent), line)
 			}
 			lines[index] = line

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

@@ -14,8 +14,11 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/olekukonko/tablewriter"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
@@ -26,10 +29,6 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type (

cmd/gf/internal/cmd/genservice/genservice.go

@@ -94,20 +94,6 @@ const (
 	genServiceFileLockSeconds = 10
 )
 
-type fileInfo struct {
-	PkgItems  []pkgItem
-	FuncItems []funcItem
-}
-
-type folderInfo struct {
-	SrcPackageName      string
-	SrcImportedPackages *garray.SortedStrArray
-	SrcStructFunctions  *gmap.ListMap
-	DstFilePath         string
-
-	FileInfos []*fileInfo
-}
-
 func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGenServiceOutput, err error) {
 	in.SrcFolder = filepath.ToSlash(in.SrcFolder)
 	in.SrcFolder = gstr.TrimRight(in.SrcFolder, `/`)
@@ -177,12 +163,7 @@ func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGe
 		return nil, err
 	}
 	// it will use goroutine to generate service files for each package.
-	var (
-		folderInfos    []folderInfo
-		wg             = sync.WaitGroup{}
-		allStructItems = make(map[string][]string)
-	)
-
+	var wg = sync.WaitGroup{}
 	for _, srcFolderPath := range srcFolderPaths {
 		if !gfile.IsDir(srcFolderPath) {
 			continue
@@ -194,7 +175,7 @@ func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGe
 		if len(files) == 0 {
 			continue
 		}
-
+		// Parse single logic package folder.
 		var (
 			srcPackageName      = gfile.Basename(srcFolderPath)
 			srcImportedPackages = garray.NewSortedStrArray().SetUnique(true)
@@ -203,46 +184,14 @@ func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGe
 				c.getDstFileNameCase(srcPackageName, in.DstFileNameCase)+".go",
 			)
 		)
-
-		folder := folderInfo{
-			SrcPackageName:      srcPackageName,
-			SrcImportedPackages: srcImportedPackages,
-			SrcStructFunctions:  srcStructFunctions,
-			DstFilePath:         dstFilePath,
-		}
-
-		for _, file := range files {
-			pkgItems, structItems, funcItems, err := c.parseItemsInSrc(file)
-			if err != nil {
-				return nil, err
-			}
-			for k, v := range structItems {
-				allStructItems[k] = v
-			}
-			folder.FileInfos = append(folder.FileInfos, &fileInfo{
-				PkgItems:  pkgItems,
-				FuncItems: funcItems,
-			})
-		}
-
-		folderInfos = append(folderInfos, folder)
-	}
-
-	folderInfos = c.calculateStructEmbeddedFuncInfos(folderInfos, allStructItems)
-
-	for _, folder := range folderInfos {
-		// Parse single logic package folder.
-		var (
-			srcPackageName      = folder.SrcPackageName
-			srcImportedPackages = folder.SrcImportedPackages
-			srcStructFunctions  = folder.SrcStructFunctions
-			dstFilePath         = folder.DstFilePath
-		)
 		generatedDstFilePathSet.Add(dstFilePath)
 		// if it were to use goroutine,
 		// it would cause the order of the generated functions in the file to be disordered.
-		for _, file := range folder.FileInfos {
-			pkgItems, funcItems := file.PkgItems, file.FuncItems
+		for _, file := range files {
+			pkgItems, funcItems, err := c.parseItemsInSrc(file)
+			if err != nil {
+				return nil, err
+			}
 
 			// Calculate imported packages for service generating.
 			err = c.calculateImportedItems(in, pkgItems, funcItems, srcImportedPackages)

cmd/gf/internal/cmd/genservice/genservice_ast_parse.go

@@ -10,10 +10,8 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
-	"strings"
 
 	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gstructs"
 	"github.com/gogf/gf/v2/text/gstr"
 )
 
@@ -34,7 +32,7 @@ type funcItem struct {
 // parseItemsInSrc parses the pkgItem and funcItem from the specified file.
 // It can't skip the private methods.
 // It can't skip the imported packages of import alias equal to `_`.
-func (c CGenService) parseItemsInSrc(filePath string) (pkgItems []pkgItem, structItems map[string][]string, funcItems []funcItem, err error) {
+func (c CGenService) parseItemsInSrc(filePath string) (pkgItems []pkgItem, funcItems []funcItem, err error) {
 	var (
 		fileContent = gfile.GetContents(filePath)
 		fileSet     = token.NewFileSet()
@@ -45,107 +43,11 @@ func (c CGenService) parseItemsInSrc(filePath string) (pkgItems []pkgItem, struc
 		return
 	}
 
-	structItems = make(map[string][]string)
-	pkg := node.Name.Name
-	pkgAliasMap := make(map[string]string)
 	ast.Inspect(node, func(n ast.Node) bool {
 		switch x := n.(type) {
 		case *ast.ImportSpec:
 			// parse the imported packages.
-			pkgItem := c.parseImportPackages(x)
-			pkgItems = append(pkgItems, pkgItem)
-			pkgPath := strings.Trim(pkgItem.Path, "\"")
-			pkgPath = strings.ReplaceAll(pkgPath, "\\", "/")
-			tmp := strings.Split(pkgPath, "/")
-			srcPkg := tmp[len(tmp)-1]
-			if srcPkg != pkgItem.Alias {
-				pkgAliasMap[pkgItem.Alias] = srcPkg
-			}
-		case *ast.TypeSpec: // type define
-			switch xType := x.Type.(type) {
-			case *ast.StructType: // define struct
-				// parse the struct declaration.
-				var structName = pkg + "." + x.Name.Name
-				var structEmbeddedStruct []string
-				for _, field := range xType.Fields.List {
-					if len(field.Names) > 0 || field.Tag == nil { // not anonymous field
-						continue
-					}
-
-					tagValue := strings.Trim(field.Tag.Value, "`")
-					tagValue = strings.TrimSpace(tagValue)
-					if len(tagValue) == 0 { // not set tag
-						continue
-					}
-					tags := gstructs.ParseTag(tagValue)
-
-					if v, ok := tags["gen"]; !ok || v != "extend" {
-						continue
-					}
-
-					var embeddedStruct string
-					switch v := field.Type.(type) {
-					case *ast.Ident:
-						if embeddedStruct, err = c.astExprToString(v); err != nil {
-							embeddedStruct = ""
-							break
-						}
-						embeddedStruct = pkg + "." + embeddedStruct
-					case *ast.StarExpr:
-						if embeddedStruct, err = c.astExprToString(v.X); err != nil {
-							embeddedStruct = ""
-							break
-						}
-						embeddedStruct = pkg + "." + embeddedStruct
-					case *ast.SelectorExpr:
-						var pkg string
-						if pkg, err = c.astExprToString(v.X); err != nil {
-							embeddedStruct = ""
-							break
-						}
-						if v, ok := pkgAliasMap[pkg]; ok {
-							pkg = v
-						}
-						if embeddedStruct, err = c.astExprToString(v.Sel); err != nil {
-							embeddedStruct = ""
-							break
-						}
-						embeddedStruct = pkg + "." + embeddedStruct
-					}
-
-					if embeddedStruct == "" {
-						continue
-					}
-					structEmbeddedStruct = append(structEmbeddedStruct, embeddedStruct)
-
-				}
-				if len(structEmbeddedStruct) > 0 {
-					structItems[structName] = structEmbeddedStruct
-				}
-			case *ast.Ident: // define ident
-				var (
-					structName = pkg + "." + x.Name.Name
-					typeName   = pkg + "." + xType.Name
-				)
-				structItems[structName] = []string{typeName}
-			case *ast.SelectorExpr: // define selector
-				var (
-					structName  = pkg + "." + x.Name.Name
-					selecotrPkg string
-					typeName    string
-				)
-				if selecotrPkg, err = c.astExprToString(xType.X); err != nil {
-					break
-				}
-				if v, ok := pkgAliasMap[selecotrPkg]; ok {
-					selecotrPkg = v
-				}
-				if typeName, err = c.astExprToString(xType.Sel); err != nil {
-					break
-				}
-				typeName = selecotrPkg + "." + typeName
-				structItems[structName] = []string{typeName}
-			}
+			pkgItems = append(pkgItems, c.parseImportPackages(x))
 
 		case *ast.FuncDecl:
 			// parse the function items.

cmd/gf/internal/cmd/genservice/genservice_calculate.go

@@ -10,13 +10,12 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 func (c CGenService) calculateImportedItems(
@@ -151,78 +150,3 @@ func (c CGenService) tidyResult(resultSlice []map[string]string) (resultStr stri
 	}
 	return
 }
-
-func (c CGenService) getStructFuncItems(structName string, allStructItems map[string][]string, funcItemsWithoutEmbed map[string][]*funcItem) (funcItems []*funcItem) {
-	funcItemNameSet := map[string]struct{}{}
-
-	if items, ok := funcItemsWithoutEmbed[structName]; ok {
-		funcItems = append(funcItems, items...)
-		for _, item := range items {
-			funcItemNameSet[item.MethodName] = struct{}{}
-		}
-	}
-
-	embeddedStructNames, ok := allStructItems[structName]
-	if !ok {
-		return
-	}
-
-	for _, embeddedStructName := range embeddedStructNames {
-		items := c.getStructFuncItems(embeddedStructName, allStructItems, funcItemsWithoutEmbed)
-
-		for _, item := range items {
-			if _, ok := funcItemNameSet[item.MethodName]; ok {
-				continue
-			}
-			funcItemNameSet[item.MethodName] = struct{}{}
-			funcItems = append(funcItems, item)
-		}
-	}
-
-	return
-}
-
-func (c CGenService) calculateStructEmbeddedFuncInfos(folderInfos []folderInfo, allStructItems map[string][]string) (newFolerInfos []folderInfo) {
-	funcItemsWithoutEmbed := make(map[string][]*funcItem)
-	funcItemMap := make(map[string]*([]funcItem))
-	funcItemsWithoutEmbedMap := make(map[string]*funcItem)
-
-	newFolerInfos = append(newFolerInfos, folderInfos...)
-
-	for _, folder := range newFolerInfos {
-		for k := range folder.FileInfos {
-			fi := folder.FileInfos[k]
-			for k := range fi.FuncItems {
-				item := &fi.FuncItems[k]
-				receiver := folder.SrcPackageName + "." + strings.ReplaceAll(item.Receiver, "*", "")
-				funcItemMap[receiver] = &fi.FuncItems
-				funcItemsWithoutEmbed[receiver] = append(funcItemsWithoutEmbed[receiver], item)
-				funcItemsWithoutEmbedMap[fmt.Sprintf("%s:%s", receiver, item.MethodName)] = item
-			}
-		}
-	}
-
-	for receiver, structItems := range allStructItems {
-		receiverName := strings.ReplaceAll(receiver, "*", "")
-		for _, structName := range structItems {
-			// Get the list of methods for the corresponding structName.
-			for _, funcItem := range c.getStructFuncItems(structName, allStructItems, funcItemsWithoutEmbed) {
-				if _, ok := funcItemsWithoutEmbedMap[fmt.Sprintf("%s:%s", receiverName, funcItem.MethodName)]; ok {
-					continue
-				}
-				if funcItemsPtr, ok := funcItemMap[receiverName]; ok {
-					newFuncItem := *funcItem
-					newFuncItem.Receiver = getReceiverName(receiver)
-					(*funcItemsPtr) = append((*funcItemsPtr), newFuncItem)
-				}
-			}
-		}
-	}
-
-	return
-}
-
-func getReceiverName(receiver string) string {
-	ss := strings.Split(receiver, ".")
-	return ss[len(ss)-1]
-}

cmd/gf/internal/cmd/genservice/genservice_generate.go

@@ -10,14 +10,13 @@ import (
 	"bytes"
 	"fmt"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"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/gmap"
 	"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/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type generateServiceFilesInput struct {

cmd/gf/internal/cmd/genservice/genservice_generate_template.go

@@ -10,12 +10,11 @@ import (
 	"bytes"
 	"fmt"
 
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
 )
 
 func (c CGenService) generatePackageImports(generatedContent *bytes.Buffer, packageName string, imports []string) {

cmd/gf/internal/cmd/testdata/build/varmap/go.mod

@@ -2,7 +2,7 @@ module github.com/gogf/gf/cmd/gf/cmd/gf/testdata/vardump/v2
 
 go 1.18
 
-require github.com/gogf/gf/v2 v2.8.2
+require github.com/gogf/gf/v2 v2.8.1
 
 require (
 	go.opentelemetry.io/otel v1.24.0 // indirect

cmd/gf/internal/cmd/testdata/gendao/generated_user/dao/internal/table_user.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// TableUserDao is the data access object for the table table_user.
+// TableUserDao is the data access object for table table_user.
 type TableUserDao struct {
 	table   string           // table is the underlying table name of the DAO.
-	group   string           // group is the database configuration group name of the current DAO.
+	group   string           // group is the database configuration group name of current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for the table table_user.
+// TableUserColumns defines and stores column names for table table_user.
 type TableUserColumns struct {
 	Id       string // User ID
 	Passport string // User Passport
@@ -29,7 +29,7 @@ type TableUserColumns struct {
 	UpdateAt string // Updated Time
 }
 
-// tableUserColumns holds the columns for the table table_user.
+// tableUserColumns holds the columns for table table_user.
 var tableUserColumns = TableUserColumns{
 	Id:       "id",
 	Passport: "passport",
@@ -49,36 +49,36 @@ func NewTableUserDao() *TableUserDao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *TableUserDao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *TableUserDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/gendao/generated_user/dao/table_user.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
+// internalTableUserDao is internal type for wrapping internal DAO implements.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for the table table_user.
-// You can define custom methods on it to extend its functionality as needed.
+// tableUserDao is the data access object for table table_user.
+// You can define custom methods on it to extend its functionality as you wish.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is a globally accessible object for table table_user operations.
+	// TableUser is globally public accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/gendao/generated_user_field_mapping/dao/internal/table_user.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// TableUserDao is the data access object for the table table_user.
+// TableUserDao is the data access object for table table_user.
 type TableUserDao struct {
 	table   string           // table is the underlying table name of the DAO.
-	group   string           // group is the database configuration group name of the current DAO.
+	group   string           // group is the database configuration group name of current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for the table table_user.
+// TableUserColumns defines and stores column names for table table_user.
 type TableUserColumns struct {
 	Id       string // User ID
 	Passport string // User Passport
@@ -29,7 +29,7 @@ type TableUserColumns struct {
 	UpdateAt string // Updated Time
 }
 
-// tableUserColumns holds the columns for the table table_user.
+// tableUserColumns holds the columns for table table_user.
 var tableUserColumns = TableUserColumns{
 	Id:       "id",
 	Passport: "passport",
@@ -49,36 +49,36 @@ func NewTableUserDao() *TableUserDao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *TableUserDao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *TableUserDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/gendao/generated_user_field_mapping/dao/table_user.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
+// internalTableUserDao is internal type for wrapping internal DAO implements.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for the table table_user.
-// You can define custom methods on it to extend its functionality as needed.
+// tableUserDao is the data access object for table table_user.
+// You can define custom methods on it to extend its functionality as you wish.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is a globally accessible object for table table_user operations.
+	// TableUser is globally public accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/gendao/generated_user_sqlite3/dao/internal/table_user.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// TableUserDao is the data access object for the table table_user.
+// TableUserDao is the data access object for table table_user.
 type TableUserDao struct {
 	table   string           // table is the underlying table name of the DAO.
-	group   string           // group is the database configuration group name of the current DAO.
+	group   string           // group is the database configuration group name of current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for the table table_user.
+// TableUserColumns defines and stores column names for table table_user.
 type TableUserColumns struct {
 	Id        string //
 	Passport  string //
@@ -28,7 +28,7 @@ type TableUserColumns struct {
 	UpdatedAt string //
 }
 
-// tableUserColumns holds the columns for the table table_user.
+// tableUserColumns holds the columns for table table_user.
 var tableUserColumns = TableUserColumns{
 	Id:        "id",
 	Passport:  "passport",
@@ -47,36 +47,36 @@ func NewTableUserDao() *TableUserDao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *TableUserDao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *TableUserDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/gendao/generated_user_sqlite3/dao/table_user.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
+// internalTableUserDao is internal type for wrapping internal DAO implements.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for the table table_user.
-// You can define custom methods on it to extend its functionality as needed.
+// tableUserDao is the data access object for table table_user.
+// You can define custom methods on it to extend its functionality as you wish.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is a globally accessible object for table table_user operations.
+	// TableUser is globally public accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/dao/internal/table_user.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// TableUserDao is the data access object for the table table_user.
+// TableUserDao is the data access object for table table_user.
 type TableUserDao struct {
 	table   string           // table is the underlying table name of the DAO.
-	group   string           // group is the database configuration group name of the current DAO.
+	group   string           // group is the database configuration group name of current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for the table table_user.
+// TableUserColumns defines and stores column names for table table_user.
 type TableUserColumns struct {
 	Id       string // User ID
 	Passport string // User Passport
@@ -29,7 +29,7 @@ type TableUserColumns struct {
 	UpdateAt string // Updated Time
 }
 
-// tableUserColumns holds the columns for the table table_user.
+// tableUserColumns holds the columns for table table_user.
 var tableUserColumns = TableUserColumns{
 	Id:       "id",
 	Passport: "passport",
@@ -49,36 +49,36 @@ func NewTableUserDao() *TableUserDao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *TableUserDao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *TableUserDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/dao/table_user.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
+// internalTableUserDao is internal type for wrapping internal DAO implements.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for the table table_user.
-// You can define custom methods on it to extend its functionality as needed.
+// tableUserDao is the data access object for table table_user.
+// You can define custom methods on it to extend its functionality as you wish.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is a globally accessible object for table table_user operations.
+	// TableUser is globally public accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/gendao/go.mod.txt

@@ -1,9 +1,9 @@
 module for-gendao-test/pkg
 
-go 1.20
+go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.8.1
+	github.com/gogf/gf/v2 v2.5.3
 	github.com/shopspring/decimal v1.3.1
 )
 
@@ -22,9 +22,9 @@ require (
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
-	go.opentelemetry.io/otel v1.24.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.24.0 // indirect
+	go.opentelemetry.io/otel v1.14.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.14.0 // indirect
+	go.opentelemetry.io/otel/trace v1.14.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect

cmd/gf/internal/cmd/testdata/genservice/logic/article/article.go

@@ -11,9 +11,8 @@ import (
 	"go/ast"
 	t "time"
 
-	gdbalias "github.com/gogf/gf/v2/database/gdb"
-
 	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/service"
+	gdbalias "github.com/gogf/gf/v2/database/gdb"
 )
 
 type sArticle struct {

cmd/gf/internal/cmd/testdata/genservice/logic/article/article_extra.go

@@ -14,13 +14,12 @@ package article
 import (
 	"context"
 
+	// This is a random comment
+	gdbas "github.com/gogf/gf/v2/database/gdb"
 	/**
 	 *
 	 */
 	_ "github.com/gogf/gf/v2/os/gfile"
-
-	// This is a random comment
-	gdbas "github.com/gogf/gf/v2/database/gdb"
 )
 
 // T1 random comment

cmd/gf/internal/cmd/testdata/genservice/logic/base/base.go

@@ -1,17 +0,0 @@
-package base
-
-type Base = sBase
-
-type sBase struct {
-	baseDestory `gen:"extend"`
-}
-
-// sBase Init
-func (*sBase) Init() {
-
-}
-
-// sBase Destory
-func (*sBase) Destory() {
-
-}

cmd/gf/internal/cmd/testdata/genservice/logic/base/base_destory.go

@@ -1,13 +0,0 @@
-package base
-
-type baseDestory struct{}
-
-// baseDestory Destory
-func (baseDestory) Destory() {
-
-}
-
-// baseDestory BeforeDestory
-func (baseDestory) BeforeDestory() {
-
-}

cmd/gf/internal/cmd/testdata/genservice/logic/base/sub/sub.go

@@ -1,14 +0,0 @@
-package sub
-
-type SubBase struct {
-}
-
-// subbase init
-func (*SubBase) Init() {
-
-}
-
-// subbase  GetSubBase
-func (*SubBase) GetSubBase() {
-
-}

cmd/gf/internal/cmd/testdata/genservice/logic/logic_expect.go

@@ -6,7 +6,6 @@ package logic
 
 import (
 	_ "github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/logic/article"
-	_ "github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/logic/base"
 	_ "github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/logic/delivery"
 	_ "github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/logic/user"
 )

cmd/gf/internal/cmd/testdata/genservice/logic/user/supper_vip_user.go

@@ -1,27 +0,0 @@
-package user
-
-import (
-	"context"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/service"
-)
-
-func init() {
-	service.RegisterSuperVipUser(&sSuperVipUser{
-		sVipUser: &sVipUser{},
-	})
-}
-
-type sSuperVipUser struct {
-	*sVipUser `gen:"extend"`
-}
-
-// Get supper vip user level
-func (s sSuperVipUser) GetVipLevel(ctx context.Context) (vipLevel int, err error) {
-	return 1, nil
-}
-
-// Set supper vip user level
-func (s *sSuperVipUser) SetVipLevel(ctx context.Context, id int, vipLevel int) (err error) {
-	return nil
-}

cmd/gf/internal/cmd/testdata/genservice/logic/user/user.go

@@ -9,7 +9,6 @@ package user
 import (
 	"context"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/logic/base"
 	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/service"
 )
 
@@ -18,7 +17,6 @@ func init() {
 }
 
 type sUser struct {
-	base.Base
 }
 
 func New() *sUser {

cmd/gf/internal/cmd/testdata/genservice/logic/user/vip_user.go

@@ -1,29 +0,0 @@
-package user
-
-import (
-	"context"
-
-	bbb "github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/logic/base"
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/service"
-)
-
-func init() {
-	service.RegisterVipUser(&sVipUser{})
-}
-
-type mybase = bbb.Base
-
-type sVipUser struct {
-	sUser  `gen:"extend"`
-	mybase `gen:"extend"`
-}
-
-// Create creates a new vip user.
-func (s *sVipUser) Create(ctx context.Context, name string, vipLevel int) (id int, err error) {
-	return 0, nil
-}
-
-// Get vip user level
-func (s *sVipUser) GetVipLevel() (vipLevel int, err error) {
-	return 1, nil
-}

cmd/gf/internal/cmd/testdata/genservice/service/base.go

@@ -1,32 +0,0 @@
-// ================================================================================
-// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
-// You can delete these comments if you wish manually maintain this interface file.
-// ================================================================================
-
-package service
-
-type (
-	IBase interface {
-		// sBase Init
-		Init()
-		// sBase Destory
-		Destory()
-		// baseDestory BeforeDestory
-		BeforeDestory()
-	}
-)
-
-var (
-	localBase IBase
-)
-
-func Base() IBase {
-	if localBase == nil {
-		panic("implement not found for interface IBase, forgot register?")
-	}
-	return localBase
-}
-
-func RegisterBase(i IBase) {
-	localBase = i
-}

cmd/gf/internal/cmd/testdata/genservice/service/user.go

@@ -10,28 +10,6 @@ import (
 )
 
 type (
-	ISuperVipUser interface {
-		// Get supper vip user level
-		GetVipLevel(ctx context.Context) (vipLevel int, err error)
-		// Set supper vip user level
-		SetVipLevel(ctx context.Context, id int, vipLevel int) (err error)
-		// Create creates a new vip user.
-		Create(ctx context.Context, name string, vipLevel int) (id int, err error)
-		// GetOne retrieves user by id.
-		GetOne(ctx context.Context, id int) (name string, err error)
-		// GetList retrieves user list.
-		GetList(ctx context.Context) (names []string, err error)
-		// Update updates user by id.
-		Update(ctx context.Context, id int) (name string, err error)
-		// Delete deletes user by id.
-		Delete(ctx context.Context, id int) (err error)
-		// sBase Init
-		Init()
-		// sBase Destory
-		Destory()
-		// baseDestory BeforeDestory
-		BeforeDestory()
-	}
 	IUser interface {
 		// Create creates a new user.
 		Create(ctx context.Context, name string) (id int, err error)
@@ -44,45 +22,12 @@ type (
 		// Delete deletes user by id.
 		Delete(ctx context.Context, id int) (err error)
 	}
-	IVipUser interface {
-		// Create creates a new vip user.
-		Create(ctx context.Context, name string, vipLevel int) (id int, err error)
-		// Get vip user level
-		GetVipLevel() (vipLevel int, err error)
-		// GetOne retrieves user by id.
-		GetOne(ctx context.Context, id int) (name string, err error)
-		// GetList retrieves user list.
-		GetList(ctx context.Context) (names []string, err error)
-		// Update updates user by id.
-		Update(ctx context.Context, id int) (name string, err error)
-		// Delete deletes user by id.
-		Delete(ctx context.Context, id int) (err error)
-		// sBase Init
-		Init()
-		// sBase Destory
-		Destory()
-		// baseDestory BeforeDestory
-		BeforeDestory()
-	}
 )
 
 var (
-	localSuperVipUser ISuperVipUser
-	localUser         IUser
-	localVipUser      IVipUser
+	localUser IUser
 )
 
-func SuperVipUser() ISuperVipUser {
-	if localSuperVipUser == nil {
-		panic("implement not found for interface ISuperVipUser, forgot register?")
-	}
-	return localSuperVipUser
-}
-
-func RegisterSuperVipUser(i ISuperVipUser) {
-	localSuperVipUser = i
-}
-
 func User() IUser {
 	if localUser == nil {
 		panic("implement not found for interface IUser, forgot register?")
@@ -93,14 +38,3 @@ func User() IUser {
 func RegisterUser(i IUser) {
 	localUser = i
 }
-
-func VipUser() IVipUser {
-	if localVipUser == nil {
-		panic("implement not found for interface IVipUser, forgot register?")
-	}
-	return localVipUser
-}
-
-func RegisterVipUser(i IVipUser) {
-	localVipUser = i
-}

cmd/gf/internal/cmd/testdata/issue/2572/dao/internal/user_3.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// User3Dao is the data access object for the table user3.
+// User3Dao is the data access object for table user3.
 type User3Dao struct {
 	table   string       // table is the underlying table name of the DAO.
-	group   string       // group is the database configuration group name of the current DAO.
+	group   string       // group is the database configuration group name of current DAO.
 	columns User3Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User3Columns defines and stores column names for the table user3.
+// User3Columns defines and stores column names for table user3.
 type User3Columns struct {
 	Id       string // User ID
 	Passport string // User Passport
@@ -29,7 +29,7 @@ type User3Columns struct {
 	UpdateAt string // Updated Time
 }
 
-// user3Columns holds the columns for the table user3.
+// user3Columns holds the columns for table user3.
 var user3Columns = User3Columns{
 	Id:       "id",
 	Passport: "passport",
@@ -49,36 +49,36 @@ func NewUser3Dao() *User3Dao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *User3Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *User3Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *User3Dao) Columns() User3Columns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *User3Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *User3Dao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *User3Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/issue/2572/dao/internal/user_4.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// User4Dao is the data access object for the table user4.
+// User4Dao is the data access object for table user4.
 type User4Dao struct {
 	table   string       // table is the underlying table name of the DAO.
-	group   string       // group is the database configuration group name of the current DAO.
+	group   string       // group is the database configuration group name of current DAO.
 	columns User4Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User4Columns defines and stores column names for the table user4.
+// User4Columns defines and stores column names for table user4.
 type User4Columns struct {
 	Id       string // User ID
 	Passport string // User Passport
@@ -29,7 +29,7 @@ type User4Columns struct {
 	UpdateAt string // Updated Time
 }
 
-// user4Columns holds the columns for the table user4.
+// user4Columns holds the columns for table user4.
 var user4Columns = User4Columns{
 	Id:       "id",
 	Passport: "passport",
@@ -49,36 +49,36 @@ func NewUser4Dao() *User4Dao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *User4Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *User4Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *User4Dao) Columns() User4Columns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *User4Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *User4Dao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *User4Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/issue/2572/dao/user_3.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"/internal"
 )
 
-// internalUser3Dao is an internal type for wrapping the internal DAO implementation.
+// internalUser3Dao is internal type for wrapping internal DAO implements.
 type internalUser3Dao = *internal.User3Dao
 
-// user3Dao is the data access object for the table user3.
-// You can define custom methods on it to extend its functionality as needed.
+// user3Dao is the data access object for table user3.
+// You can define custom methods on it to extend its functionality as you wish.
 type user3Dao struct {
 	internalUser3Dao
 }
 
 var (
-	// User3 is a globally accessible object for table user3 operations.
+	// User3 is globally public accessible object for table user3 operations.
 	User3 = user3Dao{
 		internal.NewUser3Dao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/issue/2572/dao/user_4.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"/internal"
 )
 
-// internalUser4Dao is an internal type for wrapping the internal DAO implementation.
+// internalUser4Dao is internal type for wrapping internal DAO implements.
 type internalUser4Dao = *internal.User4Dao
 
-// user4Dao is the data access object for the table user4.
-// You can define custom methods on it to extend its functionality as needed.
+// user4Dao is the data access object for table user4.
+// You can define custom methods on it to extend its functionality as you wish.
 type user4Dao struct {
 	internalUser4Dao
 }
 
 var (
-	// User4 is a globally accessible object for table user4 operations.
+	// User4 is globally public accessible object for table user4 operations.
 	User4 = user4Dao{
 		internal.NewUser4Dao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/issue/2616/dao/internal/user_1.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// User1Dao is the data access object for the table user1.
+// User1Dao is the data access object for table user1.
 type User1Dao struct {
 	table   string       // table is the underlying table name of the DAO.
-	group   string       // group is the database configuration group name of the current DAO.
+	group   string       // group is the database configuration group name of current DAO.
 	columns User1Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User1Columns defines and stores column names for the table user1.
+// User1Columns defines and stores column names for table user1.
 type User1Columns struct {
 	Id       string // User ID
 	Passport string // User Passport
@@ -29,7 +29,7 @@ type User1Columns struct {
 	UpdateAt string // Updated Time
 }
 
-// user1Columns holds the columns for the table user1.
+// user1Columns holds the columns for table user1.
 var user1Columns = User1Columns{
 	Id:       "id",
 	Passport: "passport",
@@ -49,36 +49,36 @@ func NewUser1Dao() *User1Dao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *User1Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *User1Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *User1Dao) Columns() User1Columns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *User1Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *User1Dao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *User1Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/issue/2616/dao/internal/user_2.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// User2Dao is the data access object for the table user2.
+// User2Dao is the data access object for table user2.
 type User2Dao struct {
 	table   string       // table is the underlying table name of the DAO.
-	group   string       // group is the database configuration group name of the current DAO.
+	group   string       // group is the database configuration group name of current DAO.
 	columns User2Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User2Columns defines and stores column names for the table user2.
+// User2Columns defines and stores column names for table user2.
 type User2Columns struct {
 	Id       string // User ID
 	Passport string // User Passport
@@ -29,7 +29,7 @@ type User2Columns struct {
 	UpdateAt string // Updated Time
 }
 
-// user2Columns holds the columns for the table user2.
+// user2Columns holds the columns for table user2.
 var user2Columns = User2Columns{
 	Id:       "id",
 	Passport: "passport",
@@ -49,36 +49,36 @@ func NewUser2Dao() *User2Dao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *User2Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *User2Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *User2Dao) Columns() User2Columns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *User2Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *User2Dao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *User2Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/issue/2616/dao/internal/user_3.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// User3Dao is the data access object for the table user3.
+// User3Dao is the data access object for table user3.
 type User3Dao struct {
 	table   string       // table is the underlying table name of the DAO.
-	group   string       // group is the database configuration group name of the current DAO.
+	group   string       // group is the database configuration group name of current DAO.
 	columns User3Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User3Columns defines and stores column names for the table user3.
+// User3Columns defines and stores column names for table user3.
 type User3Columns struct {
 	Id       string // User ID
 	Passport string // User Passport
@@ -29,7 +29,7 @@ type User3Columns struct {
 	UpdateAt string // Updated Time
 }
 
-// user3Columns holds the columns for the table user3.
+// user3Columns holds the columns for table user3.
 var user3Columns = User3Columns{
 	Id:       "id",
 	Passport: "passport",
@@ -49,36 +49,36 @@ func NewUser3Dao() *User3Dao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *User3Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *User3Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *User3Dao) Columns() User3Columns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *User3Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *User3Dao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *User3Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/issue/2616/dao/internal/user_4.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// User4Dao is the data access object for the table user4.
+// User4Dao is the data access object for table user4.
 type User4Dao struct {
 	table   string       // table is the underlying table name of the DAO.
-	group   string       // group is the database configuration group name of the current DAO.
+	group   string       // group is the database configuration group name of current DAO.
 	columns User4Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User4Columns defines and stores column names for the table user4.
+// User4Columns defines and stores column names for table user4.
 type User4Columns struct {
 	Id       string // User ID
 	Passport string // User Passport
@@ -29,7 +29,7 @@ type User4Columns struct {
 	UpdateAt string // Updated Time
 }
 
-// user4Columns holds the columns for the table user4.
+// user4Columns holds the columns for table user4.
 var user4Columns = User4Columns{
 	Id:       "id",
 	Passport: "passport",
@@ -49,36 +49,36 @@ func NewUser4Dao() *User4Dao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *User4Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *User4Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *User4Dao) Columns() User4Columns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *User4Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *User4Dao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *User4Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/issue/2616/dao/user_1.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 // I am not overwritten.
@@ -10,20 +10,20 @@ import (
 	"/internal"
 )
 
-// internalUser1Dao is an internal type for wrapping the internal DAO implementation.
+// internalUser1Dao is internal type for wrapping internal DAO implements.
 type internalUser1Dao = *internal.User1Dao
 
-// user1Dao is the data access object for the table user1.
-// You can define custom methods on it to extend its functionality as needed.
+// user1Dao is the data access object for table user1.
+// You can define custom methods on it to extend its functionality as you wish.
 type user1Dao struct {
 	internalUser1Dao
 }
 
 var (
-	// User1 is a globally accessible object for table user1 operations.
+	// User1 is globally public accessible object for table user1 operations.
 	User1 = user1Dao{
 		internal.NewUser1Dao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/issue/2616/dao/user_2.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 // I am not overwritten.
@@ -10,20 +10,20 @@ import (
 	"/internal"
 )
 
-// internalUser2Dao is an internal type for wrapping the internal DAO implementation.
+// internalUser2Dao is internal type for wrapping internal DAO implements.
 type internalUser2Dao = *internal.User2Dao
 
-// user2Dao is the data access object for the table user2.
-// You can define custom methods on it to extend its functionality as needed.
+// user2Dao is the data access object for table user2.
+// You can define custom methods on it to extend its functionality as you wish.
 type user2Dao struct {
 	internalUser2Dao
 }
 
 var (
-	// User2 is a globally accessible object for table user2 operations.
+	// User2 is globally public accessible object for table user2 operations.
 	User2 = user2Dao{
 		internal.NewUser2Dao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/issue/2616/dao/user_3.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"/internal"
 )
 
-// internalUser3Dao is an internal type for wrapping the internal DAO implementation.
+// internalUser3Dao is internal type for wrapping internal DAO implements.
 type internalUser3Dao = *internal.User3Dao
 
-// user3Dao is the data access object for the table user3.
-// You can define custom methods on it to extend its functionality as needed.
+// user3Dao is the data access object for table user3.
+// You can define custom methods on it to extend its functionality as you wish.
 type user3Dao struct {
 	internalUser3Dao
 }
 
 var (
-	// User3 is a globally accessible object for table user3 operations.
+	// User3 is globally public accessible object for table user3 operations.
 	User3 = user3Dao{
 		internal.NewUser3Dao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/issue/2616/dao/user_4.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"/internal"
 )
 
-// internalUser4Dao is an internal type for wrapping the internal DAO implementation.
+// internalUser4Dao is internal type for wrapping internal DAO implements.
 type internalUser4Dao = *internal.User4Dao
 
-// user4Dao is the data access object for the table user4.
-// You can define custom methods on it to extend its functionality as needed.
+// user4Dao is the data access object for table user4.
+// You can define custom methods on it to extend its functionality as you wish.
 type user4Dao struct {
 	internalUser4Dao
 }
 
 var (
-	// User4 is a globally accessible object for table user4 operations.
+	// User4 is globally public accessible object for table user4 operations.
 	User4 = user4Dao{
 		internal.NewUser4Dao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/issue/3749/dao/internal/table_user.go

@@ -11,14 +11,14 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// TableUserDao is the data access object for the table table_user.
+// TableUserDao is the data access object for table table_user.
 type TableUserDao struct {
 	table   string           // table is the underlying table name of the DAO.
-	group   string           // group is the database configuration group name of the current DAO.
+	group   string           // group is the database configuration group name of current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for the table table_user.
+// TableUserColumns defines and stores column names for table table_user.
 type TableUserColumns struct {
 	Id        string // User ID
 	ParentId  string //
@@ -29,7 +29,7 @@ type TableUserColumns struct {
 	UpdateAt  string // Updated Time
 }
 
-// tableUserColumns holds the columns for the table table_user.
+// tableUserColumns holds the columns for table table_user.
 var tableUserColumns = TableUserColumns{
 	Id:        "Id",
 	ParentId:  "parentId",
@@ -49,36 +49,36 @@ func NewTableUserDao() *TableUserDao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *TableUserDao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *TableUserDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/cmd/testdata/issue/3749/dao/table_user.go

@@ -1,5 +1,5 @@
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
+// internalTableUserDao is internal type for wrapping internal DAO implements.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for the table table_user.
-// You can define custom methods on it to extend its functionality as needed.
+// tableUserDao is the data access object for table table_user.
+// You can define custom methods on it to extend its functionality as you wish.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is a globally accessible object for table table_user operations.
+	// TableUser is globally public accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.

cmd/gf/internal/cmd/testdata/issue/3835/logic/issue3835/issue3835.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/issue/3835/service"
-
 	"github.com/gogf/gf/contrib/drivers/mysql/v2"
 )
 

cmd/gf/internal/cmd/testdata/issue/3953/issue3953.proto

@@ -1,16 +0,0 @@
-syntax = "proto3";
-package account;
-
-option go_package = "account/v1";
-
-service Account {
-  rpc getUserByIds (Req) returns (Resp) {
-  }
-}
-
-message Req {
-  repeated int64 ids = 1; // v: required
-}
-message Resp {
-  repeated string data = 1;
-}

cmd/gf/internal/consts/consts_gen_dao_template_dao.go

@@ -8,7 +8,7 @@ package consts
 
 const TemplateGenDaoIndexContent = `
 // =================================================================================
-// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
 package {TplPackageName}
@@ -17,23 +17,23 @@ import (
 	"{TplImportPrefix}/internal"
 )
 
-// internal{TplTableNameCamelCase}Dao is an internal type for wrapping the internal DAO implementation.
+// internal{TplTableNameCamelCase}Dao is internal type for wrapping internal DAO implements.
 type internal{TplTableNameCamelCase}Dao = *internal.{TplTableNameCamelCase}Dao
 
-// {TplTableNameCamelLowerCase}Dao is the data access object for the table {TplTableName}.
-// You can define custom methods on it to extend its functionality as needed.
+// {TplTableNameCamelLowerCase}Dao is the data access object for table {TplTableName}.
+// You can define custom methods on it to extend its functionality as you wish.
 type {TplTableNameCamelLowerCase}Dao struct {
 	internal{TplTableNameCamelCase}Dao
 }
 
 var (
-    // {TplTableNameCamelCase} is a globally accessible object for table {TplTableName} operations.
+	// {TplTableNameCamelCase} is globally public accessible object for table {TplTableName} operations.
 	{TplTableNameCamelCase} = {TplTableNameCamelLowerCase}Dao{
 		internal.New{TplTableNameCamelCase}Dao(),
 	}
 )
 
-// Add your custom methods and functionality below.
+// Fill with you ideas below.
 
 `
 
@@ -51,19 +51,19 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-// {TplTableNameCamelCase}Dao is the data access object for the table {TplTableName}.
+// {TplTableNameCamelCase}Dao is the data access object for table {TplTableName}.
 type {TplTableNameCamelCase}Dao struct {
 	table   string          // table is the underlying table name of the DAO.
-	group   string          // group is the database configuration group name of the current DAO.
+	group   string          // group is the database configuration group name of current DAO.
 	columns {TplTableNameCamelCase}Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// {TplTableNameCamelCase}Columns defines and stores column names for the table {TplTableName}.
+// {TplTableNameCamelCase}Columns defines and stores column names for table {TplTableName}.
 type {TplTableNameCamelCase}Columns struct {
 	{TplColumnDefine}
 }
 
-// {TplTableNameCamelLowerCase}Columns holds the columns for the table {TplTableName}.
+// {TplTableNameCamelLowerCase}Columns holds the columns for table {TplTableName}.
 var {TplTableNameCamelLowerCase}Columns = {TplTableNameCamelCase}Columns{
 	{TplColumnNames}
 }
@@ -77,36 +77,36 @@ func New{TplTableNameCamelCase}Dao() *{TplTableNameCamelCase}Dao {
 	}
 }
 
-// DB retrieves and returns the underlying raw database management object of the current DAO.
+// DB retrieves and returns the underlying raw database management object of current DAO.
 func (dao *{TplTableNameCamelCase}Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of the current DAO.
+// Table returns the table name of current dao.
 func (dao *{TplTableNameCamelCase}Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of the current DAO.
+// Columns returns all column names of current dao.
 func (dao *{TplTableNameCamelCase}Dao) Columns() {TplTableNameCamelCase}Columns {
 	return dao.columns
 }
 
-// Group returns the database configuration group name of the current DAO.
+// Group returns the configuration group name of database of current dao.
 func (dao *{TplTableNameCamelCase}Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the current operation.
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
 func (dao *{TplTableNameCamelCase}Dao) Ctx(ctx context.Context) *gdb.Model {
 	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
 }
 
 // Transaction wraps the transaction logic using function f.
-// It rolls back the transaction and returns the error if function f returns a non-nil error.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note: Do not commit or roll back the transaction in function f,
+// Note that, you should not Commit or Rollback the transaction in function f
 // as it is automatically handled by this function.
 func (dao *{TplTableNameCamelCase}Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
 	return dao.Ctx(ctx).Transaction(ctx, f)

cmd/gf/internal/utility/utils/utils_test.go

@@ -10,9 +10,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gogf/gf/v2/test/gtest"
-
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
+	"github.com/gogf/gf/v2/test/gtest"
 )
 
 func Test_GetModPath(t *testing.T) {

cmd/gf/main.go

@@ -7,19 +7,17 @@
 package main
 
 import (
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/os/gctx"
-
 	"github.com/gogf/gf/cmd/gf/v2/gfcmd"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/os/gctx"
 )
 
 func main() {
 	var (
-		ctx          = gctx.GetInitCtx()
-		command, err = gfcmd.GetCommand(ctx)
+		ctx = gctx.GetInitCtx()
 	)
-
+	command, err := gfcmd.GetCommand(ctx)
 	if err != nil {
 		mlog.Fatalf(`%+v`, err)
 	}

container/garray/garray_z_example_normal_any_test.go

@@ -9,9 +9,10 @@ package garray_test
 import (
 	"fmt"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 )
 
 func ExampleNew() {

container/garray/garray_z_example_normal_int_test.go

@@ -9,9 +9,10 @@ package garray_test
 import (
 	"fmt"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"
 )

container/garray/garray_z_example_normal_str_test.go

@@ -10,9 +10,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_example_sorted_str_test.go

@@ -9,9 +9,10 @@ package garray_test
 import (
 	"fmt"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"
 )

container/garray/garray_z_unit_normal_any_test.go

@@ -12,9 +12,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_normal_int_test.go

@@ -12,9 +12,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_normal_str_test.go

@@ -13,9 +13,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_sorted_any_test.go

@@ -13,9 +13,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_sorted_int_test.go

@@ -12,9 +12,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_sorted_str_test.go

@@ -12,9 +12,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gogf/gf/v2/internal/empty"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"

container/gmap/gmap_hash_any_any_map.go

@@ -7,14 +7,13 @@
 package gmap
 
 import (
-	"reflect"
-
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/internal/deepcopy"
 	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/util/gconv"
+	"reflect"
 )
 
 // AnyAnyMap wraps map type `map[interface{}]interface{}` and provides more map features.

container/gmap/gmap_hash_int_any_map.go

@@ -8,14 +8,13 @@
 package gmap
 
 import (
-	"reflect"
-
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/internal/deepcopy"
 	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/util/gconv"
+	"reflect"
 )
 
 // IntAnyMap implements map[int]interface{} with RWMutex that has switch.

container/gpool/gpool_z_unit_test.go

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