fix(contrib/registry/consul): update dependence of gf to v2.8.2 with relative path specified (#4029)

.github/workflows/ci-main.sh

@@ -49,7 +49,7 @@ for file in `find . -name go.mod`; do
 
     # package example needs golang >= v1.20
     if [ "example" = $(basename $dirpath) ]; then
-        if ! go version|grep -qE "go1.[2-9][0-9]"; then
+        if ! go version|grep -qE "go1.[2-9][1-9]"; then
           echo "ignore example as go version: $(go version)"
           continue 1
         fi

.github/workflows/ci-main.yml

@@ -225,7 +225,7 @@ jobs:
     - name: Install Protoc
       uses: arduino/setup-protoc@v2
       with:
-        version: "23.x"
+        version: "29.x"
         repo-token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install the protocol compiler plugins for Go

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

@@ -3,7 +3,7 @@ version: '3.7'
 services:
 
   consul-server:
-    image: loads/consul:1.15
+    image: consul:1.15
     container_name: consul-server
     restart: always
     volumes:
@@ -17,7 +17,7 @@ services:
     command: "agent"
 
   consul-client:
-    image: loads/consul:1.15
+    image: 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.22.5
+          go-version: 1.23.4
           cache: false
       - name: download goframe docs
         run: ./download.sh

.github/workflows/golangci-lint.yml

@@ -1,17 +1,8 @@
-# Tencent is pleased to support the open source community by making Polaris available.
+# Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
 #
-# Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
-#
-# Licensed under the BSD 3-Clause License (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://opensource.org/licenses/BSD-3-Clause
-#
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
+# This Source Code Form is subject to the terms of the MIT License.
+# If a copy of the MIT was not distributed with this file,
+# You can obtain one at https://github.com/gogf/gf.
 
 name: GolangCI-Lint
 on:
@@ -23,6 +14,7 @@ on:
       - feature/**
       - enhance/**
       - fix/**
+      - feat/**
   pull_request:
     branches:
       - master
@@ -31,12 +23,13 @@ on:
       - feature/**
       - enhance/**
       - fix/**
+      - feat/**
 
 jobs:
   golangci:
     strategy:
       matrix:
-        go-version: [ '1.20','1.21.4','1.22', '1.23' ]
+        go-version: [ 'stable' ]
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
@@ -49,6 +42,41 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.60.1
+          # Required: specify the golangci-lint version without the patch version to always use the latest patch.
+          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

.github/workflows/release.yml

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

.github/workflows/sonarcloud.yaml

@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 # Declare default permissions as read only.
-permissions: read-all
+permissions: read
 
 jobs:
   analysis:
@@ -34,7 +34,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@v2.4.0 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif

.golangci.yml

@@ -40,9 +40,11 @@ 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
@@ -79,7 +81,51 @@ 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:
@@ -259,16 +305,3 @@ 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,12 +27,11 @@ if [[ $? -ne 0 ]]; then
 fi
 
 if [[ true ]]; then
-    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
+    # 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
 fi
 
 if [ -f "go.work" ]; then

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 john@goframe.org https://goframe.org
+Copyright (c) 2017 GoFrame Team 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
+	golangci-lint run -c .golangci.yml
 
 # make version to=v2.4.0
 .PHONY: version

README.MD

@@ -1,7 +1,6 @@
-# GoFrame
 
 <div align=center>
-<img src="https://goframe.org/img/logo_full.png" width="300"/>
+<img src="https://goframe.org/img/logo_full.png" width="300" alt="goframe gf logo"/>
 
 [![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)
@@ -20,73 +19,26 @@
 
 </div>
 
-`GoFrame` is a modular, powerful, high-performance and enterprise-class application development framework of Golang.
+A powerful framework for faster, easier, and more efficient project development.
 
-# Features
-
-- modular, loosely coupled design
-- rich components, out-of-the-box
-- automatic codes generating for efficiency
-- simple and easy to use, detailed documentation
-- interface designed components, with high scalability
-- fully supported tracing and error stack feature
-- specially developed and powerful ORM component
-- robust engineering design specifications
-- convenient development CLI tool provide
-- OpenTelemetry observability features support
-- OpenAPIV3 documentation generating, automatically
-- much, much more...ready to explore?
 
 # Documentation
 
 - GoFrame Official Site: [https://goframe.org](https://goframe.org)
+- GoFrame Official Site(en): [https://goframe.org/en](https://goframe.org/en)
+- GoFrame Mirror Site(中文): [https://goframe.org.cn](https://goframe.org.cn)
+- GoFrame Mirror Site(github pages): [https://pages.goframe.org](https://pages.goframe.org)
 - GoDoc API: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2)
 
 
-# Installation
-
-Enter your repo. directory and execute following command:
-
-## primary module
-
-```bash
-go get -u -v github.com/gogf/gf/v2
-```
-
-## cli tool
-
-```bash
-go install github.com/gogf/gf/cmd/gf/v2@latest
-```
-
-# Limitation
-
-```
-golang version >= 1.20
-```
-
 # Contributors
 
-💖 Thanks all the contributors making GoFrame awesome! [[Contributors](https://github.com/gogf/gf/graphs/contributors)] 💖
+💖 [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" />
+<img src="https://goframe.org/img/contributors.svg?version=v2.8.2" alt="goframe contributors"/>
 </a>
 
 # License
 
 `GoFrame` is licensed under the [MIT License](LICENSE), 100% free and open-source, forever.
-
-
-# Donators
-
-If you love `GoFrame`, why not [buy developer a cup of coffee](https://goframe.org/supportus/donate)?
-
-# Sponsors
-
-We appreciate any kind of sponsorship for `GoFrame` development. If you've got some interesting, please contact WeChat `389961817` / Email `john@goframe.org`.
-
-# Thanks
-
-<a href="https://www.jetbrains.com/?from=GoFrame"><img src="https://goframe.org/img/jetbrains.png" height="120" alt="JetBrains"/></a>
-<a href="https://www.atlassian.com/?from=GoFrame"><img src="https://goframe.org/img/atlassian.jpg" height="120" alt="Atlassian"/></a>

cmd/gf/gfcmd/gfcmd.go

@@ -4,12 +4,15 @@
 // 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"
@@ -19,14 +22,11 @@ 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.18
+go 1.20
 
 require (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.8.0
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.8.0
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.0
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.8.0
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.8.0
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.8.0
-	github.com/gogf/gf/v2 v2.8.0
+	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/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.18
+go 1.20
 
 use (
 	./

cmd/gf/internal/cmd/cmd.go

@@ -4,6 +4,7 @@
 // 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 (
@@ -19,9 +20,8 @@ import (
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
-var (
-	GF = cGF{}
-)
+// GF is the management object for `gf` command line tool.
+var GF = cGF{}
 
 type cGF struct {
 	g.Meta `name:"gf" ad:"{cGFAd}"`

cmd/gf/internal/cmd/cmd_build.go

@@ -138,11 +138,6 @@ type cBuildInput struct {
 type cBuildOutput struct{}
 
 func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, err error) {
-	// print used go env
-	if in.DumpENV {
-		_, _ = Env.Index(ctx, cEnvInput{})
-	}
-
 	mlog.SetHeaderPrint(true)
 
 	mlog.Debugf(`build command input: %+v`, in)
@@ -241,6 +236,10 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e
 	} else {
 		genv.MustSet("CGO_ENABLED", "0")
 	}
+	// print used go env
+	if in.DumpENV {
+		_, _ = Env.Index(ctx, cEnvInput{})
+	}
 	for system, item := range platformMap {
 		if len(customSystems) > 0 && customSystems[0] != "all" && !gstr.InArray(customSystems, system) {
 			continue

cmd/gf/internal/cmd/cmd_doc.go

@@ -16,10 +16,11 @@ 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,9 +12,6 @@ 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"
@@ -22,6 +19,10 @@ 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,14 +13,15 @@ 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,11 +10,12 @@ 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,7 +11,6 @@ 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"
@@ -20,6 +19,8 @@ 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,11 +10,12 @@ 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) {
@@ -48,3 +49,42 @@ 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,12 +11,13 @@ 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) {
@@ -52,6 +53,8 @@ func Test_Gen_Pbentity_Default(t *testing.T) {
 				NameCase:          "",
 				JsonCase:          "",
 				Option:            "",
+				TypeMapping:       nil,
+				FieldMapping:      nil,
 			}
 		)
 		err = gutil.FillStructWithDefault(&in)
@@ -115,6 +118,8 @@ func Test_Gen_Pbentity_NameCase_SnakeScreaming(t *testing.T) {
 				NameCase:          "SnakeScreaming",
 				JsonCase:          "",
 				Option:            "",
+				TypeMapping:       nil,
+				FieldMapping:      nil,
 			}
 		)
 		err = gutil.FillStructWithDefault(&in)
@@ -179,6 +184,8 @@ func Test_Issue_3545(t *testing.T) {
 				NameCase:          "",
 				JsonCase:          "",
 				Option:            "",
+				TypeMapping:       nil,
+				FieldMapping:      nil,
 			}
 		)
 		err = gutil.FillStructWithDefault(&in)
@@ -208,3 +215,74 @@ func Test_Issue_3545(t *testing.T) {
 		}
 	})
 }
+
+// https://github.com/gogf/gf/issues/3685
+func Test_Issue_3685(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err        error
+			db         = testDB
+			table      = "table_user"
+			sqlContent = fmt.Sprintf(
+				gtest.DataContent(`issue`, `3685`, `user.tpl.sql`),
+				table,
+			)
+		)
+		dropTableWithDb(db, table)
+		array := gstr.SplitAndTrim(sqlContent, ";")
+		for _, v := range array {
+			if _, err = db.Exec(ctx, v); err != nil {
+				t.AssertNil(err)
+			}
+		}
+		defer dropTableWithDb(db, table)
+
+		var (
+			path = gfile.Temp(guid.S())
+			in   = genpbentity.CGenPbEntityInput{
+				Path:              path,
+				Package:           "",
+				Link:              link,
+				Tables:            "",
+				Prefix:            "",
+				RemovePrefix:      "",
+				RemoveFieldPrefix: "",
+				NameCase:          "",
+				JsonCase:          "",
+				Option:            "",
+				TypeMapping: map[genpbentity.DBFieldTypeName]genpbentity.CustomAttributeType{
+					"json": {
+						Type:   "google.protobuf.Value",
+						Import: "google/protobuf/struct.proto",
+					},
+				},
+				FieldMapping: nil,
+			}
+		)
+		err = gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		_, err = genpbentity.CGenPbEntity{}.PbEntity(ctx, in)
+		t.AssertNil(err)
+
+		// files
+		files, err := gfile.ScanDir(path, "*.proto", false)
+		t.AssertNil(err)
+		t.Assert(files, []string{
+			path + filepath.FromSlash("/table_user.proto"),
+		})
+
+		// contents
+		testPath := gtest.DataPath("issue", "3685")
+		expectFiles := []string{
+			testPath + filepath.FromSlash("/table_user.proto"),
+		}
+		for i := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}

cmd/gf/internal/cmd/cmd_z_unit_gen_service_test.go

@@ -10,11 +10,12 @@ 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) {
@@ -57,6 +58,7 @@ 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"),
 		})
@@ -65,6 +67,7 @@ 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,10 +7,11 @@
 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,12 +11,13 @@ 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,9 +9,10 @@ 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,15 +10,16 @@ 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,13 +10,14 @@ 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,7 +13,6 @@ 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"
@@ -24,6 +23,7 @@ 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,22 +8,24 @@ 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:"."`
-		Path     string   `name:"path"     short:"p"  dc:"output go file path storing enums content" d:"internal/boot/boot_enums.go"`
+		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"`
 		Prefixes []string `name:"prefixes" short:"x"  dc:"only exports packages that starts with specified prefixes"`
 	}
 	CGenEnumsOutput struct{}
@@ -34,8 +36,8 @@ const (
 	CGenEnumsBrief  = `parse go files in current project and generate enums go file`
 	CGenEnumsEg     = `
 gf gen enums
-gf gen enums -p internal/boot/boot_enums.go
-gf gen enums -p internal/boot/boot_enums.go -s .
+gf gen enums -p internal/packed/packed_enums.go
+gf gen enums -p internal/packed/packed_enums.go -s .
 gf gen enums -x github.com/gogf
 `
 )

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

@@ -9,6 +9,7 @@ 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,11 +9,12 @@ 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,11 +11,12 @@ 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,13 +10,14 @@ 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 {
@@ -71,6 +72,10 @@ 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

@@ -11,13 +11,12 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
+	"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"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -27,6 +26,10 @@ 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 (
@@ -43,6 +46,9 @@ type (
 		NameCase          string `name:"nameCase"          short:"n"  brief:"{CGenPbEntityBriefNameCase}" d:"Camel"`
 		JsonCase          string `name:"jsonCase"          short:"j"  brief:"{CGenPbEntityBriefJsonCase}" d:"none"`
 		Option            string `name:"option"            short:"o"  brief:"{CGenPbEntityBriefOption}"`
+
+		TypeMapping  map[DBFieldTypeName]CustomAttributeType  `name:"typeMapping"  short:"y"  brief:"{CGenPbEntityBriefTypeMapping}"  orphan:"true"`
+		FieldMapping map[DBTableFieldName]CustomAttributeType `name:"fieldMapping" short:"fm" brief:"{CGenPbEntityBriefFieldMapping}" orphan:"true"`
 	}
 	CGenPbEntityOutput struct{}
 
@@ -52,6 +58,13 @@ type (
 		TableName    string // TableName specifies the table name of the table.
 		NewTableName string // NewTableName specifies the prefix-stripped name of the table.
 	}
+
+	DBTableFieldName    = string
+	DBFieldTypeName     = string
+	CustomAttributeType struct {
+		Type   string `brief:"custom attribute type name"`
+		Import string `brief:"custom import for this type"`
+	}
 )
 
 const (
@@ -69,7 +82,7 @@ gf gen pbentity -r user_
 	CGenPbEntityAd = `
 CONFIGURATION SUPPORT
     Options are also supported by configuration file.
-    It's suggested using configuration file instead of command line arguments making producing. 
+    It's suggested using configuration file instead of command line arguments making producing.
     The configuration node name is "gf.gen.pbentity", which also supports multiple databases, for example(config.yaml):
     gfcli:
       gen:
@@ -88,6 +101,13 @@ CONFIGURATION SUPPORT
 			  option go_package    = "protobuf/demos";
 			  option java_package  = "protobuf/demos";
 			  option php_namespace = "protobuf/demos";
+            typeMapping:
+              json:
+                type: google.protobuf.Value
+                import: google/protobuf/struct.proto
+              jsonb:
+                type: google.protobuf.Value
+                import: google/protobuf/struct.proto
 `
 	CGenPbEntityBriefPath              = `directory path for generated files storing`
 	CGenPbEntityBriefPackage           = `package path for all entity proto files`
@@ -106,7 +126,7 @@ it's not necessary and the default value is "default"
 case for message attribute names, default is "Camel":
 | Case            | Example            |
 |---------------- |--------------------|
-| Camel           | AnyKindOfString    | 
+| Camel           | AnyKindOfString    |
 | CamelLower      | anyKindOfString    | default
 | Snake           | any_kind_of_string |
 | SnakeScreaming  | ANY_KIND_OF_STRING |
@@ -119,8 +139,95 @@ case for message attribute names, default is "Camel":
 case for message json tag, cases are the same as "nameCase", default "CamelLower".
 set it to "none" to ignore json tag generating.
 `
+
+	CGenPbEntityBriefTypeMapping  = `custom local type mapping for generated struct attributes relevant to fields of table`
+	CGenPbEntityBriefFieldMapping = `custom local type mapping for generated struct attributes relevant to specific fields of table`
 )
 
+var defaultTypeMapping = map[DBFieldTypeName]CustomAttributeType{
+	// gdb.LocalTypeString
+	"string": {
+		Type: "string",
+	},
+	// gdb.LocalTypeTime
+	// "time": {
+	// 	Type:   "google.protobuf.Duration",
+	// 	Import: "google/protobuf/duration.proto",
+	// },
+	// gdb.LocalTypeDate
+	"date": {
+		Type:   "google.protobuf.Timestamp",
+		Import: "google/protobuf/timestamp.proto",
+	},
+	// gdb.LocalTypeDatetime
+	"datetime": {
+		Type:   "google.protobuf.Timestamp",
+		Import: "google/protobuf/timestamp.proto",
+	},
+	// gdb.LocalTypeInt
+	"int": {
+		Type: "int32",
+	},
+	// gdb.LocalTypeUint
+	"uint": {
+		Type: "uint32",
+	},
+	// gdb.LocalTypeInt64
+	"int64": {
+		Type: "int64",
+	},
+	// gdb.LocalTypeUint64
+	"uint64": {
+		Type: "uint64",
+	},
+	// gdb.LocalTypeIntSlice
+	"[]int": {
+		Type: "repeated int32",
+	},
+	// gdb.LocalTypeInt64Slice
+	"[]int64": {
+		Type: "repeated int64",
+	},
+	// gdb.LocalTypeUint64Slice
+	"[]uint64": {
+		Type: "repeated uint64",
+	},
+	// gdb.LocalTypeInt64Bytes
+	"int64-bytes": {
+		Type: "repeated int64",
+	},
+	// gdb.LocalTypeUint64Bytes
+	"uint64-bytes": {
+		Type: "repeated uint64",
+	},
+	// gdb.LocalTypeFloat32
+	"float32": {
+		Type: "float",
+	},
+	// gdb.LocalTypeFloat64
+	"float64": {
+		Type: "double",
+	},
+	// gdb.LocalTypeBytes
+	"[]byte": {
+		Type: "bytes",
+	},
+	// gdb.LocalTypeBool
+	"bool": {
+		Type: "bool",
+	},
+	// gdb.LocalTypeJson
+	// "json": {
+	// 	Type:   "google.protobuf.Value",
+	// 	Import: "google/protobuf/struct.proto",
+	// },
+	// gdb.LocalTypeJsonb
+	// "jsonb": {
+	// 	Type:   "google.protobuf.Value",
+	// 	Import: "google/protobuf/struct.proto",
+	// },
+}
+
 func init() {
 	gtag.Sets(g.MapStrStr{
 		`CGenPbEntityConfig`:                 CGenPbEntityConfig,
@@ -138,6 +245,8 @@ func init() {
 		`CGenPbEntityBriefNameCase`:          CGenPbEntityBriefNameCase,
 		`CGenPbEntityBriefJsonCase`:          CGenPbEntityBriefJsonCase,
 		`CGenPbEntityBriefOption`:            CGenPbEntityBriefOption,
+		`CGenPbEntityBriefTypeMapping`:       CGenPbEntityBriefTypeMapping,
+		`CGenPbEntityBriefFieldMapping`:      CGenPbEntityBriefFieldMapping,
 	})
 }
 
@@ -210,6 +319,16 @@ func doGenPbEntityForArray(ctx context.Context, index int, in CGenPbEntityInput)
 			mlog.Fatalf("fetching tables failed: \n %v", err)
 		}
 	}
+	// merge default typeMapping to input typeMapping.
+	if in.TypeMapping == nil {
+		in.TypeMapping = defaultTypeMapping
+	} else {
+		for key, typeMapping := range defaultTypeMapping {
+			if _, ok := in.TypeMapping[key]; !ok {
+				in.TypeMapping[key] = typeMapping
+			}
+		}
+	}
 
 	for _, tableName := range tableNames {
 		newTableName := tableName
@@ -234,18 +353,24 @@ func generatePbEntityContentFile(ctx context.Context, in CGenPbEntityInternalInp
 	// Change the `newTableName` if `Prefix` is given.
 	newTableName := in.Prefix + in.NewTableName
 	var (
-		imports             string
-		tableNameCamelCase  = gstr.CaseCamel(newTableName)
-		tableNameSnakeCase  = gstr.CaseSnake(newTableName)
-		entityMessageDefine = generateEntityMessageDefinition(tableNameCamelCase, fieldMap, in)
-		fileName            = gstr.Trim(tableNameSnakeCase, "-_.")
-		path                = filepath.FromSlash(gfile.Join(in.Path, fileName+".proto"))
+		tableNameCamelCase                 = gstr.CaseCamel(newTableName)
+		tableNameSnakeCase                 = gstr.CaseSnake(newTableName)
+		entityMessageDefine, appendImports = generateEntityMessageDefinition(tableNameCamelCase, fieldMap, in)
+		fileName                           = gstr.Trim(tableNameSnakeCase, "-_.")
+		path                               = filepath.FromSlash(gfile.Join(in.Path, fileName+".proto"))
 	)
-	if gstr.Contains(entityMessageDefine, "google.protobuf.Timestamp") {
-		imports = `import "google/protobuf/timestamp.proto";`
+	packageImportStr := ""
+	var packageImportsArray = garray.NewStrArray()
+	if len(appendImports) > 0 {
+		for _, appendImport := range appendImports {
+			packageImportStr = fmt.Sprintf(`import "%s";`, appendImport)
+			if packageImportsArray.Search(packageImportStr) == -1 {
+				packageImportsArray.Append(packageImportStr)
+			}
+		}
 	}
 	entityContent := gstr.ReplaceByMap(getTplPbEntityContent(""), g.MapStrStr{
-		"{Imports}":       imports,
+		"{Imports}":       packageImportsArray.Join("\n"),
 		"{PackageName}":   gfile.Basename(in.Package),
 		"{GoPackage}":     in.Package,
 		"{OptionContent}": in.Option,
@@ -259,14 +384,19 @@ func generatePbEntityContentFile(ctx context.Context, in CGenPbEntityInternalInp
 }
 
 // generateEntityMessageDefinition generates and returns the message definition for specified table.
-func generateEntityMessageDefinition(entityName string, fieldMap map[string]*gdb.TableField, in CGenPbEntityInternalInput) string {
+func generateEntityMessageDefinition(entityName string, fieldMap map[string]*gdb.TableField, in CGenPbEntityInternalInput) (string, []string) {
 	var (
-		buffer = bytes.NewBuffer(nil)
-		array  = make([][]string, len(fieldMap))
-		names  = sortFieldKeyForPbEntity(fieldMap)
+		appendImports []string
+		buffer        = bytes.NewBuffer(nil)
+		array         = make([][]string, len(fieldMap))
+		names         = sortFieldKeyForPbEntity(fieldMap)
 	)
 	for index, name := range names {
-		array[index] = generateMessageFieldForPbEntity(index+1, fieldMap[name], in)
+		var imports string
+		array[index], imports = generateMessageFieldForPbEntity(index+1, fieldMap[name], in)
+		if imports != "" {
+			appendImports = append(appendImports, imports)
+		}
 	}
 	tw := tablewriter.NewWriter(buffer)
 	tw.SetBorder(false)
@@ -277,48 +407,38 @@ func generateEntityMessageDefinition(entityName string, fieldMap map[string]*gdb
 	tw.Render()
 	stContent := buffer.String()
 	// Let's do this hack of table writer for indent!
-	stContent = gstr.Replace(stContent, "  #", "")
+	stContent = regexp.MustCompile(`\s+\n`).ReplaceAllString(gstr.Replace(stContent, "  #", ""), "\n")
 	buffer.Reset()
 	buffer.WriteString(fmt.Sprintf("message %s {\n", entityName))
 	buffer.WriteString(stContent)
 	buffer.WriteString("}")
-	return buffer.String()
+	return buffer.String(), appendImports
 }
 
 // generateMessageFieldForPbEntity generates and returns the message definition for specified field.
-func generateMessageFieldForPbEntity(index int, field *gdb.TableField, in CGenPbEntityInternalInput) []string {
+func generateMessageFieldForPbEntity(index int, field *gdb.TableField, in CGenPbEntityInternalInput) (attrLines []string, appendImport string) {
 	var (
-		localTypeName gdb.LocalType
-		comment       string
-		jsonTagStr    string
-		err           error
-		ctx           = gctx.GetInitCtx()
+		localTypeNameStr string
+		localTypeName    gdb.LocalType
+		comment          string
+		jsonTagStr       string
+		err              error
+		ctx              = gctx.GetInitCtx()
 	)
-	localTypeName, err = in.DB.CheckLocalTypeForField(ctx, field.Type, nil)
-	if err != nil {
-		panic(err)
+
+	if in.TypeMapping != nil && len(in.TypeMapping) > 0 {
+		localTypeName, err = in.DB.CheckLocalTypeForField(ctx, field.Type, nil)
+		if err != nil {
+			panic(err)
+		}
+		if localTypeName != "" {
+			if typeMapping, ok := in.TypeMapping[strings.ToLower(string(localTypeName))]; ok {
+				localTypeNameStr = typeMapping.Type
+				appendImport = typeMapping.Import
+			}
+		}
 	}
-	var typeMapping = map[gdb.LocalType]string{
-		gdb.LocalTypeString:      "string",
-		gdb.LocalTypeDate:        "google.protobuf.Timestamp",
-		gdb.LocalTypeDatetime:    "google.protobuf.Timestamp",
-		gdb.LocalTypeInt:         "int32",
-		gdb.LocalTypeUint:        "uint32",
-		gdb.LocalTypeInt64:       "int64",
-		gdb.LocalTypeUint64:      "uint64",
-		gdb.LocalTypeIntSlice:    "repeated int32",
-		gdb.LocalTypeInt64Slice:  "repeated int64",
-		gdb.LocalTypeUint64Slice: "repeated uint64",
-		gdb.LocalTypeInt64Bytes:  "repeated int64",
-		gdb.LocalTypeUint64Bytes: "repeated uint64",
-		gdb.LocalTypeFloat32:     "float",
-		gdb.LocalTypeFloat64:     "double",
-		gdb.LocalTypeBytes:       "bytes",
-		gdb.LocalTypeBool:        "bool",
-		gdb.LocalTypeJson:        "string",
-		gdb.LocalTypeJsonb:       "string",
-	}
-	localTypeNameStr := typeMapping[localTypeName]
+
 	if localTypeNameStr == "" {
 		localTypeNameStr = "string"
 	}
@@ -351,12 +471,19 @@ func generateMessageFieldForPbEntity(index int, field *gdb.TableField, in CGenPb
 		newFiledName = gstr.TrimLeftStr(newFiledName, v, 1)
 	}
 
+	if in.FieldMapping != nil && len(in.FieldMapping) > 0 {
+		if typeMapping, ok := in.FieldMapping[fmt.Sprintf("%s.%s", in.TableName, newFiledName)]; ok {
+			localTypeNameStr = typeMapping.Type
+			appendImport = typeMapping.Import
+		}
+	}
+
 	return []string{
 		"    #" + localTypeNameStr,
 		" #" + formatCase(newFiledName, in.NameCase),
 		" #= " + gconv.String(index) + jsonTagStr + ";",
 		" #" + fmt.Sprintf(`// %s`, comment),
-	}
+	}, appendImport
 }
 
 func getTplPbEntityContent(tplEntityPath string) string {

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

@@ -94,6 +94,20 @@ 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, `/`)
@@ -163,7 +177,12 @@ 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 wg = sync.WaitGroup{}
+	var (
+		folderInfos    []folderInfo
+		wg             = sync.WaitGroup{}
+		allStructItems = make(map[string][]string)
+	)
+
 	for _, srcFolderPath := range srcFolderPaths {
 		if !gfile.IsDir(srcFolderPath) {
 			continue
@@ -175,7 +194,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)
@@ -184,14 +203,46 @@ func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGe
 				c.getDstFileNameCase(srcPackageName, in.DstFileNameCase)+".go",
 			)
 		)
-		generatedDstFilePathSet.Add(dstFilePath)
-		// if it were to use goroutine,
-		// it would cause the order of the generated functions in the file to be disordered.
+
+		folder := folderInfo{
+			SrcPackageName:      srcPackageName,
+			SrcImportedPackages: srcImportedPackages,
+			SrcStructFunctions:  srcStructFunctions,
+			DstFilePath:         dstFilePath,
+		}
+
 		for _, file := range files {
-			pkgItems, funcItems, err := c.parseItemsInSrc(file)
+			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
 
 			// Calculate imported packages for service generating.
 			err = c.calculateImportedItems(in, pkgItems, funcItems, srcImportedPackages)

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

@@ -10,8 +10,10 @@ 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"
 )
 
@@ -32,7 +34,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, funcItems []funcItem, err error) {
+func (c CGenService) parseItemsInSrc(filePath string) (pkgItems []pkgItem, structItems map[string][]string, funcItems []funcItem, err error) {
 	var (
 		fileContent = gfile.GetContents(filePath)
 		fileSet     = token.NewFileSet()
@@ -43,11 +45,107 @@ func (c CGenService) parseItemsInSrc(filePath string) (pkgItems []pkgItem, funcI
 		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.
-			pkgItems = append(pkgItems, c.parseImportPackages(x))
+			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}
+			}
 
 		case *ast.FuncDecl:
 			// parse the function items.

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

@@ -10,12 +10,13 @@ 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(
@@ -150,3 +151,78 @@ 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,13 +10,14 @@ 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,11 +10,12 @@ 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.0
+require github.com/gogf/gf/v2 v2.8.2
 
 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 table table_user.
+// TableUserDao is the data access object for the 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 current DAO.
+	group   string           // group is the database configuration group name of the current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for table table_user.
+// TableUserColumns defines and stores column names for the 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 table table_user.
+// tableUserColumns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is internal type for wrapping internal DAO implements.
+// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for table table_user.
-// You can define custom methods on it to extend its functionality as you wish.
+// tableUserDao is the data access object for the table table_user.
+// You can define custom methods on it to extend its functionality as needed.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is globally public accessible object for table table_user operations.
+	// TableUser is a globally accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Fill with you ideas below.
+// Add your custom methods and functionality 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 table table_user.
+// TableUserDao is the data access object for the 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 current DAO.
+	group   string           // group is the database configuration group name of the current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for table table_user.
+// TableUserColumns defines and stores column names for the 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 table table_user.
+// tableUserColumns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is internal type for wrapping internal DAO implements.
+// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for table table_user.
-// You can define custom methods on it to extend its functionality as you wish.
+// tableUserDao is the data access object for the table table_user.
+// You can define custom methods on it to extend its functionality as needed.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is globally public accessible object for table table_user operations.
+	// TableUser is a globally accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Fill with you ideas below.
+// Add your custom methods and functionality 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 table table_user.
+// TableUserDao is the data access object for the 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 current DAO.
+	group   string           // group is the database configuration group name of the current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for table table_user.
+// TableUserColumns defines and stores column names for the table table_user.
 type TableUserColumns struct {
 	Id        string //
 	Passport  string //
@@ -28,7 +28,7 @@ type TableUserColumns struct {
 	UpdatedAt string //
 }
 
-// tableUserColumns holds the columns for table table_user.
+// tableUserColumns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is internal type for wrapping internal DAO implements.
+// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for table table_user.
-// You can define custom methods on it to extend its functionality as you wish.
+// tableUserDao is the data access object for the table table_user.
+// You can define custom methods on it to extend its functionality as needed.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is globally public accessible object for table table_user operations.
+	// TableUser is a globally accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Fill with you ideas below.
+// Add your custom methods and functionality 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 table table_user.
+// TableUserDao is the data access object for the 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 current DAO.
+	group   string           // group is the database configuration group name of the current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for table table_user.
+// TableUserColumns defines and stores column names for the 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 table table_user.
+// tableUserColumns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is internal type for wrapping internal DAO implements.
+// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for table table_user.
-// You can define custom methods on it to extend its functionality as you wish.
+// tableUserDao is the data access object for the table table_user.
+// You can define custom methods on it to extend its functionality as needed.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is globally public accessible object for table table_user operations.
+	// TableUser is a globally accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Fill with you ideas below.
+// Add your custom methods and functionality below.

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

@@ -1,9 +1,9 @@
 module for-gendao-test/pkg
 
-go 1.18
+go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.5.3
+	github.com/gogf/gf/v2 v2.8.1
 	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.14.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.14.0 // indirect
-	go.opentelemetry.io/otel/trace v1.14.0 // 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
 	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/genpbentity/generated/table_user.proto

@@ -11,11 +11,11 @@ option go_package = "unittest";
 import "google/protobuf/timestamp.proto";
 
 message TableUser {
-    uint32                    Id       = 1; // User ID              
-    string                    Passport = 2; // User Passport        
-    string                    Password = 3; // User Password        
-    string                    Nickname = 4; // User Nickname        
-    string                    Score    = 5; // Total score amount.  
-    google.protobuf.Timestamp CreateAt = 6; // Created Time         
-    google.protobuf.Timestamp UpdateAt = 7; // Updated Time         
+    uint32                    Id       = 1; // User ID
+    string                    Passport = 2; // User Passport
+    string                    Password = 3; // User Password
+    string                    Nickname = 4; // User Nickname
+    string                    Score    = 5; // Total score amount.
+    google.protobuf.Timestamp CreateAt = 6; // Created Time
+    google.protobuf.Timestamp UpdateAt = 7; // Updated Time
 }

cmd/gf/internal/cmd/testdata/genpbentity/generated/table_user_snake_screaming.proto

@@ -11,11 +11,11 @@ option go_package = "unittest";
 import "google/protobuf/timestamp.proto";
 
 message TableUser {
-    uint32                    ID        = 1; // User ID              
-    string                    PASSPORT  = 2; // User Passport        
-    string                    PASSWORD  = 3; // User Password        
-    string                    NICKNAME  = 4; // User Nickname        
-    string                    SCORE     = 5; // Total score amount.  
-    google.protobuf.Timestamp CREATE_AT = 6; // Created Time         
-    google.protobuf.Timestamp UPDATE_AT = 7; // Updated Time         
+    uint32                    ID        = 1; // User ID
+    string                    PASSPORT  = 2; // User Passport
+    string                    PASSWORD  = 3; // User Password
+    string                    NICKNAME  = 4; // User Nickname
+    string                    SCORE     = 5; // Total score amount.
+    google.protobuf.Timestamp CREATE_AT = 6; // Created Time
+    google.protobuf.Timestamp UPDATE_AT = 7; // Updated Time
 }

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

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

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

@@ -14,12 +14,13 @@ 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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,14 @@
+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,6 +6,7 @@ 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

@@ -0,0 +1,27 @@
+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,6 +9,7 @@ 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"
 )
 
@@ -17,6 +18,7 @@ func init() {
 }
 
 type sUser struct {
+	base.Base
 }
 
 func New() *sUser {

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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,32 @@
+// ================================================================================
+// 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,6 +10,28 @@ 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)
@@ -22,12 +44,45 @@ 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 (
-	localUser IUser
+	localSuperVipUser ISuperVipUser
+	localUser         IUser
+	localVipUser      IVipUser
 )
 
+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?")
@@ -38,3 +93,14 @@ 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 table user3.
+// User3Dao is the data access object for the 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 current DAO.
+	group   string       // group is the database configuration group name of the current DAO.
 	columns User3Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User3Columns defines and stores column names for table user3.
+// User3Columns defines and stores column names for the 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 table user3.
+// user3Columns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *User3Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *User3Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *User3Dao) Columns() User3Columns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *User3Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 table user4.
+// User4Dao is the data access object for the 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 current DAO.
+	group   string       // group is the database configuration group name of the current DAO.
 	columns User4Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User4Columns defines and stores column names for table user4.
+// User4Columns defines and stores column names for the 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 table user4.
+// user4Columns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *User4Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *User4Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *User4Dao) Columns() User4Columns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *User4Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"/internal"
 )
 
-// internalUser3Dao is internal type for wrapping internal DAO implements.
+// internalUser3Dao is an internal type for wrapping the internal DAO implementation.
 type internalUser3Dao = *internal.User3Dao
 
-// user3Dao is the data access object for table user3.
-// You can define custom methods on it to extend its functionality as you wish.
+// user3Dao is the data access object for the table user3.
+// You can define custom methods on it to extend its functionality as needed.
 type user3Dao struct {
 	internalUser3Dao
 }
 
 var (
-	// User3 is globally public accessible object for table user3 operations.
+	// User3 is a globally accessible object for table user3 operations.
 	User3 = user3Dao{
 		internal.NewUser3Dao(),
 	}
 )
 
-// Fill with you ideas below.
+// Add your custom methods and functionality below.

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

@@ -1,5 +1,5 @@
 // =================================================================================
-// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"/internal"
 )
 
-// internalUser4Dao is internal type for wrapping internal DAO implements.
+// internalUser4Dao is an internal type for wrapping the internal DAO implementation.
 type internalUser4Dao = *internal.User4Dao
 
-// user4Dao is the data access object for table user4.
-// You can define custom methods on it to extend its functionality as you wish.
+// user4Dao is the data access object for the table user4.
+// You can define custom methods on it to extend its functionality as needed.
 type user4Dao struct {
 	internalUser4Dao
 }
 
 var (
-	// User4 is globally public accessible object for table user4 operations.
+	// User4 is a globally accessible object for table user4 operations.
 	User4 = user4Dao{
 		internal.NewUser4Dao(),
 	}
 )
 
-// Fill with you ideas below.
+// Add your custom methods and functionality 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 table user1.
+// User1Dao is the data access object for the 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 current DAO.
+	group   string       // group is the database configuration group name of the current DAO.
 	columns User1Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User1Columns defines and stores column names for table user1.
+// User1Columns defines and stores column names for the 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 table user1.
+// user1Columns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *User1Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *User1Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *User1Dao) Columns() User1Columns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *User1Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 table user2.
+// User2Dao is the data access object for the 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 current DAO.
+	group   string       // group is the database configuration group name of the current DAO.
 	columns User2Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User2Columns defines and stores column names for table user2.
+// User2Columns defines and stores column names for the 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 table user2.
+// user2Columns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *User2Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *User2Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *User2Dao) Columns() User2Columns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *User2Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 table user3.
+// User3Dao is the data access object for the 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 current DAO.
+	group   string       // group is the database configuration group name of the current DAO.
 	columns User3Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User3Columns defines and stores column names for table user3.
+// User3Columns defines and stores column names for the 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 table user3.
+// user3Columns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *User3Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *User3Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *User3Dao) Columns() User3Columns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *User3Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 table user4.
+// User4Dao is the data access object for the 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 current DAO.
+	group   string       // group is the database configuration group name of the current DAO.
 	columns User4Columns // columns contains all the column names of Table for convenient usage.
 }
 
-// User4Columns defines and stores column names for table user4.
+// User4Columns defines and stores column names for the 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 table user4.
+// user4Columns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *User4Dao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *User4Dao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *User4Dao) Columns() User4Columns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *User4Dao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
 // =================================================================================
 
 // I am not overwritten.
@@ -10,20 +10,20 @@ import (
 	"/internal"
 )
 
-// internalUser1Dao is internal type for wrapping internal DAO implements.
+// internalUser1Dao is an internal type for wrapping the internal DAO implementation.
 type internalUser1Dao = *internal.User1Dao
 
-// user1Dao is the data access object for table user1.
-// You can define custom methods on it to extend its functionality as you wish.
+// user1Dao is the data access object for the table user1.
+// You can define custom methods on it to extend its functionality as needed.
 type user1Dao struct {
 	internalUser1Dao
 }
 
 var (
-	// User1 is globally public accessible object for table user1 operations.
+	// User1 is a globally accessible object for table user1 operations.
 	User1 = user1Dao{
 		internal.NewUser1Dao(),
 	}
 )
 
-// Fill with you ideas below.
+// Add your custom methods and functionality below.

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

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

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

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

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

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

cmd/gf/internal/cmd/testdata/issue/3545/table_user.proto

@@ -11,11 +11,11 @@ option go_package = "github.com/gogf/gf/cmd/gf/v2/internal/cmd/api/pbentity";
 import "google/protobuf/timestamp.proto";
 
 message TableUser {
-    uint32                    Id       = 1; // User ID              
-    string                    Passport = 2; // User Passport        
-    string                    Password = 3; // User Password        
-    string                    Nickname = 4; // User Nickname        
-    string                    Score    = 5; // Total score amount.  
-    google.protobuf.Timestamp CreateAt = 6; // Created Time         
-    google.protobuf.Timestamp UpdateAt = 7; // Updated Time         
+    uint32                    Id       = 1; // User ID
+    string                    Passport = 2; // User Passport
+    string                    Password = 3; // User Password
+    string                    Nickname = 4; // User Nickname
+    string                    Score    = 5; // Total score amount.
+    google.protobuf.Timestamp CreateAt = 6; // Created Time
+    google.protobuf.Timestamp UpdateAt = 7; // Updated Time
 }

cmd/gf/internal/cmd/testdata/issue/3685/table_user.proto

@@ -0,0 +1,23 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+syntax = "proto3";
+
+package pbentity;
+
+option go_package = "github.com/gogf/gf/cmd/gf/v2/internal/cmd/api/pbentity";
+
+import "google/protobuf/struct.proto";
+import "google/protobuf/timestamp.proto";
+
+message TableUser {
+    uint32                    Id       = 1; // User ID
+    string                    Passport = 2; // User Passport
+    string                    Password = 3; // User Password
+    string                    Nickname = 4; // User Nickname
+    string                    Score    = 5; // Total score amount.
+    google.protobuf.Value     Data     = 6; // User Data
+    google.protobuf.Timestamp CreateAt = 7; // Created Time
+    google.protobuf.Timestamp UpdateAt = 8; // Updated Time
+}

cmd/gf/internal/cmd/testdata/issue/3685/user.tpl.sql

@@ -0,0 +1,11 @@
+CREATE TABLE `%s` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
+  `passport` varchar(45) NOT NULL COMMENT 'User Passport',
+  `password` varchar(45) NOT NULL COMMENT 'User Password',
+  `nickname` varchar(45) NOT NULL COMMENT 'User Nickname',
+  `score` decimal(10,2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
+  `data` json DEFAULT NULL COMMENT 'User Data',
+  `create_at` datetime DEFAULT NULL COMMENT 'Created Time',
+  `update_at` datetime DEFAULT NULL COMMENT 'Updated Time',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;

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 table table_user.
+// TableUserDao is the data access object for the 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 current DAO.
+	group   string           // group is the database configuration group name of the current DAO.
 	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
 }
 
-// TableUserColumns defines and stores column names for table table_user.
+// TableUserColumns defines and stores column names for the 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 table table_user.
+// tableUserColumns holds the columns for the 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 current DAO.
+// DB retrieves and returns the underlying raw database management object of the current DAO.
 func (dao *TableUserDao) DB() gdb.DB {
 	return g.DB(dao.group)
 }
 
-// Table returns the table name of current dao.
+// Table returns the table name of the current DAO.
 func (dao *TableUserDao) Table() string {
 	return dao.table
 }
 
-// Columns returns all column names of current dao.
+// Columns returns all column names of the current DAO.
 func (dao *TableUserDao) Columns() TableUserColumns {
 	return dao.columns
 }
 
-// Group returns the configuration group name of database of current dao.
+// Group returns the database configuration group name of the current DAO.
 func (dao *TableUserDao) Group() string {
 	return dao.group
 }
 
-// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+// Ctx creates and returns a Model for the current DAO. It automatically sets the context for the 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 rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It rolls back the transaction and returns the error if function f returns a non-nil error.
 // It commits the transaction and returns nil if function f returns nil.
 //
-// Note that, you should not Commit or Rollback the transaction in function f
+// Note: Do not commit or roll back 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 is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// This file is auto-generated by the GoFrame CLI tool. You may modify it as needed.
 // =================================================================================
 
 package dao
@@ -8,20 +8,20 @@ import (
 	"for-gendao-test/pkg/dao/internal"
 )
 
-// internalTableUserDao is internal type for wrapping internal DAO implements.
+// internalTableUserDao is an internal type for wrapping the internal DAO implementation.
 type internalTableUserDao = *internal.TableUserDao
 
-// tableUserDao is the data access object for table table_user.
-// You can define custom methods on it to extend its functionality as you wish.
+// tableUserDao is the data access object for the table table_user.
+// You can define custom methods on it to extend its functionality as needed.
 type tableUserDao struct {
 	internalTableUserDao
 }
 
 var (
-	// TableUser is globally public accessible object for table table_user operations.
+	// TableUser is a globally accessible object for table table_user operations.
 	TableUser = tableUserDao{
 		internal.NewTableUserDao(),
 	}
 )
 
-// Fill with you ideas below.
+// Add your custom methods and functionality below.

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

@@ -4,6 +4,7 @@ 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

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

cmd/gf/main.go

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

container/garray/garray_z_example_normal_any_test.go

@@ -9,10 +9,9 @@ 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,10 +9,9 @@ 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,10 +10,9 @@ 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,10 +9,9 @@ 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,10 +12,9 @@ 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,10 +12,9 @@ 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,10 +13,9 @@ 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,10 +13,9 @@ 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,10 +12,9 @@ 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"