refract(os/gtime): swap function names between Format and Layout (#4275)

.github/workflows/ci-main.yml

@@ -8,6 +8,7 @@ on:
     - master
     - develop
     - personal/**
+    - feat/**
     - feature/**
     - enhance/**
     - fix/**
@@ -17,16 +18,10 @@ on:
     - master
     - develop
     - personal/**
+    - feat/**
     - feature/**
     - enhance/**
     - fix/**
-  workflow_dispatch:
-    inputs:
-      debug:
-        type: boolean
-        description: 'Enable tmate Debug'
-        required: false
-        default: false
 
 # This allows a subsequently queued workflow run to interrupt previous runs
 concurrency:
@@ -36,7 +31,7 @@ concurrency:
 env:
   TZ: "Asia/Shanghai"
   # for unit testing cases of some components that only execute on the latest go version.
-  LATEST_GO_VERSION: "1.25"
+  LATEST_GO_VERSION: "1.23"
 
 jobs:
   code-test:
@@ -45,8 +40,9 @@ jobs:
         # 🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥
         # When adding new go version to the list, make sure:
         # 1. Update the `LATEST_GO_VERSION` env variable.
+        # 2. Update the `Report Coverage` action.
         # 🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥
-        go-version: [ "1.23", "1.24", "1.25" ]
+        go-version: [ "1.22", "1.23" ]
         goarch: [ "386", "amd64" ]
 
     runs-on: ubuntu-latest
@@ -54,9 +50,9 @@ jobs:
     # Service containers to run with `code-test`
     services:
       # Etcd service.
-      # docker run -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes bitnamilegacy/etcd:3.4.24
+      # docker run -d --name etcd -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes bitnami/etcd:3.4.24
       etcd:
-        image: bitnamilegacy/etcd:3.4.24
+        image: bitnami/etcd:3.4.24
         env:
           ALLOW_NONE_AUTHENTICATION: yes
         ports:
@@ -75,7 +71,7 @@ jobs:
           - 6379:6379
 
       # MySQL backend server.
-      # docker run \
+      # docker run -d --name mysql \
       # -p 3306:3306 \
       # -e MYSQL_DATABASE=test \
       # -e MYSQL_ROOT_PASSWORD=12345678 \
@@ -89,7 +85,7 @@ jobs:
           - 3306:3306
 
       # MariaDb backend server.
-      # docker run \
+      # docker run -d --name mariadb \
       # -p 3307:3306 \
       # -e MYSQL_DATABASE=test \
       # -e MYSQL_ROOT_PASSWORD=12345678 \
@@ -103,7 +99,7 @@ jobs:
           - 3307:3306
 
       # PostgreSQL backend server.
-      # docker run \
+      # docker run -d --name postgres \
       # -p 5432:5432 \
       # -e POSTGRES_PASSWORD=12345678 \
       # -e POSTGRES_USER=postgres \
@@ -150,7 +146,7 @@ jobs:
           --health-retries 10
 
       # ClickHouse backend server.
-      # docker run \
+      # docker run -d --name clickhouse \
       # -p 9000:9000 -p 8123:8123 -p 9001:9001 \
       # clickhouse/clickhouse-server:24.11.1.2557-alpine
       clickhouse-server:
@@ -161,7 +157,7 @@ jobs:
           - 9001:9001
 
       # Polaris backend server.
-      # docker run \
+      # docker run -d --name polaris \
       # -p 8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091 \
       # polarismesh/polaris-standalone:v1.17.2
       polaris:
@@ -198,17 +194,6 @@ jobs:
         ports:
           - 5236:5236
 
-      # openGauss server
-      # docker run --privileged=true -e GS_PASSWORD=UTpass@1234 -p 9950:5432 opengauss/opengauss:7.0.0-RC1.B023
-      gaussdb:
-        image: opengauss/opengauss:7.0.0-RC1.B023
-        env:
-          GS_PASSWORD: UTpass@1234
-          TZ: Asia/Shanghai
-        ports:
-          - 9950:5432
-
-
       zookeeper:
         image: zookeeper:3.8
         ports:
@@ -223,20 +208,7 @@ jobs:
         timezoneLinux: "Asia/Shanghai"
 
     - name: Checkout Repository
-      uses: actions/checkout@v5
-
-    - name: Setup tmate Session
-      uses: mxschmitt/action-tmate@v3
-      if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug }}
-      with:
-        detached: true
-        limit-access-to-actor: false
-
-    - name: Free Disk Space
-      run: |
-        df -h /
-        sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/hostedtoolcache/CodeQL /opt/hostedtoolcache/Python || true
-        df -h /
+      uses: actions/checkout@v4
 
     - name: Start Apollo Containers
       run:  docker compose -f ".github/workflows/apollo/docker-compose.yml" up -d --build
@@ -257,9 +229,9 @@ jobs:
         cache-dependency-path: '**/go.sum'
 
     - name: Install Protoc
-      uses: arduino/setup-protoc@v3
+      uses: arduino/setup-protoc@v2
       with:
-        version: "31.x"
+        version: "29.x"
         repo-token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install the protocol compiler plugins for Go
@@ -293,8 +265,8 @@ jobs:
 
     - name: Report Coverage
       uses: codecov/codecov-action@v4
-      # Only report coverage on the latest go version
-      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.go-version == env.LATEST_GO_VERSION }}
+      # Only report coverage on the latest go version and amd64 arch
+      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.go-version == '1.23' && matrix.goarch == 'amd64' }}
       with:
         flags: go-${{ matrix.go-version }}-${{ matrix.goarch }}
         token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci-sub.yml

@@ -30,7 +30,7 @@ concurrency:
 env:
   TZ: "Asia/Shanghai"
   # for unit testing cases of some components that only execute on the latest go version.
-  LATEST_GO_VERSION: "1.25"
+  LATEST_GO_VERSION: "1.23"
 
 jobs:
   code-test:
@@ -40,7 +40,7 @@ jobs:
         # When adding new go version to the list, make sure:
         # 1. Update the `LATEST_GO_VERSION` env variable.
         # 🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥
-        go-version: [ "1.23", "1.24", "1.25" ]
+        go-version: [ "1.22", "1.23" ]
         goarch: [ "386", "amd64" ]
 
     runs-on: ubuntu-latest
@@ -52,7 +52,7 @@ jobs:
         timezoneLinux: "Asia/Shanghai"
 
     - name: Checkout Repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4
 
     - name: Start Minikube
       uses: medyagh/setup-minikube@master

.github/workflows/codeql.yml

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

.github/workflows/format-code-on-push.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Setup Golang ${{ matrix.go-version }}
         uses: actions/setup-go@v5
         with:
@@ -28,7 +28,7 @@ jobs:
           -s blank \
           -s default \
           -s dot \
-          -s "prefix(github.com/gogf/gf/v2)" \
+          -s "prefix(github.com/gogf/gf/v3)" \
           -s "prefix(github.com/gogf/gf/cmd)" \
           -s "prefix(github.com/gogf/gf/contrib)" \
           -s "prefix(github.com/gogf/gf/example)" \

.github/workflows/gitee-sync.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Mirror GitHub to Gitee
         uses: Yikun/hub-mirror-action@v1.4
         with:

.github/workflows/golangci-lint.yml

@@ -4,7 +4,7 @@
 # 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
+name: GolangCI Lint
 on:
   push:
     branches:
@@ -29,24 +29,23 @@ jobs:
   golang-ci:
     strategy:
       matrix:
-        go-version: [ "stable" ]
+        go-version: [ 'stable' ]
 
     name: golang-ci-lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 0
+        uses: actions/checkout@v4
       - name: Setup Golang ${{ matrix.go-version }}
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
       - name: golang-ci-lint
-        uses: golangci/golangci-lint-action@v8
+        uses: golangci/golangci-lint-action@v6
         with:
           # Required: specify the golangci-lint version without the patch version to always use the latest patch.
+          version: v1.64.5
           only-new-issues: true
           skip-cache: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          args: --config=.golangci.yml -v
+          args: --timeout 3m0s --config=.golangci.yml -v

.github/workflows/release.yml

@@ -16,13 +16,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Github Code
-        uses: actions/checkout@v5
-
+        uses: actions/checkout@v4
+      
       - name: Set Up Golang Environment
         uses: actions/setup-go@v5
         with:
-          go-version: 1.25
-          cache: false
+          go-version: 1.23.4
       
       - name: Build CLI Binary
         run: |
@@ -35,7 +34,7 @@ jobs:
       - name: Build CLI Binary For All Platform
         run: |
           cd cmd/gf
-          gf build main.go -n gf -a all -s linux,windows,darwin,freebsd,netbsd,openbsd -p temp
+          gf build main.go -n gf -a all -s all -p temp
 
       - name: Move Files Before Release
         run: |
@@ -53,7 +52,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name:     ${{ github.ref }}
-          name: GoFrame Release ${{ github.ref_name }}
+          name: GoFrame Release ${{ github.ref }}
           draft:        false
           prerelease:   false
       

.github/workflows/scorecard.yml

@@ -1,80 +0,0 @@
-# This workflow uses actions that are not certified by GitHub. They are provided
-# by a third-party and are governed by separate terms of service, privacy
-# policy, and support documentation.
-
-name: Scorecard supply-chain security
-on:
-  # For Branch-Protection check. Only the default branch is supported. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
-  branch_protection_rule:
-  # To guarantee Maintained check is occasionally updated. See
-  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: '0 21 * * *'
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecard analysis
-    runs-on: ubuntu-latest
-    # `publish_results: true` only works when run from the default branch. conditional can be removed if disabled.
-    if: github.event.repository.default_branch == github.ref_name || github.event_name == 'pull_request'
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Needed to publish results and get a badge (see publish_results below).
-      id-token: write
-      # Uncomment the permissions below if installing in a private repository.
-      # contents: read
-      # actions: read
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4.2.2
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.4.1
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
-          # - you want to enable the Branch-Protection check on a *public* repository, or
-          # - you are installing Scorecard on a *private* repository
-          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
-          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
-
-          # Public repositories:
-          #   - Publish results to OpenSSF REST API for easy access by consumers
-          #   - Allows the repository to include the Scorecard badge.
-          #   - See https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories:
-          #   - `publish_results` will always be set to `false`, regardless
-          #     of the value entered here.
-          publish_results: true
-
-          # (Optional) Uncomment file_mode if you have a .gitattributes with files marked export-ignore
-          # file_mode: git
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@v4.6.1
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard (optional).
-      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: results.sarif

.github/workflows/scripts/before_script.sh

@@ -21,7 +21,7 @@ gci write \
       -s blank \
       -s default \
       -s dot \
-      -s "prefix(github.com/gogf/gf/v2)" \
+      -s "prefix(github.com/gogf/gf/v3)" \
       -s "prefix(github.com/gogf/gf/cmd)" \
       -s "prefix(github.com/gogf/gf/contrib)" \
       -s "prefix(github.com/gogf/gf/example)" \

.github/workflows/scripts/ci-main-clean.sh

@@ -1,250 +0,0 @@
-#!/usr/bin/env bash
-
-dirpath=$1
-
-# Extract the base directory name for pattern matching
-if [ -n "$dirpath" ]; then
-    dirname=$(basename "$dirpath")
-    echo "Cleaning Docker resources for path: $dirpath (pattern: $dirname)"
-    df -h /
-    
-    # Process containers and images based on the directory
-    case "$dirname" in
-        # "mysql")
-        #     echo "Cleaning mysql resources..."
-        #     containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-        #     if [ -n "$containers" ]; then
-        #         echo "Stopping and removing mysql containers..."
-        #         docker stop $containers 2>/dev/null || true
-        #         docker rm -f $containers 2>/dev/null || true
-        #     fi
-        #     docker rmi -f $(docker images -q mysql 2>/dev/null) 2>/dev/null || true
-        #     ;;
-        "mssql")
-            echo "Cleaning mssql resources..."
-            containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-            if [ -n "$containers" ]; then
-                echo "Stopping and removing mssql containers..."
-                docker stop $containers 2>/dev/null || true
-                docker rm -f $containers 2>/dev/null || true
-            fi
-            docker rmi -f $(docker images -q mcr.microsoft.com/mssql/server 2>/dev/null) 2>/dev/null || true
-        ;;
-        "pgsql")
-            echo "Cleaning postgres resources..."
-            containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-            if [ -n "$containers" ]; then
-                echo "Stopping and removing postgres containers..."
-                docker stop $containers 2>/dev/null || true
-                docker rm -f $containers 2>/dev/null || true
-            fi
-            docker rmi -f $(docker images -q postgres 2>/dev/null) 2>/dev/null || true
-        ;;
-        "oracle")
-            echo "Cleaning oracle resources..."
-            containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-            if [ -n "$containers" ]; then
-                echo "Stopping and removing oracle containers..."
-                docker stop $containers 2>/dev/null || true
-                docker rm -f $containers 2>/dev/null || true
-            fi
-            docker rmi -f $(docker images -q loads/oracle-xe-11g-r2 2>/dev/null) 2>/dev/null || true
-        ;;
-        "dm")
-            echo "Cleaning dm resources..."
-            containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-            if [ -n "$containers" ]; then
-                echo "Stopping and removing dm containers..."
-                docker stop $containers 2>/dev/null || true
-                docker rm -f $containers 2>/dev/null || true
-            fi
-            docker rmi -f $(docker images -q loads/dm 2>/dev/null) 2>/dev/null || true
-        ;;
-        "clickhouse")
-            echo "Cleaning clickhouse resources..."
-            containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-            if [ -n "$containers" ]; then
-                echo "Stopping and removing clickhouse containers..."
-                docker stop $containers 2>/dev/null || true
-                docker rm -f $containers 2>/dev/null || true
-            fi
-            docker rmi -f $(docker images -q clickhouse/clickhouse-server 2>/dev/null) 2>/dev/null || true
-        ;;
-        # "redis")
-        #     echo "Cleaning redis resources..."
-        #     containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-        #     if [ -n "$containers" ]; then
-        #         echo "Stopping and removing redis containers..."
-        #         docker stop $containers 2>/dev/null || true
-        #         docker rm -f $containers 2>/dev/null || true
-        #     fi
-        #     docker rmi -f $(docker images -q redis loads/redis loads/redis-sentinel 2>/dev/null) 2>/dev/null || true
-        #     ;;
-        "etcd")
-            echo "Cleaning etcd resources..."
-            containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-            if [ -n "$containers" ]; then
-                echo "Stopping and removing etcd containers..."
-                docker stop $containers 2>/dev/null || true
-                docker rm -f $containers 2>/dev/null || true
-            fi
-            docker rmi -f $(docker images -q bitnamilegacy/etcd 2>/dev/null) 2>/dev/null || true
-        ;;
-        # "consul")
-        #     echo "Cleaning consul resources..."
-        #     containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-        #     if [ -n "$containers" ]; then
-        #         echo "Stopping and removing consul containers..."
-        #         docker stop $containers 2>/dev/null || true
-        #         docker rm -f $containers 2>/dev/null || true
-        #     fi
-        #     docker rmi -f $(docker images -q consul 2>/dev/null) 2>/dev/null || true
-        #     ;;
-        # "nacos")
-        #     echo "Cleaning nacos resources..."
-        #     containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-        #     if [ -n "$containers" ]; then
-        #         echo "Stopping and removing nacos containers..."
-        #         docker stop $containers 2>/dev/null || true
-        #         docker rm -f $containers 2>/dev/null || true
-        #     fi
-        #     docker rmi -f $(docker images -q nacos/nacos-server 2>/dev/null) 2>/dev/null || true
-        #     ;;
-        # "polaris")
-        #     echo "Cleaning polaris resources..."
-        #     containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-        #     if [ -n "$containers" ]; then
-        #         echo "Stopping and removing polaris containers..."
-        #         docker stop $containers 2>/dev/null || true
-        #         docker rm -f $containers 2>/dev/null || true
-        #     fi
-        #     docker rmi -f $(docker images -q polarismesh/polaris-standalone 2>/dev/null) 2>/dev/null || true
-        #     ;;
-        "zookeeper")
-            echo "Cleaning zookeeper resources..."
-            containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-            if [ -n "$containers" ]; then
-                echo "Stopping and removing zookeeper containers..."
-                docker stop $containers 2>/dev/null || true
-                docker rm -f $containers 2>/dev/null || true
-            fi
-            docker rmi -f $(docker images -q zookeeper 2>/dev/null) 2>/dev/null || true
-        ;;
-        # "apollo")
-        #     echo "Cleaning apollo resources..."
-        #     containers=$(docker ps -aq --filter "name=$dirname" 2>/dev/null)
-        #     if [ -n "$containers" ]; then
-        #         echo "Stopping and removing apollo containers..."
-        #         docker stop $containers 2>/dev/null || true
-        #         docker rm -f $containers 2>/dev/null || true
-        #     fi
-        #     docker rmi -f $(docker images -q loads/apollo-quick-start 2>/dev/null) 2>/dev/null || true
-        #     ;;
-        *)
-            # No matching pattern, skip cleanup
-            echo "No specific Docker cleanup rule for '$dirname', skipping cleanup"
-        ;;
-    esac
-    
-    # Remove dangling images and volumes to free up space
-    echo "Removing dangling images and unused volumes..."
-    docker image prune -f 2>/dev/null || true
-    docker volume prune -f 2>/dev/null || true
-    
-    echo "Docker cleanup completed for $dirname"
-    docker system df
-    df -h /
-fi
-
-# df -h /
-# Filesystem      Size  Used Avail Use% Mounted on
-# /dev/root        72G   67G  5.4G  93% /
-# tmpfs           7.9G   84K  7.9G   1% /dev/shm
-# tmpfs           3.2G  2.6M  3.2G   1% /run
-# tmpfs           5.0M     0  5.0M   0% /run/lock
-# /dev/sdb16      881M   62M  758M   8% /boot
-# /dev/sdb15      105M  6.2M   99M   6% /boot/efi
-# /dev/sda1        74G  4.1G   66G   6% /mnt
-# tmpfs           1.6G   12K  1.6G   1% /run/user/1001
-
-# runner@runnervmg1sw1:~/work/gf/gf$ docker system df
-# TYPE            TOTAL     ACTIVE    SIZE      RECLAIMABLE
-# Images          18        11        8.326GB   1.644GB (19%)
-# Containers      11        11        2.692GB   0B (0%)
-# Local Volumes   11        8         665.7MB   211.9MB (31%)
-# Build Cache     0         0         0B        0B
-
-# runner@runnervmg1sw1:~/work/gf/gf$ docker images
-# REPOSITORY                       TAG                               IMAGE ID       CREATED         SIZE
-# alpine/curl                      latest                            99fd43792a61   2 days ago      13.5MB
-# postgres                         17-alpine                         b6bf692a8125   9 days ago      278MB
-# zookeeper                        3.8                               2f26c02b94ca   10 days ago     306MB
-# mariadb                          11.4                              063fb6684f96   10 days ago     332MB
-# mcr.microsoft.com/mssql/server   2022-latest                       a2fbff321505   4 weeks ago     1.61GB
-# clickhouse/clickhouse-server     24.11.1.2557-alpine               2eee9fd3ae74   12 months ago   539MB
-# redis                            7.0                               7705dd2858c1   18 months ago   109MB
-# consul                           1.15                              686495461132   20 months ago   155MB
-# mysql                            5.7                               5107333e08a8   23 months ago   501MB
-# polarismesh/polaris-standalone   v1.17.2                           b7a8cf0a8438   2 years ago     545MB
-# bitnamilegacy/etcd               3.4.24                            74ae5e205ac5   2 years ago     134MB
-# nacos/nacos-server               v2.1.2                            a978644d9246   2 years ago     1.06GB
-# loads/redis                      7.0-sentinel                      6f12d40540ba   3 years ago     114MB
-# loads/dm                         v8.1.2.128_ent_x86_64_ctm_pack4   ccb727ce9dce   3 years ago     432MB
-# loads/redis-sentinel             7.0                               6818c626f5ca   3 years ago     104MB
-# loads/apollo-quick-start         latest                            8490de672148   3 years ago     190MB
-# alpine                           3.8                               c8bccc0af957   5 years ago     4.41MB
-# loads/oracle-xe-11g-r2           11.2.0                            0d19fd2e072e   6 years ago     2.1GB
-
-# runner@runnervmg1sw1:~/work/gf/gf$ docker ps -s
-# CONTAINER ID   IMAGE                                              COMMAND                  CREATED         STATUS                   PORTS                                                                                                                                                                                                                         NAMES                                                                               SIZE
-# 8214f83420c6   zookeeper:3.8                                      "/docker-entrypoint.…"   6 minutes ago   Up 6 minutes             2888/tcp, 3888/tcp, 0.0.0.0:2181->2181/tcp, [::]:2181->2181/tcp, 8080/tcp                                                                                                                                                     d66bac92ae9646f688f70ed4b5176f14_zookeeper38_3a22ef                                 33kB (virtual 306MB)
-# 8938d73842e8   loads/dm:v8.1.2.128_ent_x86_64_ctm_pack4           "/bin/bash /opt/star…"   6 minutes ago   Up 6 minutes             0.0.0.0:5236->5236/tcp, [::]:5236->5236/tcp                                                                                                                                                                                   ca280fbdb86f40c2acf86d7d526c6285_loadsdmv812128_ent_x86_64_ctm_pack4_770a59         844MB (virtual 1.28GB)
-# 0d3a653fe1f2   loads/oracle-xe-11g-r2:11.2.0                      "/bin/sh -c '/usr/sb…"   6 minutes ago   Up 6 minutes             22/tcp, 8080/tcp, 0.0.0.0:1521->1521/tcp, [::]:1521->1521/tcp                                                                                                                                                                 2048856d428c4967b1c35193eb8c9192_loadsoraclexe11gr21120_295d54                      1.3GB (virtual 3.4GB)
-# ca3936189166   polarismesh/polaris-standalone:v1.17.2             "/bin/bash run.sh"       6 minutes ago   Up 6 minutes             0.0.0.0:8090-8091->8090-8091/tcp, [::]:8090-8091->8090-8091/tcp, 8080/tcp, 8100-8101/tcp, 0.0.0.0:8093->8093/tcp, [::]:8093->8093/tcp, 8761/tcp, 15010/tcp, 0.0.0.0:9090-9091->9090-9091/tcp, [::]:9090-9091->9090-9091/tcp   cbd43dceef754e2d8aab507e33167be7_polarismeshpolarisstandalonev1172_ca40b6           299MB (virtual 844MB)
-# 26169dad485e   clickhouse/clickhouse-server:24.11.1.2557-alpine   "/entrypoint.sh"         6 minutes ago   Up 6 minutes             0.0.0.0:8123->8123/tcp, [::]:8123->8123/tcp, 0.0.0.0:9000-9001->9000-9001/tcp, [::]:9000-9001->9000-9001/tcp, 9009/tcp                                                                                                        f1c7766fbe36401792a6f735d7acf123_clickhouseclickhouseserver241112557alpine_cfc034   338kB (virtual 539MB)
-# 04689a1d581f   mcr.microsoft.com/mssql/server:2022-latest         "/opt/mssql/bin/laun…"   6 minutes ago   Up 6 minutes (healthy)   0.0.0.0:1433->1433/tcp, [::]:1433->1433/tcp                                                                                                                                                                                   41d685349a7640b28230db8d0f60efe7_mcrmicrosoftcommssqlserver2022latest_fe29fb        108MB (virtual 1.72GB)
-# d5fbc5f811af   postgres:17-alpine                                 "docker-entrypoint.s…"   6 minutes ago   Up 6 minutes (healthy)   0.0.0.0:5432->5432/tcp, [::]:5432->5432/tcp                                                                                                                                                                                   2783be71b5ce417ab9a31428e7b4d8f2_postgres17alpine_c60840                            63B (virtual 278MB)
-# da96a7ad7a01   mariadb:11.4                                       "docker-entrypoint.s…"   7 minutes ago   Up 7 minutes             0.0.0.0:3307->3306/tcp, [::]:3307->3306/tcp                                                                                                                                                                                   45eed646fa6c4a698893ee11cda95a4c_mariadb114_3a9cd6                                  2B (virtual 332MB)
-# 27ba1904ba3a   mysql:5.7                                          "docker-entrypoint.s…"   7 minutes ago   Up 7 minutes             0.0.0.0:3306->3306/tcp, [::]:3306->3306/tcp, 33060/tcp                                                                                                                                                                        ea6d7a4c207d427a95b5ae0db91fdf56_mysql57_c21053                                     4B (virtual 501MB)
-# 518e785d1bb6   redis:7.0                                          "docker-entrypoint.s…"   7 minutes ago   Up 7 minutes (healthy)   0.0.0.0:6379->6379/tcp, [::]:6379->6379/tcp                                                                                                                                                                                   af6044fc849e441bbc6c48f7a5ec5fec_redis70_b11994                                     0B (virtual 109MB)
-# 7495ec2cd8e3   bitnamilegacy/etcd:3.4.24                          "/opt/bitnami/script…"   7 minutes ago   Up 7 minutes             0.0.0.0:2379->2379/tcp, [::]:2379->2379/tcp, 2380/tcp                                                                                                                                                                         49f2a2a6bf3a4fae842cc950bbc3658a_bitnamilegacyetcd3424_1265e1                       145MB (virtual 279MB)
-
-# runner@runnervmg1sw1:~/work/gf/gf$ du -ah --max-depth=1 /usr | sort -n
-# 4.0K    /usr/games
-# 4.0K    /usr/lib64
-# 6.6G    /usr/lib
-# 9.3G    /usr/share
-# 15M     /usr/lib32
-# 24G     /usr/local
-# 41G     /usr
-# 95M     /usr/sbin
-# 156M    /usr/include
-# 158M    /usr/src
-# 402M    /usr/libexec
-# 841M    /usr/bin
-
-# runner@runnervmg1sw1:~/work/gf/gf$ du -ah --max-depth=1 /opt | sort -n                                                                        
-# 4.0K    /opt/pipx_bin
-# 5.8G    /opt/hostedtoolcache
-# 8.5G    /opt
-# 12K     /opt/containerd
-# 14M     /opt/hca
-# 16K     /opt/post-generation
-# 217M    /opt/runner-cache
-# 243M    /opt/actionarchivecache
-# 374M    /opt/google
-# 515M    /opt/pipx
-# 655M    /opt/az
-# 783M    /opt/microsoft
-
-# runner@runnervmg1sw1:~/work/gf/gf$ du -ah --max-depth=1 /opt/hostedtoolcache/ | sort -n
-# 1.1G    /opt/hostedtoolcache/go
-# 1.6G    /opt/hostedtoolcache/CodeQL
-# 1.9G    /opt/hostedtoolcache/Python
-# 5.8G    /opt/hostedtoolcache/
-# 9.9M    /opt/hostedtoolcache/protoc
-# 24K     /opt/hostedtoolcache/Java_Temurin-Hotspot_jdk
-# 217M    /opt/hostedtoolcache/Ruby
-# 520M    /opt/hostedtoolcache/PyPy
-# 574M    /opt/hostedtoolcache/node
-

.github/workflows/scripts/ci-main.sh

@@ -2,58 +2,65 @@
 
 coverage=$1
 
+# update code of submodules
+git clone https://github.com/gogf/examples
+
+# update go.mod in examples directory to replace github.com/gogf/gf packages with local directory
+bash .github/workflows/scripts/replace_examples_gomod.sh
+
 # find all path that contains go.mod.
 for file in `find . -name go.mod`; do
     dirpath=$(dirname $file)
     echo $dirpath
-    
-    # package kubecm was moved to sub ci procedure.
+
+    # ignore mssql tests as its docker service failed
+    # TODO remove this ignoring codes after the mssql docker service OK
+    if [ "mssql" = $(basename $dirpath) ]; then
+        continue 1
+    fi
+
+    # package kuhecm was moved to sub ci procedure.
     if [ "kubecm" = $(basename $dirpath) ]; then
         continue 1
     fi
-    
-    # examples directory was moved to sub ci procedure.
-    if [[ $dirpath =~ "/examples/" ]]; then
-        continue 1
+
+    # Check if it's a contrib directory or examples directory
+    if [[ $dirpath =~ "/contrib/" ]] || [[ $dirpath =~ "/examples/" ]]; then
+        # Check if go version meets the requirement
+        if ! go version | grep -qE "go${LATEST_GO_VERSION}"; then
+            echo "ignore path $dirpath as go version is not ${LATEST_GO_VERSION}: $(go version)"
+            continue 1
+        fi
+        # If it's examples directory, only build without tests
+        if [[ $dirpath =~ "/examples/" ]]; then
+            echo "the examples directory only needs to be built, not unit tests and coverage tests."
+            cd $dirpath
+            go mod tidy
+            go build ./...
+            cd -
+            continue 1
+        fi
     fi
-    
+
     if [[ $file =~ "/testdata/" ]]; then
         echo "ignore testdata path $file"
         continue 1
     fi
-    
-    # Check if it's a contrib directory
-    if [[ $dirpath =~ "/contrib/" ]]; then
-        # Check if go version meets the requirement
-        if ! go version | grep -qE "go${LATEST_GO_VERSION}"; then
-            echo "ignore path $dirpath as go version is not ${LATEST_GO_VERSION}: $(go version)"
-            # clean docker containers and images to free disk space
-            # bash .github/workflows/scripts/ci-main-clean.sh "$dirpath"
-            continue 1
-        fi
-    fi
-    
-    # if [[ $dirpath = "." ]]; then
-    #     # No space left on device error sometimes occurs in CI pipelines, so clean the cache before tests.
-    #     go clean -cache
-    # fi
-    
+
     cd $dirpath
     go mod tidy
     go build ./...
-    
+
     # test with coverage
     if [ "${coverage}" = "coverage" ]; then
-        go test ./... -count=1 -race -coverprofile=coverage.out -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1
-        
-        if grep -q "/gogf/gf/.*/v2" go.mod; then
-            sed -i "s/gogf\/gf\(\/.*\)\/v2/gogf\/gf\/v2\1/g" coverage.out
-        fi
+      go test ./... -race -coverprofile=coverage.out -covermode=atomic -coverpkg=./...,github.com/gogf/gf/... || exit 1
+
+      if grep -q "/gogf/gf/.*/v3" go.mod; then
+        sed -i "s/gogf\/gf\(\/.*\)\/v3/gogf\/gf\/v3\1/g" coverage.out
+      fi
     else
-        go test ./... -count=1 -race || exit 1
+      go test ./... -race || exit 1
     fi
-    
+
     cd -
-    # clean docker containers and images to free disk space
-    # bash .github/workflows/scripts/ci-main-clean.sh "$dirpath"
 done

.github/workflows/scripts/ci-sub.sh

@@ -2,85 +2,26 @@
 
 coverage=$1
 
-# update code of submodules
-git clone https://github.com/gogf/examples
-
-# update go.mod in examples directory to replace github.com/gogf/gf packages with local directory
-bash .github/workflows/scripts/replace_examples_gomod.sh
-
-# Function to compare version numbers
-version_compare() {
-    local ver1=$1
-    local ver2=$2
-    
-    # Remove 'go' prefix and 'v' if present
-    ver1=$(echo "$ver1" | sed 's/^go//; s/^v//')
-    ver2=$(echo "$ver2" | sed 's/^go//; s/^v//')
-    
-    # Split versions into major.minor format
-    local major1=$(echo "$ver1" | cut -d. -f1)
-    local minor1=$(echo "$ver1" | cut -d. -f2)
-    local major2=$(echo "$ver2" | cut -d. -f1)
-    local minor2=$(echo "$ver2" | cut -d. -f2)
-    
-    # Compare versions: return 0 if ver1 <= ver2, 1 otherwise
-    if [ "$major1" -lt "$major2" ]; then
-        return 0
-    elif [ "$major1" -eq "$major2" ] && [ "$minor1" -le "$minor2" ]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-# Get current Go version
-current_go_version=$(go version | grep -oE 'go[0-9]+\.[0-9]+')
-
 # find all path that contains go.mod.
 for file in `find . -name go.mod`; do
     dirpath=$(dirname $file)
-    echo "Processing: $dirpath"
+    echo $dirpath
 
-    # Only process examples and kubecm directories  
-
-    # Process examples directory (only build, no tests)
-    if [[ $dirpath =~ "/examples/" ]]; then
-        echo "  the examples directory only needs to be built, not unit tests."
-        cd $dirpath
-        go mod tidy
-        go build ./...
-        cd -
-        continue 1
-    fi
-    
-    # Process kubecm directory
-    if [ "kubecm" != $(basename $dirpath) ]; then
-        echo "  Skipping: not kubecm directory"
-        continue
+    # package kuhecm needs golang >= v1.19
+    if [ "kubecm" = $(basename $dirpath) ]; then
+        if ! go version|grep -qE "go1.[2-9][0-9]"; then
+          echo "ignore kubecm as go version: $(go version)"
+          continue 1
+        fi
+    else
+      continue 1
     fi
 
     cd $dirpath
 
-    # Read Go version requirement from go.mod
-    if [ -f "go.mod" ]; then
-        go_mod_version=$(grep '^go ' go.mod | awk '{print $2}' | head -1)
-        
-        if [ -n "$go_mod_version" ]; then
-            echo "  go.mod requires: go$go_mod_version"
-            echo "  current version: $current_go_version"
-            
-            # Check if go.mod version requirement is satisfied by current Go version
-            if version_compare "$go_mod_version" "$current_go_version"; then
-                echo "  ✓ Version requirement satisfied, proceeding with build and test"
-                
-                go mod tidy
-                go build ./...
-                go test ./... -race || exit 1
-            else
-                echo "  ✗ Current Go version ($current_go_version) does not meet requirement (go$go_mod_version), skipping"
-            fi
-        fi
-    fi
+    go mod tidy
+    go build ./...
+    go test ./... -race || exit 1
 
     cd -
 done

.github/workflows/scripts/docker-services.sh

@@ -1,785 +0,0 @@
-#!/usr/bin/env bash
-#
-# GoFrame Docker Services Manager
-# For managing Docker services used in local development and testing
-#
-
-set -e
-
-# Container name prefix
-PREFIX="goframe"
-
-# Color definitions
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-CYAN='\033[0;36m'
-NC='\033[0m' # No Color
-
-# Service definitions
-declare -A SERVICES
-declare -A SERVICE_PORTS
-declare -A SERVICE_ENVS
-declare -A SERVICE_OPTS
-
-# Basic services
-SERVICES["etcd"]="bitnamilegacy/etcd:3.4.24"
-SERVICE_PORTS["etcd"]="2379:2379"
-SERVICE_ENVS["etcd"]="-e ALLOW_NONE_AUTHENTICATION=yes"
-
-SERVICES["redis"]="redis:7.0"
-SERVICE_PORTS["redis"]="6379:6379"
-SERVICE_OPTS["redis"]="--health-cmd 'redis-cli ping' --health-interval 10s --health-timeout 5s --health-retries 5"
-
-SERVICES["mysql"]="mysql:5.7"
-SERVICE_PORTS["mysql"]="3306:3306"
-SERVICE_ENVS["mysql"]="-e MYSQL_DATABASE=test -e MYSQL_ROOT_PASSWORD=12345678"
-
-SERVICES["mariadb"]="mariadb:11.4"
-SERVICE_PORTS["mariadb"]="3307:3306"
-SERVICE_ENVS["mariadb"]="-e MARIADB_DATABASE=test -e MARIADB_ROOT_PASSWORD=12345678"
-
-SERVICES["postgres"]="postgres:17-alpine"
-SERVICE_PORTS["postgres"]="5432:5432"
-SERVICE_ENVS["postgres"]="-e POSTGRES_PASSWORD=12345678 -e POSTGRES_USER=postgres -e POSTGRES_DB=test -e TZ=Asia/Shanghai"
-SERVICE_OPTS["postgres"]="--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5"
-
-SERVICES["mssql"]="mcr.microsoft.com/mssql/server:2022-latest"
-SERVICE_PORTS["mssql"]="1433:1433"
-SERVICE_ENVS["mssql"]="-e TZ=Asia/Shanghai -e ACCEPT_EULA=Y -e MSSQL_SA_PASSWORD=LoremIpsum86"
-
-SERVICES["clickhouse"]="clickhouse/clickhouse-server:24.11.1.2557-alpine"
-SERVICE_PORTS["clickhouse"]="9000:9000 -p 8123:8123 -p 9001:9001"
-
-SERVICES["polaris"]="polarismesh/polaris-standalone:v1.17.2"
-SERVICE_PORTS["polaris"]="8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091"
-
-SERVICES["oracle"]="loads/oracle-xe-11g-r2:11.2.0"
-SERVICE_PORTS["oracle"]="1521:1521"
-SERVICE_ENVS["oracle"]="-e ORACLE_ALLOW_REMOTE=true -e ORACLE_SID=XE -e ORACLE_DB_USER_NAME=system -e ORACLE_DB_PASSWORD=oracle"
-
-SERVICES["dm"]="loads/dm:v8.1.2.128_ent_x86_64_ctm_pack4"
-SERVICE_PORTS["dm"]="5236:5236"
-
-SERVICES["gaussdb"]="opengauss/opengauss:7.0.0-RC1.B023"
-SERVICE_PORTS["gaussdb"]="9950:5432"
-SERVICE_ENVS["gaussdb"]="-e GS_PASSWORD=UTpass@1234 -e TZ=Asia/Shanghai"
-SERVICE_OPTS["gaussdb"]="--privileged=true"
-
-SERVICES["zookeeper"]="zookeeper:3.8"
-SERVICE_PORTS["zookeeper"]="2181:2181"
-
-# Service groups
-GROUP_DB="mysql mariadb postgres mssql oracle dm gaussdb clickhouse"
-GROUP_CACHE="redis etcd"
-GROUP_REGISTRY="polaris zookeeper"
-GROUP_ALL="etcd redis mysql mariadb postgres mssql clickhouse polaris oracle dm gaussdb zookeeper"
-
-# Working directories
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
-WORKFLOW_DIR="$PROJECT_ROOT/.github/workflows"
-
-# Print colored messages
-print_info() {
-    echo -e "${BLUE}[INFO]${NC} $1"
-}
-
-print_success() {
-    echo -e "${GREEN}[OK]${NC} $1"
-}
-
-print_warning() {
-    echo -e "${YELLOW}[WARN]${NC} $1"
-}
-
-print_error() {
-    echo -e "${RED}[ERROR]${NC} $1"
-}
-
-# Check if Docker is available
-check_docker() {
-    if ! command -v docker &> /dev/null; then
-        print_error "Docker is not installed or not in PATH"
-        exit 1
-    fi
-    if ! docker info &> /dev/null; then
-        print_error "Docker service is not running"
-        exit 1
-    fi
-}
-
-# Get container name
-get_container_name() {
-    echo "${PREFIX}-$1"
-}
-
-# Start a single service
-start_service() {
-    local service=$1
-    local container_name=$(get_container_name "$service")
-    local image="${SERVICES[$service]}"
-    local ports="${SERVICE_PORTS[$service]}"
-    local envs="${SERVICE_ENVS[$service]}"
-    local opts="${SERVICE_OPTS[$service]}"
-
-    if [ -z "$image" ]; then
-        print_error "Unknown service: $service"
-        return 1
-    fi
-
-    # Check if container already exists
-    if docker ps -a --format '{{.Names}}' | grep -q "^${container_name}$"; then
-        if docker ps --format '{{.Names}}' | grep -q "^${container_name}$"; then
-            print_warning "$service is already running"
-            return 0
-        else
-            print_info "Starting existing container $service..."
-            docker start "$container_name" > /dev/null
-            print_success "$service started"
-            return 0
-        fi
-    fi
-
-    print_info "Starting $service..."
-    
-    # Build docker run command
-    local cmd="docker run -d --name $container_name"
-    
-    # Add port mappings
-    for port in $ports; do
-        cmd="$cmd -p $port"
-    done
-    
-    # Add environment variables
-    if [ -n "$envs" ]; then
-        cmd="$cmd $envs"
-    fi
-    
-    # Add other options
-    if [ -n "$opts" ]; then
-        cmd="$cmd $opts"
-    fi
-    
-    cmd="$cmd $image"
-    
-    if eval "$cmd" > /dev/null 2>&1; then
-        print_success "$service started (container: $container_name)"
-    else
-        print_error "Failed to start $service"
-        return 1
-    fi
-}
-
-# Stop a single service
-stop_service() {
-    local service=$1
-    local container_name=$(get_container_name "$service")
-
-    if docker ps --format '{{.Names}}' | grep -q "^${container_name}$"; then
-        print_info "Stopping $service..."
-        docker stop "$container_name" > /dev/null
-        print_success "$service stopped"
-    else
-        print_warning "$service is not running"
-    fi
-}
-
-# Remove a single service
-remove_service() {
-    local service=$1
-    local container_name=$(get_container_name "$service")
-
-    if docker ps -a --format '{{.Names}}' | grep -q "^${container_name}$"; then
-        print_info "Removing $service..."
-        docker rm -f "$container_name" > /dev/null
-        print_success "$service removed"
-    else
-        print_warning "$service container does not exist"
-    fi
-}
-
-# View service logs
-logs_service() {
-    local service=$1
-    local container_name=$(get_container_name "$service")
-    local lines=${2:-100}
-
-    if docker ps -a --format '{{.Names}}' | grep -q "^${container_name}$"; then
-        docker logs --tail "$lines" -f "$container_name"
-    else
-        print_error "$service container does not exist"
-        return 1
-    fi
-}
-
-# Start docker-compose service
-start_compose_service() {
-    local service=$1
-    local compose_file=""
-    
-    case $service in
-        apollo)
-            compose_file="$WORKFLOW_DIR/apollo/docker-compose.yml"
-            ;;
-        nacos)
-            compose_file="$WORKFLOW_DIR/nacos/docker-compose.yml"
-            ;;
-        redis-cluster)
-            compose_file="$WORKFLOW_DIR/redis/docker-compose.yml"
-            ;;
-        consul)
-            compose_file="$WORKFLOW_DIR/consul/docker-compose.yml"
-            ;;
-        *)
-            print_error "Unknown compose service: $service"
-            return 1
-            ;;
-    esac
-    
-    if [ -f "$compose_file" ]; then
-        print_info "Starting $service (docker-compose)..."
-        docker compose -f "$compose_file" up -d
-        print_success "$service started"
-    else
-        print_error "Compose file does not exist: $compose_file"
-        return 1
-    fi
-}
-
-# Stop docker-compose service
-stop_compose_service() {
-    local service=$1
-    local compose_file=""
-    
-    case $service in
-        apollo)
-            compose_file="$WORKFLOW_DIR/apollo/docker-compose.yml"
-            ;;
-        nacos)
-            compose_file="$WORKFLOW_DIR/nacos/docker-compose.yml"
-            ;;
-        redis-cluster)
-            compose_file="$WORKFLOW_DIR/redis/docker-compose.yml"
-            ;;
-        consul)
-            compose_file="$WORKFLOW_DIR/consul/docker-compose.yml"
-            ;;
-        *)
-            print_error "Unknown compose service: $service"
-            return 1
-            ;;
-    esac
-    
-    if [ -f "$compose_file" ]; then
-        print_info "Stopping $service (docker-compose)..."
-        docker compose -f "$compose_file" down
-        print_success "$service stopped"
-    else
-        print_error "Compose file does not exist: $compose_file"
-        return 1
-    fi
-}
-
-# Show service status
-show_status() {
-    echo ""
-    echo -e "${CYAN}========== GoFrame Docker Services Status ==========${NC}"
-    echo ""
-    printf "%-15s %-12s %-30s %s\n" "SERVICE" "STATUS" "CONTAINER" "PORTS"
-    echo "--------------------------------------------------------------------------------"
-    
-    for service in $GROUP_ALL; do
-        local container_name=$(get_container_name "$service")
-        local status="stopped"
-        local ports="-"
-        
-        if docker ps --format '{{.Names}}' 2>/dev/null | grep -q "^${container_name}$"; then
-            status="${GREEN}running${NC}"
-            ports=$(docker port "$container_name" 2>/dev/null | tr '\n' ' ' || echo "-")
-        elif docker ps -a --format '{{.Names}}' 2>/dev/null | grep -q "^${container_name}$"; then
-            status="${YELLOW}stopped${NC}"
-        else
-            status="${RED}not created${NC}"
-        fi
-        
-        printf "%-15s %-22b %-30s %s\n" "$service" "$status" "$container_name" "$ports"
-    done
-    
-    echo ""
-    echo -e "${CYAN}========== Compose Services ==========${NC}"
-    echo ""
-    
-    for compose_svc in apollo nacos redis-cluster consul; do
-        local running=0
-        case $compose_svc in
-            apollo)
-                running=$(docker ps --filter "name=apollo" --format '{{.Names}}' 2>/dev/null | wc -l)
-                ;;
-            nacos)
-                running=$(docker ps --filter "name=nacos" --format '{{.Names}}' 2>/dev/null | wc -l)
-                ;;
-            redis-cluster)
-                running=$(docker ps --filter "name=redis-" --format '{{.Names}}' 2>/dev/null | wc -l)
-                ;;
-            consul)
-                running=$(docker ps --filter "name=consul" --format '{{.Names}}' 2>/dev/null | wc -l)
-                ;;
-        esac
-        
-        if [ "$running" -gt 0 ]; then
-            printf "%-15s ${GREEN}running${NC} (%d containers)\n" "$compose_svc" "$running"
-        else
-            printf "%-15s ${RED}stopped${NC}\n" "$compose_svc"
-        fi
-    done
-    
-    echo ""
-}
-
-# Show service information
-show_service_info() {
-    echo ""
-    echo -e "${CYAN}========== Available Services ==========${NC}"
-    echo ""
-    echo -e "${YELLOW}Basic Services (standalone containers):${NC}"
-    echo ""
-    printf "%-15s %-50s %s\n" "SERVICE" "IMAGE" "PORTS"
-    echo "--------------------------------------------------------------------------------"
-    
-    for service in $GROUP_ALL; do
-        printf "%-15s %-50s %s\n" "$service" "${SERVICES[$service]}" "${SERVICE_PORTS[$service]}"
-    done
-    
-    echo ""
-    echo -e "${YELLOW}Compose Services (multi-container):${NC}"
-    echo "  apollo        - Apollo Config Center (8080, 8070, 8060, 13306)"
-    echo "  nacos         - Nacos Registry (8848, 9848, 9555)"
-    echo "  redis-cluster - Redis Primary-Replica + Sentinel Cluster (6380-6382, 26379-26381)"
-    echo "  consul        - Consul Service Discovery (8500, 8600)"
-    echo ""
-    echo -e "${YELLOW}Service Groups:${NC}"
-    echo "  db       - Databases: $GROUP_DB"
-    echo "  cache    - Cache: $GROUP_CACHE"
-    echo "  registry - Registry: $GROUP_REGISTRY"
-    echo "  all      - All basic services"
-    echo ""
-}
-
-# Show help
-show_help() {
-    echo ""
-    echo -e "${CYAN}GoFrame Docker Services Manager${NC}"
-    echo ""
-    echo "Usage: $0 <command> [service|group] [options]"
-    echo ""
-    echo "Commands:"
-    echo "  start <service|group>    Start service or service group"
-    echo "  stop <service|group>     Stop service or service group"
-    echo "  restart <service|group>  Restart service or service group"
-    echo "  remove <service|group>   Remove service container"
-    echo "  logs <service> [lines]   View service logs (default 100 lines)"
-    echo "  status                   Show all service status"
-    echo "  info                     Show available service information"
-    echo "  clean                    Remove all goframe containers"
-    echo "  pull [service]           Pull images"
-    echo ""
-    echo "Services:"
-    echo "  Basic: etcd, redis, mysql, mariadb, postgres, mssql,"
-    echo "         clickhouse, polaris, oracle, dm, gaussdb, zookeeper"
-    echo "  Compose: apollo, nacos, redis-cluster, consul"
-    echo ""
-    echo "Service Groups:"
-    echo "  db       - All database services"
-    echo "  cache    - Cache services (redis, etcd)"
-    echo "  registry - Registry services (polaris, zookeeper)"
-    echo "  all      - All basic services"
-    echo ""
-    echo "Examples:"
-    echo "  $0 start mysql           # Start MySQL"
-    echo "  $0 start db              # Start all databases"
-    echo "  $0 start all             # Start all basic services"
-    echo "  $0 start apollo          # Start Apollo (compose)"
-    echo "  $0 stop all              # Stop all basic services"
-    echo "  $0 logs mysql 50         # View last 50 lines of MySQL logs"
-    echo "  $0 status                # View service status"
-    echo ""
-}
-
-# Parse service groups
-parse_services() {
-    local input=$1
-    case $input in
-        db)
-            echo "$GROUP_DB"
-            ;;
-        cache)
-            echo "$GROUP_CACHE"
-            ;;
-        registry)
-            echo "$GROUP_REGISTRY"
-            ;;
-        all)
-            echo "$GROUP_ALL"
-            ;;
-        *)
-            echo "$input"
-            ;;
-    esac
-}
-
-# Check if it's a compose service
-is_compose_service() {
-    local service=$1
-    case $service in
-        apollo|nacos|redis-cluster|consul)
-            return 0
-            ;;
-        *)
-            return 1
-            ;;
-    esac
-}
-
-# Pull images
-pull_images() {
-    local services=$1
-    
-    if [ -z "$services" ]; then
-        services="$GROUP_ALL"
-    fi
-    
-    for service in $services; do
-        if [ -n "${SERVICES[$service]}" ]; then
-            print_info "Pulling image: ${SERVICES[$service]}"
-            docker pull "${SERVICES[$service]}"
-        fi
-    done
-}
-
-# Clean all goframe containers
-clean_all() {
-    print_info "Removing all $PREFIX containers..."
-    local containers=$(docker ps -a --filter "name=$PREFIX" --format '{{.Names}}')
-    
-    if [ -n "$containers" ]; then
-        for container in $containers; do
-            docker rm -f "$container" > /dev/null
-            print_success "Removed: $container"
-        done
-    else
-        print_info "No $PREFIX containers found"
-    fi
-}
-
-# Get service status mark
-get_service_status_mark() {
-    local service=$1
-    local container_name=$(get_container_name "$service")
-    
-    if docker ps --format '{{.Names}}' 2>/dev/null | grep -q "^${container_name}$"; then
-        echo -e "${GREEN}*${NC}"
-    else
-        echo " "
-    fi
-}
-
-# Get compose service status mark
-get_compose_status_mark() {
-    local service=$1
-    local running=0
-    
-    case $service in
-        apollo)
-            running=$(docker ps --filter "name=apollo" --format '{{.Names}}' 2>/dev/null | wc -l)
-            ;;
-        nacos)
-            running=$(docker ps --filter "name=nacos" --format '{{.Names}}' 2>/dev/null | wc -l)
-            ;;
-        redis-cluster)
-            running=$(docker ps --filter "name=redis-" --format '{{.Names}}' 2>/dev/null | wc -l)
-            ;;
-        consul)
-            running=$(docker ps --filter "name=consul" --format '{{.Names}}' 2>/dev/null | wc -l)
-            ;;
-    esac
-    
-    if [ "$running" -gt 0 ]; then
-        echo -e "${GREEN}*${NC}"
-    else
-        echo " "
-    fi
-}
-
-# Service selection menu
-select_service_menu() {
-    local action=$1
-    local action_name=$2
-    
-    echo ""
-    echo -e "${CYAN}========== Select Service to ${action_name} ==========${NC}"
-    
-    # Show running status for stop/restart/logs operations
-    if [[ "$action" == "stop" || "$action" == "restart" || "$action" == "logs" ]]; then
-        echo -e "  (${GREEN}*${NC} indicates running)"
-    fi
-    echo ""
-    echo -e "${YELLOW}Basic Services:${NC}"
-    printf "  %b1) etcd         %b2) redis        %b3) mysql\n" \
-        "$(get_service_status_mark etcd)" "$(get_service_status_mark redis)" "$(get_service_status_mark mysql)"
-    printf "  %b4) mariadb      %b5) postgres     %b6) mssql\n" \
-        "$(get_service_status_mark mariadb)" "$(get_service_status_mark postgres)" "$(get_service_status_mark mssql)"
-    printf "  %b7) clickhouse   %b8) polaris      %b9) oracle\n" \
-        "$(get_service_status_mark clickhouse)" "$(get_service_status_mark polaris)" "$(get_service_status_mark oracle)"
-    printf " %b10) dm          %b11) gaussdb     %b12) zookeeper\n" \
-        "$(get_service_status_mark dm)" "$(get_service_status_mark gaussdb)" "$(get_service_status_mark zookeeper)"
-    echo ""
-    echo -e "${YELLOW}Compose Services:${NC}"
-    printf " %b13) apollo      %b14) nacos       %b15) redis-cluster\n" \
-        "$(get_compose_status_mark apollo)" "$(get_compose_status_mark nacos)" "$(get_compose_status_mark redis-cluster)"
-    printf " %b16) consul\n" "$(get_compose_status_mark consul)"
-    echo ""
-    echo -e "${YELLOW}Service Groups:${NC}"
-    echo "  17) db (all databases)    18) cache (cache services)"
-    echo "  19) registry (registry services) 20) all (all basic services)"
-    echo ""
-    echo "   0) Back to main menu"
-    echo ""
-    read -p "Select [0-20]: " svc_choice
-    
-    local svc=""
-    case $svc_choice in
-        1) svc="etcd" ;;
-        2) svc="redis" ;;
-        3) svc="mysql" ;;
-        4) svc="mariadb" ;;
-        5) svc="postgres" ;;
-        6) svc="mssql" ;;
-        7) svc="clickhouse" ;;
-        8) svc="polaris" ;;
-        9) svc="oracle" ;;
-        10) svc="dm" ;;
-        11) svc="gaussdb" ;;
-        12) svc="zookeeper" ;;
-        13) svc="apollo" ;;
-        14) svc="nacos" ;;
-        15) svc="redis-cluster" ;;
-        16) svc="consul" ;;
-        17) svc="db" ;;
-        18) svc="cache" ;;
-        19) svc="registry" ;;
-        20) svc="all" ;;
-        0) return ;;
-        *)
-            print_error "Invalid selection"
-            return
-            ;;
-    esac
-    
-    case $action in
-        start)
-            if is_compose_service "$svc"; then
-                start_compose_service "$svc"
-            else
-                for s in $(parse_services "$svc"); do
-                    start_service "$s"
-                done
-            fi
-            ;;
-        stop)
-            if is_compose_service "$svc"; then
-                stop_compose_service "$svc"
-            else
-                for s in $(parse_services "$svc"); do
-                    stop_service "$s"
-                done
-            fi
-            ;;
-        restart)
-            if is_compose_service "$svc"; then
-                stop_compose_service "$svc"
-                start_compose_service "$svc"
-            else
-                for s in $(parse_services "$svc"); do
-                    stop_service "$s"
-                    start_service "$s"
-                done
-            fi
-            ;;
-        remove)
-            for s in $(parse_services "$svc"); do
-                remove_service "$s"
-            done
-            ;;
-        logs)
-            if is_compose_service "$svc"; then
-                print_error "For Compose services, please use 'docker compose logs'"
-            else
-                read -p "Number of lines (default 100): " lines
-                lines=${lines:-100}
-                logs_service "$svc" "$lines"
-            fi
-            ;;
-        pull)
-            pull_images "$(parse_services "$svc")"
-            ;;
-    esac
-}
-
-# Interactive menu
-interactive_menu() {
-    while true; do
-        echo ""
-        echo -e "${CYAN}========== GoFrame Docker Services Manager ==========${NC}"
-        echo ""
-        echo "  1) Start Service"
-        echo "  2) Stop Service"
-        echo "  3) Restart Service"
-        echo "  4) Remove Service"
-        echo "  5) View Logs"
-        echo "  6) View Status"
-        echo "  7) Service Info"
-        echo "  8) Clean All Containers"
-        echo "  9) Pull Images"
-        echo "  0) Exit"
-        echo ""
-        read -p "Select operation [0-9]: " choice
-        
-        case $choice in
-            1)
-                select_service_menu "start" "Start"
-                ;;
-            2)
-                select_service_menu "stop" "Stop"
-                ;;
-            3)
-                select_service_menu "restart" "Restart"
-                ;;
-            4)
-                select_service_menu "remove" "Remove"
-                ;;
-            5)
-                select_service_menu "logs" "View Logs"
-                ;;
-            6)
-                show_status
-                ;;
-            7)
-                show_service_info
-                ;;
-            8)
-                read -p "Confirm removing all goframe containers? [y/N]: " confirm
-                if [[ "$confirm" =~ ^[Yy]$ ]]; then
-                    clean_all
-                fi
-                ;;
-            9)
-                select_service_menu "pull" "Pull Images"
-                ;;
-            0)
-                echo "Goodbye!"
-                exit 0
-                ;;
-            *)
-                print_error "Invalid selection"
-                ;;
-        esac
-    done
-}
-
-# Main function
-main() {
-    check_docker
-    
-    if [ $# -eq 0 ]; then
-        interactive_menu
-        exit 0
-    fi
-    
-    local command=$1
-    local target=$2
-    local extra=$3
-    
-    case $command in
-        start)
-            if [ -z "$target" ]; then
-                print_error "Please specify service name or service group"
-                exit 1
-            fi
-            if is_compose_service "$target"; then
-                start_compose_service "$target"
-            else
-                for service in $(parse_services "$target"); do
-                    start_service "$service"
-                done
-            fi
-            ;;
-        stop)
-            if [ -z "$target" ]; then
-                print_error "Please specify service name or service group"
-                exit 1
-            fi
-            if is_compose_service "$target"; then
-                stop_compose_service "$target"
-            else
-                for service in $(parse_services "$target"); do
-                    stop_service "$service"
-                done
-            fi
-            ;;
-        restart)
-            if [ -z "$target" ]; then
-                print_error "Please specify service name or service group"
-                exit 1
-            fi
-            if is_compose_service "$target"; then
-                stop_compose_service "$target"
-                start_compose_service "$target"
-            else
-                for service in $(parse_services "$target"); do
-                    stop_service "$service"
-                    start_service "$service"
-                done
-            fi
-            ;;
-        remove|rm)
-            if [ -z "$target" ]; then
-                print_error "Please specify service name or service group"
-                exit 1
-            fi
-            for service in $(parse_services "$target"); do
-                remove_service "$service"
-            done
-            ;;
-        logs)
-            if [ -z "$target" ]; then
-                print_error "Please specify service name"
-                exit 1
-            fi
-            logs_service "$target" "${extra:-100}"
-            ;;
-        status|ps)
-            show_status
-            ;;
-        info|list)
-            show_service_info
-            ;;
-        clean)
-            clean_all
-            ;;
-        pull)
-            pull_images "$target"
-            ;;
-        help|--help|-h)
-            show_help
-            ;;
-        *)
-            print_error "Unknown command: $command"
-            show_help
-            exit 1
-            ;;
-    esac
-}
-
-main "$@"

.github/workflows/scripts/replace_examples_gomod.sh

@@ -57,11 +57,11 @@ for file in `find ${workdir} -name go.mod`; do
             [ -z "$dep" ] && continue
             
             # Calculate the relative path for the replacement
-            if [[ "$dep" == "github.com/gogf/gf/v2" ]]; then
+            if [[ "$dep" == "github.com/gogf/gf/v3" ]]; then
                 replacement="$relativePath"
             else
                 # Extract the path after v2 and remove trailing version
-                subpath=$(echo "$dep" | sed -E 's/github\.com\/gogf\/gf\/(contrib\/[^/]+\/[^/]+)\/v2.*/\1/')
+                subpath=$(echo "$dep" | sed -E 's/github\.com\/gogf\/gf\/(contrib\/[^/]+\/[^/]+)\/v3.*/\1/')
                 replacement="$relativePath/$subpath"
             fi
             

.github/workflows/scripts/update_version.sh

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-# Check if the number of parameters is 2
-if [ $# -ne 2 ]; then
-    echo "Invalid parameters, please execute in format: version.sh [directory] [version]"
-    echo "Example: version.sh ./contrib v1.0.0"
-    exit 1
-fi
-
-# Check if the first parameter is a directory and exists
-if [ ! -d "$1" ]; then
-    echo "Error: Directory does not exist"
-    exit 1
-fi
-
-# Check if the second parameter starts with 'v'
-if [[ "$2" != v* ]]; then
-    echo "Error: Version number does not start with 'v'"
-    exit 1
-fi
-
-workdir=$1
-newVersion=$2
-echo "Preparing to replace version numbers in all go.mod files under ${workdir} directory to ${newVersion}"
-
-
-# Check if file exists
-if [ -f "go.work" ]; then
-    # File exists, rename it
-    mv go.work go.work.${newVersion}
-    echo "Backup go.work file to avoid affecting the upgrade"
-fi
-
-for file in `find ${workdir} -name go.mod`; do
-    goModPath=$(dirname $file)
-    echo ""
-    echo "processing dir: $goModPath"
-    cd $goModPath
-    go mod tidy
-    go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf"
-    go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" | xargs -L1 go get -v 
-    go mod tidy
-    cd -
-done
-
-if [ -f "go.work.${newVersion}" ]; then
-    # File exists, rename it back
-    mv go.work.${newVersion} go.work
-    echo "Restore go.work file"
-fi

.github/workflows/sonarcloud.yaml

@@ -0,0 +1,53 @@
+name: Sonarcloud Scan
+
+on:
+  schedule:
+    # Weekly on Saturdays.
+    - cron: '30 1 * * 6'
+  push:
+    branches: [ master ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+# Declare default permissions as read only.
+permissions: read
+
+jobs:
+  analysis:
+    name: Scorecards analysis
+    runs-on: ubuntu-22.04
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Used to receive a badge. (Upcoming feature)
+      id-token: write
+      # Needs for private repositories.
+      contents: read
+      actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@v2.4.0 # v2.4.0
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true
+
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@v4
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # v2.2.1
+        with:
+          sarif_file: results.sarif

.github/workflows/tag.yml

@@ -4,56 +4,36 @@ on:
   push:
     # Sequence of patterns matched against refs/tags
     tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
 env:
   TZ: Asia/Shanghai
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
 jobs:
   build:
     name: Auto Creating Tags
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Github Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
+
       - name: Auto Creating Tags For Contrib Packages
         run: |
           git config --global user.email "tagrobot@goframe.org"
           git config --global user.name  "TagRobot"
+          
           # auto create tags for contrib packages.
           for file in `find contrib -name go.mod`; do
-              tag=$(dirname $file)/${{ github.ref_name }}
+              tag=$(dirname $file)/$GITHUB_REF_NAME
               git tag $tag
               git push origin $tag
           done
-      - name: update dependencies
-        run: |
-          go env -w GOPRIVATE=github.com/gogf/gf
-          .github/workflows/scripts/update_version.sh ./cmd/gf ${{ github.ref_name }}
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
-        with:
-          commit-message: 'update gf cli to ${{ github.ref_name }}'
-          title: 'fix: update gf cli to ${{ github.ref_name }}'
-          base: master
-          branch: fix/${{ github.ref_name }}
-          delete-branch: true
-      - name: Commit & Push changes
-        uses: actions-js/push@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: fix/${{ github.ref_name }}
-          author_name: TagRobot
-          author_email: tagrobot@goframe.org
-          message: 'fix: update gf cli to ${{ github.ref_name }}'
-      - name: Auto Creating Tags For cli tool
-        run: |
-          git config --global user.email "tagrobot@goframe.org"
-          git config --global user.name  "TagRobot"
+          
           # auto create tag for cli tool
-          for file in `find cmd -name go.mod -not -path "*/testdata/*"`; do
-              tag=$(dirname $file)/${{ github.ref_name }}
+          for file in `find cmd -name go.mod`; do
+              tag=$(dirname $file)/$GITHUB_REF_NAME
               git tag $tag
               git push origin $tag
           done

.gitignore

@@ -18,11 +18,10 @@ go.work
 go.work.sum
 !cmd/gf/go.work
 .windsurfrules
+.make_v3.sh
 
 # Ignore for docs
 node_modules
 .docusaurus
 output
-.example/
-.golangci.bck.yml
-*.exe
+.example/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "examples"]
+	path = examples
+	url = git@github.com:gogf/examples.git

.golangci.yml

@@ -1,220 +1,325 @@
-version: "2"
+## This file contains all available configuration options
+## with their default values.
+
+# See https://github.com/golangci/golangci-lint#config-file
+# See https://golangci-lint.run/usage/configuration/
+
+# Options for analysis running.
 run:
-  concurrency: 4
-  go: "1.25"
-  modules-download-mode: readonly
+  # Timeout for analysis, e.g. 30s, 5m.
+  # Default: 1m
+  timeout: 5m
+  # Exit code when at least one issue was found.
+  # Default: 1
   issues-exit-code: 2
+  # Include test files or not.
+  # Default: true
   tests: false
+  # List of build tags, all linters use it.
+  # Default: []
+  build-tags: []
+  # If set, we pass it to "go list -mod={option}". From "go help modules":
+  # If invoked with -mod=readonly, the go command is disallowed from the implicit
+  # automatic updating of go.mod described above. Instead, it fails when any changes
+  # to go.mod are needed. This setting is most useful to check that go.mod does
+  # not need updates, such as in a continuous integration and testing system.
+  # If invoked with -mod=vendor, the go command assumes that the vendor
+  # directory holds the correct copies of dependencies and ignores
+  # the dependency descriptions in go.mod.
+  #
+  # Allowed values: readonly|vendor|mod
+  # Default: ""
+  modules-download-mode: readonly
+  # Allow multiple parallel golangci-lint instances running.
+  # If false, golangci-lint acquires file lock on start.
+  # Default: false
   allow-parallel-runners: true
+  # Allow multiple golangci-lint instances running, but serialize them around a lock.
+  # If false, golangci-lint exits with an error if it fails to acquire file lock on start.
+  # Default: false
   allow-serial-runners: true
+  # Define the Go version limit.
+  # Mainly related to generics support since go1.18.
+  # Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.17
+  go: '1.20'
+  # Number of operating system threads (`GOMAXPROCS`) that can execute golangci-lint simultaneously.
+  # If it is explicitly set to 0 (i.e. not the default) then golangci-lint will automatically set the value to match Linux container CPU quota.
+  # Default: the number of logical CPUs in the machine
+  concurrency: 4
+
+
+# Main linters configurations.
+# See https://golangci-lint.run/usage/linters
 linters:
-  default: none
+  # Disable all default enabled linters.
+  disable-all: true
+  # Custom enable linters we want to use.
   enable:
-    - errcheck
-    - errchkjson
-    - funlen
-    - goconst
-    - gocritic
-    - govet
-    - misspell
-    - nolintlint
-    - revive
-    - staticcheck
-    - usestdlibvars
-    - whitespace
-  settings:
-    funlen:
-      lines: 340
-      statements: -1
-    goconst:
-      match-constant: false
-      min-len: 4
-      min-occurrences: 30
-      numbers: true
-      min: 5
-      max: 20
-      ignore-calls: false
-    gocritic:
-      disabled-checks:
-        - ifElseChain
-        - assignOp
-        - appendAssign
-        - singleCaseSwitch
-        - regexpMust
-        - typeSwitchVar
-        - elseif
-    govet:
-      disable:
-        - asmdecl
-        - assign
-        - atomic
-        - atomicalign
-        - bools
-        - buildtag
-        - cgocall
-        - composites
-        - copylocks
-        - deepequalerrors
-        - errorsas
-        - fieldalignment
-        - findcall
-        - framepointer
-        - httpresponse
-        - ifaceassert
-        - loopclosure
-        - lostcancel
-        - nilfunc
-        - nilness
-        - reflectvaluecompare
-        - shift
-        - shadow
-        - sigchanyzer
-        - sortslice
-        - stdmethods
-        - stringintconv
-        - structtag
-        - testinggoroutine
-        - tests
-        - unmarshal
-        - unreachable
-        - unsafeptr
-        - unusedwrite
-      enable-all: true
-      settings:
-        printf:
-          funcs:
-            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
-            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
-            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
-            - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
-        unusedresult:
-          funcs:
-            - pkg.MyFunc
-            - context.WithCancel
-          stringmethods:
-            - MyMethod
-    misspell:
-      locale: US
-      ignore-rules:
-        - cancelled
-    revive:
-      severity: error
-      rules:
-        - name: atomic
-        - name: line-length-limit
-          arguments:
-            - 380
-          severity: error
-        - name: unhandled-error
-          severity: warning
-          disabled: true
-        - name: var-naming
-          arguments:
-            - - ID
-              - URL
-              - IP
-              - HTTP
-              - JSON
-              - API
-              - UID
-              - Id
-              - Api
-              - Uid
-              - Http
-              - Json
-              - Ip
-              - Url
-            - - VM
-          severity: warning
-          disabled: true
-        - name: string-format
-          arguments:
-            - - core.WriteError[1].Message
-              - /^([^A-Z]|$)/
-              - must not start with a capital letter
-            - - fmt.Errorf[0]
-              - /(^|[^\.!?])$/
-              - must not end in punctuation
-            - - panic
-              - /^[^\n]*$/
-              - must not contain line breaks
-          severity: warning
-          disabled: false
-        - name: function-result-limit
-          arguments:
-            - 4
-          severity: warning
-          disabled: false
-    staticcheck:
-      checks: [ "all","-S1000","-S1009","-S1016","-S1023","-S1025","-S1029","-S1034","-S1040","-SA1016","-SA1019","-SA1029","-SA4006","-SA4015","-SA6003","-SA9003","-ST1003","-QF1001","-QF1002","-QF1003","-QF1006","-QF1007","-QF1008","-QF1011","-QF1012","-ST1011" ]
-      initialisms: [ "ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS", "SIP", "RTP", "AMQP", "DB", "TS" ]
-      dot-import-whitelist: [ "fmt" ]
-      http-status-code-whitelist: [ "200", "400", "404", "500" ]
-  exclusions:
-    generated: lax
-    presets:
-      - comments
-      - common-false-positives
-      - legacy
-      - std-error-handling
+    - 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.
+    - 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
+    - nolintlint    # Reports ill-formed or insufficient nolint directives
+    - revive        # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint.
+    - staticcheck   # It's a set of rules from staticcheck. It's not the same thing as the staticcheck binary.
+    - typecheck     # Like the front-end of a Go compiler, parses and type-checks Go code
+    - usestdlibvars # A linter that detect the possibility to use variables/constants from the Go standard library.
+    - whitespace    # Tool for detection of leading and trailing whitespace
+
+
+issues:
+  exclude-rules:
+    # helpers in tests often (rightfully) pass a *testing.T as their first argument
+    - path: _test\.go
+      text: "context.Context should be the first parameter of a function"
+      linters:
+        - revive
+    # Yes, they are, but it's okay in a test
+    - path: _test\.go
+      text: "exported func.*returns unexported type.*which can be annoying to use"
+      linters:
+        - revive
+    # https://github.com/go-critic/go-critic/issues/926
+    - linters:
+        - gocritic
+      text: "unnecessaryDefer:"
+
+
+# https://golangci-lint.run/usage/linters
+linters-settings:
+  # https://golangci-lint.run/usage/linters/#misspell
+  misspell:
+    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/v3
+  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:
+    ignore-generated-header: true
+    severity: error
     rules:
-      - linters:
-          - revive
-        path: _test\.go
-        text: context.Context should be the first parameter of a function
-      - linters:
-          - revive
-        path: _test\.go
-        text: exported func.*returns unexported type.*which can be annoying to use
-      - linters:
-          - gocritic
-        text: 'unnecessaryDefer:'
-      - linters:
-          - goconst
-        path: (.+)_test\.go
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
-formatters:
-  enable:
-    - gci
-    - gofmt
-    - goimports
-  settings:
-    gci:
-      sections:
-        - standard
-        - blank
-        - default
-        - dot
-        - prefix(github.com/gogf/gf/v2)
-        - prefix(github.com/gogf/gf/cmd)
-        - prefix(github.com/gogf/gfcontrib)
-        - prefix(github.com/gogf/gf/example)
-      custom-order: true
-      no-lex-order: false
-    gofmt:
-      simplify: true
-      rewrite-rules:
-        - pattern: 'interface{}'
-          replacement: 'any'
-        - pattern: 'reflect.Ptr'
-          replacement: 'reflect.Pointer'
-        - pattern: 'ioutil.ReadAll'
-          replacement: 'io.ReadAll'
-        - pattern: 'ioutil.WriteFile'
-          replacement: 'os.WriteFile'
-        - pattern: 'ioutil.ReadFile'
-          replacement: 'os.ReadFile'
-        - pattern: 'ioutil.NopCloser'
-          replacement: 'io.NopCloser'
-    goimports:
-      local-prefixes:
-        - github.com/gogf/gf/v2
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+      - name: atomic
+      - name: line-length-limit
+        severity: error
+        arguments: [ 380 ]
+      - name: unhandled-error
+        severity: warning
+        disabled: true
+        arguments: []
+      - name: var-naming
+        severity: warning
+        disabled: true
+        arguments:
+          # AllowList
+          - [ "ID","URL","IP","HTTP","JSON","API","UID","Id","Api","Uid","Http","Json","Ip","Url" ]
+          # DenyList
+          - [ "VM" ]
+      - name: string-format
+        severity: warning
+        disabled: false
+        arguments:
+          - - 'core.WriteError[1].Message'
+            - '/^([^A-Z]|$)/'
+            - must not start with a capital letter
+          - - 'fmt.Errorf[0]'
+            - '/(^|[^\.!?])$/'
+            - must not end in punctuation
+          - - panic
+            - '/^[^\n]*$/'
+            - must not contain line breaks
+      - name: function-result-limit
+        severity: warning
+        disabled: false
+        arguments: [ 4 ]
+
+  # https://golangci-lint.run/usage/linters/#funlen
+  funlen:
+    # Checks the number of lines in a function.
+    # If lower than 0, disable the check.
+    # Default: 60
+    lines: 340
+    # Checks the number of statements in a function.
+    # If lower than 0, disable the check.
+    # Default: 40
+    statements: -1
+
+  # https://golangci-lint.run/usage/linters/#goconst
+  goconst:
+    # Minimal length of string constant.
+    # Default: 3
+    min-len: 4
+    # Minimum occurrences of constant string count to trigger issue.
+    # Default: 3
+    # For subsequent optimization, the value is reduced.
+    min-occurrences: 30
+    # Ignore test files.
+    # Default: false
+    ignore-tests: true
+    # Look for existing constants matching the values.
+    # Default: true
+    match-constant: false
+    # Search also for duplicated numbers.
+    # Default: false
+    numbers: true
+    # Minimum value, only works with goconst.numbers
+    # Default: 3
+    min: 5
+    # Maximum value, only works with goconst.numbers
+    # Default: 3
+    max: 20
+    # Ignore when constant is not used as function argument.
+    # Default: true
+    ignore-calls: false
+
+  # https://golangci-lint.run/usage/linters/#gocritic
+  gocritic:
+    disabled-checks:
+      - ifElseChain
+      - assignOp
+      - appendAssign
+      - singleCaseSwitch
+      - regexpMust
+      - typeSwitchVar
+      - elseif
+
+  # https://golangci-lint.run/usage/linters/#gosimple
+  gosimple:
+    # Sxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
+    # Default: ["*"]
+    checks: [
+      "all", "-S1000", "-S1001", "-S1002", "-S1008", "-S1009", "-S1016", "-S1023", "-S1025", "-S1029", "-S1034", "-S1040"
+    ]
+
+  # https://golangci-lint.run/usage/linters/#govet
+  govet:
+    # Report about shadowed variables.
+    # Default: false
+    # check-shadowing: true
+    # Settings per analyzer.
+    settings:
+      # Analyzer name, run `go tool vet help` to see all analyzers.
+      printf:
+        # Comma-separated list of print function names to check (in addition to default, see `go tool vet help printf`).
+        # Default: []
+        funcs:
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
+        # shadow:
+        # Whether to be strict about shadowing; can be noisy.
+        # Default: false
+        # strict: false
+      unusedresult:
+        # Comma-separated list of functions whose results must be used
+        # (in addition to defaults context.WithCancel,context.WithDeadline,context.WithTimeout,context.WithValue,
+        # errors.New,fmt.Errorf,fmt.Sprint,fmt.Sprintf,sort.Reverse)
+        # Default []
+        funcs:
+          - pkg.MyFunc
+          - context.WithCancel
+        # Comma-separated list of names of methods of type func() string whose results must be used
+        # (in addition to default Error,String)
+        # Default []
+        stringmethods:
+          - MyMethod
+    # Enable all analyzers.
+    # Default: false
+    enable-all: true
+    # Disable analyzers by name.
+    # Run `go tool vet help` to see all analyzers.
+    # Default: []
+    disable:
+      - asmdecl
+      - assign
+      - atomic
+      - atomicalign
+      - bools
+      - buildtag
+      - cgocall
+      - composites
+      - copylocks
+      - deepequalerrors
+      - errorsas
+      - fieldalignment
+      - findcall
+      - framepointer
+      - httpresponse
+      - ifaceassert
+      - loopclosure
+      - lostcancel
+      - nilfunc
+      - nilness
+      - reflectvaluecompare
+      - shift
+      - shadow
+      - sigchanyzer
+      - sortslice
+      - stdmethods
+      - stringintconv
+      - structtag
+      - testinggoroutine
+      - tests
+      - unmarshal
+      - unreachable
+      - unsafeptr
+      - unusedwrite
+
+  # https://golangci-lint.run/usage/linters/#staticcheck
+  staticcheck:
+    # SAxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
+    # Default: ["*"]
+    checks: [ "all","-SA1019","-SA4015","-SA1029","-SA1016","-SA9003","-SA4006","-SA6003" ]
+

.make_tidy.sh

@@ -26,8 +26,6 @@ for file in `find ${workdir} -name go.mod`; do
     fi
 
     cd $goModPath
-    # Remove indirect dependencies
-    sed -i '/\/\/ indirect/d' go.mod
     go mod tidy
     # Remove toolchain line if exists
     sed -i '' '/^toolchain/d' go.mod

.make_version.sh

@@ -1,19 +1,4 @@
 #!/usr/bin/env bash
-
-# Function to detect OS and set sed parameters
-setup_sed() {
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        # macOS
-        SED_INPLACE="sed -i ''"
-    else
-        # Linux/Windows Git Bash
-        SED_INPLACE="sed -i"
-    fi
-}
-
-# Initialize sed command
-setup_sed
-
 if [ $# -ne 2 ]; then
     echo "Parameter exception, please execute in the format of $0 [directory] [version number]"
     echo "PS：$0 ./ v2.4.0"
@@ -43,10 +28,10 @@ fi
 
 if [[ true ]]; then
     # Use sed to replace the version number in version.go
-    $SED_INPLACE 's/VERSION = ".*"/VERSION = "'${newVersion}'"/' version.go
+    sed -i '' 's/VERSION = ".*"/VERSION = "'${newVersion}'"/' version.go
 
     # Use sed to replace the version number in README.MD
-    $SED_INPLACE 's/version=[^"]*/version='${newVersion}'/' README.MD
+    sed -i '' 's/version=[^"]*/version='${newVersion}'/' README.MD
 fi
 
 if [ -f "go.work" ]; then
@@ -72,37 +57,33 @@ for file in `find ${workdir} -name go.mod`; do
     cd $goModPath
     if [ $goModPath = "./cmd/gf" ]; then
         mv go.work go.work.version.bak
-        go mod edit -replace github.com/gogf/gf/v2=../../
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/clickhouse/v2=../../contrib/drivers/clickhouse
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/mssql/v2=../../contrib/drivers/mssql
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/mysql/v2=../../contrib/drivers/mysql
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/oracle/v2=../../contrib/drivers/oracle
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/pgsql/v2=../../contrib/drivers/pgsql
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/sqlite/v2=../../contrib/drivers/sqlite
+        go mod edit -replace github.com/gogf/gf/v3=../../
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/clickhouse/v3=../../contrib/drivers/clickhouse
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/mssql/v3=../../contrib/drivers/mssql
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/mysql/v3=../../contrib/drivers/mysql
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/oracle/v3=../../contrib/drivers/oracle
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/pgsql/v3=../../contrib/drivers/pgsql
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/sqlite/v3=../../contrib/drivers/sqlite
     fi
-    # Remove indirect dependencies
-    sed -i '/\/\/ indirect/d' go.mod
     go mod tidy
     # Remove toolchain line if exists
-    $SED_INPLACE '/^toolchain/d' go.mod
+    sed -i '' '/^toolchain/d' go.mod
 
     # Upgrading only GoFrame related libraries, sometimes even if a version number is specified, 
     # it may not be possible to successfully upgrade. Please confirm before submitting the code
     go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf"
     go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" | xargs -L1 go get -v 
-    # Remove indirect dependencies
-    sed -i '/\/\/ indirect/d' go.mod
     go mod tidy
     # Remove toolchain line if exists
-    $SED_INPLACE '/^toolchain/d' go.mod
+    sed -i '' '/^toolchain/d' go.mod
     if [ $goModPath = "./cmd/gf" ]; then
-        go mod edit -dropreplace github.com/gogf/gf/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/clickhouse/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/mssql/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/mysql/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/oracle/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/pgsql/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/sqlite/v2
+        go mod edit -dropreplace github.com/gogf/gf/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/clickhouse/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/mssql/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/mysql/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/oracle/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/pgsql/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/sqlite/v3
         mv go.work.version.bak go.work
     fi
     cd -

CONTRIBUTING.md

@@ -3,13 +3,11 @@
 Thanks for taking the time to join our community and start contributing!
 
 ## With issues
-
 - Use the search tool before opening a new issue.
 - Please provide source code and commit sha if you found a bug.
 - Review existing issues and provide feedback or react to them.
 
 ## With pull requests
-
 - Open your pull request against `master`
 - Your pull request should have no more than two commits, if not you should squash them.
 - It should pass all tests in the available continuous integrations systems such as GitHub CI.

GO_LIST_OPTIMIZATION.md

@@ -1,231 +0,0 @@
-# go list 性能优化 - 完成报告
-
-**日期**：2026-01-09  
-**优化目标**：减少 `go list` 调用次数，提升依赖分析性能  
-**优化结果**：✅ 从 3 次调用减少到 2 次调用 (-33%)
-
----
-
-## 问题分析
-
-### 原始问题
-在 `cmddep_analyzer.go` 的 `loadPackages()` 方法中存在 **3 次 `go list` 调用**：
-
-1. `go list -json %s` (行 158)
-   - 目标：获取指定的包信息
-   - 问题：只获取主包，不含依赖信息
-
-2. `go list -json -deps %s` (行 179)
-   - 目标：获取指定包及其所有依赖
-   - 问题：和第一次调用冗余，且可能因时间差而导致数据不一致
-
-3. `go list -json -m all` (行 198)
-   - 目标：获取所有模块信息（包括在 go.mod 中但代码未使用的模块）
-   - 问题：第三次调用导致性能开销
-
-### 性能影响
-- **频繁I/O**：每次 `go list` 都涉及 Go 工具链的启动和包元数据扫描
-- **时间累积**：大型项目中每次调用可能耗时 200-500ms，3 次调用总耗时可达 1-1.5s
-- **不一致风险**：连续调用可能因依赖版本变更而返回不同结果
-
----
-
-## 优化方案
-
-### 关键优化点
-
-**优化前的调用顺序**：
-```
-调用1: go list -json %s           (主包)
-      ↓
-调用2: go list -json -deps %s     (主包+依赖)
-      ↓
-调用3: go list -json -m all       (所有模块)
-```
-
-**优化后的调用顺序**：
-```
-调用1: go list -json -m all       (所有模块) - 快速
-      ↓ 用模块信息预填充 packages 集合
-调用2: go list -json -deps %s     (主包+依赖) - 覆盖/补充包信息
-```
-
-### 具体改进
-
-1. **取消第一次调用**
-   - 原因：`go list -json -deps` 已包含主包信息，第一次调用冗余
-   - 效果：减少 1 次调用 (-33%)
-
-2. **调整模块加载时机**
-   - 原因：模块信息加载应先执行，为包信息加载做准备
-   - 优势：支持 go.mod 中声明但未在代码中直接使用的模块出现在依赖图中
-
-3. **优化错误处理**
-   - 模块加载失败不中断：`if err != nil { moduleResult = "" }`
-   - 保证即使模块加载失败，包加载仍能继续
-
----
-
-## 实现细节
-
-### 改动代码 (cmddep_analyzer.go)
-
-```go
-// loadPackages loads package information using go list with optimized approach.
-// OPTIMIZATION: Reduced from 3 separate go list calls to 2 efficient calls:
-// Previously:
-//   1. go list -json %s                (target packages only)
-//   2. go list -json -deps %s          (with dependencies)
-//   3. go list -json -m all            (all modules)
-// Now (optimized):
-//   1. go list -json -m all            (all modules - fast, definitive)
-//   2. go list -json -deps ./...       (all packages with dependencies)
-func (a *analyzer) loadPackages(ctx context.Context, pkgPath string) error {
-	// First, load module information - fast, provides metadata
-	moduleCmd := "go list -json -m all"
-	moduleResult, err := gproc.ShellExec(ctx, moduleCmd)
-	if err != nil {
-		moduleResult = ""  // Module loading is optional
-	}
-
-	// Parse modules and pre-populate packages
-	if moduleResult != "" {
-		// ... decode modules ...
-	}
-
-	// Second, load package information with dependencies
-	cmd := fmt.Sprintf("go list -json -deps %s", pkgPath)
-	result, err := gproc.ShellExec(ctx, cmd)
-	if err != nil {
-		// ... error handling ...
-	}
-
-	// Parse packages
-	// ... decode packages ...
-
-	return nil
-}
-```
-
----
-
-## 验证结果
-
-### 编译检查
-✅ 编译成功，无编译错误
-
-### Lint 检查
-✅ 无 lint 警告或错误
-
-### 向后兼容性
-✅ **完全兼容**
-- `loadPackages()` 方法签名不变
-- 返回结果（`a.packages` 数据结构）不变
-- 所有调用者代码无需修改
-
-### 功能正确性
-✅ 功能保持一致
-- 获取相同的包和模块信息
-- 建立相同的依赖关系图
-- 支持所有原有的过滤和遍历操作
-
----
-
-## 性能指标
-
-### 理论改进
-| 指标 | 优化前 | 优化后 | 改进 |
-|------|------|------|------|
-| **go list 调用数** | 3 次 | 2 次 | -33% |
-| **预期执行时间** | ~600-1500ms | ~400-1000ms | -33% |
-
-### 说明
-- 假设每次调用 200-500ms
-- 模块加载（`go list -m all`）通常最快，因为不需要扫描代码
-- 包依赖加载（`go list -deps`）取决于项目复杂度
-
----
-
-## 设计决策
-
-### 为什么是 2 次而不是 1 次？
-
-虽然设计目标是"1 次调用"，但实际上 2 次调用是更合理的方案：
-
-**原因**：
-1. `go list -deps %s` 和 `go list -m all` 的 **命令标志组合不兼容**
-   - `-deps` 要求指定包/模块作为分析起点
-   - `-m` 要求以模块视图操作
-   - 两者不能在同一命令中有效结合
-
-2. 模块加载和包加载的 **职责不同**
-   - 模块加载：获取 go.mod 声明的完整依赖
-   - 包加载：获取代码中实际使用的包
-   - 两者信息互补
-
-3. **错误隔离**的好处
-   - 模块加载失败不影响包加载
-   - 提高系统鲁棒性
-
----
-
-## 后续优化机会
-
-### 1. 缓存层 (未来版本)
-```go
-// 缓存 go list 结果，支持增量更新
-type PackageCache struct {
-    modules  map[string]bool    // 缓存模块清单
-    packages map[string]*goPackage  // 缓存包信息
-    checksum string             // go.mod 校验和
-}
-```
-
-### 2. 并行加载 (未来版本)
-```go
-// 并行执行两次 go list 调用
-go func() { moduleResult = shell_exec(moduleCmd) }()
-result = shell_exec(packageCmd)  // 同时执行
-// 等待两者完成...
-```
-
-### 3. 按需加载 (未来版本)
-- 支持渐进式加载（只分析指定包及其直接依赖）
-- 支持深度控制（避免加载整个传递依赖树）
-
----
-
-## 代码变更统计
-
-| 指标 | 值 |
-|------|-----|
-| 修改文件 | 1 (`cmddep_analyzer.go`) |
-| 修改行数 | ~70 行 |
-| 删除行数 | 50+ 行 |
-| 净增加 | ~20 行 |
-| 编译错误 | 0 |
-| Lint 警告 | 0 |
-| 测试通过 | ✅ |
-
----
-
-## 总结
-
-✨ **性能优化完成** - 成功将 `go list` 调用从 3 次减少到 2 次，提升了依赖分析性能并改善了代码清晰度。
-
-### 主要成就
-- ✅ 减少 1/3 的 go list 调用
-- ✅ 改进代码结构（模块优先加载）
-- ✅ 增强错误隔离（模块加载失败不影响包加载）
-- ✅ 保持 100% 向后兼容
-- ✅ 零性能退化
-
-### 建议
-- 立即合并此优化
-- 后续考虑实现缓存和并行加载进一步改进
-
----
-
-**完成日期**：2026-01-09  
-**优化者**：AI Assistant  
-**状态**：✅ 完成并验证

MAINONLY_FIX.md

@@ -1,263 +0,0 @@
-# 修复报告 - MainModuleOnly 参数无效问题
-
-**日期**：2026-01-09  
-**优先级**：🔴 高 (功能缺陷)  
-**状态**：✅ 已修复
-
----
-
-## 问题描述
-
-`--main-only` (仅主模块) 参数在代码中定义但从未实际被使用，导致该参数完全无效。
-
-### 表现
-- 用户使用 `gf dep --main-only` 时，仍然显示所有包（包括子模块的包）
-- 参数被解析，但在过滤逻辑中被忽略
-
-### 根本原因
-虽然有定义 `MainModuleOnly` 字段在 `FilterOptions` 中，但：
-1. `ShouldInclude()` 方法从未检查这个参数
-2. `PackageInfo` 没有记录包是否属于主模块的信息
-3. 虽然有 `isMainModulePackage()` 方法可以判断，但它不被调用
-
----
-
-## 修复方案
-
-### 改动 1: 扩展 `PackageInfo` 结构
-
-**文件**：`cmddep_analyzer.go` (L51-60)
-
-```go
-type PackageInfo struct {
-    ImportPath   string       // Full import path
-    ModulePath   string       // Module path
-    Kind         PackageKind  // Package classification
-    Tier         int          // Package tier
-    Imports      []string     // Direct imports
-    IsStdLib     bool         // Standard library marker
-    IsModuleRoot bool         // Is this the root package of its module
-    IsMainModule bool         // ← NEW: Is this package from the main module
-}
-```
-
-**原因**：需要在包信息中记录"是否属于主模块"，以便在过滤时使用。
-
-### 改动 2: 更新 `buildPackageStore()` 方法
-
-**文件**：`cmddep_analyzer.go` (L636-653)
-
-```go
-func (a *analyzer) buildPackageStore() *PackageStore {
-    store := newPackageStore(a.modulePrefix)
-    
-    for path, goPkg := range a.packages {
-        pkgInfo := &PackageInfo{
-            ImportPath:   path,
-            ModulePath:   goPkg.Module.Path,
-            IsStdLib:     goPkg.Standard,
-            Imports:      goPkg.Imports,
-            IsMainModule: a.isMainModulePackage(path),  // ← NEW
-        }
-        pkgInfo.Kind = store.identifyPackageKind(pkgInfo)
-        store.packages[path] = pkgInfo
-    }
-    
-    return store
-}
-```
-
-**原因**：在构建 `PackageInfo` 时调用 `isMainModulePackage()` 来填充 `IsMainModule` 字段。
-
-### 改动 3: 修复 `ShouldInclude()` 方法
-
-**文件**：`cmddep_analyzer.go` (L325-346)
-
-```go
-func (opts *FilterOptions) ShouldInclude(pkg *PackageInfo) bool {
-    // ← NEW: Check main module filter first
-    if opts.MainModuleOnly && !pkg.IsMainModule {
-        return false
-    }
-    
-    // Filter by kind
-    switch pkg.Kind {
-    case KindStdLib:
-        if !opts.IncludeStdLib {
-            return false
-        }
-    case KindInternal:
-        if !opts.IncludeInternal {
-            return false
-        }
-    case KindExternal:
-        if !opts.IncludeExternal {
-            return false
-        }
-    }
-    
-    return true
-}
-```
-
-**原因**：在过滤逻辑中实际检查 `MainModuleOnly` 参数。
-
----
-
-## 影响范围
-
-### 受影响的功能
-- ✅ 命令行 `gf dep --main-only` 命令
-- ✅ Web UI "Main module only" 复选框
-- ✅ HTTP API `?main=true` 参数
-
-### 受影响的输出格式
-- ✅ Tree 格式
-- ✅ List 格式
-- ✅ JSON 格式
-- ✅ Mermaid 格式
-- ✅ Dot 格式
-- ✅ Reverse 格式
-- ✅ Group 格式
-
----
-
-## 验证结果
-
-### 编译检查
-✅ 编译成功，无编译错误
-
-### Lint 检查
-✅ 无 lint 警告或错误
-
-### 向后兼容性
-✅ **完全兼容**
-- 所有现有代码无需修改
-- API 签名不变
-
-### 功能正确性
-✅ 现在可以正确过滤子模块的包
-
----
-
-## 使用示例
-
-### 命令行
-```bash
-# 仅显示主模块的包
-gf dep --main-only
-
-# 结合其他参数
-gf dep --external --main-only
-```
-
-### Web UI
-- 勾选 "Main module only" 复选框来过滤掉子模块
-
-### HTTP API
-```
-GET /api/packages?main=true
-GET /api/tree?main=true
-```
-
----
-
-## 技术细节
-
-### `isMainModulePackage()` 工作原理
-
-位于 `cmddep_analyzer.go` (L381-408)：
-
-```go
-func (a *analyzer) isMainModulePackage(pkg string) bool {
-    // 没有模块前缀，认为所有包都在主模块中
-    if a.modulePrefix == "" {
-        return true
-    }
-    
-    // 包不在模块范围内
-    if !gstr.HasPrefix(pkg, a.modulePrefix) {
-        return false
-    }
-    
-    // 移除模块前缀得到相对路径
-    relativePath := gstr.TrimLeft(pkg[len(a.modulePrefix):], "/")
-    if relativePath == "" {
-        return true  // 这是模块根本身
-    }
-    
-    // 检查是否有子 go.mod 文件（表示子模块）
-    parts := gstr.Split(relativePath, "/")
-    for i := len(parts); i > 0; i-- {
-        subPath := gstr.Join(parts[:i], "/")
-        if subPath != "" && gfile.Exists(subPath+"/go.mod") {
-            return false  // 找到了子模块
-        }
-    }
-    
-    return true  // 这是主模块的一部分
-}
-```
-
-**工作流程**：
-1. 验证包在模块范围内
-2. 检查包相对路径中是否存在 `go.mod` 文件
-3. 如果存在子 `go.mod`，说明这是子模块，返回 `false`
-4. 否则是主模块的一部分，返回 `true`
-
----
-
-## 相关代码位置
-
-| 组件 | 文件 | 行号 | 用途 |
-|------|------|------|------|
-| PackageInfo | cmddep_analyzer.go | L51-60 | 数据模型 |
-| FilterOptions | cmddep_analyzer.go | L62-77 | 过滤参数 |
-| ShouldInclude() | cmddep_analyzer.go | L323-346 | 过滤决策 |
-| buildPackageStore() | cmddep_analyzer.go | L636-653 | 数据构建 |
-| isMainModulePackage() | cmddep_analyzer.go | L381-408 | 主模块检测 |
-
----
-
-## 测试建议
-
-### 手动测试
-```bash
-# 创建有子模块的项目或使用现有项目
-cd /path/to/project/with/submodule
-
-# 测试不带参数
-gf dep --tree
-
-# 测试只显示主模块
-gf dep --tree --main-only
-
-# 验证结果应该显著减少（子模块包被过滤）
-```
-
-### 自动测试
-建议添加单元测试验证：
-- `MainModuleOnly=true` 时 `ShouldInclude()` 正确返回 `false` 对于非主模块包
-- `buildPackageStore()` 正确设置 `IsMainModule` 字段
-- 各种输出格式都正确应用过滤
-
----
-
-## 总结
-
-✨ **功能修复完成**
-
-| 项 | 状态 |
-|----|------|
-| **编译** | ✅ 成功 |
-| **Lint** | ✅ 无错误 |
-| **功能** | ✅ 正常 |
-| **兼容性** | ✅ 100% |
-
-现在 `--main-only` 参数可以正确过滤掉子模块的包。
-
----
-
-**完成日期**：2026-01-09  
-**修复者**：AI Assistant  
-**状态**：✅ 完成并验证

Makefile

@@ -6,29 +6,10 @@ tidy:
 	./.make_tidy.sh
 
 # execute "golangci-lint" to check code style
-# go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
 .PHONY: lint
 lint:
 	golangci-lint run -c .golangci.yml
 
-# make branch to=v2.4.0
-.PHONY: branch
-branch:
-	@set -e; \
-	newVersion=$(to); \
-	if [ -z "$$newVersion" ]; then \
-		echo "Error: 'to' variable is required. Usage: make branch to=vX.Y.Z"; \
-		exit 1; \
-	fi; \
-	branchName=fix/$$newVersion; \
-	echo "Switching to master branch..."; \
-	git checkout master; \
-	echo "Pulling latest changes from master..."; \
-	git pull origin master; \
-	echo "Creating and switching to branch $$branchName from master..."; \
-	git checkout -b $$branchName; \
-	echo "Branch $$branchName created successfully!"
-
 # make version to=v2.4.0
 .PHONY: version
 version:
@@ -37,20 +18,6 @@ version:
 	./.make_version.sh ./ $$newVersion; \
 	echo "make version to=$(to) done"
 
-# make tag to=v2.4.0
-.PHONY: tag
-tag:
-	@set -e; \
-	newVersion=$(to); \
-	echo "Switching to master branch..."; \
-	git checkout master; \
-	echo "Pulling latest changes from master..."; \
-	git pull origin master; \
-	echo "Creating annotated tag $$newVersion..."; \
-	git tag -a $$newVersion -m "Release $$newVersion"; \
-	echo "Pushing tag $$newVersion..."; \
-	git push origin $$newVersion; \
-	echo "Tag $$newVersion created and pushed successfully!"
 
 # update submodules
 .PHONY: subup
@@ -76,13 +43,3 @@ subsync: subup
 		git push origin; \
 	fi; \
 	cd ..;
-
-# manage docker services for local development
-# usage: make docker or make docker cmd=start svc=mysql
-.PHONY: docker
-docker:
-	@if [ -z "$(cmd)" ]; then \
-		./.github/workflows/scripts/docker-services.sh; \
-	else \
-		./.github/workflows/scripts/docker-services.sh $(cmd) $(svc) $(extra); \
-	fi

README.MD

@@ -1,13 +1,10 @@
-English | [简体中文](README.zh_CN.MD)
 
 <div align=center>
 <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)
+[![Go Reference](https://pkg.go.dev/badge/github.com/gogf/gf/v3.svg)](https://pkg.go.dev/github.com/gogf/gf/v3)
 [![GoFrame CI](https://github.com/gogf/gf/actions/workflows/ci-main.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/ci-main.yml)
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/gogf/gf/badge)](https://scorecard.dev/viewer/?uri=github.com/gogf/gf)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/9233/badge)](https://bestpractices.coreinfrastructure.org/projects/9233)
-[![Go Report Card](https://goreportcard.com/badge/github.com/gogf/gf/v2)](https://goreportcard.com/report/github.com/gogf/gf/v2)
+[![Go Report Card](https://goreportcard.com/badge/github.com/gogf/gf/v3)](https://goreportcard.com/report/github.com/gogf/gf/v3)
 [![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf)
 [![Production Ready](https://img.shields.io/badge/production-ready-blue.svg?style=flat)](https://github.com/gogf/gf)
 [![License](https://img.shields.io/github/license/gogf/gf.svg?style=flat)](https://github.com/gogf/gf)
@@ -24,30 +21,24 @@ English | [简体中文](README.zh_CN.MD)
 
 A powerful framework for faster, easier, and more efficient project development.
 
-## Installation
 
-```bash
-go get -u github.com/gogf/gf/v2
-```
+# Documentation
 
-## 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/v3](https://pkg.go.dev/github.com/gogf/gf/v3)
 
-- Official Site: [https://goframe.org](https://goframe.org)
-- Official Site(en): [https://goframe.org/en](https://goframe.org/en)
-- 国内镜像: [https://goframe.org.cn](https://goframe.org.cn)
-- Mirror Site: [Github Pages](https://pages.goframe.org)
-- Mirror Site: [Offline Docs](https://github.com/gogf/goframe.org-pdf?tab=readme-ov-file#%E6%9C%80%E6%96%B0%E7%89%88%E6%9C%AC)
-- GoDoc API: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2)
-- Doc Source: [https://github.com/gogf/gf-site](https://github.com/gogf/gf-site)
 
-## Contributors
+# 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?version=v2.9.8" alt="goframe contributors"/>
+<img src="https://goframe.org/img/contributors.svg?version=v2.9.0" alt="goframe contributors"/>
 </a>
 
-## License
+# License
 
 `GoFrame` is licensed under the [MIT License](LICENSE), 100% free and open-source, forever.

README.zh_CN.MD

@@ -1,53 +0,0 @@
-[English](README.MD) | 简体中文
-
-<div align=center>
-<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)
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/gogf/gf/badge)](https://scorecard.dev/viewer/?uri=github.com/gogf/gf)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/9233/badge)](https://bestpractices.coreinfrastructure.org/projects/9233)
-[![Go Report Card](https://goreportcard.com/badge/github.com/gogf/gf/v2)](https://goreportcard.com/report/github.com/gogf/gf/v2)
-[![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf)
-[![Production Ready](https://img.shields.io/badge/production-ready-blue.svg?style=flat)](https://github.com/gogf/gf)
-[![License](https://img.shields.io/github/license/gogf/gf.svg?style=flat)](https://github.com/gogf/gf)
-
-[![Release](https://img.shields.io/github/v/release/gogf/gf?style=flat)](https://github.com/gogf/gf/releases)
-[![GitHub pull requests](https://img.shields.io/github/issues-pr/gogf/gf?style=flat)](https://github.com/gogf/gf/pulls)
-[![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed/gogf/gf?style=flat)](https://github.com/gogf/gf/pulls?q=is%3Apr+is%3Aclosed)
-[![GitHub issues](https://img.shields.io/github/issues/gogf/gf?style=flat)](https://github.com/gogf/gf/issues)
-[![GitHub closed issues](https://img.shields.io/github/issues-closed/gogf/gf?style=flat)](https://github.com/gogf/gf/issues?q=is%3Aissue+is%3Aclosed)
-![Stars](https://img.shields.io/github/stars/gogf/gf?style=flat)
-![Forks](https://img.shields.io/github/forks/gogf/gf?style=flat)
-
-</div>
-
-一个强大的框架，为了更快、更轻松、更高效的项目开发。
-
-## 安装
-
-```bash
-go get -u github.com/gogf/gf/v2
-```
-
-## 文档
-
-- 官方网站: [https://goframe.org](https://goframe.org)
-- 官方网站(en): [https://goframe.org/en](https://goframe.org/en)
-- 国内镜像: [https://goframe.org.cn](https://goframe.org.cn)
-- 镜像网站: [Github Pages](https://pages.goframe.org)
-- 镜像网站: [离线文档](https://github.com/gogf/goframe.org-pdf?tab=readme-ov-file#%E6%9C%80%E6%96%B0%E7%89%88%E6%9C%AC)
-- Go包文档: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2)
-- 文档源码: [https://github.com/gogf/gf-site](https://github.com/gogf/gf-site)
-
-## 贡献者
-
-💖 [感谢所有使 GoFrame 成为可能的贡献者](https://github.com/gogf/gf/graphs/contributors) 💖
-
-<a href="https://github.com/gogf/gf/graphs/contributors">
-<img src="https://goframe.org/img/contributors.svg?version=v2.9.5" alt="goframe contributors"/>
-</a>
-
-## 许可证
-
-`GoFrame` 采用 [MIT License](LICENSE) 许可，100% 免费和开源，永久保持。

cmd/gf/README.MD

@@ -1,5 +1,3 @@
-English | [简体中文](README.zh_CN.MD)
-
 # gf
 
 `gf` is a powerful CLI tool for building [GoFrame](https://goframe.org) application with convenience.
@@ -23,53 +21,52 @@ You can also install `gf` tool using pre-built binaries: <https://github.com/gog
 
 3. Database support
 
-   |     DB     | builtin support |                                                                             remarks                                                                             |
-   | :--------: | :-------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-   |   mysql    |       yes       |                                                                                -                                                                                |
-   |  mariadb   |       yes       |                                                                                -                                                                                |
-   |    tidb    |       yes       |                                                                                -                                                                                |
-   |   mssql    |       yes       |                                                                                -                                                                                |
-   |   oracle   |       yes       |                                                                                -                                                                                |
-   |   pgsql    |       yes       |                                                                                -                                                                                |
-   |   sqlite   |       yes       |                                                                                -                                                                                |
-   | sqlitecgo  |       no        | to support sqlite database on 32bit architecture systems, manually add package import to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building. |
-   | clickhouse |       yes       |                                                                                -                                                                                |
-   |     dm     |       no        |                              manually add package import to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building.                              |
+   |     DB     | builtin support |                                                                             remarks                                                                              |
+   |:----------:|:---------------:|:----------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+   |   mysql    |       yes       |                                                                                -                                                                                 |
+   |  mariadb   |       yes       |                                                                                -                                                                                 |
+   |    tidb    |       yes       |                                                                                -                                                                                 |
+   |   mssql    |       yes       |                                                                                -                                                                                 |
+   |   oracle   |       yes       |                                                                                -                                                                                 |
+   |   pgsql    |       yes       |                                                                                -                                                                                 |
+   |   sqlite   |       yes       |                                                                                -                                                                                 |
+   | sqlitecgo  |       no        | to support sqlite database on 32bit architecture systems, manually add package import to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building.  |
+   | clickhouse |       no        |                              manually add package import to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building.                               |
+   |     dm     |       no        |                              manually add package import to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building.                               |
 
 ## 2) Manually Install
 
 ```shell
-go install github.com/gogf/gf/cmd/gf/v2@latest # latest version
-go install github.com/gogf/gf/cmd/gf/v2@v2.5.5 # certain version(should be >= v2.5.5)
+go install github.com/gogf/gf/cmd/gf/v3@latest # latest version
+go install github.com/gogf/gf/cmd/gf/v3@v2.5.5 # certain version(should be >= v2.5.5)
 ```
 
 ## 2. Commands
 
-```shell
-$ gf -h
+```html
+$ gf
 USAGE
     gf COMMAND [OPTION]
 
 COMMAND
-    up         upgrade GoFrame version/tool to latest one in current project
-    env        show current Golang environment variables
-    fix        auto fixing codes after upgrading to new GoFrame version
-    run        running go codes with hot-compiled-like feature
-    gen        automatically generate go files for dao/do/entity/pb/pbentity
-    tpl        template parsing and building commands
-    init       create and initialize an empty GoFrame project
-    pack       packing any file/directory to a resource file, or a go file
-    build      cross-building go project for lots of platforms
-    docker     build docker image for current GoFrame project
-    install    install gf binary to system (might need root/admin permission)
-    version    show version information of current binary
-    doc        download https://pages.goframe.org/ to run locally
+   up         upgrade GoFrame version/tool to latest one in current project
+   env        show current Golang environment variables
+   fix        auto fixing codes after upgrading to new GoFrame version
+   run        running go codes with hot-compiled-like feature
+   gen        automatically generate go files for dao/do/entity/pb/pbentity
+   tpl        template parsing and building commands
+   init       create and initialize an empty GoFrame project
+   pack       packing any file/directory to a resource file, or a go file
+   build      cross-building go project for lots of platforms
+   docker     build docker image for current GoFrame project
+   install    install gf binary to system (might need root/admin permission)
+   version    show version information of current binary
 
 OPTION
-    -y, --yes       all yes for all command without prompt ask
-    -v, --version   show version information of current binary
-    -d, --debug     show internal detailed debugging information
-    -h, --help      more information about this command
+   -y, --yes       all yes for all command without prompt ask
+   -v, --version   show version information of current binary
+   -d, --debug     show internal detailed debugging information
+   -h, --help      more information about this command
 
 ADDITIONAL
     Use "gf COMMAND -h" for details about a command.

cmd/gf/README.zh_CN.MD

@@ -1,82 +0,0 @@
-[English](README.MD) | 简体中文
-
-# gf
-
-`gf` 是一个强大的 CLI 工具，用于便捷地构建 [GoFrame](https://goframe.org) 应用程序。
-
-## 1. 安装
-
-## 1) 预编译二进制文件
-
-您也可以使用预构建的二进制文件安装 `gf` 工具：<https://github.com/gogf/gf/releases>
-
-1. `Mac` & `Linux`
-
-   ```shell
-    wget -O gf https://github.com/gogf/gf/releases/latest/download/gf_$(go env GOOS)_$(go env GOARCH) && chmod +x gf && ./gf install -y && rm ./gf
-   ```
-
-   > 如果您使用 `zsh`，您可能需要通过命令 `alias gf=gf` 重命名别名以解决 `gf` 和 `git fetch` 之间的冲突。
-
-2. `Windows`
-   手动下载，在命令行中执行，然后按照说明操作。
-
-3. 数据库支持
-
-   |     数据库     | 内置支持 |                                                                             说明                                                                             |
-   | :--------: | :-------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-   |   mysql    |       是       |                                                                                -                                                                                |
-   |  mariadb   |       是       |                                                                                -                                                                                |
-   |    tidb    |       是       |                                                                                -                                                                                |
-   |   mssql    |       是       |                                                                                -                                                                                |
-   |   oracle   |       是       |                                                                                -                                                                                |
-   |   pgsql    |       是       |                                                                                -                                                                                |
-   |   sqlite   |       是       |                                                                                -                                                                                |
-   | sqlitecgo  |       否        | 要在 32 位架构系统上支持 sqlite 数据库，请手动向[源代码](./internal/cmd/cmd_gen_dao.go)添加包导入并进行构建。 |
-   | clickhouse |       是        |                                                                                -                                                                                |
-   |     dm     |       否        |                              手动向[源代码](./internal/cmd/cmd_gen_dao.go)添加包导入并进行构建。                              |
-
-## 2) 手动安装
-
-```shell
-go install github.com/gogf/gf/cmd/gf/v2@latest # 最新版本
-go install github.com/gogf/gf/cmd/gf/v2@v2.5.5 # 特定版本(应该 >= v2.5.5)
-```
-
-## 2. 命令
-
-```shell
-$ gf -h
-用法
-    gf 命令 [选项]
-
-命令
-    up         升级项目中的 GoFrame 版本/工具到最新版本
-    env        显示当前 Golang 环境变量
-    fix        升级到新 GoFrame 版本后自动修复代码
-    run        运行 go 代码，具有热编译功能
-    gen        自动生成 dao/do/entity/pb/pbentity 的 go 文件
-    tpl        模板解析和构建命令
-    init       创建并初始化一个空的 GoFrame 项目
-    pack       将任何文件/目录打包到资源文件或 go 文件
-    build      为多个平台交叉编译 go 项目
-    docker     为当前 GoFrame 项目构建 docker 镜像
-    install    将 gf 二进制文件安装到系统(可能需要 root/admin 权限)
-    version    显示当前二进制文件的版本信息
-    doc        下载 https://pages.goframe.org/ 本地运行
-
-选项
-    -y, --yes       对所有命令都使用 yes，不再提示
-    -v, --version   显示当前二进制文件的版本信息
-    -d, --debug     显示内部详细的调试信息
-    -h, --help      显示此命令的更多信息
-
-附加信息
-    使用 "gf 命令 -h" 获取有关命令的详细信息。
-```
-
-## 3. 常见问题
-
-### 1). 命令 `gf run` 返回 `pipe: too many open files`
-
-请使用 `ulimit -n 65535` 扩大系统配置以增加当前终端 shell 会话的最大打开文件数，然后再运行 `gf run`。

cmd/gf/gfcmd/gfcmd.go

@@ -11,20 +11,19 @@ import (
 	"context"
 	"runtime"
 
-	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
+	_ "github.com/gogf/gf/cmd/gf/v3/internal/packed"
 
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcfg"
-	"github.com/gogf/gf/v2/os/gcmd"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gcfg"
+	"github.com/gogf/gf/v3/os/gcmd"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/text/gstr"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/cmddep"
-	"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/v3/internal/cmd"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 const cliFolderName = `hack`
@@ -90,7 +89,6 @@ func GetCommand(ctx context.Context) (*Command, error) {
 		cmd.Install,
 		cmd.Version,
 		cmd.Doc,
-		cmddep.Dep,
 	)
 	if err != nil {
 		return nil, err

cmd/gf/go.mod

@@ -1,33 +1,33 @@
-module github.com/gogf/gf/cmd/gf/v2
+module github.com/gogf/gf/cmd/gf/v3
 
-go 1.23.0
+go 1.22
 
 require (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8
-	github.com/gogf/gf/v2 v2.9.8
+	github.com/gogf/gf/contrib/drivers/clickhouse/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/mssql/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/mysql/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/oracle/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/pgsql/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/sqlite/v3 v3.0.0-alpha
+	github.com/gogf/gf/v3 v3.0.0-alpha
 	github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
-	github.com/olekukonko/tablewriter v1.1.0
+	github.com/olekukonko/tablewriter v0.0.5
 	github.com/schollz/progressbar/v3 v3.15.0
-	golang.org/x/mod v0.25.0
-	golang.org/x/tools v0.26.0
+	golang.org/x/mod v0.17.0
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
 )
 
 require (
 	aead.dev/minisign v0.2.0 // indirect
-	github.com/BurntSushi/toml v1.5.0 // indirect
+	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/ClickHouse/clickhouse-go/v2 v2.0.15 // indirect
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/emirpasic/gods/v2 v2.0.0-alpha // indirect
+	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/fatih/color v1.18.0 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/glebarez/go-sqlite v1.21.2 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
@@ -36,31 +36,28 @@ require (
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
-	github.com/magiconair/properties v1.8.10 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/microsoft/go-mssqldb v1.7.1 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
-	github.com/olekukonko/errors v1.1.0 // indirect
-	github.com/olekukonko/ll v0.0.9 // indirect
 	github.com/paulmach/orb v0.7.1 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sijms/go-ora/v2 v2.7.10 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	golang.org/x/crypto v0.38.0 // indirect
-	golang.org/x/net v0.40.0 // indirect
-	golang.org/x/sync v0.14.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/term v0.32.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
+	go.opentelemetry.io/otel v1.32.0 // indirect
+	go.opentelemetry.io/otel/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
+	go.opentelemetry.io/otel/trace v1.32.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/libc v1.22.5 // indirect
 	modernc.org/mathutil v1.5.0 // indirect

cmd/gf/go.sum

@@ -12,8 +12,8 @@ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occ
 github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
-github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
-github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
 github.com/ClickHouse/clickhouse-go/v2 v2.0.15 h1:lLAZliqrZEygkxosLaW1qHyeTb4Ho7fVCZ0WKCpLocU=
 github.com/ClickHouse/clickhouse-go/v2 v2.0.15/go.mod h1:Z21o82zD8FFqefOQDg93c0XITlxGbTsWQuRm588Azkk=
@@ -27,18 +27,18 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/emirpasic/gods/v2 v2.0.0-alpha h1:dwFlh8pBg1VMOXWGipNMRt8v96dKAIvBehtCt6OtunU=
-github.com/emirpasic/gods/v2 v2.0.0-alpha/go.mod h1:W0y4M2dtBB9U5z3YlghmpuUhiaZT2h6yoeE+C1sCp6A=
+github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
+github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
 github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
@@ -46,20 +46,6 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8 h1:L72OB2HPuZSHtJ2ipBzI+62rGGDRdwYjequ1v+zctpg=
-github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8/go.mod h1:D0UySg70Bd264F5AScYmz1Hl8vjzlUJ7YvqBJc5OFbo=
-github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8 h1:DT5zHfo9/VkbJ+TF7kUasvv4dbU5uctoj+JGbrzgdYE=
-github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8/go.mod h1:cDd91Zd8LxFF+xxOflRRqw0WTTCpAJ0nf0KKRA+nvTE=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8 h1:XZ4Ya/50xpjf81+4genr33iJXR2dxJmqYKxGyXlLRqA=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8/go.mod h1:wtm2NJb/L3CbDOmyUc7TsOpWHTCMakg1QRG7B/oKrRs=
-github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8 h1:ZrqABJsUnhNDz8VAem1XXONBTywl6r+GHQH05i+4W1g=
-github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8/go.mod h1:YTFyeVk2Rgu/JMUhFxkjYzWaBc+yZ6wAvY54XVZoNko=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8 h1:Dc227FD1uf9nNBPFEjMEgIoAJbAgeYeNrOrjviDgPzY=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8/go.mod h1:o3EpB4Ti3+x/axzRMJg2k7TrLiWZiSTxP0v64LBkk5k=
-github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8 h1:LHEhzsBfIo8xHvOUuLDQW1q7Qix1vnBabH/iivCRghs=
-github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8/go.mod h1:SX6dRONaJGafzCoMIrn8CkRM4fIvtmJRt/aYclUHy3Q=
-github.com/gogf/gf/v2 v2.9.8 h1:El0HwksTzeRk0DQV4Lh7S9DbsIwKInhHSHGcH7qJumM=
-github.com/gogf/gf/v2 v2.9.8/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM=
 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -72,8 +58,8 @@ github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EO
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -98,13 +84,14 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE=
-github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
+github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
@@ -113,12 +100,8 @@ github.com/microsoft/go-mssqldb v1.7.1/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpth
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615/go.mod h1:Ad7oeElCZqA1Ufj0U9/liOF4BtVepxRcTvr2ey7zTvM=
-github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
-github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
-github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
-github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
-github.com/olekukonko/tablewriter v1.1.0 h1:N0LHrshF4T39KvI96fn6GT8HEjXRXYNDrDjKFDB7RIY=
-github.com/olekukonko/tablewriter v1.1.0/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/paulmach/orb v0.7.1 h1:Zha++Z5OX/l168sqHK3k4z18LDvr+YAO/VjK0ReQ9rU=
 github.com/paulmach/orb v0.7.1/go.mod h1:FWRlTgl88VI1RBx/MkrwWDRhQ96ctqMCh8boXhmqB/A=
 github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
@@ -151,50 +134,44 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
-go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
+go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
+go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
+go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
+go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
+go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
 go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
+go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
-golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -207,22 +184,22 @@ golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
-golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

cmd/gf/go.work

@@ -1,6 +1,8 @@
-go 1.23.0
+go 1.22
 
-use ./
+use (
+	./
+)
 
 // =====================================================================================================
 // NOTE:
@@ -8,15 +10,11 @@ use ./
 // =====================================================================================================
 
 replace (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 => ../../contrib/drivers/clickhouse
-	github.com/gogf/gf/contrib/drivers/mssql/v2 => ../../contrib/drivers/mssql
-	github.com/gogf/gf/contrib/drivers/mysql/v2 => ../../contrib/drivers/mysql
-	github.com/gogf/gf/contrib/drivers/oracle/v2 => ../../contrib/drivers/oracle
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 => ../../contrib/drivers/pgsql
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 => ../../contrib/drivers/sqlite
-	github.com/gogf/gf/contrib/drivers/mariadb/v2 => ../../contrib/drivers/mariadb
-	github.com/gogf/gf/contrib/drivers/tidb/v2 => ../../contrib/drivers/tidb
-	github.com/gogf/gf/contrib/drivers/oceanbase/v2 => ../../contrib/drivers/oceanbase
-	github.com/gogf/gf/contrib/drivers/gaussdb/v2 => ../../contrib/drivers/gaussdb
-	github.com/gogf/gf/v2 => ../../
+	github.com/gogf/gf/contrib/drivers/clickhouse/v3 => ../../contrib/drivers/clickhouse
+	github.com/gogf/gf/contrib/drivers/mssql/v3 => ../../contrib/drivers/mssql
+	github.com/gogf/gf/contrib/drivers/mysql/v3 => ../../contrib/drivers/mysql
+	github.com/gogf/gf/contrib/drivers/oracle/v3 => ../../contrib/drivers/oracle
+	github.com/gogf/gf/contrib/drivers/pgsql/v3 => ../../contrib/drivers/pgsql
+	github.com/gogf/gf/contrib/drivers/sqlite/v3 => ../../contrib/drivers/sqlite
+	github.com/gogf/gf/v3 => ../../
 )

cmd/gf/internal/cmd/cmd.go

@@ -11,13 +11,13 @@ import (
 	"context"
 	"strings"
 
-	"github.com/gogf/gf/v2"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcmd"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gcmd"
+	"github.com/gogf/gf/v3/util/gtag"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/service"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/service"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 // GF is the management object for `gf` command line tool.

cmd/gf/internal/cmd/cmd_build.go

@@ -15,25 +15,27 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/gogf/gf/v2/encoding/gbase64"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gbuild"
-	"github.com/gogf/gf/v2/os/gcmd"
-	"github.com/gogf/gf/v2/os/genv"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gproc"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3/encoding/gbase64"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gbuild"
+	"github.com/gogf/gf/v3/os/gcmd"
+	"github.com/gogf/gf/v3/os/genv"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/os/gtime"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gtag"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
-var Build = cBuild{
-	nodeNameInConfigFile: "gfcli.build",
-	packedGoFileName:     "internal/packed/build_pack_data.go",
-}
+var (
+	Build = cBuild{
+		nodeNameInConfigFile: "gfcli.build",
+		packedGoFileName:     "internal/packed/build_pack_data.go",
+	}
+)
 
 type cBuild struct {
 	g.Meta               `name:"build" brief:"{cBuildBrief}" dc:"{cBuildDc}" eg:"{cBuildEg}" ad:"{cBuildAd}"`
@@ -63,67 +65,45 @@ It provides much more features for building binary:
 `
 	cBuildAd = `
 PLATFORMS
-    aix       ppc64
-    android   386,amd64,arm,arm64
     darwin    amd64,arm64
-    dragonfly amd64
     freebsd   386,amd64,arm
-    illumos   amd64
-    ios       arm64
-    js        wasm
-    linux     386,amd64,arm,arm64,loong64,mips,mipsle,mips64,mips64le,ppc64,ppc64le,riscv64,s390x
+    linux     386,amd64,arm,arm64,ppc64,ppc64le,mips,mipsle,mips64,mips64le
     netbsd    386,amd64,arm
-    openbsd   386,amd64,arm,arm64
-    plan9     386,amd64,arm
-    solaris   amd64
-    wasip1    wasm
-    windows   386,amd64,arm,arm64
+    openbsd   386,amd64,arm
+    windows   386,amd64
 `
 	// https://golang.google.cn/doc/install/source
 	cBuildPlatforms = `
-aix       ppc64
-android   386
-android   amd64
-android   arm
-android   arm64
 darwin    amd64
 darwin    arm64
-dragonfly amd64
+ios       amd64
+ios       arm64
 freebsd   386
 freebsd   amd64
 freebsd   arm
-illumos   amd64
-ios       arm64
-js        wasm
 linux     386
 linux     amd64
 linux     arm
 linux     arm64
-linux     loong64
+linux     ppc64
+linux     ppc64le
 linux     mips
 linux     mipsle
 linux     mips64
 linux     mips64le
-linux     ppc64
-linux     ppc64le
-linux     riscv64
-linux     s390x
 netbsd    386
 netbsd    amd64
 netbsd    arm
 openbsd   386
 openbsd   amd64
 openbsd   arm
-openbsd   arm64
-plan9     386
-plan9     amd64
-plan9     arm
-solaris   amd64
-wasip1    wasm
 windows   386
 windows   amd64
-windows   arm
-windows   arm64
+android   arm
+dragonfly amd64
+plan9     386
+plan9     amd64
+solaris   amd64
 `
 )
 
@@ -245,7 +225,7 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e
 
 	// Injected information by building flags.
 	ldFlags := fmt.Sprintf(
-		`-X 'github.com/gogf/gf/v2/os/gbuild.builtInVarStr=%v'`,
+		`-X 'github.com/gogf/gf/v3/os/gbuild.builtInVarStr=%v'`,
 		c.getBuildInVarStr(ctx, in),
 	)
 

cmd/gf/internal/cmd/cmd_doc.go

@@ -16,11 +16,11 @@ import (
 	"path/filepath"
 	"time"
 
-	"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/v3/encoding/gcompress"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 const (

cmd/gf/internal/cmd/cmd_docker.go

@@ -11,13 +11,13 @@ import (
 	"fmt"
 	"runtime"
 
-	"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/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gtag"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 var (

cmd/gf/internal/cmd/cmd_env.go

@@ -11,15 +11,13 @@ import (
 	"context"
 
 	"github.com/olekukonko/tablewriter"
-	"github.com/olekukonko/tablewriter/renderer"
-	"github.com/olekukonko/tablewriter/tw"
 
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gproc"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/text/gstr"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 var (
@@ -37,13 +35,11 @@ type cEnvInput struct {
 type cEnvOutput struct{}
 
 func (c cEnv) Index(ctx context.Context, in cEnvInput) (out *cEnvOutput, err error) {
-	result, execErr := gproc.ShellExec(ctx, "go env")
-	// Note: go env may return non-zero exit code when there are warnings (e.g., invalid characters in env vars),
-	// but it still outputs valid environment variables. So we only fail if result is empty.
+	result, err := gproc.ShellExec(ctx, "go env")
+	if err != nil {
+		mlog.Fatal(err)
+	}
 	if result == "" {
-		if execErr != nil {
-			mlog.Fatal(execErr)
-		}
 		mlog.Fatal(`retrieving Golang environment variables failed, did you install Golang?`)
 	}
 	var (
@@ -61,29 +57,14 @@ func (c cEnv) Index(ctx context.Context, in cEnvInput) (out *cEnvOutput, err err
 		}
 		match, _ := gregex.MatchString(`(.+?)=(.*)`, line)
 		if len(match) < 3 {
-			// Skip lines that don't match key=value format (e.g., warning messages from go env)
-			mlog.Debugf(`invalid Golang environment variable: "%s"`, line)
-			continue
+			mlog.Fatalf(`invalid Golang environment variable: "%s"`, line)
 		}
 		array = append(array, []string{gstr.Trim(match[1]), gstr.Trim(match[2])})
 	}
-	table := tablewriter.NewTable(buffer,
-		tablewriter.WithRenderer(renderer.NewBlueprint(tw.Rendition{
-			Settings: tw.Settings{
-				Separators: tw.Separators{BetweenRows: tw.Off, BetweenColumns: tw.On},
-			},
-			Symbols: tw.NewSymbols(tw.StyleASCII),
-		})),
-		tablewriter.WithConfig(tablewriter.Config{
-			Row: tw.CellConfig{
-				Formatting:   tw.CellFormatting{AutoWrap: tw.WrapNone},
-				Alignment:    tw.CellAlignment{PerColumn: []tw.Align{tw.AlignLeft, tw.AlignLeft}},
-				ColMaxWidths: tw.CellWidth{Global: 84},
-			},
-		}),
-	)
-	table.Bulk(array)
-	table.Render()
+	tw := tablewriter.NewWriter(buffer)
+	tw.SetColumnAlignment([]int{tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT})
+	tw.AppendBulk(array)
+	tw.Render()
 	mlog.Print(buffer.String())
 	return
 }

cmd/gf/internal/cmd/cmd_fix.go

@@ -9,14 +9,14 @@ package cmd
 import (
 	"context"
 
-	"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/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/text/gstr"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 var (
@@ -93,7 +93,7 @@ func (c cFix) doFixV23(version string) error {
 		// gdb.TX from struct to interface.
 		content = gstr.Replace(content, "*gdb.TX", "gdb.TX")
 		// function name changes for package gtcp/gudp.
-		if gstr.Contains(content, "/gf/v2/net/gtcp") || gstr.Contains(content, "/gf/v2/net/gudp") {
+		if gstr.Contains(content, "/gf/v3/net/gtcp") || gstr.Contains(content, "/gf/v3/net/gudp") {
 			content = gstr.ReplaceByMap(content, g.MapStrStr{
 				".SetSendDeadline":      ".SetDeadlineSend",
 				".SetReceiveDeadline":   ".SetDeadlineRecv",

cmd/gf/internal/cmd/cmd_gen.go

@@ -7,8 +7,8 @@
 package cmd
 
 import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/util/gtag"
 )
 
 var (

cmd/gf/internal/cmd/cmd_gen_ctrl.go

@@ -7,7 +7,7 @@
 package cmd
 
 import (
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genctrl"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/genctrl"
 )
 
 type (

cmd/gf/internal/cmd/cmd_gen_dao.go

@@ -7,17 +7,17 @@
 package cmd
 
 import (
-	_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
-	_ "github.com/gogf/gf/contrib/drivers/mssql/v2"
-	_ "github.com/gogf/gf/contrib/drivers/mysql/v2"
-	_ "github.com/gogf/gf/contrib/drivers/oracle/v2"
-	_ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
-	_ "github.com/gogf/gf/contrib/drivers/sqlite/v2"
+	_ "github.com/gogf/gf/contrib/drivers/clickhouse/v3"
+	_ "github.com/gogf/gf/contrib/drivers/mssql/v3"
+	_ "github.com/gogf/gf/contrib/drivers/mysql/v3"
+	_ "github.com/gogf/gf/contrib/drivers/oracle/v3"
+	_ "github.com/gogf/gf/contrib/drivers/pgsql/v3"
+	_ "github.com/gogf/gf/contrib/drivers/sqlite/v3"
 
 	// do not add dm in cli pre-compilation,
 	// the dm driver does not support certain target platforms.
-	// _ "github.com/gogf/gf/contrib/drivers/dm/v2"
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
+	// _ "github.com/gogf/gf/contrib/drivers/dm/v3"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/gendao"
 )
 
 type (

cmd/gf/internal/cmd/cmd_gen_enums.go

@@ -7,7 +7,7 @@
 package cmd
 
 import (
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genenums"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/genenums"
 )
 
 type (

cmd/gf/internal/cmd/cmd_gen_pb.go

@@ -6,7 +6,7 @@
 
 package cmd
 
-import "github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpb"
+import "github.com/gogf/gf/cmd/gf/v3/internal/cmd/genpb"
 
 type (
 	cGenPb = genpb.CGenPb

cmd/gf/internal/cmd/cmd_gen_pbentity.go

@@ -6,7 +6,7 @@
 
 package cmd
 
-import "github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpbentity"
+import "github.com/gogf/gf/cmd/gf/v3/internal/cmd/genpbentity"
 
 type (
 	cGenPbEntity = genpbentity.CGenPbEntity

cmd/gf/internal/cmd/cmd_gen_service.go

@@ -7,7 +7,7 @@
 package cmd
 
 import (
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genservice"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/genservice"
 )
 
 type (

cmd/gf/internal/cmd/cmd_init.go

@@ -7,25 +7,22 @@
 package cmd
 
 import (
-	"bufio"
 	"context"
 	"fmt"
 	"os"
-	"strconv"
 	"strings"
 
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcmd"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gproc"
-	"github.com/gogf/gf/v2/os/gres"
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gcmd"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/os/gres"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gtag"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/geninit"
-	"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/cmd/gf/v3/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/utils"
 )
 
 var (
@@ -47,13 +44,6 @@ const (
 gf init my-project
 gf init my-mono-repo -m
 gf init my-mono-repo -a
-gf init my-project -u
-gf init my-project -g "github.com/myorg/myproject"
-gf init -r github.com/gogf/template-single my-project
-gf init -r github.com/gogf/examples/httpserver/jwt my-jwt
-gf init -r github.com/gogf/gf/cmd/gf/v2@v2.9.7 mygf
-gf init -r github.com/gogf/gf/cmd/gf/v2 mygf -s
-gf init -i
 `
 	cInitNameBrief = `
 name for the project. It will create a folder with NAME in current directory.
@@ -65,16 +55,6 @@ The NAME will also be the module name for the project.
 	cInitGitignore = ".gitignore"
 )
 
-// defaultTemplates is the list of predefined templates for interactive selection
-var defaultTemplates = []struct {
-	Name string
-	Repo string
-	Desc string
-}{
-	{"template-single", "github.com/gogf/template-single", "Single project template"},
-	{"template-mono", "github.com/gogf/template-mono", "Mono-repo project template"},
-}
-
 func init() {
 	gtag.Sets(g.MapStrStr{
 		`cInitBrief`:     cInitBrief,
@@ -84,86 +64,17 @@ func init() {
 }
 
 type cInitInput struct {
-	g.Meta      `name:"init"`
-	Name        string `name:"NAME" arg:"true" brief:"{cInitNameBrief}"`
-	Mono        bool   `name:"mono" short:"m" brief:"initialize a mono-repo instead a single-repo" orphan:"true"`
-	MonoApp     bool   `name:"monoApp" short:"a" brief:"initialize a mono-repo-app instead a single-repo" orphan:"true"`
-	Update      bool   `name:"update" short:"u" brief:"update to the latest goframe version" orphan:"true"`
-	Module      string `name:"module" short:"g" brief:"custom go module"`
-	Repo        string `name:"repo" short:"r" brief:"remote repository URL for template download"`
-	SelectVer   bool   `name:"select" short:"s" brief:"enable interactive version selection for remote template" orphan:"true"`
-	Interactive bool   `name:"interactive" short:"i" brief:"enable interactive mode to select template" orphan:"true"`
+	g.Meta  `name:"init"`
+	Name    string `name:"NAME" arg:"true" v:"required" brief:"{cInitNameBrief}"`
+	Mono    bool   `name:"mono" short:"m" brief:"initialize a mono-repo instead a single-repo" orphan:"true"`
+	MonoApp bool   `name:"monoApp" short:"a" brief:"initialize a mono-repo-app instead a single-repo" orphan:"true"`
+	Update  bool   `name:"update" short:"u" brief:"update to the latest goframe version" orphan:"true"`
+	Module  string `name:"module" short:"g" brief:"custom go module"`
 }
 
 type cInitOutput struct{}
 
 func (c cInit) Index(ctx context.Context, in cInitInput) (out *cInitOutput, err error) {
-	// Check if using remote template mode
-	if in.Repo != "" || in.Interactive {
-		return c.initFromRemote(ctx, in)
-	}
-
-	// If no name provided and no remote mode, enter interactive mode
-	if in.Name == "" {
-		return c.initInteractive(ctx, in)
-	}
-
-	// Default: use built-in template
-	return c.initFromBuiltin(ctx, in)
-}
-
-// initFromRemote initializes project from remote repository
-func (c cInit) initFromRemote(ctx context.Context, in cInitInput) (out *cInitOutput, err error) {
-	repo := in.Repo
-	name := in.Name
-
-	// If interactive mode and no repo specified, let user select
-	if in.Interactive && repo == "" {
-		var modPath string
-		var upgradeDeps bool
-		repo, name, modPath, upgradeDeps, err = interactiveSelectTemplate()
-		if err != nil {
-			return nil, err
-		}
-		if modPath != "" {
-			in.Module = modPath
-		}
-		if upgradeDeps {
-			in.Update = true
-		}
-	}
-
-	if repo == "" {
-		return nil, fmt.Errorf("repository URL is required for remote template mode")
-	}
-
-	// Default name to repo basename if empty
-	if name == "" {
-		name = gfile.Basename(repo)
-		mlog.Printf("Using repository basename as project name: %s", name)
-	}
-
-	mlog.Print("initializing from remote template...")
-
-	opts := &geninit.ProcessOptions{
-		SelectVersion: in.SelectVer,
-		ModulePath:    in.Module,
-		UpgradeDeps:   in.Update,
-	}
-
-	if err = geninit.Process(ctx, repo, name, opts); err != nil {
-		return nil, err
-	}
-
-	mlog.Print("initialization done!")
-	if name != "" && name != "." {
-		mlog.Printf(`you can now run "cd %s && gf run main.go" to start your journey, enjoy!`, name)
-	}
-	return
-}
-
-// initFromBuiltin initializes project from built-in template
-func (c cInit) initFromBuiltin(ctx context.Context, in cInitInput) (out *cInitOutput, err error) {
 	var overwrote = false
 	if !gfile.IsEmpty(in.Name) && !allyes.Check() {
 		s := gcmd.Scanf(`the folder "%s" is not empty, files might be overwrote, continue? [y/n]: `, in.Name)
@@ -238,14 +149,11 @@ func (c cInit) initFromBuiltin(ctx context.Context, in cInitInput) (out *cInitOu
 		return
 	}
 
-	// Format the generated Go files.
-	utils.GoFmt(in.Name)
-
 	// Update the GoFrame version.
 	if in.Update {
 		mlog.Print("update goframe...")
-		// go get -u github.com/gogf/gf/v2@latest
-		updateCommand := `go get -u github.com/gogf/gf/v2@latest`
+		// go get -u github.com/gogf/gf/v3@latest
+		updateCommand := `go get -u github.com/gogf/gf/v3@latest`
 		if in.Name != "." {
 			updateCommand = fmt.Sprintf(`cd %s && %s`, in.Name, updateCommand)
 		}
@@ -272,170 +180,3 @@ func (c cInit) initFromBuiltin(ctx context.Context, in cInitInput) (out *cInitOu
 	}
 	return
 }
-
-// initInteractive enters interactive mode when no arguments provided
-func (c cInit) initInteractive(ctx context.Context, in cInitInput) (out *cInitOutput, err error) {
-	reader := bufio.NewReader(os.Stdin)
-
-	// Ask user which mode to use
-	fmt.Println("\nPlease select initialization mode:")
-	fmt.Println(strings.Repeat("-", 50))
-	fmt.Println("  [1] Built-in template (default)")
-	fmt.Println("  [2] Remote template")
-	fmt.Println(strings.Repeat("-", 50))
-
-	fmt.Print("Select mode [1-2] (default: 1): ")
-	input, err := reader.ReadString('\n')
-	if err != nil {
-		mlog.Fatalf("failed to read input: %v", err)
-		return
-	}
-	input = strings.TrimSpace(input)
-
-	if input == "2" {
-		in.Interactive = true
-		return c.initFromRemote(ctx, in)
-	}
-
-	// Built-in template mode
-	fmt.Println("\nPlease select project type:")
-	fmt.Println(strings.Repeat("-", 50))
-	fmt.Println("  [1] Single project (default)")
-	fmt.Println("  [2] Mono-repo project")
-	fmt.Println("  [3] Mono-repo app")
-	fmt.Println(strings.Repeat("-", 50))
-
-	fmt.Print("Select type [1-3] (default: 1): ")
-	input, err = reader.ReadString('\n')
-	if err != nil {
-		mlog.Fatalf("failed to read input: %v", err)
-		return
-	}
-	input = strings.TrimSpace(input)
-
-	switch input {
-	case "2":
-		in.Mono = true
-	case "3":
-		in.MonoApp = true
-	}
-
-	// Get project name
-	for {
-		fmt.Print("Enter project name: ")
-		input, err = reader.ReadString('\n')
-		if err != nil {
-			mlog.Fatalf("failed to read input: %v", err)
-			return
-		}
-		in.Name = strings.TrimSpace(input)
-		if in.Name != "" {
-			break
-		}
-		fmt.Println("Project name cannot be empty")
-	}
-
-	// Get module path (optional)
-	fmt.Printf("Enter Go module path (leave empty to use \"%s\"): ", in.Name)
-	input, err = reader.ReadString('\n')
-	if err != nil {
-		mlog.Fatalf("failed to read input: %v", err)
-		return
-	}
-	in.Module = strings.TrimSpace(input)
-
-	// Ask about update
-	fmt.Print("Update to latest GoFrame version? [y/N]: ")
-	input, err = reader.ReadString('\n')
-	if err != nil {
-		mlog.Fatalf("failed to read input: %v", err)
-		return
-	}
-	input = strings.TrimSpace(strings.ToLower(input))
-	in.Update = input == "y" || input == "yes"
-
-	fmt.Println()
-	return c.initFromBuiltin(ctx, in)
-}
-
-// interactiveSelectTemplate prompts user to select a template interactively
-func interactiveSelectTemplate() (repo, name, modPath string, upgradeDeps bool, err error) {
-	reader := bufio.NewReader(os.Stdin)
-
-	// 1. Select template
-	fmt.Println("\nPlease select a project template:")
-	fmt.Println(strings.Repeat("-", 50))
-	for i, t := range defaultTemplates {
-		fmt.Printf("  [%d] %s - %s\n", i+1, t.Name, t.Desc)
-	}
-	fmt.Printf("  [%d] Custom repository URL\n", len(defaultTemplates)+1)
-	fmt.Println(strings.Repeat("-", 50))
-
-	for {
-		fmt.Printf("Select template [1-%d]: ", len(defaultTemplates)+1)
-		input, err := reader.ReadString('\n')
-		if err != nil {
-			return "", "", "", false, fmt.Errorf("failed to read template selection: %w", err)
-		}
-		input = strings.TrimSpace(input)
-
-		idx, e := strconv.Atoi(input)
-		if e != nil || idx < 1 || idx > len(defaultTemplates)+1 {
-			fmt.Printf("Invalid selection, please enter a number between 1-%d\n", len(defaultTemplates)+1)
-			continue
-		}
-
-		if idx <= len(defaultTemplates) {
-			repo = defaultTemplates[idx-1].Repo
-			fmt.Printf("Selected: %s\n\n", repo)
-		} else {
-			// Custom URL
-			fmt.Print("Enter repository URL: ")
-			input, err = reader.ReadString('\n')
-			if err != nil {
-				return "", "", "", false, fmt.Errorf("failed to read repository URL: %w", err)
-			}
-			repo = strings.TrimSpace(input)
-			if repo == "" {
-				fmt.Println("Repository URL cannot be empty")
-				continue
-			}
-		}
-		break
-	}
-
-	// 2. Enter project name
-	for {
-		fmt.Print("Enter project name: ")
-		input, err := reader.ReadString('\n')
-		if err != nil {
-			return "", "", "", false, fmt.Errorf("failed to read project name: %w", err)
-		}
-		name = strings.TrimSpace(input)
-		if name == "" {
-			fmt.Println("Project name cannot be empty")
-			continue
-		}
-		break
-	}
-
-	// 3. Enter module path (optional)
-	fmt.Printf("Enter Go module path (leave empty to use \"%s\"): ", name)
-	input, err := reader.ReadString('\n')
-	if err != nil {
-		return "", "", "", false, fmt.Errorf("failed to read module path: %w", err)
-	}
-	modPath = strings.TrimSpace(input)
-
-	// 4. Ask about upgrade
-	fmt.Print("Upgrade dependencies to latest (go get -u)? [y/N]: ")
-	input, err = reader.ReadString('\n')
-	if err != nil {
-		return "", "", "", false, fmt.Errorf("failed to read upgrade confirmation: %w", err)
-	}
-	input = strings.TrimSpace(strings.ToLower(input))
-	upgradeDeps = input == "y" || input == "yes"
-
-	fmt.Println()
-	return repo, name, modPath, upgradeDeps, nil
-}

cmd/gf/internal/cmd/cmd_install.go

@@ -9,9 +9,9 @@ package cmd
 import (
 	"context"
 
-	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v3/frame/g"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/service"
+	"github.com/gogf/gf/cmd/gf/v3/internal/service"
 )
 
 var (

cmd/gf/internal/cmd/cmd_pack.go

@@ -10,14 +10,14 @@ import (
 	"context"
 	"strings"
 
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcmd"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gres"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gcmd"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gres"
+	"github.com/gogf/gf/v3/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/v3/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 var (

cmd/gf/internal/cmd/cmd_run.go

@@ -13,38 +13,33 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
-	"time"
 
-	"github.com/gogf/gf/v2/container/gtype"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gfsnotify"
-	"github.com/gogf/gf/v2/os/gproc"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/os/gtimer"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3/container/gatomic"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gfsnotify"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/os/gtime"
+	"github.com/gogf/gf/v3/os/gtimer"
+	"github.com/gogf/gf/v3/util/gtag"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
-var Run = cRun{}
+var (
+	Run = cRun{}
+)
 
 type cRun struct {
 	g.Meta `name:"run" usage:"{cRunUsage}" brief:"{cRunBrief}" eg:"{cRunEg}" dc:"{cRunDc}"`
 }
 
-type watchPath struct {
-	Path      string
-	Recursive bool
-}
-
 type cRunApp struct {
-	File           string   // Go run file name.
-	Path           string   // Directory storing built binary.
-	Options        string   // Extra "go run" options.
-	Args           string   // Custom arguments.
-	WatchPaths     []string // Watch paths for live reload.
-	IgnorePatterns []string // Custom ignore patterns.
+	File       string   // Go run file name.
+	Path       string   // Directory storing built binary.
+	Options    string   // Extra "go run" options.
+	Args       string   // Custom arguments.
+	WatchPaths []string // Watch paths for live reload.
 }
 
 const (
@@ -54,47 +49,45 @@ const (
 gf run main.go
 gf run main.go --args "server -p 8080"
 gf run main.go -mod=vendor
-gf run main.go -w internal,api
-gf run main.go -i ".git,node_modules"
+gf run main.go -w "manifest/config/*.yaml"
 `
 	cRunDc = `
 The "run" command is used for running go codes with hot-compiled-like feature,
 which compiles and runs the go codes asynchronously when codes change.
 `
-	cRunFileBrief          = `building file path.`
-	cRunPathBrief          = `output directory path for built binary file. it's "./" in default`
-	cRunExtraBrief         = `the same options as "go run"/"go build" except some options as follows defined`
-	cRunArgsBrief          = `custom arguments for your process`
-	cRunWatchPathsBrief    = `watch additional paths for live reload, separated by ",". i.e. "internal,api"`
-	cRunIgnorePatternBrief = `custom ignore patterns for watch, separated by ",". i.e. ".git,node_modules". default patterns: node_modules, vendor, .*, _*. Glob syntax: "*" matches any chars, "?" matches single char, "[abc]" matches char class. Note: patterns match directory names only, not paths`
+	cRunFileBrief       = `building file path.`
+	cRunPathBrief       = `output directory path for built binary file. it's "./" in default`
+	cRunExtraBrief      = `the same options as "go run"/"go build" except some options as follows defined`
+	cRunArgsBrief       = `custom arguments for your process`
+	cRunWatchPathsBrief = `watch additional paths for live reload, separated by ",". i.e. "manifest/config/*.yaml"`
 )
 
-var process *gproc.Process
+var (
+	process *gproc.Process
+)
 
 func init() {
 	gtag.Sets(g.MapStrStr{
-		`cRunUsage`:              cRunUsage,
-		`cRunBrief`:              cRunBrief,
-		`cRunEg`:                 cRunEg,
-		`cRunDc`:                 cRunDc,
-		`cRunFileBrief`:          cRunFileBrief,
-		`cRunPathBrief`:          cRunPathBrief,
-		`cRunExtraBrief`:         cRunExtraBrief,
-		`cRunArgsBrief`:          cRunArgsBrief,
-		`cRunWatchPathsBrief`:    cRunWatchPathsBrief,
-		`cRunIgnorePatternBrief`: cRunIgnorePatternBrief,
+		`cRunUsage`:           cRunUsage,
+		`cRunBrief`:           cRunBrief,
+		`cRunEg`:              cRunEg,
+		`cRunDc`:              cRunDc,
+		`cRunFileBrief`:       cRunFileBrief,
+		`cRunPathBrief`:       cRunPathBrief,
+		`cRunExtraBrief`:      cRunExtraBrief,
+		`cRunArgsBrief`:       cRunArgsBrief,
+		`cRunWatchPathsBrief`: cRunWatchPathsBrief,
 	})
 }
 
 type (
 	cRunInput struct {
-		g.Meta         `name:"run" config:"gfcli.run"`
-		File           string   `name:"FILE"           arg:"true" brief:"{cRunFileBrief}" v:"required"`
-		Path           string   `name:"path"           short:"p"  brief:"{cRunPathBrief}" d:"./"`
-		Extra          string   `name:"extra"          short:"e"  brief:"{cRunExtraBrief}"`
-		Args           string   `name:"args"           short:"a"  brief:"{cRunArgsBrief}"`
-		WatchPaths     []string `name:"watchPaths"     short:"w"  brief:"{cRunWatchPathsBrief}"`
-		IgnorePatterns []string `name:"ignorePatterns" short:"i"  brief:"{cRunIgnorePatternBrief}"`
+		g.Meta     `name:"run" config:"gfcli.run"`
+		File       string   `name:"FILE"       arg:"true" brief:"{cRunFileBrief}" v:"required"`
+		Path       string   `name:"path"       short:"p"  brief:"{cRunPathBrief}" d:"./"`
+		Extra      string   `name:"extra"      short:"e"  brief:"{cRunExtraBrief}"`
+		Args       string   `name:"args"       short:"a"  brief:"{cRunArgsBrief}"`
+		WatchPaths []string `name:"watchPaths" short:"w"  brief:"{cRunWatchPathsBrief}"`
 	}
 	cRunOutput struct{}
 )
@@ -111,35 +104,22 @@ func (c cRun) Index(ctx context.Context, in cRunInput) (out *cRunOutput, err err
 		mlog.Fatalf(`command "go" not found in your environment, please install golang first to proceed this command`)
 	}
 
-	// Parse comma-separated values in WatchPaths
-	if len(in.WatchPaths) > 0 {
-		in.WatchPaths = parseCommaSeparatedArgs(in.WatchPaths)
+	if len(in.WatchPaths) == 1 {
+		in.WatchPaths = strings.Split(in.WatchPaths[0], ",")
 		mlog.Printf("watchPaths: %v", in.WatchPaths)
 	}
 
-	// Parse comma-separated values in IgnorePatterns
-	if len(in.IgnorePatterns) > 0 {
-		in.IgnorePatterns = parseCommaSeparatedArgs(in.IgnorePatterns)
-		mlog.Printf("ignorePatterns: %v", in.IgnorePatterns)
-	}
-
 	app := &cRunApp{
-		File:           in.File,
-		Path:           filepath.FromSlash(in.Path),
-		Options:        in.Extra,
-		Args:           in.Args,
-		WatchPaths:     in.WatchPaths,
-		IgnorePatterns: in.IgnorePatterns,
+		File:       in.File,
+		Path:       filepath.FromSlash(in.Path),
+		Options:    in.Extra,
+		Args:       in.Args,
+		WatchPaths: in.WatchPaths,
 	}
-	dirty := gtype.NewBool()
+	dirty := gatomic.NewBool()
 
-	outputPath := app.genOutputPath()
+	var outputPath = app.genOutputPath()
 	callbackFunc := func(event *gfsnotify.Event) {
-		if !event.IsWrite() && !event.IsCreate() && !event.IsRemove() && !event.IsRename() {
-			return
-		}
-
-		// Check if the file extension is 'go'.
 		if gfile.ExtName(event.Path) != "go" {
 			return
 		}
@@ -157,11 +137,15 @@ func (c cRun) Index(ctx context.Context, in cRunInput) (out *cRunOutput, err err
 		})
 	}
 
-	// Get directories to watch (recursive or non-recursive monitoring).
-	watchPaths := app.getWatchPaths()
-	for _, wp := range watchPaths {
-		option := gfsnotify.WatchOption{NoRecursive: !wp.Recursive}
-		_, err = gfsnotify.Add(wp.Path, callbackFunc, option)
+	if len(app.WatchPaths) > 0 {
+		for _, path := range app.WatchPaths {
+			_, err = gfsnotify.Add(gfile.RealPath(path), callbackFunc)
+			if err != nil {
+				mlog.Fatal(err)
+			}
+		}
+	} else {
+		_, err = gfsnotify.Add(gfile.RealPath("."), callbackFunc)
 		if err != nil {
 			mlog.Fatal(err)
 		}
@@ -223,37 +207,8 @@ func (app *cRunApp) End(ctx context.Context, sig os.Signal, outputPath string) {
 	// Delete the binary file.
 	// firstly, kill the process.
 	if process != nil {
-		if sig != nil && runtime.GOOS != "windows" {
-			if err := process.Signal(sig); err != nil {
-				mlog.Debugf("send signal to process error: %s", err.Error())
-				if err := process.Kill(); err != nil {
-					mlog.Debugf("kill process error: %s", err.Error())
-				}
-			} else {
-				waitCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
-				defer cancel()
-				done := make(chan error, 1)
-				go func() {
-					select {
-					case <-waitCtx.Done():
-						done <- waitCtx.Err()
-					case done <- process.Wait():
-					}
-				}()
-				err := <-done
-				if err != nil {
-					mlog.Debugf("process wait error: %s", err.Error())
-					if err := process.Kill(); err != nil {
-						mlog.Debugf("kill process error: %s", err.Error())
-					}
-				} else {
-					mlog.Debug("process exited gracefully")
-				}
-			}
-		} else {
-			if err := process.Kill(); err != nil {
-				mlog.Debugf("kill process error: %s", err.Error())
-			}
+		if err := process.Kill(); err != nil {
+			mlog.Debugf("kill process error: %s", err.Error())
 		}
 	}
 	if err := gfile.RemoveFile(outputPath); err != nil {
@@ -264,181 +219,35 @@ func (app *cRunApp) End(ctx context.Context, sig os.Signal, outputPath string) {
 }
 
 func (app *cRunApp) genOutputPath() (outputPath string) {
+	var renamePath string
 	outputPath = gfile.Join(app.Path, gfile.Name(app.File))
 	if runtime.GOOS == "windows" {
 		outputPath += ".exe"
 		if gfile.Exists(outputPath) {
-			renamePath := outputPath + "~"
+			renamePath = outputPath + "~"
 			if err := gfile.Rename(outputPath, renamePath); err != nil {
 				mlog.Print(err)
 			}
-			// Clean up the renamed old binary file
-			defer func() {
-				if gfile.Exists(renamePath) {
-					_ = gfile.Remove(renamePath)
-				}
-			}()
 		}
 	}
 	return filepath.FromSlash(outputPath)
 }
 
-// getWatchPaths uses DFS to find the minimal set of directories to watch.
-// Rule: if a directory and all its descendants have no ignored subdirectories, watch it;
-// otherwise, recurse into valid children and watch the current directory non-recursively.
-func (app *cRunApp) getWatchPaths() []watchPath {
-	roots := []string{"."}
-	if len(app.WatchPaths) > 0 {
-		roots = app.WatchPaths
-	}
-
-	// Use custom ignore patterns if provided, otherwise use default.
-	ignorePatterns := defaultIgnorePatterns
-	if len(app.IgnorePatterns) > 0 {
-		ignorePatterns = app.IgnorePatterns
-	}
-
-	var watchPaths []watchPath
-
-	for _, root := range roots {
-		absRoot := gfile.RealPath(root)
-		if absRoot == "" {
-			mlog.Printf("watch path '%s' not found, skipping", root)
+func matchWatchPaths(watchPaths []string, eventPath string) bool {
+	for _, path := range watchPaths {
+		absPath, err := filepath.Abs(path)
+		if err != nil {
+			mlog.Printf("match watchPath '%s' error: %s", path, err.Error())
 			continue
 		}
-		if isIgnoredDirName(absRoot, ignorePatterns) {
+		matched, err := filepath.Match(absPath, eventPath)
+		if err != nil {
+			mlog.Printf("match watchPath '%s' error: %s", path, err.Error())
 			continue
 		}
-		app.collectWatchPaths(absRoot, ignorePatterns, &watchPaths)
-	}
-
-	if len(watchPaths) == 0 {
-		mlog.Printf("no directories to watch, using current directory")
-		if absCur := gfile.RealPath("."); absCur != "" {
-			return []watchPath{{Path: absCur, Recursive: true}}
-		}
-		return []watchPath{{Path: ".", Recursive: true}}
-	}
-
-	mlog.Printf("watching %d paths", len(watchPaths))
-	for _, wp := range watchPaths {
-		recursiveStr := "recursive"
-		if !wp.Recursive {
-			recursiveStr = "non-recursive"
-		}
-		mlog.Debugf("  - %s (%s)", wp.Path, recursiveStr)
-	}
-	return watchPaths
-}
-
-// collectWatchPaths performs a DFS traversal to collect the minimal set of directories to watch.
-// Returns true if the directory or any of its descendants contains ignored directories.
-// Rule: if a directory has no ignored descendants at any depth, watch it recursively;
-// otherwise, watch it non-recursively and recurse into valid children.
-func (app *cRunApp) collectWatchPaths(dir string, ignorePatterns []string, watchPaths *[]watchPath) bool {
-	entries, err := gfile.ScanDir(dir, "*", false)
-	if err != nil {
-		mlog.Printf("scan directory '%s' error: %s", dir, err.Error())
-		// If we can't scan the directory, add it to watch list as fallback
-		*watchPaths = append(*watchPaths, watchPath{Path: dir, Recursive: true})
-		return false
-	}
-
-	// First pass: identify valid subdirectories and check for directly ignored children
-	var validSubDirs []string
-	hasIgnoredChild := false
-	for _, entry := range entries {
-		if !gfile.IsDir(entry) {
-			continue
-		}
-		if isIgnoredDirName(entry, ignorePatterns) {
-			hasIgnoredChild = true
-		} else {
-			validSubDirs = append(validSubDirs, entry)
-		}
-	}
-
-	// If already has ignored child, we know this dir needs non-recursive watch
-	if hasIgnoredChild {
-		*watchPaths = append(*watchPaths, watchPath{Path: dir, Recursive: false})
-		for _, subDir := range validSubDirs {
-			app.collectWatchPaths(subDir, ignorePatterns, watchPaths)
-		}
-		return true
-	}
-
-	// No ignored children, but need to check descendants recursively
-	// Collect results from all subdirectories first
-	subResults := make([]bool, len(validSubDirs))
-	subWatchPaths := make([][]watchPath, len(validSubDirs))
-	hasIgnoredDescendant := false
-
-	for i, subDir := range validSubDirs {
-		var subPaths []watchPath
-		subResults[i] = app.collectWatchPaths(subDir, ignorePatterns, &subPaths)
-		subWatchPaths[i] = subPaths
-		if subResults[i] {
-			hasIgnoredDescendant = true
-		}
-	}
-
-	if !hasIgnoredDescendant {
-		// No ignored descendants at any depth, watch this directory recursively
-		*watchPaths = append(*watchPaths, watchPath{Path: dir, Recursive: true})
-		return false
-	}
-
-	// Has ignored descendants, watch current directory non-recursively
-	// and add all collected subdirectory watch paths
-	*watchPaths = append(*watchPaths, watchPath{Path: dir, Recursive: false})
-	for _, subPaths := range subWatchPaths {
-		*watchPaths = append(*watchPaths, subPaths...)
-	}
-	return true
-}
-
-// defaultIgnorePatterns contains glob patterns for directory names that should be ignored when watching.
-// These directories typically contain third-party code or non-source files.
-// Supported glob syntax (filepath.Match):
-//   - "*" matches any sequence of non-separator characters
-//   - "?" matches any single non-separator character
-//   - "[abc]" matches any character in the bracket
-//   - "[a-z]" matches any character in the range
-//   - "[^abc]" or "[!abc]" matches any character not in the bracket
-//
-// Note: patterns match directory base names only, not full paths (no "/" or path separators allowed).
-var defaultIgnorePatterns = []string{
-	"node_modules",
-	"vendor",
-	".*", // All hidden directories (covers .git, .svn, .hg, .idea, .vscode, etc.)
-	"_*", // Directories starting with underscore
-}
-
-// isIgnoredDirName checks if a directory name matches any ignored pattern.
-// It accepts either a full path or just the directory name, but only matches against the base name.
-// Note: patterns should not contain "/" as they only match directory names, not paths.
-func isIgnoredDirName(name string, ignorePatterns []string) bool {
-	baseName := gfile.Basename(name)
-	for _, pattern := range ignorePatterns {
-		if matched, _ := filepath.Match(pattern, baseName); matched {
+		if matched {
 			return true
 		}
 	}
 	return false
 }
-
-// parseCommaSeparatedArgs parses command line arguments that may contain comma-separated values.
-// It handles both single argument with commas (e.g., "a,b,c") and multiple arguments.
-func parseCommaSeparatedArgs(args []string) []string {
-	var result []string
-	for _, arg := range args {
-		parts := strings.Split(arg, ",")
-		for _, part := range parts {
-			trimmed := strings.TrimSpace(part)
-			if trimmed != "" {
-				result = append(result, trimmed)
-			}
-		}
-	}
-	return result
-}

cmd/gf/internal/cmd/cmd_tpl.go

@@ -9,15 +9,15 @@ package cmd
 import (
 	"context"
 
-	"github.com/gogf/gf/v2/encoding/gjson"
-	"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/text/gstr"
-	"github.com/gogf/gf/v2/util/gtag"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/encoding/gjson"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gtag"
+	"github.com/gogf/gf/v3/util/gutil"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 var (

cmd/gf/internal/cmd/cmd_up.go

@@ -13,16 +13,15 @@ import (
 
 	"github.com/gogf/selfupdate"
 
-	"github.com/gogf/gf/v2/container/gset"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/genv"
-	"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/v3/container/gset"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gtag"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/utils"
 )
 
 var (
@@ -40,11 +39,7 @@ gf up
 gf up -a
 gf up -c
 gf up -cf
-gf up -a -m=install
-gf up -a -m=install -p=github.com/gogf/gf/cmd/gf/v2@latest
 `
-	cliMethodHttpDownload = "http"
-	cliMethodGoInstall    = "install"
 )
 
 func init() {
@@ -54,14 +49,10 @@ func init() {
 }
 
 type cUpInput struct {
-	g.Meta               `name:"up" config:"gfcli.up"`
-	All                  bool   `name:"all" short:"a" brief:"upgrade both version and cli, auto fix codes" orphan:"true"`
-	Cli                  bool   `name:"cli" short:"c" brief:"also upgrade CLI tool" orphan:"true"`
-	Fix                  bool   `name:"fix" short:"f" brief:"auto fix codes(it only make sense if cli is to be upgraded)" orphan:"true"`
-	CliDownloadingMethod string `name:"cli-download-method" short:"m" brief:"cli upgrade method: http=download binary via HTTP GET, install=upgrade via go install" d:"http"`
-	// CliModulePath specifies the module path for CLI installation via go install.
-	// This is used when CliDownloadingMethod is set to "install".
-	CliModulePath string `name:"cli-module-path" short:"p" brief:"custom cli module path for upgrade CLI tool with go install method" d:"github.com/gogf/gf/cmd/gf/v2@latest"`
+	g.Meta `name:"up" config:"gfcli.up"`
+	All    bool `name:"all" short:"a" brief:"upgrade both version and cli, auto fix codes" orphan:"true"`
+	Cli    bool `name:"cli" short:"c" brief:"also upgrade CLI tool" orphan:"true"`
+	Fix    bool `name:"fix" short:"f" brief:"auto fix codes(it only make sense if cli is to be upgraded)" orphan:"true"`
 }
 
 type cUpOutput struct{}
@@ -85,7 +76,7 @@ func (c cUp) Index(ctx context.Context, in cUpInput) (out *cUpOutput, err error)
 	}
 
 	if in.Cli {
-		if err = c.doUpgradeCLI(ctx, in); err != nil {
+		if err = c.doUpgradeCLI(ctx); err != nil {
 			return nil, err
 		}
 	}
@@ -179,22 +170,8 @@ func (c cUp) doUpgradeVersion(ctx context.Context, in cUpInput) (out *doUpgradeV
 }
 
 // doUpgradeCLI downloads the new version binary with process.
-func (c cUp) doUpgradeCLI(ctx context.Context, in cUpInput) (err error) {
+func (c cUp) doUpgradeCLI(ctx context.Context) (err error) {
 	mlog.Print(`start upgrading cli...`)
-	fmt.Println(` cli upgrade method:`, in.CliDownloadingMethod)
-	switch in.CliDownloadingMethod {
-	case cliMethodHttpDownload:
-		return c.doUpgradeCLIWithHttpDownload(ctx)
-	case cliMethodGoInstall:
-		return c.doUpgradeCLIWithGoInstall(ctx, in)
-	default:
-		mlog.Fatalf(`invalid cli upgrade method: "%s", please use "http" or "install"`, in.CliDownloadingMethod)
-	}
-	return
-}
-
-func (c cUp) doUpgradeCLIWithHttpDownload(ctx context.Context) (err error) {
-	mlog.Print(`start upgrading cli with http get download...`)
 	var (
 		downloadUrl = fmt.Sprintf(
 			`https://github.com/gogf/gf/releases/latest/download/gf_%s_%s`,
@@ -236,41 +213,6 @@ func (c cUp) doUpgradeCLIWithHttpDownload(ctx context.Context) (err error) {
 	return
 }
 
-func (c cUp) doUpgradeCLIWithGoInstall(ctx context.Context, in cUpInput) (err error) {
-	mlog.Print(`upgrading cli with go install...`)
-	if !genv.Contains("GOPATH") {
-		mlog.Fatal(`"GOPATH" environment variable does not exist, please check your go installation`)
-	}
-
-	command := fmt.Sprintf(`go install %s`, in.CliModulePath)
-	mlog.Printf(`running command: %s`, command)
-	err = gproc.ShellRun(ctx, command)
-	if err != nil {
-		return err
-	}
-
-	cliFilePath := gfile.Join(genv.Get("GOPATH").String(), "bin/gf")
-	if runtime.GOOS == "windows" {
-		cliFilePath += ".exe"
-	}
-
-	// It fails if file not exist or its size is less than 1MB.
-	if !gfile.Exists(cliFilePath) || gfile.Size(cliFilePath) < 1024*1024 {
-		mlog.Fatalf(`go install %s failed, "%s" does not exist or its size is less than 1MB`, in.CliModulePath, cliFilePath)
-	}
-
-	newFile, err := gfile.Open(cliFilePath)
-	if err != nil {
-		return err
-	}
-	// selfupdate
-	err = selfupdate.Apply(newFile, selfupdate.Options{})
-	if err != nil {
-		return err
-	}
-	return
-}
-
 func (c cUp) doAutoFixing(ctx context.Context, dirPath string, version string) (err error) {
 	mlog.Printf(`auto fixing directory path "%s" from version "%s" ...`, dirPath, version)
 	command := fmt.Sprintf(`gf fix -p %s`, dirPath)

cmd/gf/internal/cmd/cmd_version.go

@@ -14,16 +14,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gogf/gf/v2"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gbuild"
-	"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/v3"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gbuild"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/text/gstr"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 var (

cmd/gf/internal/cmd/cmd_z_init_test.go

@@ -10,30 +10,24 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v3/database/gdb"
+	"github.com/gogf/gf/v3/test/gtest"
 )
 
 var (
-	ctx      = context.Background()
-	testDB   gdb.DB
-	testPgDB gdb.DB
-	link     = "mysql:root:12345678@tcp(127.0.0.1:3306)/test?loc=Local&parseTime=true"
-	linkPg   = "pgsql:postgres:12345678@tcp(127.0.0.1:5432)/test"
+	ctx    = context.Background()
+	testDB gdb.DB
+	link   = "mysql:root:12345678@tcp(127.0.0.1:3306)/test?loc=Local&parseTime=true"
 )
 
 func init() {
 	var err error
-	testDB, err = gdb.New(gdb.ConfigNode{
+	testDB, err = gdb.New(&gdb.ConfigNode{
 		Link: link,
 	})
 	if err != nil {
 		panic(err)
 	}
-	// PostgreSQL connection (optional, may not be available in all environments)
-	testPgDB, _ = gdb.New(gdb.ConfigNode{
-		Link: linkPg,
-	})
 }
 
 func dropTableWithDb(db gdb.DB, table string) {
@@ -42,11 +36,3 @@ func dropTableWithDb(db gdb.DB, table string) {
 		gtest.Error(err)
 	}
 }
-
-// dropTableStd uses standard SQL syntax compatible with MySQL and PostgreSQL.
-func dropTableStd(db gdb.DB, table string) {
-	dropTableStmt := fmt.Sprintf("DROP TABLE IF EXISTS %s", table)
-	if _, err := db.Exec(ctx, dropTableStmt); err != nil {
-		gtest.Error(err)
-	}
-}

cmd/gf/internal/cmd/cmd_z_unit_build_test.go

@@ -9,10 +9,10 @@ package cmd
 import (
 	"testing"
 
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gproc"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 func Test_Build_Single(t *testing.T) {
@@ -104,7 +104,7 @@ func Test_Build_Single_VarMap(t *testing.T) {
 
 		t.Assert(gfile.Exists(binaryPath), false)
 		_, err = f.Index(ctx, cBuildInput{
-			VarMap: map[string]any{
+			VarMap: map[string]interface{}{
 				"a": "1",
 				"b": "2",
 			},

cmd/gf/internal/cmd/cmd_z_unit_env_test.go

@@ -1,84 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package cmd
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
-)
-
-func Test_Env_Index(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test that env command runs without error
-		_, err := Env.Index(ctx, cEnvInput{})
-		t.AssertNil(err)
-	})
-}
-
-func Test_Env_ParseGoEnvOutput(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test parsing normal go env output
-		lines := []string{
-			"set GOPATH=C:\\Users\\test\\go",
-			"set GOROOT=C:\\Go",
-			"set GOOS=windows",
-			"GOARCH=amd64", // Unix format without "set " prefix
-			"CGO_ENABLED=0",
-		}
-
-		for _, line := range lines {
-			line = gstr.Trim(line)
-			if gstr.Pos(line, "set ") == 0 {
-				line = line[4:]
-			}
-			match, _ := gregex.MatchString(`(.+?)=(.*)`, line)
-			t.Assert(len(match) >= 3, true)
-		}
-	})
-}
-
-func Test_Env_ParseGoEnvOutput_WithWarnings(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test parsing go env output that contains warning messages
-		// These lines should be skipped without causing errors
-		lines := []string{
-			"go: stripping unprintable or unescapable characters from %\"GOPROXY\"%",
-			"go: warning: some warning message",
-			"# this is a comment",
-			"",
-			"set GOPATH=C:\\Users\\test\\go",
-			"set GOOS=windows",
-		}
-
-		array := make([][]string, 0)
-		for _, line := range lines {
-			line = gstr.Trim(line)
-			if line == "" {
-				continue
-			}
-			if gstr.Pos(line, "set ") == 0 {
-				line = line[4:]
-			}
-			match, _ := gregex.MatchString(`(.+?)=(.*)`, line)
-			if len(match) < 3 {
-				// Skip lines that don't match key=value format (e.g., warning messages)
-				continue
-			}
-			array = append(array, []string{gstr.Trim(match[1]), gstr.Trim(match[2])})
-		}
-
-		// Should have parsed 2 valid environment variables
-		t.Assert(len(array), 2)
-		t.Assert(array[0][0], "GOPATH")
-		t.Assert(array[0][1], "C:\\Users\\test\\go")
-		t.Assert(array[1][0], "GOOS")
-		t.Assert(array[1][1], "windows")
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_fix_test.go

@@ -9,8 +9,7 @@ package cmd
 import (
 	"testing"
 
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/test/gtest"
 )
 
 func Test_Fix_doFixV25Content(t *testing.T) {
@@ -23,82 +22,3 @@ func Test_Fix_doFixV25Content(t *testing.T) {
 		t.AssertNil(err)
 	})
 }
-
-func Test_Fix_doFixV25Content_WithReplacement(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			f       = cFix{}
-			content = `s.BindHookHandlerByMap("/path", map[string]ghttp.HandlerFunc{
-				ghttp.HookBeforeServe: func(r *ghttp.Request) {},
-			})`
-		)
-		newContent, err := f.doFixV25Content(content)
-		t.AssertNil(err)
-		// Verify the replacement was made
-		t.Assert(gstr.Contains(newContent, "map[ghttp.HookName]ghttp.HandlerFunc"), true)
-		t.Assert(gstr.Contains(newContent, "map[string]ghttp.HandlerFunc"), false)
-	})
-}
-
-func Test_Fix_doFixV25Content_NoMatch(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			f       = cFix{}
-			content = `package main
-
-func main() {
-	fmt.Println("Hello World")
-}
-`
-		)
-		newContent, err := f.doFixV25Content(content)
-		t.AssertNil(err)
-		// Content should remain unchanged
-		t.Assert(newContent, content)
-	})
-}
-
-func Test_Fix_doFixV25Content_MultipleMatches(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			f       = cFix{}
-			content = `
-s.BindHookHandlerByMap("/path1", map[string]ghttp.HandlerFunc{})
-s.BindHookHandlerByMap("/path2", map[string]ghttp.HandlerFunc{})
-`
-		)
-		newContent, err := f.doFixV25Content(content)
-		t.AssertNil(err)
-		// Both should be replaced
-		count := gstr.Count(newContent, "map[ghttp.HookName]ghttp.HandlerFunc")
-		t.Assert(count, 2)
-	})
-}
-
-func Test_Fix_doFixV25Content_EmptyContent(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			f       = cFix{}
-			content = ""
-		)
-		newContent, err := f.doFixV25Content(content)
-		t.AssertNil(err)
-		t.Assert(newContent, "")
-	})
-}
-
-func Test_Fix_doFixV25Content_ComplexPath(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			f       = cFix{}
-			content = `s.BindHookHandlerByMap("/api/v1/user/{id}/profile", map[string]ghttp.HandlerFunc{
-				ghttp.HookBeforeServe: func(r *ghttp.Request) {
-					r.Response.Write("before")
-				},
-			})`
-		)
-		newContent, err := f.doFixV25Content(content)
-		t.AssertNil(err)
-		t.Assert(gstr.Contains(newContent, "map[ghttp.HookName]ghttp.HandlerFunc"), true)
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_gen_ctrl_test.go

@@ -10,19 +10,19 @@ import (
 	"path/filepath"
 	"testing"
 
-	"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/v3/os/gfile"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/guid"
+	"github.com/gogf/gf/v3/util/gutil"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genctrl"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/genctrl"
 )
 
 func Test_Gen_Ctrl_Default(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var (
 			path      = gfile.Temp(guid.S())
-			apiFolder = gtest.DataPath("genctrl", "default", "api")
+			apiFolder = gtest.DataPath("genctrl", "api")
 			in        = genctrl.CGenCtrlInput{
 				SrcFolder:     apiFolder,
 				DstFolder:     path,
@@ -39,7 +39,7 @@ func Test_Gen_Ctrl_Default(t *testing.T) {
 
 		err = gfile.Mkdir(path)
 		t.AssertNil(err)
-		defer gfile.RemoveAll(path)
+		defer gfile.Remove(path)
 
 		_, err = genctrl.CGenCtrl{}.Ctrl(ctx, in)
 		t.AssertNil(err)
@@ -49,7 +49,7 @@ func Test_Gen_Ctrl_Default(t *testing.T) {
 			genApi       = apiFolder + filepath.FromSlash("/article/article.go")
 			genApiExpect = apiFolder + filepath.FromSlash("/article/article_expect.go")
 		)
-		defer gfile.RemoveAll(genApi)
+		defer gfile.Remove(genApi)
 		t.Assert(gfile.GetContents(genApi), gfile.GetContents(genApiExpect))
 
 		// files
@@ -67,7 +67,7 @@ func Test_Gen_Ctrl_Default(t *testing.T) {
 		})
 
 		// content
-		testPath := gtest.DataPath("genctrl", "default", "controller")
+		testPath := gtest.DataPath("genctrl", "controller")
 		expectFiles := []string{
 			testPath + filepath.FromSlash("/article/article.go"),
 			testPath + filepath.FromSlash("/article/article_new.go"),
@@ -84,104 +84,6 @@ func Test_Gen_Ctrl_Default(t *testing.T) {
 	})
 }
 
-func Test_Gen_Ctrl_Default_Multi(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			path      = gfile.Temp(guid.S())
-			apiFolder = gtest.DataPath("genctrl", "multi", "api")
-			in        = genctrl.CGenCtrlInput{
-				SrcFolder:     apiFolder,
-				DstFolder:     path,
-				WatchFile:     "",
-				SdkPath:       "",
-				SdkStdVersion: false,
-				SdkNoV1:       false,
-				Clear:         false,
-				Merge:         false,
-			}
-		)
-
-		err := gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-		defer gfile.RemoveAll(path)
-
-		_, err = genctrl.CGenCtrl{}.Ctrl(ctx, in)
-		t.AssertNil(err)
-
-		// apiInterface file
-		var (
-			genApiSlice = []string{
-				apiFolder + filepath.FromSlash("/admin/article/article.go"),
-				apiFolder + filepath.FromSlash("/admin/user/user.go"),
-				apiFolder + filepath.FromSlash("/app/user/user.go"),
-				apiFolder + filepath.FromSlash("/app/user/user_ext/user_ext.go"),
-			}
-			genApiSliceExpect = []string{
-				apiFolder + filepath.FromSlash("/admin/article/article_expect.go"),
-				apiFolder + filepath.FromSlash("/admin/user/user_expect.go"),
-				apiFolder + filepath.FromSlash("/app/user/user_expect.go"),
-				apiFolder + filepath.FromSlash("/app/user/user_ext/user_ext_expect.go"),
-			}
-		)
-
-		for i := range genApiSlice {
-			t.Assert(gfile.GetContents(genApiSlice[i]), gfile.GetContents(genApiSliceExpect[i]))
-			gfile.RemoveAll(genApiSlice[i])
-		}
-
-		// files
-		files, err := gfile.ScanDir(path, "*.go", true)
-		t.AssertNil(err)
-		t.Assert(files, []string{
-			path + filepath.FromSlash("/admin/article/article.go"),
-			path + filepath.FromSlash("/admin/article/article_new.go"),
-			path + filepath.FromSlash("/admin/article/article_v1_create.go"),
-
-			path + filepath.FromSlash("/admin/user/user.go"),
-			path + filepath.FromSlash("/admin/user/user_new.go"),
-			path + filepath.FromSlash("/admin/user/user_v1_create.go"),
-
-			path + filepath.FromSlash("/app/user/user.go"),
-			path + filepath.FromSlash("/app/user/user_ext/user_ext.go"),
-			path + filepath.FromSlash("/app/user/user_ext/user_ext_new.go"),
-			path + filepath.FromSlash("/app/user/user_ext/user_ext_v1_create.go"),
-			path + filepath.FromSlash("/app/user/user_ext/user_ext_v1_update.go"),
-
-			path + filepath.FromSlash("/app/user/user_new.go"),
-			path + filepath.FromSlash("/app/user/user_v1_create.go"),
-			path + filepath.FromSlash("/app/user/user_v1_update.go"),
-		})
-
-		// content
-		testPath := gtest.DataPath("genctrl", "multi", "controller")
-		expectFiles := []string{
-			testPath + filepath.FromSlash("/admin/article/article.go"),
-			testPath + filepath.FromSlash("/admin/article/article_new.go"),
-			testPath + filepath.FromSlash("/admin/article/article_v1_create.go"),
-
-			testPath + filepath.FromSlash("/admin/user/user.go"),
-			testPath + filepath.FromSlash("/admin/user/user_new.go"),
-			testPath + filepath.FromSlash("/admin/user/user_v1_create.go"),
-
-			testPath + filepath.FromSlash("/app/user/user.go"),
-			testPath + filepath.FromSlash("/app/user/user_ext/user_ext.go"),
-			testPath + filepath.FromSlash("/app/user/user_ext/user_ext_new.go"),
-			testPath + filepath.FromSlash("/app/user/user_ext/user_ext_v1_create.go"),
-			testPath + filepath.FromSlash("/app/user/user_ext/user_ext_v1_update.go"),
-
-			testPath + filepath.FromSlash("/app/user/user_new.go"),
-			testPath + filepath.FromSlash("/app/user/user_v1_create.go"),
-			testPath + filepath.FromSlash("/app/user/user_v1_update.go"),
-		}
-		for i := range files {
-			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
-		}
-	})
-}
-
 func expectFilesContent(t *gtest.T, paths []string, expectPaths []string) {
 	for i, expectFile := range expectPaths {
 		val := gfile.GetContents(paths[i])
@@ -196,8 +98,8 @@ func Test_Gen_Ctrl_UseMerge_AddNewFile(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var (
 			ctrlPath = gfile.Temp(guid.S())
-			// ctrlPath  = gtest.DataPath("issue", "3460", "controller")
-			apiFolder = gtest.DataPath("genctrl", "merge", "add_new_file", "api")
+			//ctrlPath  = gtest.DataPath("issue", "3460", "controller")
+			apiFolder = gtest.DataPath("genctrl-merge", "add_new_file", "api")
 			in        = genctrl.CGenCtrlInput{
 				SrcFolder: apiFolder,
 				DstFolder: ctrlPath,
@@ -206,7 +108,7 @@ func Test_Gen_Ctrl_UseMerge_AddNewFile(t *testing.T) {
 		)
 		const testNewApiFile = `
 package v1
-import "github.com/gogf/gf/v2/frame/g"
+import "github.com/gogf/gf/v3/frame/g"
 type DictTypeAddReq struct {
 	g.Meta
 }
@@ -216,7 +118,7 @@ type DictTypeAddRes struct {
 
 		err := gfile.Mkdir(ctrlPath)
 		t.AssertNil(err)
-		defer gfile.RemoveAll(ctrlPath)
+		defer gfile.Remove(ctrlPath)
 
 		_, err = genctrl.CGenCtrl{}.Ctrl(ctx, in)
 		t.AssertNil(err)
@@ -225,7 +127,7 @@ type DictTypeAddRes struct {
 			genApi       = filepath.Join(apiFolder, "/dict/dict.go")
 			genApiExpect = filepath.Join(apiFolder, "/dict/dict_expect.go")
 		)
-		defer gfile.RemoveAll(genApi)
+		defer gfile.Remove(genApi)
 		t.Assert(gfile.GetContents(genApi), gfile.GetContents(genApiExpect))
 
 		genCtrlFiles, err := gfile.ScanDir(ctrlPath, "*.go", true)
@@ -236,7 +138,7 @@ type DictTypeAddRes struct {
 			filepath.Join(ctrlPath, "/dict/dict_v1_dict_type.go"),
 		})
 
-		expectCtrlPath := gtest.DataPath("genctrl", "merge", "add_new_file", "controller")
+		expectCtrlPath := gtest.DataPath("genctrl-merge", "add_new_file", "controller")
 		expectFiles := []string{
 			filepath.Join(expectCtrlPath, "/dict/dict.go"),
 			filepath.Join(expectCtrlPath, "/dict/dict_new.go"),
@@ -250,7 +152,7 @@ type DictTypeAddRes struct {
 		newApiFilePath := filepath.Join(apiFolder, "/dict/v1/test_new.go")
 		err = gfile.PutContents(newApiFilePath, testNewApiFile)
 		t.AssertNil(err)
-		defer gfile.RemoveAll(newApiFilePath)
+		defer gfile.Remove(newApiFilePath)
 
 		// Then execute the command
 		_, err = genctrl.CGenCtrl{}.Ctrl(ctx, in)
@@ -277,8 +179,8 @@ func Test_Gen_Ctrl_UseMerge_AddNewCtrl(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var (
 			ctrlPath = gfile.Temp(guid.S())
-			// ctrlPath  = gtest.DataPath("issue", "3460", "controller")
-			apiFolder = gtest.DataPath("genctrl", "merge", "add_new_ctrl", "api")
+			//ctrlPath  = gtest.DataPath("issue", "3460", "controller")
+			apiFolder = gtest.DataPath("genctrl-merge", "add_new_ctrl", "api")
 			in        = genctrl.CGenCtrlInput{
 				SrcFolder: apiFolder,
 				DstFolder: ctrlPath,
@@ -288,7 +190,7 @@ func Test_Gen_Ctrl_UseMerge_AddNewCtrl(t *testing.T) {
 
 		err := gfile.Mkdir(ctrlPath)
 		t.AssertNil(err)
-		defer gfile.RemoveAll(ctrlPath)
+		defer gfile.Remove(ctrlPath)
 
 		_, err = genctrl.CGenCtrl{}.Ctrl(ctx, in)
 		t.AssertNil(err)
@@ -297,7 +199,7 @@ func Test_Gen_Ctrl_UseMerge_AddNewCtrl(t *testing.T) {
 			genApi       = filepath.Join(apiFolder, "/dict/dict.go")
 			genApiExpect = filepath.Join(apiFolder, "/dict/dict_expect.go")
 		)
-		defer gfile.RemoveAll(genApi)
+		defer gfile.Remove(genApi)
 		t.Assert(gfile.GetContents(genApi), gfile.GetContents(genApiExpect))
 
 		genCtrlFiles, err := gfile.ScanDir(ctrlPath, "*.go", true)
@@ -308,7 +210,7 @@ func Test_Gen_Ctrl_UseMerge_AddNewCtrl(t *testing.T) {
 			filepath.Join(ctrlPath, "/dict/dict_v1_dict_type.go"),
 		})
 
-		expectCtrlPath := gtest.DataPath("genctrl", "merge", "add_new_ctrl", "controller")
+		expectCtrlPath := gtest.DataPath("genctrl-merge", "add_new_ctrl", "controller")
 		expectFiles := []string{
 			filepath.Join(expectCtrlPath, "/dict/dict.go"),
 			filepath.Join(expectCtrlPath, "/dict/dict_new.go"),
@@ -334,7 +236,7 @@ type DictTypeAddRes struct {
 		err = gfile.PutContentsAppend(dictModuleFileName, testNewApiFile)
 		t.AssertNil(err)
 
-		// ==================================
+		//==================================
 		// Then execute the command
 		_, err = genctrl.CGenCtrl{}.Ctrl(ctx, in)
 		t.AssertNil(err)
@@ -360,7 +262,7 @@ func Test_Gen_Ctrl_UseMerge_Issue3460(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var (
 			ctrlPath = gfile.Temp(guid.S())
-			// ctrlPath  = gtest.DataPath("issue", "3460", "controller")
+			//ctrlPath  = gtest.DataPath("issue", "3460", "controller")
 			apiFolder = gtest.DataPath("issue", "3460", "api")
 			in        = genctrl.CGenCtrlInput{
 				SrcFolder:     apiFolder,
@@ -376,7 +278,7 @@ func Test_Gen_Ctrl_UseMerge_Issue3460(t *testing.T) {
 
 		err := gfile.Mkdir(ctrlPath)
 		t.AssertNil(err)
-		defer gfile.RemoveAll(ctrlPath)
+		defer gfile.Remove(ctrlPath)
 
 		_, err = genctrl.CGenCtrl{}.Ctrl(ctx, in)
 		t.AssertNil(err)

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_issue_test.go

@@ -11,16 +11,16 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcfg"
-	"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/v3/database/gdb"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gcfg"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/guid"
+	"github.com/gogf/gf/v3/util/gutil"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/gendao"
 )
 
 // https://github.com/gogf/gf/issues/2572
@@ -66,7 +66,6 @@ func Test_Gen_Dao_Issue2572(t *testing.T) {
 				NoJsonTag:          false,
 				NoModelComment:     false,
 				Clear:              false,
-				GenTable:           false,
 				TypeMapping:        nil,
 				FieldMapping:       nil,
 			}
@@ -156,7 +155,6 @@ func Test_Gen_Dao_Issue2616(t *testing.T) {
 				NoJsonTag:          false,
 				NoModelComment:     false,
 				Clear:              false,
-				GenTable:           false,
 				TypeMapping:        nil,
 				FieldMapping:       nil,
 			}
@@ -227,7 +225,7 @@ func Test_Gen_Dao_Issue2746(t *testing.T) {
 				table,
 			)
 		)
-		mdb, err = gdb.New(gdb.ConfigNode{
+		mdb, err = gdb.New(&gdb.ConfigNode{
 			Link: link2746,
 		})
 		t.AssertNil(err)
@@ -268,7 +266,6 @@ func Test_Gen_Dao_Issue2746(t *testing.T) {
 				NoJsonTag:          false,
 				NoModelComment:     false,
 				Clear:              false,
-				GenTable:           false,
 				TypeMapping:        nil,
 				FieldMapping:       nil,
 			}
@@ -341,7 +338,6 @@ func Test_Gen_Dao_Issue3459(t *testing.T) {
 				NoJsonTag:          false,
 				NoModelComment:     false,
 				Clear:              false,
-				GenTable:           false,
 				TypeMapping:        nil,
 			}
 		)
@@ -382,7 +378,7 @@ func Test_Gen_Dao_Issue3459(t *testing.T) {
 			filepath.FromSlash(testPath + "/model/do/table_user.go"),
 			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
 		}
-		for i := range files {
+		for i, _ := range files {
 			//_ = gfile.PutContents(expectFiles[i], gfile.GetContents(files[i]))
 			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
 		}
@@ -454,404 +450,9 @@ func Test_Gen_Dao_Issue3749(t *testing.T) {
 			filepath.FromSlash(testPath + "/model/do/table_user.go"),
 			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
 		}
-		for i := range files {
+		for i, _ := range files {
 			//_ = gfile.PutContents(expectFiles[i], gfile.GetContents(files[i]))
 			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
 		}
 	})
 }
-
-// https://github.com/gogf/gf/issues/4629
-// Test tables pattern matching with * wildcard.
-func Test_Gen_Dao_Issue4629_TablesPattern_Star(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			err         error
-			db          = testDB
-			table1      = "trade_order"
-			table2      = "trade_item"
-			table3      = "user_info"
-			table4      = "user_log"
-			table5      = "config"
-			sqlFilePath = gtest.DataPath(`gendao`, `tables_pattern.sql`)
-		)
-		dropTableStd(db, table1)
-		dropTableStd(db, table2)
-		dropTableStd(db, table3)
-		dropTableStd(db, table4)
-		dropTableStd(db, table5)
-		t.AssertNil(execSqlFile(db, sqlFilePath))
-		defer dropTableStd(db, table1)
-		defer dropTableStd(db, table2)
-		defer dropTableStd(db, table3)
-		defer dropTableStd(db, table4)
-		defer dropTableStd(db, table5)
-
-		var (
-			path  = gfile.Temp(guid.S())
-			group = "test"
-			in    = gendao.CGenDaoInput{
-				Path:   path,
-				Link:   link,
-				Group:  group,
-				Tables: "trade_*", // Should match trade_order, trade_item
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-
-		pwd := gfile.Pwd()
-		err = gfile.Chdir(path)
-		t.AssertNil(err)
-		defer gfile.Chdir(pwd)
-		defer gfile.RemoveAll(path)
-
-		_, err = gendao.CGenDao{}.Dao(ctx, in)
-		t.AssertNil(err)
-
-		// Should generate 2 dao files: trade_order.go, trade_item.go
-		generatedFiles, err := gfile.ScanDir(gfile.Join(path, "dao"), "*.go", false)
-		t.AssertNil(err)
-		t.Assert(len(generatedFiles), 2)
-
-		// Verify the correct files are generated
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_order.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_item.go")), true)
-		// user_* and config should NOT be generated
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_info.go")), false)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_log.go")), false)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "config.go")), false)
-	})
-}
-
-// https://github.com/gogf/gf/issues/4629
-// Test tables pattern matching with multiple patterns.
-func Test_Gen_Dao_Issue4629_TablesPattern_Multiple(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			err         error
-			db          = testDB
-			table1      = "trade_order"
-			table2      = "trade_item"
-			table3      = "user_info"
-			table4      = "user_log"
-			table5      = "config"
-			sqlFilePath = gtest.DataPath(`gendao`, `tables_pattern.sql`)
-		)
-		dropTableStd(db, table1)
-		dropTableStd(db, table2)
-		dropTableStd(db, table3)
-		dropTableStd(db, table4)
-		dropTableStd(db, table5)
-		t.AssertNil(execSqlFile(db, sqlFilePath))
-		defer dropTableStd(db, table1)
-		defer dropTableStd(db, table2)
-		defer dropTableStd(db, table3)
-		defer dropTableStd(db, table4)
-		defer dropTableStd(db, table5)
-
-		var (
-			path  = gfile.Temp(guid.S())
-			group = "test"
-			in    = gendao.CGenDaoInput{
-				Path:   path,
-				Link:   link,
-				Group:  group,
-				Tables: "trade_*,user_*", // Should match trade_order, trade_item, user_info, user_log
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-
-		pwd := gfile.Pwd()
-		err = gfile.Chdir(path)
-		t.AssertNil(err)
-		defer gfile.Chdir(pwd)
-		defer gfile.RemoveAll(path)
-
-		_, err = gendao.CGenDao{}.Dao(ctx, in)
-		t.AssertNil(err)
-
-		// Should generate 4 dao files
-		generatedFiles, err := gfile.ScanDir(gfile.Join(path, "dao"), "*.go", false)
-		t.AssertNil(err)
-		t.Assert(len(generatedFiles), 4)
-
-		// Verify the correct files are generated
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_order.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_item.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_info.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_log.go")), true)
-		// config should NOT be generated
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "config.go")), false)
-	})
-}
-
-// https://github.com/gogf/gf/issues/4629
-// Test tables pattern mixed with exact table name.
-func Test_Gen_Dao_Issue4629_TablesPattern_Mixed(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			err         error
-			db          = testDB
-			table1      = "trade_order"
-			table2      = "trade_item"
-			table3      = "user_info"
-			table4      = "user_log"
-			table5      = "config"
-			sqlFilePath = gtest.DataPath(`gendao`, `tables_pattern.sql`)
-		)
-		dropTableStd(db, table1)
-		dropTableStd(db, table2)
-		dropTableStd(db, table3)
-		dropTableStd(db, table4)
-		dropTableStd(db, table5)
-		t.AssertNil(execSqlFile(db, sqlFilePath))
-		defer dropTableStd(db, table1)
-		defer dropTableStd(db, table2)
-		defer dropTableStd(db, table3)
-		defer dropTableStd(db, table4)
-		defer dropTableStd(db, table5)
-
-		var (
-			path  = gfile.Temp(guid.S())
-			group = "test"
-			in    = gendao.CGenDaoInput{
-				Path:   path,
-				Link:   link,
-				Group:  group,
-				Tables: "trade_*,config", // Pattern + exact name
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-
-		pwd := gfile.Pwd()
-		err = gfile.Chdir(path)
-		t.AssertNil(err)
-		defer gfile.Chdir(pwd)
-		defer gfile.RemoveAll(path)
-
-		_, err = gendao.CGenDao{}.Dao(ctx, in)
-		t.AssertNil(err)
-
-		// Should generate 3 dao files: trade_order.go, trade_item.go, config.go
-		generatedFiles, err := gfile.ScanDir(gfile.Join(path, "dao"), "*.go", false)
-		t.AssertNil(err)
-		t.Assert(len(generatedFiles), 3)
-
-		// Verify the correct files are generated
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_order.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_item.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "config.go")), true)
-		// user_* should NOT be generated
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_info.go")), false)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_log.go")), false)
-	})
-}
-
-// https://github.com/gogf/gf/issues/4629
-// Test tables pattern with ? wildcard (single character match).
-func Test_Gen_Dao_Issue4629_TablesPattern_Question(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			err         error
-			db          = testDB
-			table1      = "trade_order"
-			table2      = "trade_item"
-			table3      = "user_info"
-			table4      = "user_log"
-			table5      = "config"
-			sqlFilePath = gtest.DataPath(`gendao`, `tables_pattern.sql`)
-		)
-		dropTableStd(db, table1)
-		dropTableStd(db, table2)
-		dropTableStd(db, table3)
-		dropTableStd(db, table4)
-		dropTableStd(db, table5)
-		t.AssertNil(execSqlFile(db, sqlFilePath))
-		defer dropTableStd(db, table1)
-		defer dropTableStd(db, table2)
-		defer dropTableStd(db, table3)
-		defer dropTableStd(db, table4)
-		defer dropTableStd(db, table5)
-
-		var (
-			path  = gfile.Temp(guid.S())
-			group = "test"
-			in    = gendao.CGenDaoInput{
-				Path:   path,
-				Link:   link,
-				Group:  group,
-				Tables: "user_???", // ? matches single char: user_log (3 chars) but not user_info (4 chars)
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-
-		pwd := gfile.Pwd()
-		err = gfile.Chdir(path)
-		t.AssertNil(err)
-		defer gfile.Chdir(pwd)
-		defer gfile.RemoveAll(path)
-
-		_, err = gendao.CGenDao{}.Dao(ctx, in)
-		t.AssertNil(err)
-
-		// Should generate 1 dao file: user_log.go (3 chars after user_)
-		generatedFiles, err := gfile.ScanDir(gfile.Join(path, "dao"), "*.go", false)
-		t.AssertNil(err)
-		t.Assert(len(generatedFiles), 1)
-
-		// Verify only user_log is generated
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_log.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_info.go")), false) // 4 chars, doesn't match
-	})
-}
-
-// https://github.com/gogf/gf/issues/4629
-// Test that exact table names still work (backward compatibility).
-func Test_Gen_Dao_Issue4629_TablesPattern_ExactNames(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			err         error
-			db          = testDB
-			table1      = "trade_order"
-			table2      = "trade_item"
-			table3      = "user_info"
-			table4      = "user_log"
-			table5      = "config"
-			sqlFilePath = gtest.DataPath(`gendao`, `tables_pattern.sql`)
-		)
-		dropTableStd(db, table1)
-		dropTableStd(db, table2)
-		dropTableStd(db, table3)
-		dropTableStd(db, table4)
-		dropTableStd(db, table5)
-		t.AssertNil(execSqlFile(db, sqlFilePath))
-		defer dropTableStd(db, table1)
-		defer dropTableStd(db, table2)
-		defer dropTableStd(db, table3)
-		defer dropTableStd(db, table4)
-		defer dropTableStd(db, table5)
-
-		var (
-			path  = gfile.Temp(guid.S())
-			group = "test"
-			in    = gendao.CGenDaoInput{
-				Path:   path,
-				Link:   link,
-				Group:  group,
-				Tables: "trade_order,config", // Exact names, no patterns
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-
-		pwd := gfile.Pwd()
-		err = gfile.Chdir(path)
-		t.AssertNil(err)
-		defer gfile.Chdir(pwd)
-		defer gfile.RemoveAll(path)
-
-		_, err = gendao.CGenDao{}.Dao(ctx, in)
-		t.AssertNil(err)
-
-		// Should generate 2 dao files
-		generatedFiles, err := gfile.ScanDir(gfile.Join(path, "dao"), "*.go", false)
-		t.AssertNil(err)
-		t.Assert(len(generatedFiles), 2)
-
-		// Verify exactly the specified tables are generated
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_order.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "config.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_item.go")), false)
-	})
-}
-
-// https://github.com/gogf/gf/issues/4629
-// Test tables pattern matching with PostgreSQL.
-func Test_Gen_Dao_Issue4629_TablesPattern_PgSql(t *testing.T) {
-	if testPgDB == nil {
-		t.Skip("PostgreSQL database not available, skipping test")
-		return
-	}
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			err         error
-			db          = testPgDB
-			table1      = "trade_order"
-			table2      = "trade_item"
-			table3      = "user_info"
-			table4      = "user_log"
-			table5      = "config"
-			sqlFilePath = gtest.DataPath(`gendao`, `tables_pattern.sql`)
-		)
-		dropTableStd(db, table1)
-		dropTableStd(db, table2)
-		dropTableStd(db, table3)
-		dropTableStd(db, table4)
-		dropTableStd(db, table5)
-		t.AssertNil(execSqlFile(db, sqlFilePath))
-		defer dropTableStd(db, table1)
-		defer dropTableStd(db, table2)
-		defer dropTableStd(db, table3)
-		defer dropTableStd(db, table4)
-		defer dropTableStd(db, table5)
-
-		// Test tables pattern with tablesEx pattern
-		var (
-			path  = gfile.Temp(guid.S())
-			group = "test"
-			in    = gendao.CGenDaoInput{
-				Path:     path,
-				Link:     linkPg,
-				Group:    group,
-				Tables:   "trade_*,user_*,config", // Match only our test tables
-				TablesEx: "user_*",                // Exclude user_* tables
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-
-		pwd := gfile.Pwd()
-		err = gfile.Chdir(path)
-		t.AssertNil(err)
-		defer gfile.Chdir(pwd)
-		defer gfile.RemoveAll(path)
-
-		_, err = gendao.CGenDao{}.Dao(ctx, in)
-		t.AssertNil(err)
-
-		// Should generate 3 dao files: trade_order, trade_item, config (user_* excluded by tablesEx)
-		generatedFiles, err := gfile.ScanDir(gfile.Join(path, "dao"), "*.go", false)
-		t.AssertNil(err)
-		t.Assert(len(generatedFiles), 3)
-
-		// Verify the correct files are generated
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_order.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "trade_item.go")), true)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "config.go")), true)
-		// user_* should NOT be generated (excluded by tablesEx)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_info.go")), false)
-		t.Assert(gfile.Exists(gfile.Join(path, "dao", "user_log.go")), false)
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_sharding_test.go

@@ -9,101 +9,15 @@ package cmd
 import (
 	"testing"
 
-	"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/v3/os/gfile"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/guid"
+	"github.com/gogf/gf/v3/util/gutil"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/gendao"
 )
 
-// Test_Gen_Dao_Sharding_Overlapping tests the fix for issue #4603.
-// When sharding patterns have overlapping prefixes (like "a_?", "a_b_?", "a_c_?"),
-// longer (more specific) patterns should be matched first.
-// https://github.com/gogf/gf/issues/4603
-func Test_Gen_Dao_Sharding_Overlapping(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			err         error
-			db          = testDB
-			tableA1     = "a_1"
-			tableA2     = "a_2"
-			tableAB1    = "a_b_1"
-			tableAB2    = "a_b_2"
-			tableAC1    = "a_c_1"
-			tableAC2    = "a_c_2"
-			sqlFilePath = gtest.DataPath(`gendao`, `sharding`, `sharding_overlapping.sql`)
-		)
-		dropTableWithDb(db, tableA1)
-		dropTableWithDb(db, tableA2)
-		dropTableWithDb(db, tableAB1)
-		dropTableWithDb(db, tableAB2)
-		dropTableWithDb(db, tableAC1)
-		dropTableWithDb(db, tableAC2)
-		t.AssertNil(execSqlFile(db, sqlFilePath))
-		defer dropTableWithDb(db, tableA1)
-		defer dropTableWithDb(db, tableA2)
-		defer dropTableWithDb(db, tableAB1)
-		defer dropTableWithDb(db, tableAB2)
-		defer dropTableWithDb(db, tableAC1)
-		defer dropTableWithDb(db, tableAC2)
-
-		var (
-			path  = gfile.Temp(guid.S())
-			group = "test"
-			in    = gendao.CGenDaoInput{
-				Path:   path,
-				Link:   link,
-				Group:  group,
-				Prefix: "",
-				// Patterns with overlapping prefixes - order should not matter due to sorting fix
-				ShardingPattern: []string{
-					`a_?`,   // shortest, matches a_1, a_2 but also a_b_1, a_c_1 without fix
-					`a_b_?`, // longer, should match a_b_1, a_b_2
-					`a_c_?`, // longer, should match a_c_1, a_c_2
-				},
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-
-		pwd := gfile.Pwd()
-		err = gfile.Chdir(path)
-		t.AssertNil(err)
-		defer gfile.Chdir(pwd)
-		defer gfile.RemoveAll(path)
-
-		_, err = gendao.CGenDao{}.Dao(ctx, in)
-		t.AssertNil(err)
-
-		// Should generate 3 dao files: a.go, a_b.go, a_c.go (plus internal versions)
-		generatedFiles, err := gfile.ScanDir(path, "*.go", true)
-		t.AssertNil(err)
-		// 3 sharding groups * 4 files each (dao, internal, do, entity) = 12 files
-		t.Assert(len(generatedFiles), 12)
-
-		var (
-			daoAContent  = gfile.GetContents(gfile.Join(path, "dao", "a.go"))
-			daoABContent = gfile.GetContents(gfile.Join(path, "dao", "a_b.go"))
-			daoACContent = gfile.GetContents(gfile.Join(path, "dao", "a_c.go"))
-		)
-
-		// Verify each sharding group has correct dao file generated
-		t.Assert(gstr.Contains(daoAContent, "aShardingHandler"), true)
-		t.Assert(gstr.Contains(daoAContent, "m.Sharding(gdb.ShardingConfig{"), true)
-
-		t.Assert(gstr.Contains(daoABContent, "aBShardingHandler"), true)
-		t.Assert(gstr.Contains(daoABContent, "m.Sharding(gdb.ShardingConfig{"), true)
-
-		t.Assert(gstr.Contains(daoACContent, "aCShardingHandler"), true)
-		t.Assert(gstr.Contains(daoACContent, "m.Sharding(gdb.ShardingConfig{"), true)
-	})
-}
-
 func Test_Gen_Dao_Sharding(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var (
@@ -112,34 +26,25 @@ func Test_Gen_Dao_Sharding(t *testing.T) {
 			tableSingle = "single_table"
 			table1      = "users_0001"
 			table2      = "users_0002"
-			table3      = "orders_0001"
-			table4      = "orders_0002"
+			table3      = "users_0003"
 			sqlFilePath = gtest.DataPath(`gendao`, `sharding`, `sharding.sql`)
 		)
-		dropTableWithDb(db, tableSingle)
-		dropTableWithDb(db, table1)
-		dropTableWithDb(db, table2)
-		dropTableWithDb(db, table3)
-		dropTableWithDb(db, table4)
 		t.AssertNil(execSqlFile(db, sqlFilePath))
 		defer dropTableWithDb(db, tableSingle)
 		defer dropTableWithDb(db, table1)
 		defer dropTableWithDb(db, table2)
 		defer dropTableWithDb(db, table3)
-		defer dropTableWithDb(db, table4)
 
 		var (
 			path = gfile.Temp(guid.S())
-			// path  = "/Users/john/Temp/gen_dao_sharding"
+			//path  = "/Users/john/Temp/gen_dao_sharding"
 			group = "test"
 			in    = gendao.CGenDaoInput{
-				Path:   path,
-				Link:   link,
-				Group:  group,
-				Prefix: "",
+				Path:  path,
+				Link:  link,
+				Group: group,
 				ShardingPattern: []string{
 					`users_?`,
-					`orders_?`,
 				},
 			}
 		)
@@ -160,16 +65,13 @@ func Test_Gen_Dao_Sharding(t *testing.T) {
 
 		generatedFiles, err := gfile.ScanDir(path, "*.go", true)
 		t.AssertNil(err)
-		t.Assert(len(generatedFiles), 12)
+		t.Assert(len(generatedFiles), 8)
 		var (
 			daoSingleTableContent = gfile.GetContents(gfile.Join(path, "dao", "single_table.go"))
 			daoUsersContent       = gfile.GetContents(gfile.Join(path, "dao", "users.go"))
-			daoOrdersContent      = gfile.GetContents(gfile.Join(path, "dao", "orders.go"))
 		)
 		t.Assert(gstr.Contains(daoSingleTableContent, "SingleTable = singleTableDao{internal.NewSingleTableDao()}"), true)
-		t.Assert(gstr.Contains(daoUsersContent, "Users = usersDao{internal.NewUsersDao(usersShardingHandler)}"), true)
+		t.Assert(gstr.Contains(daoUsersContent, "Users = usersDao{internal.NewUsersDao(userShardingHandler)}"), true)
 		t.Assert(gstr.Contains(daoUsersContent, "m.Sharding(gdb.ShardingConfig{"), true)
-		t.Assert(gstr.Contains(daoOrdersContent, "Orders = ordersDao{internal.NewOrdersDao(ordersShardingHandler)}"), true)
-		t.Assert(gstr.Contains(daoOrdersContent, "m.Sharding(gdb.ShardingConfig{"), true)
 	})
 }

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_test.go

@@ -11,14 +11,14 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gogf/gf/v2/database/gdb"
-	"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/v3/database/gdb"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/guid"
+	"github.com/gogf/gf/v3/util/gutil"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/gendao"
 )
 
 func Test_Gen_Dao_Default(t *testing.T) {
@@ -69,7 +69,6 @@ func Test_Gen_Dao_Default(t *testing.T) {
 				NoJsonTag:          false,
 				NoModelComment:     false,
 				Clear:              false,
-				GenTable:           false,
 				TypeMapping:        nil,
 				FieldMapping:       nil,
 			}
@@ -108,7 +107,7 @@ func Test_Gen_Dao_Default(t *testing.T) {
 			filepath.FromSlash(testPath + "/model/do/table_user.go"),
 			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
 		}
-		for i := range files {
+		for i, _ := range files {
 			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
 		}
 	})
@@ -162,7 +161,6 @@ func Test_Gen_Dao_TypeMapping(t *testing.T) {
 				NoJsonTag:          false,
 				NoModelComment:     false,
 				Clear:              false,
-				GenTable:           false,
 				TypeMapping: map[gendao.DBFieldTypeName]gendao.CustomAttributeType{
 					"int": {
 						Type:   "int64",
@@ -210,7 +208,7 @@ func Test_Gen_Dao_TypeMapping(t *testing.T) {
 			filepath.FromSlash(testPath + "/model/do/table_user.go"),
 			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
 		}
-		for i := range files {
+		for i, _ := range files {
 			//_ = gfile.PutContents(expectFiles[i], gfile.GetContents(files[i]))
 			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
 		}
@@ -265,7 +263,6 @@ func Test_Gen_Dao_FieldMapping(t *testing.T) {
 				NoJsonTag:          false,
 				NoModelComment:     false,
 				Clear:              false,
-				GenTable:           false,
 				TypeMapping: map[gendao.DBFieldTypeName]gendao.CustomAttributeType{
 					"int": {
 						Type:   "int64",
@@ -314,7 +311,7 @@ func Test_Gen_Dao_FieldMapping(t *testing.T) {
 			filepath.FromSlash(testPath + "/model/do/table_user.go"),
 			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
 		}
-		for i := range files {
+		for i, _ := range files {
 			//_ = gfile.PutContents(expectFiles[i], gfile.GetContents(files[i]))
 			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
 		}
@@ -351,7 +348,7 @@ func Test_Gen_Dao_Sqlite3(t *testing.T) {
 		t.AssertNil(err)
 		defer gfile.Remove(path)
 
-		dbSqlite3, err := gdb.New(gdb.ConfigNode{
+		dbSqlite3, err := gdb.New(&gdb.ConfigNode{
 			Link: linkSqlite3,
 		})
 		t.AssertNil(err)
@@ -406,7 +403,7 @@ func Test_Gen_Dao_Sqlite3(t *testing.T) {
 			filepath.FromSlash(testPath + "/model/do/table_user.go"),
 			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
 		}
-		for i := range files {
+		for i, _ := range files {
 			//_ = gfile.PutContents(expectFiles[i], gfile.GetContents(files[i]))
 			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
 		}

cmd/gf/internal/cmd/cmd_z_unit_gen_enums_test.go

@@ -1,158 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package cmd
-
-import (
-	"path/filepath"
-	"testing"
-
-	"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/genenums"
-)
-
-// https://github.com/gogf/gf/issues/4387
-// Test that the output path is relative to the original working directory,
-// not the source directory after Chdir.
-func Test_Gen_Enums_Issue4387_RelativePath(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			// Create temp directory to simulate user's project
-			tempPath = gfile.Temp(guid.S())
-			// Copy testdata to temp directory
-			srcTestData = gtest.DataPath("issue", "4387")
-		)
-
-		// Setup: create temp project structure
-		err := gfile.CopyDir(srcTestData, tempPath)
-		t.AssertNil(err)
-		defer gfile.Remove(tempPath)
-
-		// Save original working directory
-		originalWd := gfile.Pwd()
-
-		// Change to temp directory (simulate user being in project root)
-		err = gfile.Chdir(tempPath)
-		t.AssertNil(err)
-		defer gfile.Chdir(originalWd) // Restore original working directory
-
-		// Run gen enums with relative paths
-		var (
-			srcFolder  = "api"
-			outputPath = filepath.FromSlash("internal/packed/packed_enums.go")
-			in         = genenums.CGenEnumsInput{
-				Src:  srcFolder,
-				Path: outputPath,
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		_, err = genenums.CGenEnums{}.Enums(ctx, in)
-		t.AssertNil(err)
-
-		// Expected: file should be created at tempPath/internal/packed/packed_enums.go
-		expectedPath := filepath.Join(tempPath, "internal", "packed", "packed_enums.go")
-		// Bug: file is created at tempPath/api/internal/packed/packed_enums.go
-		wrongPath := filepath.Join(tempPath, "api", "internal", "packed", "packed_enums.go")
-
-		// Assert the file is at the expected location
-		t.Assert(gfile.Exists(expectedPath), true)
-		// Assert the file is NOT at the wrong location
-		t.Assert(gfile.Exists(wrongPath), false)
-	})
-}
-
-// Test gen enums with absolute output path (should work correctly)
-func Test_Gen_Enums_AbsolutePath(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			tempPath    = gfile.Temp(guid.S())
-			srcTestData = gtest.DataPath("issue", "4387")
-		)
-
-		err := gfile.CopyDir(srcTestData, tempPath)
-		t.AssertNil(err)
-		defer gfile.Remove(tempPath)
-
-		originalWd := gfile.Pwd()
-		err = gfile.Chdir(tempPath)
-		t.AssertNil(err)
-		defer gfile.Chdir(originalWd)
-
-		// Use absolute path for output
-		var (
-			srcFolder  = "api"
-			outputPath = filepath.Join(tempPath, "internal", "packed", "packed_enums.go")
-			in         = genenums.CGenEnumsInput{
-				Src:  srcFolder,
-				Path: outputPath,
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		_, err = genenums.CGenEnums{}.Enums(ctx, in)
-		t.AssertNil(err)
-
-		// Assert the file exists at absolute path
-		t.Assert(gfile.Exists(outputPath), true)
-	})
-}
-
-// Test gen enums in monorepo mode (cd app/xxx/ then run command)
-func Test_Gen_Enums_Issue4387_Monorepo(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			// Simulate monorepo structure
-			tempPath    = gfile.Temp(guid.S())
-			srcTestData = gtest.DataPath("issue", "4387")
-			// app/myapp is the subdirectory in monorepo
-			appPath = filepath.Join(tempPath, "app", "myapp")
-		)
-
-		// Create monorepo structure: tempPath/app/myapp/api/...
-		err := gfile.Mkdir(appPath)
-		t.AssertNil(err)
-		// Copy testdata into app/myapp
-		err = gfile.CopyDir(srcTestData, appPath)
-		t.AssertNil(err)
-		defer gfile.Remove(tempPath)
-
-		originalWd := gfile.Pwd()
-
-		// cd app/myapp (simulate user in monorepo subdirectory)
-		err = gfile.Chdir(appPath)
-		t.AssertNil(err)
-		defer gfile.Chdir(originalWd)
-
-		var (
-			srcFolder  = "api"
-			outputPath = filepath.FromSlash("internal/packed/packed_enums.go")
-			in         = genenums.CGenEnumsInput{
-				Src:  srcFolder,
-				Path: outputPath,
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		_, err = genenums.CGenEnums{}.Enums(ctx, in)
-		t.AssertNil(err)
-
-		// Expected: file at app/myapp/internal/packed/packed_enums.go
-		expectedPath := filepath.Join(appPath, "internal", "packed", "packed_enums.go")
-		// Bug: file at app/myapp/api/internal/packed/packed_enums.go
-		wrongPath := filepath.Join(appPath, "api", "internal", "packed", "packed_enums.go")
-
-		t.Assert(gfile.Exists(expectedPath), true)
-		t.Assert(gfile.Exists(wrongPath), false)
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_gen_pb_test.go

@@ -10,12 +10,12 @@ import (
 	"path/filepath"
 	"testing"
 
-	"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/v3/os/gfile"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/guid"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpb"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/genpb"
 )
 
 func TestGenPbIssue3882(t *testing.T) {
@@ -55,7 +55,7 @@ func TestGenPbIssue3882(t *testing.T) {
 func TestGenPbIssue3953(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var (
-			outputPath     = gfile.Temp("f" + guid.S())
+			outputPath     = gfile.Temp(guid.S())
 			outputApiPath  = filepath.Join(outputPath, "api")
 			outputCtrlPath = filepath.Join(outputPath, "controller")
 
@@ -88,76 +88,3 @@ func TestGenPbIssue3953(t *testing.T) {
 		t.Assert(gstr.Contains(genContent, notExceptText), false)
 	})
 }
-
-func TestGenPb_MultipleTags(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("genpb")
-			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)
-		t.AssertNil(err)
-
-		// Test multiple_tags.proto output
-		genContent := gfile.GetContents(filepath.Join(outputApiPath, "multiple_tags.pb.go"))
-		// Id field should have combined validation tags: v:"required#Id > 0"
-		t.Assert(gstr.Contains(genContent, `v:"required#Id > 0"`), true)
-		// Name field should have dc tag from plain comment
-		t.Assert(gstr.Contains(genContent, `dc:"User name for login"`), true)
-		// Email field should have combined validation and dc tag
-		t.Assert(gstr.Contains(genContent, `v:"requiredemail"`), true)
-		t.Assert(gstr.Contains(genContent, `dc:"User email address"`), true)
-	})
-}
-
-func TestGenPb_NestedMessage(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("genpb")
-			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)
-		t.AssertNil(err)
-
-		// Test nested_message.proto output
-		genContent := gfile.GetContents(filepath.Join(outputApiPath, "nested_message.pb.go"))
-		// Order.OrderId should have v:"required"
-		t.Assert(gstr.Contains(genContent, `v:"required"`), true)
-		// Order.Detail should have dc:"Order details"
-		t.Assert(gstr.Contains(genContent, `dc:"Order details"`), true)
-		// OrderDetail.Quantity should have v:"min:1"
-		t.Assert(gstr.Contains(genContent, `v:"min:1"`), true)
-		// OrderDetail.Price should have v:"min:0.01"
-		t.Assert(gstr.Contains(genContent, `v:"min:0.01"`), true)
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_gen_pbentity_test.go

@@ -11,13 +11,13 @@ import (
 	"path/filepath"
 	"testing"
 
-	"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/v3/os/gfile"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/guid"
+	"github.com/gogf/gf/v3/util/gutil"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpbentity"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/genpbentity"
 )
 
 func Test_Gen_Pbentity_Default(t *testing.T) {
@@ -367,145 +367,3 @@ func Test_Issue_3955(t *testing.T) {
 		}
 	})
 }
-
-func Test_Issue_4330_TypeMapping_Ineffective(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",
-					},
-					"decimal": {
-						Type: "double",
-					},
-				},
-				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", "4330")
-		expectFiles := []string{
-			testPath + filepath.FromSlash("/issue4330_double.proto"),
-		}
-		for i := range files {
-			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
-		}
-	})
-}
-
-func Test_Gen_Pbentity_Sharding(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			err         error
-			db          = testDB
-			tableSingle = "single_table"
-			table1      = "users_0001"
-			table2      = "users_0002"
-			table3      = "orders_0001"
-			table4      = "orders_0002"
-			sqlFilePath = gtest.DataPath(`gendao`, `sharding`, `sharding.sql`)
-		)
-		dropTableWithDb(db, tableSingle)
-		dropTableWithDb(db, table1)
-		dropTableWithDb(db, table2)
-		dropTableWithDb(db, table3)
-		dropTableWithDb(db, table4)
-		t.AssertNil(execSqlFile(db, sqlFilePath))
-		defer dropTableWithDb(db, tableSingle)
-		defer dropTableWithDb(db, table1)
-		defer dropTableWithDb(db, table2)
-		defer dropTableWithDb(db, table3)
-		defer dropTableWithDb(db, table4)
-
-		var (
-			path = gfile.Temp(guid.S())
-			in   = genpbentity.CGenPbEntityInput{
-				Path:              path,
-				Package:           "unittest",
-				Link:              link,
-				Tables:            "",
-				RemovePrefix:      "",
-				RemoveFieldPrefix: "",
-				NameCase:          "",
-				JsonCase:          "",
-				Option:            "",
-				TypeMapping:       nil,
-				FieldMapping:      nil,
-				ShardingPattern: []string{
-					`users_?`,
-					`orders_?`,
-				},
-			}
-		)
-		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
-		t.AssertNil(err)
-		generatedFiles, err := gfile.ScanDir(path, "*.proto", true)
-		t.Assert(len(generatedFiles), 3)
-		var (
-			msgSingleTableContent = gfile.GetContents(gfile.Join(path, "single_table.proto"))
-			msgUsersContent       = gfile.GetContents(gfile.Join(path, "users.proto"))
-			msgOrdersContent      = gfile.GetContents(gfile.Join(path, "orders.proto"))
-		)
-		t.Assert(gstr.Contains(msgSingleTableContent, "message SingleTable {"), true)
-		t.Assert(gstr.Contains(msgUsersContent, "message Users {"), true)
-		t.Assert(gstr.Contains(msgOrdersContent, "message Orders {"), true)
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_gen_service_test.go

@@ -10,12 +10,12 @@ import (
 	"path/filepath"
 	"testing"
 
-	"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/v3/os/gfile"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/guid"
+	"github.com/gogf/gf/v3/util/gutil"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genservice"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd/genservice"
 )
 
 func Test_Gen_Service_Default(t *testing.T) {
@@ -156,85 +156,3 @@ func Test_Issue3835(t *testing.T) {
 		t.Assert(gfile.GetContents(genFile), gfile.GetContents(expectFile))
 	})
 }
-
-func Test_Gen_Service_CamelCase(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			path      = gfile.Temp(guid.S())
-			dstFolder = path + filepath.FromSlash("/service")
-			srvFolder = gtest.DataPath("genservice", "logic")
-			in        = genservice.CGenServiceInput{
-				SrcFolder:       srvFolder,
-				DstFolder:       dstFolder,
-				DstFileNameCase: "Camel",
-				WatchFile:       "",
-				StPattern:       "",
-				Packages:        nil,
-				ImportPrefix:    "",
-				Clear:           false,
-			}
-		)
-		err := gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-		defer gfile.Remove(path)
-
-		// Clean up generated logic.go
-		genSrv := srvFolder + filepath.FromSlash("/logic.go")
-		defer gfile.Remove(genSrv)
-
-		_, err = genservice.CGenService{}.Service(ctx, in)
-		t.AssertNil(err)
-
-		// Files should be in CamelCase
-		files, err := gfile.ScanDir(dstFolder, "*.go", true)
-		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"),
-		})
-	})
-}
-
-func Test_Gen_Service_PackagesFilter(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			path      = gfile.Temp(guid.S())
-			dstFolder = path + filepath.FromSlash("/service")
-			srvFolder = gtest.DataPath("genservice", "logic")
-			in        = genservice.CGenServiceInput{
-				SrcFolder:       srvFolder,
-				DstFolder:       dstFolder,
-				DstFileNameCase: "Snake",
-				WatchFile:       "",
-				StPattern:       "",
-				Packages:        []string{"user"},
-				ImportPrefix:    "",
-				Clear:           false,
-			}
-		)
-		err := gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-		defer gfile.Remove(path)
-
-		// Clean up generated logic.go
-		genSrv := srvFolder + filepath.FromSlash("/logic.go")
-		defer gfile.Remove(genSrv)
-
-		_, err = genservice.CGenService{}.Service(ctx, in)
-		t.AssertNil(err)
-
-		// Only user.go should be generated
-		files, err := gfile.ScanDir(dstFolder, "*.go", true)
-		t.AssertNil(err)
-		t.Assert(len(files), 1)
-		t.Assert(files[0], dstFolder+filepath.FromSlash("/user.go"))
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_pack_test.go

@@ -1,346 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package cmd
-
-import (
-	"context"
-	"path/filepath"
-	"testing"
-
-	"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"
-)
-
-func Test_Pack_ToGoFile(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			srcPath = gfile.Temp(guid.S())
-			dstPath = gfile.Temp(guid.S())
-			dstFile = filepath.Join(dstPath, "packed", "data.go")
-		)
-		// Create source directory with test files
-		err := gfile.Mkdir(srcPath)
-		t.AssertNil(err)
-		defer gfile.Remove(srcPath)
-
-		err = gfile.Mkdir(dstPath)
-		t.AssertNil(err)
-		defer gfile.Remove(dstPath)
-
-		// Create test files
-		err = gfile.PutContents(filepath.Join(srcPath, "test.txt"), "hello world")
-		t.AssertNil(err)
-		err = gfile.PutContents(filepath.Join(srcPath, "test.json"), `{"key":"value"}`)
-		t.AssertNil(err)
-
-		// Create packed directory
-		err = gfile.Mkdir(filepath.Join(dstPath, "packed"))
-		t.AssertNil(err)
-
-		// Pack to go file
-		_, err = Pack.Index(context.Background(), cPackInput{
-			Src:  srcPath,
-			Dst:  dstFile,
-			Name: "packed",
-		})
-		t.AssertNil(err)
-
-		// Verify output file exists
-		t.Assert(gfile.Exists(dstFile), true)
-
-		// Verify it's a valid Go file
-		content := gfile.GetContents(dstFile)
-		t.Assert(gstr.Contains(content, "package packed"), true)
-		t.Assert(gstr.Contains(content, "func init()"), true)
-	})
-}
-
-func Test_Pack_ToBinaryFile(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			srcPath = gfile.Temp(guid.S())
-			dstPath = gfile.Temp(guid.S())
-			dstFile = filepath.Join(dstPath, "data.bin")
-		)
-		// Create source directory with test files
-		err := gfile.Mkdir(srcPath)
-		t.AssertNil(err)
-		defer gfile.Remove(srcPath)
-
-		err = gfile.Mkdir(dstPath)
-		t.AssertNil(err)
-		defer gfile.Remove(dstPath)
-
-		// Create test file
-		err = gfile.PutContents(filepath.Join(srcPath, "test.txt"), "binary content")
-		t.AssertNil(err)
-
-		// Pack to binary file (no Name specified)
-		_, err = Pack.Index(context.Background(), cPackInput{
-			Src: srcPath,
-			Dst: dstFile,
-		})
-		t.AssertNil(err)
-
-		// Verify output file exists
-		t.Assert(gfile.Exists(dstFile), true)
-
-		// Verify it's a binary file (not a Go file)
-		content := gfile.GetContents(dstFile)
-		t.Assert(gstr.Contains(content, "package"), false)
-	})
-}
-
-func Test_Pack_MultipleSources(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			srcPath1 = gfile.Temp(guid.S())
-			srcPath2 = gfile.Temp(guid.S())
-			dstPath  = gfile.Temp(guid.S())
-			dstFile  = filepath.Join(dstPath, "packed", "multi.go")
-		)
-		// Create source directories
-		err := gfile.Mkdir(srcPath1)
-		t.AssertNil(err)
-		defer gfile.Remove(srcPath1)
-
-		err = gfile.Mkdir(srcPath2)
-		t.AssertNil(err)
-		defer gfile.Remove(srcPath2)
-
-		err = gfile.Mkdir(dstPath)
-		t.AssertNil(err)
-		defer gfile.Remove(dstPath)
-
-		// Create test files in each source
-		err = gfile.PutContents(filepath.Join(srcPath1, "file1.txt"), "content1")
-		t.AssertNil(err)
-		err = gfile.PutContents(filepath.Join(srcPath2, "file2.txt"), "content2")
-		t.AssertNil(err)
-
-		// Create packed directory
-		err = gfile.Mkdir(filepath.Join(dstPath, "packed"))
-		t.AssertNil(err)
-
-		// Pack multiple sources (comma-separated)
-		_, err = Pack.Index(context.Background(), cPackInput{
-			Src:  srcPath1 + "," + srcPath2,
-			Dst:  dstFile,
-			Name: "packed",
-		})
-		t.AssertNil(err)
-
-		// Verify output file exists
-		t.Assert(gfile.Exists(dstFile), true)
-	})
-}
-
-func Test_Pack_WithPrefix(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			srcPath = gfile.Temp(guid.S())
-			dstPath = gfile.Temp(guid.S())
-			dstFile = filepath.Join(dstPath, "packed", "prefix.go")
-		)
-		// Create source directory
-		err := gfile.Mkdir(srcPath)
-		t.AssertNil(err)
-		defer gfile.Remove(srcPath)
-
-		err = gfile.Mkdir(dstPath)
-		t.AssertNil(err)
-		defer gfile.Remove(dstPath)
-
-		// Create test file
-		err = gfile.PutContents(filepath.Join(srcPath, "test.txt"), "with prefix")
-		t.AssertNil(err)
-
-		// Create packed directory
-		err = gfile.Mkdir(filepath.Join(dstPath, "packed"))
-		t.AssertNil(err)
-
-		// Pack with prefix
-		_, err = Pack.Index(context.Background(), cPackInput{
-			Src:    srcPath,
-			Dst:    dstFile,
-			Name:   "packed",
-			Prefix: "/static",
-		})
-		t.AssertNil(err)
-
-		// Verify output file exists
-		t.Assert(gfile.Exists(dstFile), true)
-	})
-}
-
-func Test_Pack_WithKeepPath(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			srcPath = gfile.Temp(guid.S())
-			dstPath = gfile.Temp(guid.S())
-			dstFile = filepath.Join(dstPath, "packed", "keeppath.go")
-		)
-		// Create source directory with subdirectory
-		err := gfile.Mkdir(srcPath)
-		t.AssertNil(err)
-		defer gfile.Remove(srcPath)
-
-		err = gfile.Mkdir(dstPath)
-		t.AssertNil(err)
-		defer gfile.Remove(dstPath)
-
-		// Create subdirectory and file
-		subDir := filepath.Join(srcPath, "subdir")
-		err = gfile.Mkdir(subDir)
-		t.AssertNil(err)
-		err = gfile.PutContents(filepath.Join(subDir, "test.txt"), "keeppath content")
-		t.AssertNil(err)
-
-		// Create packed directory
-		err = gfile.Mkdir(filepath.Join(dstPath, "packed"))
-		t.AssertNil(err)
-
-		// Pack with keepPath
-		_, err = Pack.Index(context.Background(), cPackInput{
-			Src:      srcPath,
-			Dst:      dstFile,
-			Name:     "packed",
-			KeepPath: true,
-		})
-		t.AssertNil(err)
-
-		// Verify output file exists
-		t.Assert(gfile.Exists(dstFile), true)
-	})
-}
-
-func Test_Pack_AutoPackageName(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			srcPath = gfile.Temp(guid.S())
-			dstPath = gfile.Temp(guid.S())
-			dstFile = filepath.Join(dstPath, "mypackage", "data.go")
-		)
-		// Create source directory
-		err := gfile.Mkdir(srcPath)
-		t.AssertNil(err)
-		defer gfile.Remove(srcPath)
-
-		err = gfile.Mkdir(dstPath)
-		t.AssertNil(err)
-		defer gfile.Remove(dstPath)
-
-		// Create test file
-		err = gfile.PutContents(filepath.Join(srcPath, "test.txt"), "auto package name")
-		t.AssertNil(err)
-
-		// Create mypackage directory
-		err = gfile.Mkdir(filepath.Join(dstPath, "mypackage"))
-		t.AssertNil(err)
-
-		// Pack without Name - should use directory name "mypackage"
-		_, err = Pack.Index(context.Background(), cPackInput{
-			Src: srcPath,
-			Dst: dstFile,
-			// Name not specified, should be auto-detected as "mypackage"
-		})
-		t.AssertNil(err)
-
-		// Verify output file exists and has correct package name
-		t.Assert(gfile.Exists(dstFile), true)
-		content := gfile.GetContents(dstFile)
-		t.Assert(gstr.Contains(content, "package mypackage"), true)
-	})
-}
-
-func Test_Pack_EmptySource(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			srcPath = gfile.Temp(guid.S())
-			dstPath = gfile.Temp(guid.S())
-			dstFile = filepath.Join(dstPath, "packed", "empty.go")
-		)
-		// Create empty source directory
-		err := gfile.Mkdir(srcPath)
-		t.AssertNil(err)
-		defer gfile.Remove(srcPath)
-
-		err = gfile.Mkdir(dstPath)
-		t.AssertNil(err)
-		defer gfile.Remove(dstPath)
-
-		// Create packed directory
-		err = gfile.Mkdir(filepath.Join(dstPath, "packed"))
-		t.AssertNil(err)
-
-		// Pack empty directory
-		_, err = Pack.Index(context.Background(), cPackInput{
-			Src:  srcPath,
-			Dst:  dstFile,
-			Name: "packed",
-		})
-		t.AssertNil(err)
-
-		// Verify output file exists (even if source is empty)
-		t.Assert(gfile.Exists(dstFile), true)
-	})
-}
-
-func Test_Pack_NestedDirectories(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			srcPath = gfile.Temp(guid.S())
-			dstPath = gfile.Temp(guid.S())
-			dstFile = filepath.Join(dstPath, "packed", "nested.go")
-		)
-		// Create source directory with nested structure
-		err := gfile.Mkdir(srcPath)
-		t.AssertNil(err)
-		defer gfile.Remove(srcPath)
-
-		err = gfile.Mkdir(dstPath)
-		t.AssertNil(err)
-		defer gfile.Remove(dstPath)
-
-		// Create nested directories and files
-		level1 := filepath.Join(srcPath, "level1")
-		level2 := filepath.Join(level1, "level2")
-		level3 := filepath.Join(level2, "level3")
-		err = gfile.Mkdir(level3)
-		t.AssertNil(err)
-
-		err = gfile.PutContents(filepath.Join(srcPath, "root.txt"), "root")
-		t.AssertNil(err)
-		err = gfile.PutContents(filepath.Join(level1, "l1.txt"), "level1")
-		t.AssertNil(err)
-		err = gfile.PutContents(filepath.Join(level2, "l2.txt"), "level2")
-		t.AssertNil(err)
-		err = gfile.PutContents(filepath.Join(level3, "l3.txt"), "level3")
-		t.AssertNil(err)
-
-		// Create packed directory
-		err = gfile.Mkdir(filepath.Join(dstPath, "packed"))
-		t.AssertNil(err)
-
-		// Pack nested directories
-		_, err = Pack.Index(context.Background(), cPackInput{
-			Src:  srcPath,
-			Dst:  dstFile,
-			Name: "packed",
-		})
-		t.AssertNil(err)
-
-		// Verify output file exists
-		t.Assert(gfile.Exists(dstFile), true)
-
-		// Verify content includes all files
-		content := gfile.GetContents(dstFile)
-		t.Assert(gstr.Contains(content, "package packed"), true)
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_run_test.go

@@ -1,336 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package cmd
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func Test_cRunApp_getWatchPaths_Basic(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		app := &cRunApp{
-			WatchPaths: []string{"."},
-		}
-		watchPaths := app.getWatchPaths()
-
-		t.AssertGT(len(watchPaths), 0)
-		for _, v := range watchPaths {
-			t.Log(v)
-		}
-	})
-}
-
-func Test_cRunApp_getWatchPaths_EmptyWatchPaths(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		app := &cRunApp{
-			WatchPaths: []string{},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Should default to current directory "."
-		t.AssertGT(len(watchPaths), 0)
-	})
-}
-
-func Test_cRunApp_getWatchPaths_CustomIgnorePattern(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		app := &cRunApp{
-			WatchPaths:     []string{"testdata"},
-			IgnorePatterns: []string{"2572"},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Ensure the "2572" directory is not watched directly.
-		for _, wp := range watchPaths {
-			t.Log("watch path:", wp)
-			t.Assert(strings.HasSuffix(wp.Path, "2572"), false)
-		}
-		t.AssertGT(len(watchPaths), 0)
-	})
-}
-
-func Test_cRunApp_getWatchPaths_WithIgnoredDirectories(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Create a temporary directory structure for testing
-		tempDir := gfile.Temp("gf_run_test")
-		defer gfile.Remove(tempDir)
-
-		// Create directory structure:
-		// tempDir/
-		//   ├── src/
-		//   │   ├── api/
-		//   │   └── internal/
-		//   ├── vendor/  <-- ignored
-		//   └── node_modules/  <-- ignored
-		gfile.Mkdir(filepath.Join(tempDir, "src", "api"))
-		gfile.Mkdir(filepath.Join(tempDir, "src", "internal"))
-		gfile.Mkdir(filepath.Join(tempDir, "vendor"))
-		gfile.Mkdir(filepath.Join(tempDir, "node_modules"))
-
-		app := &cRunApp{
-			WatchPaths: []string{tempDir},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Should watch tempDir non-recursively (to catch top-level files) and src recursively
-		t.Assert(len(watchPaths), 2)
-		// First path is tempDir (non-recursive)
-		t.Assert(watchPaths[0].Path, tempDir)
-		t.Assert(watchPaths[0].Recursive, false)
-		// Second path is src (recursive, since it has no ignored descendants)
-		t.Assert(watchPaths[1].Path, filepath.Join(tempDir, "src"))
-		t.Assert(watchPaths[1].Recursive, true)
-	})
-}
-
-func Test_cRunApp_getWatchPaths_NoIgnoredDirectories(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Create a temporary directory structure without ignored directories
-		tempDir := gfile.Temp("gf_run_test_no_ignore")
-		defer gfile.Remove(tempDir)
-
-		// Create directory structure without ignored patterns:
-		// tempDir/
-		//   ├── src/
-		//   │   ├── api/
-		//   │   └── internal/
-		gfile.Mkdir(filepath.Join(tempDir, "src", "api"))
-		gfile.Mkdir(filepath.Join(tempDir, "src", "internal"))
-
-		app := &cRunApp{
-			WatchPaths: []string{tempDir},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Should watch the root directory recursively since no ignored directories exist
-		t.Assert(len(watchPaths), 1)
-		t.Assert(watchPaths[0].Path, tempDir)
-		t.Assert(watchPaths[0].Recursive, true)
-	})
-}
-
-func Test_cRunApp_getWatchPaths_CustomIgnorePatterns(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Create a temporary directory structure
-		tempDir := gfile.Temp("gf_run_test_custom_ignore")
-		defer gfile.Remove(tempDir)
-
-		// Create directory structure:
-		// tempDir/
-		//   ├── src/
-		//   │   ├── api/
-		//   │   └── internal/
-		//   ├── build/  <-- ignored
-		//   └── dist/  <-- ignored
-		gfile.Mkdir(filepath.Join(tempDir, "src", "api"))
-		gfile.Mkdir(filepath.Join(tempDir, "src", "internal"))
-		gfile.Mkdir(filepath.Join(tempDir, "build"))
-		gfile.Mkdir(filepath.Join(tempDir, "dist"))
-
-		app := &cRunApp{
-			WatchPaths:     []string{tempDir},
-			IgnorePatterns: []string{"build", "dist"},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Should watch tempDir non-recursively and src recursively
-		t.Assert(len(watchPaths), 2)
-		t.Assert(watchPaths[0].Path, tempDir)
-		t.Assert(watchPaths[0].Recursive, false)
-		t.Assert(watchPaths[1].Path, filepath.Join(tempDir, "src"))
-		t.Assert(watchPaths[1].Recursive, true)
-	})
-}
-
-func Test_cRunApp_getWatchPaths_DeepNestedStructure(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Create a deep nested directory structure
-		tempDir := gfile.Temp("gf_run_test_deep")
-		defer gfile.Remove(tempDir)
-
-		// Create deep directory structure:
-		// tempDir/
-		//   ├── a/
-		//   │   ├── b/
-		//   │   │   └── c/
-		//   │   └── vendor/  <-- ignored
-		//   └── d/
-		gfile.Mkdir(filepath.Join(tempDir, "a", "b", "c"))
-		gfile.Mkdir(filepath.Join(tempDir, "a", "vendor"))
-		gfile.Mkdir(filepath.Join(tempDir, "d"))
-
-		app := &cRunApp{
-			WatchPaths: []string{tempDir},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Should watch individual valid directories due to ignored vendor directory
-		t.AssertGT(len(watchPaths), 0)
-
-		// Verify that vendor directory is not in watch list
-		for _, wp := range watchPaths {
-			t.Assert(strings.Contains(wp.Path, "vendor"), false)
-		}
-	})
-}
-
-func Test_cRunApp_getWatchPaths_MultipleRoots(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Create multiple temporary directories
-		tempDir1 := gfile.Temp("gf_run_test_multi1")
-		tempDir2 := gfile.Temp("gf_run_test_multi2")
-		defer gfile.Remove(tempDir1)
-		defer gfile.Remove(tempDir2)
-
-		gfile.Mkdir(filepath.Join(tempDir1, "src"))
-		gfile.Mkdir(filepath.Join(tempDir2, "api"))
-
-		app := &cRunApp{
-			WatchPaths: []string{tempDir1, tempDir2},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Should watch both root directories recursively
-		t.Assert(len(watchPaths), 2)
-
-		// Both directories should be in the watch list
-		foundDir1, foundDir2 := false, false
-		for _, wp := range watchPaths {
-			if wp.Path == tempDir1 {
-				foundDir1 = true
-				t.Assert(wp.Recursive, true)
-			}
-			if wp.Path == tempDir2 {
-				foundDir2 = true
-				t.Assert(wp.Recursive, true)
-			}
-		}
-		t.Assert(foundDir1, true)
-		t.Assert(foundDir2, true)
-	})
-}
-
-func Test_cRunApp_getWatchPaths_NonExistentDirectory(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		app := &cRunApp{
-			WatchPaths: []string{"/non/existent/path"},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Should fall back to current directory when no valid paths found
-		t.AssertGT(len(watchPaths), 0)
-
-		// Should contain current directory
-		currentDir, _ := os.Getwd()
-		foundCurrentDir := false
-		for _, wp := range watchPaths {
-			if wp.Path == currentDir {
-				foundCurrentDir = true
-				break
-			}
-		}
-		t.Assert(foundCurrentDir, true)
-	})
-}
-
-func Test_isIgnoredDirName(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test default ignore patterns
-		t.Assert(isIgnoredDirName("node_modules", defaultIgnorePatterns), true)
-		t.Assert(isIgnoredDirName("vendor", defaultIgnorePatterns), true)
-		t.Assert(isIgnoredDirName(".git", defaultIgnorePatterns), true)
-		t.Assert(isIgnoredDirName("_private", defaultIgnorePatterns), true)
-		t.Assert(isIgnoredDirName("src", defaultIgnorePatterns), false)
-		t.Assert(isIgnoredDirName("api", defaultIgnorePatterns), false)
-
-		// Test custom ignore patterns
-		customPatterns := []string{"build", "dist", "*.tmp"}
-		t.Assert(isIgnoredDirName("build", customPatterns), true)
-		t.Assert(isIgnoredDirName("dist", customPatterns), true)
-		t.Assert(isIgnoredDirName("test.tmp", customPatterns), true)
-		t.Assert(isIgnoredDirName("src", customPatterns), false)
-	})
-}
-
-func Test_cRunApp_getWatchPaths_DeeplyNestedIgnore(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Create a temporary directory structure with deeply nested ignored directory
-		tempDir := gfile.Temp("gf_run_test_deeply_nested")
-		defer gfile.Remove(tempDir)
-
-		// Create directory structure:
-		// tempDir/
-		//   ├── a/
-		//   │   ├── b/
-		//   │   │   ├── c/
-		//   │   │   │   └── vendor/  <-- deeply nested ignored (4 levels)
-		//   │   │   └── d/
-		//   │   └── e/
-		//   └── f/
-		gfile.Mkdir(filepath.Join(tempDir, "a", "b", "c", "vendor"))
-		gfile.Mkdir(filepath.Join(tempDir, "a", "b", "d"))
-		gfile.Mkdir(filepath.Join(tempDir, "a", "e"))
-		gfile.Mkdir(filepath.Join(tempDir, "f"))
-
-		app := &cRunApp{
-			WatchPaths: []string{tempDir},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Expected watch paths:
-		// 1. tempDir (non-recursive) - has ignored descendant
-		// 2. a (non-recursive) - has ignored descendant in b/c/vendor
-		// 3. b (non-recursive) - has ignored descendant in c/vendor
-		// 4. c (non-recursive) - has ignored child vendor
-		// 5. d (recursive) - no ignored descendants
-		// 6. e (recursive) - no ignored descendants
-		// 7. f (recursive) - no ignored descendants
-
-		t.AssertGT(len(watchPaths), 0)
-
-		// Verify vendor is not in watch paths
-		for _, wp := range watchPaths {
-			t.Assert(strings.Contains(wp.Path, "vendor"), false)
-		}
-
-		// Find specific paths and verify their recursive flags
-		foundF := false
-		for _, wp := range watchPaths {
-			if wp.Path == filepath.Join(tempDir, "f") {
-				foundF = true
-				t.Assert(wp.Recursive, true) // f should be recursive (no ignored descendants)
-			}
-		}
-		t.Assert(foundF, true)
-	})
-}
-
-func Test_cRunApp_getWatchPaths_EmptyDirectory(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Create an empty temporary directory
-		tempDir := gfile.Temp("gf_run_test_empty")
-		defer gfile.Remove(tempDir)
-
-		gfile.Mkdir(tempDir)
-
-		app := &cRunApp{
-			WatchPaths: []string{tempDir},
-		}
-		watchPaths := app.getWatchPaths()
-
-		// Empty directory should be watched recursively (no ignored descendants)
-		t.Assert(len(watchPaths), 1)
-		t.Assert(watchPaths[0].Path, tempDir)
-		t.Assert(watchPaths[0].Recursive, true)
-	})
-}

cmd/gf/internal/cmd/cmddep/cmddep.go

@@ -1,140 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package cmddep
-
-import (
-	"context"
-
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-)
-
-var (
-	Dep = cDep{}
-)
-
-type cDep struct {
-	g.Meta `name:"dep" brief:"{cDepBrief}" eg:"{cDepEg}"`
-}
-
-const (
-	cDepBrief = `analyze and display Go package dependencies`
-	cDepEg    = `
-gf dep
-gf dep ./...
-gf dep ./internal/...
-gf dep -f list
-gf dep -f mermaid
-gf dep -f mermaid -g
-gf dep -f dot -d 5
-gf dep -f json -d 0
-gf dep -g
-gf dep -r
-gf dep -i=false
-gf dep -e
-gf dep -e -i=false
-gf dep -M
-gf dep -M -D
-gf dep -s
-gf dep -s -p 8080
-gf dep ./internal/... -f tree -d 2
-gf dep --external --group -f mermaid
-gf dep --module --direct -f json
-`
-)
-
-func init() {
-	gtag.Sets(g.MapStrStr{
-		`cDepBrief`: cDepBrief,
-		`cDepEg`:    cDepEg,
-	})
-}
-
-// Input defines the input parameters for dep command.
-type Input struct {
-	g.Meta   `name:"dep"`
-	Package  string `name:"PACKAGE" arg:"true" brief:"package path to analyze, default is ./..." d:"./..."`
-	Format   string `name:"format"   short:"f" brief:"output format: tree/list/mermaid/dot/json" d:"tree"`
-	Depth    int    `name:"depth"    short:"d" brief:"dependency depth limit, 0 means unlimited" d:"3"`
-	Group    bool   `name:"group"    short:"g" brief:"group by top-level directory" d:"false" orphan:"true"`
-	Internal bool   `name:"internal" short:"i" brief:"show only internal packages" d:"true" orphan:"true"`
-	External bool   `name:"external" short:"e" brief:"show external packages" d:"false" orphan:"true"`
-	Module   bool   `name:"module"   short:"M" brief:"show module-level dependencies (from go.mod)" d:"false" orphan:"true"`
-	Direct   bool   `name:"direct"   short:"D" brief:"show only direct dependencies (requires --module)" d:"false" orphan:"true"`
-	NoStd    bool   `name:"nostd"    short:"n" brief:"exclude standard library" d:"true" orphan:"true"`
-	Reverse  bool   `name:"reverse"  short:"r" brief:"show reverse dependencies" d:"false" orphan:"true"`
-	Serve    bool   `name:"serve"    short:"s" brief:"start HTTP server to view dependencies" d:"false" orphan:"true"`
-	Port     int    `name:"port"     short:"p" brief:"HTTP server port" d:"8888"`
-}
-
-// Output defines the output for dep command.
-type Output struct{}
-
-// Index is the main entry point for the dep command.
-func (c cDep) Index(ctx context.Context, in Input) (out *Output, err error) {
-	analyzer := newAnalyzer()
-
-	// Detect module prefix from go.mod
-	analyzer.modulePrefix = analyzer.detectModulePrefix()
-
-	// Module-level analysis mode (uses go mod graph)
-	if in.Module {
-		if in.Serve {
-			// Load module graph for server mode
-			if err := analyzer.loadModuleGraph(ctx); err != nil {
-				mlog.Print("Warning: Failed to load module graph: " + err.Error())
-			}
-			return nil, analyzer.startServer(in)
-		}
-
-		// Load module graph
-		if err := analyzer.loadModuleGraph(ctx); err != nil {
-			return nil, err
-		}
-
-		// Generate module-level output
-		output := analyzer.generateModuleOutput(in)
-		mlog.Print(output)
-		return
-	}
-
-	// Package-level analysis mode (original behavior)
-	loadErr := analyzer.loadPackages(ctx, in.Package)
-
-	// Start HTTP server if requested
-	// In server mode, allow starting even without local Go module
-	// because users may want to analyze remote modules
-	if in.Serve {
-		if loadErr != nil {
-			mlog.Print("Warning: No local Go module found, you can analyze remote modules in the web UI")
-		}
-		return nil, analyzer.startServer(in)
-	}
-
-	// For non-server mode, return error if loading failed
-	if loadErr != nil {
-		return nil, loadErr
-	}
-
-	if len(analyzer.packages) == 0 {
-		mlog.Print("No packages found")
-		return
-	}
-
-	// Generate output based on format
-	var output string
-	if in.Reverse {
-		output = analyzer.generateReverse(in)
-	} else {
-		output = analyzer.generate(in)
-	}
-
-	mlog.Print(output)
-	return
-}

cmd/gf/internal/cmd/cmddep/cmddep_external_test.go

@@ -1,107 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package cmddep
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func TestExternalDependencyAnalysis(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		analyzer := newAnalyzer()
-		analyzer.modulePrefix = "github.com/gogf/gf/cmd/gf/v2"
-		analyzer.packages = map[string]*goPackage{
-			"github.com/other/package": {
-				ImportPath: "github.com/other/package",
-				Standard:   false,
-			},
-			"github.com/gogf/gf/cmd/gf/v2/internal": {
-				ImportPath: "github.com/gogf/gf/cmd/gf/v2/internal",
-				Standard:   false,
-			},
-			"fmt": {
-				ImportPath: "fmt",
-				Standard:   true,
-			},
-		}
-
-		// Test using new FilterOptions system
-		in := Input{
-			Internal: false,
-			External: true,
-			NoStd:    true,
-		}
-
-		opts := analyzer.convertInputToFilterOptions(in)
-		opts.Normalize(analyzer.modulePrefix)
-		store := analyzer.buildPackageStore()
-
-		// Test external package (should be included)
-		externalPkg, ok := store.packages["github.com/other/package"]
-		t.Assert(ok, true)
-		t.Assert(opts.ShouldInclude(externalPkg), true)
-
-		// Test internal package (should not be included)
-		internalPkg, ok := store.packages["github.com/gogf/gf/cmd/gf/v2/internal"]
-		t.Assert(ok, true)
-		t.Assert(opts.ShouldInclude(internalPkg), false)
-
-		// Test standard library (should not be included due to NoStd)
-		stdPkg, ok := store.packages["fmt"]
-		t.Assert(ok, true)
-		t.Assert(opts.ShouldInclude(stdPkg), false)
-	})
-}
-
-func TestExternalGrouping(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		analyzer := newAnalyzer()
-
-		// Test external group extraction using shortName
-		t.Assert(analyzer.shortName("github.com/user/repo", false), "github.com/user/repo")
-		t.Assert(analyzer.shortName("golang.org/x/tools", false), "golang.org/x/tools")
-		t.Assert(analyzer.shortName("fmt", false), "fmt")
-		t.Assert(analyzer.shortName("simple", false), "simple")
-	})
-}
-
-func TestDependencyStats(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		analyzer := newAnalyzer()
-		analyzer.modulePrefix = "github.com/gogf/gf/cmd/gf/v2"
-
-		// Add test packages
-		analyzer.packages = map[string]*goPackage{
-			"github.com/gogf/gf/cmd/gf/v2/internal": {
-				ImportPath: "github.com/gogf/gf/cmd/gf/v2/internal",
-				Standard:   false,
-			},
-			"github.com/external/package": {
-				ImportPath: "github.com/external/package",
-				Standard:   false,
-			},
-			"fmt": {
-				ImportPath: "fmt",
-				Standard:   true,
-			},
-		}
-
-		in := Input{
-			Internal: true,
-			External: true,
-			NoStd:    false,
-		}
-
-		stats := analyzer.getDependencyStats(in)
-		t.Assert(stats["total"], 3)
-		t.Assert(stats["internal"], 1)
-		t.Assert(stats["external"], 1)
-		t.Assert(stats["stdlib"], 1)
-	})
-}

cmd/gf/internal/cmd/cmddep/cmddep_output.go

@@ -1,403 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package cmddep
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-	"strings"
-)
-
-// generate creates output based on format.
-func (a *analyzer) generate(in Input) string {
-	switch in.Format {
-	case "tree":
-		return a.generateTree(in)
-	case "list":
-		return a.generateList(in)
-	case "mermaid":
-		return a.generateMermaid(in)
-	case "dot":
-		return a.generateDot(in)
-	case "json":
-		return a.generateJSON(in)
-	default:
-		// Default to tree format
-		return a.generateTree(in)
-	}
-}
-
-// generateTree generates ASCII tree output using new traversal system.
-func (a *analyzer) generateTree(in Input) string {
-	var sb strings.Builder
-
-	// Prepare options
-	opts := a.convertInputToFilterOptions(in)
-	opts.Normalize(a.modulePrefix)
-
-	// Add statistics header if showing external dependencies
-	if in.External {
-		stats := a.getDependencyStats(in)
-		sb.WriteString("Dependency Statistics:\n")
-		fmt.Fprintf(&sb, "  Total packages: %v\n", stats["total"])
-		fmt.Fprintf(&sb, "  Internal: %v\n", stats["internal"])
-		fmt.Fprintf(&sb, "  External: %v\n", stats["external"])
-		fmt.Fprintf(&sb, "  Standard library: %v\n", stats["stdlib"])
-
-		if groups, ok := stats["external_groups"].(map[string]int); ok && len(groups) > 0 {
-			sb.WriteString("  External groups:\n")
-			for group, count := range groups {
-				fmt.Fprintf(&sb, "    %s: %d\n", group, count)
-			}
-		}
-		sb.WriteString("\nDependency Tree:\n")
-	}
-
-	// Build package store
-	store := a.buildPackageStore()
-
-	// Find root packages (packages that are not imported by any other package)
-	rootPkgs := a.findRootPackages()
-
-	// Create traversal context
-	ctx := &TraversalContext{
-		visited:  make(map[string]bool),
-		options:  opts,
-		store:    store,
-		maxDepth: opts.Depth,
-	}
-
-	for _, pkgPath := range rootPkgs {
-		pkgInfo, ok := store.packages[pkgPath]
-		if !ok || !opts.ShouldInclude(pkgInfo) {
-			continue
-		}
-
-		shortName := a.shortName(pkgPath, in.Group)
-		sb.WriteString(shortName + "\n")
-
-		// Use new traversal system
-		a.printTreeNodeNew(&sb, pkgPath, "", in, ctx, 0)
-	}
-	return sb.String()
-}
-
-// findRootPackages finds packages that are not imported by any other internal package.
-func (a *analyzer) findRootPackages() []string {
-	// Build a set of all imported packages
-	imported := make(map[string]bool)
-	for _, pkg := range a.packages {
-		for _, dep := range pkg.Imports {
-			imported[dep] = true
-		}
-	}
-
-	// Find packages that are not imported by others
-	roots := make([]string, 0)
-	for pkgPath := range a.packages {
-		if !imported[pkgPath] {
-			roots = append(roots, pkgPath)
-		}
-	}
-
-	// If no roots found (circular dependencies), use all packages
-	if len(roots) == 0 {
-		roots = a.getSortedPackages()
-	}
-
-	sort.Strings(roots)
-	return roots
-}
-
-// printTreeNodeNew prints tree node using new traversal system.
-func (a *analyzer) printTreeNodeNew(sb *strings.Builder, pkgPath string, prefix string, in Input, ctx *TraversalContext, depth int) {
-	if ctx.maxDepth > 0 && depth >= ctx.maxDepth {
-		return
-	}
-
-	_, ok := ctx.store.packages[pkgPath]
-	if !ok {
-		return
-	}
-
-	// Get filtered dependencies
-	deps := ctx.GetDependencies(pkgPath)
-	sort.Strings(deps)
-
-	for i, dep := range deps {
-		// Check if already visited
-		if ctx.Visit(dep) {
-			continue
-		}
-
-		isLast := i == len(deps)-1
-		connector := "├── "
-		if isLast {
-			connector = "└── "
-		}
-
-		shortName := a.shortName(dep, in.Group)
-		sb.WriteString(prefix + connector + shortName + "\n")
-
-		newPrefix := prefix
-		if isLast {
-			newPrefix += "    "
-		} else {
-			newPrefix += "│   "
-		}
-
-		// Recursively print dependencies
-		ctx.depth++
-		a.printTreeNodeNew(sb, dep, newPrefix, in, ctx, depth+1)
-		ctx.depth--
-	}
-}
-
-// generateList generates simple list output using new traversal system.
-func (a *analyzer) generateList(in Input) string {
-	var sb strings.Builder
-
-	// Prepare options
-	opts := a.convertInputToFilterOptions(in)
-	opts.Normalize(a.modulePrefix)
-
-	// Add statistics header if showing external dependencies
-	if in.External {
-		stats := a.getDependencyStats(in)
-		sb.WriteString("# Dependency Statistics\n")
-		fmt.Fprintf(&sb, "# Total: %v, Internal: %v, External: %v, Stdlib: %v\n",
-			stats["total"], stats["internal"], stats["external"], stats["stdlib"])
-		sb.WriteString("\n")
-	}
-
-	// Build package store
-	store := a.buildPackageStore()
-
-	allDeps := make(map[string]bool)
-
-	// Collect dependencies from packages that should be included
-	for pkgPath, pkgInfo := range store.packages {
-		if !opts.ShouldInclude(pkgInfo) {
-			continue
-		}
-
-		// Get filtered dependencies for this package
-		for _, dep := range store.packages[pkgPath].Imports {
-			depInfo, ok := store.packages[dep]
-			if ok && opts.ShouldInclude(depInfo) {
-				allDeps[dep] = true
-			}
-		}
-	}
-
-	deps := make([]string, 0, len(allDeps))
-	for dep := range allDeps {
-		deps = append(deps, a.shortName(dep, in.Group))
-	}
-	sort.Strings(deps)
-
-	for _, dep := range deps {
-		sb.WriteString(dep + "\n")
-	}
-	return sb.String()
-}
-
-// generateMermaid generates Mermaid diagram output.
-func (a *analyzer) generateMermaid(in Input) string {
-	var sb strings.Builder
-	sb.WriteString("```mermaid\n")
-	sb.WriteString("graph TD\n")
-
-	edges := a.collectEdges(in)
-	sortedEdges := make([]string, 0, len(edges))
-	for edge := range edges {
-		sortedEdges = append(sortedEdges, edge)
-	}
-	sort.Strings(sortedEdges)
-
-	for _, edge := range sortedEdges {
-		sb.WriteString("    " + edge + "\n")
-	}
-	sb.WriteString("```\n")
-	return sb.String()
-}
-
-// generateMermaidRaw generates Mermaid code without markdown wrapper.
-func (a *analyzer) generateMermaidRaw(in Input) string {
-	var sb strings.Builder
-	sb.WriteString("graph TD\n")
-
-	edges := a.collectEdges(in)
-	sortedEdges := make([]string, 0, len(edges))
-	for edge := range edges {
-		sortedEdges = append(sortedEdges, edge)
-	}
-	sort.Strings(sortedEdges)
-
-	for _, edge := range sortedEdges {
-		sb.WriteString("    " + edge + "\n")
-	}
-	return sb.String()
-}
-
-// generateDot generates Graphviz DOT output.
-func (a *analyzer) generateDot(in Input) string {
-	var sb strings.Builder
-	sb.WriteString("digraph deps {\n")
-	sb.WriteString("    rankdir=TB;\n")
-	sb.WriteString("    node [shape=box];\n")
-
-	edges := a.collectEdges(in)
-	sortedEdges := make([]string, 0, len(edges))
-	for edge := range edges {
-		sortedEdges = append(sortedEdges, edge)
-	}
-	sort.Strings(sortedEdges)
-
-	for _, edge := range sortedEdges {
-		parts := strings.Split(edge, " --> ")
-		if len(parts) == 2 {
-			fmt.Fprintf(&sb, "    \"%s\" -> \"%s\";\n", parts[0], parts[1])
-		}
-	}
-	sb.WriteString("}\n")
-	return sb.String()
-}
-
-// generateJSON generates JSON output using new traversal system.
-func (a *analyzer) generateJSON(in Input) string {
-	opts := a.convertInputToFilterOptions(in)
-	opts.Normalize(a.modulePrefix)
-	store := a.buildPackageStore()
-
-	result := make(map[string]any)
-
-	// Add dependency nodes
-	nodes := make([]*depNode, 0)
-	for _, pkgPath := range a.getSortedPackages() {
-		pkgInfo, ok := store.packages[pkgPath]
-		if !ok || !opts.ShouldInclude(pkgInfo) {
-			continue
-		}
-
-		pkg := a.packages[pkgPath]
-		a.visited = make(map[string]bool)
-		node := a.buildDepNode(pkg, in, 0)
-		nodes = append(nodes, node)
-	}
-	result["dependencies"] = nodes
-
-	// Add statistics
-	result["statistics"] = a.getDependencyStats(in)
-
-	// Add metadata
-	result["metadata"] = map[string]any{
-		"module":   a.modulePrefix,
-		"format":   in.Format,
-		"depth":    in.Depth,
-		"group":    in.Group,
-		"internal": in.Internal,
-		"external": in.External,
-		"nostd":    in.NoStd,
-	}
-
-	data, err := json.MarshalIndent(result, "", "  ")
-	if err != nil {
-		return fmt.Sprintf("Error: %v", err)
-	}
-	return string(data)
-}
-
-func (a *analyzer) buildDepNode(pkg *goPackage, in Input, depth int) *depNode {
-	opts := a.convertInputToFilterOptions(in)
-	opts.Normalize(a.modulePrefix)
-	store := a.buildPackageStore()
-
-	node := &depNode{
-		Package: a.shortName(pkg.ImportPath, in.Group),
-	}
-
-	if in.Depth > 0 && depth >= in.Depth {
-		return node
-	}
-
-	pkgInfo, ok := store.packages[pkg.ImportPath]
-	if !ok {
-		return node
-	}
-
-	// Track visited packages to avoid cycles
-	if !a.visited[pkg.ImportPath] {
-		a.visited[pkg.ImportPath] = true
-
-		for _, dep := range pkgInfo.Imports {
-			depInfo, ok := store.packages[dep]
-			if !ok || !opts.ShouldInclude(depInfo) {
-				continue
-			}
-
-			if depPkg, ok := a.packages[dep]; ok {
-				childNode := a.buildDepNode(depPkg, in, depth+1)
-				node.Dependencies = append(node.Dependencies, childNode)
-			} else {
-				node.Dependencies = append(node.Dependencies, &depNode{
-					Package: a.shortName(dep, in.Group),
-				})
-			}
-		}
-	}
-
-	return node
-}
-
-// generateReverse generates reverse dependency output using new system.
-func (a *analyzer) generateReverse(in Input) string {
-	opts := a.convertInputToFilterOptions(in)
-	opts.Normalize(a.modulePrefix)
-
-	store := a.buildPackageStore()
-
-	// Build reverse dependency map
-	reverseDeps := make(map[string][]string)
-	for pkgPath, pkgInfo := range store.packages {
-		for _, dep := range pkgInfo.Imports {
-			depInfo, ok := store.packages[dep]
-			if ok && opts.ShouldInclude(depInfo) {
-				reverseDeps[dep] = append(reverseDeps[dep], pkgPath)
-			}
-		}
-	}
-
-	var sb strings.Builder
-	targets := a.getSortedPackages()
-
-	for _, target := range targets {
-		deps := reverseDeps[target]
-		if len(deps) == 0 {
-			continue
-		}
-
-		sort.Strings(deps)
-		shortTarget := a.shortName(target, in.Group)
-		if shortTarget == "" {
-			continue
-		}
-		fmt.Fprintf(&sb, "%s (used by %d packages):\n", shortTarget, len(deps))
-
-		for i, dep := range deps {
-			isLast := i == len(deps)-1
-			connector := "├── "
-			if isLast {
-				connector = "└── "
-			}
-			sb.WriteString(connector + a.shortName(dep, in.Group) + "\n")
-		}
-		sb.WriteString("\n")
-	}
-	return sb.String()
-}

cmd/gf/internal/cmd/cmddep/cmddep_z_unit_test.go

@@ -1,255 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package cmddep
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-// Test data model creation and classification
-func Test_PackageInfo_Creation(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		pkg := &PackageInfo{
-			ImportPath:   "github.com/gogf/gf/v2/os/gfile",
-			ModulePath:   "github.com/gogf/gf/v2",
-			Kind:         KindInternal,
-			Tier:         2,
-			Imports:      []string{"fmt", "os"},
-			IsStdLib:     false,
-			IsModuleRoot: false,
-		}
-		t.Assert(pkg != nil, true)
-		t.Assert(pkg.Kind, KindInternal)
-		t.Assert(pkg.Tier, 2)
-		t.Assert(len(pkg.Imports), 2)
-	})
-}
-
-// Test FilterOptions normalization
-func Test_FilterOptions_Normalize(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		opts := &FilterOptions{
-			IncludeInternal: false,
-			IncludeExternal: false,
-			IncludeStdLib:   false,
-		}
-		opts.Normalize("github.com/gogf/gf/v2")
-
-		// After normalization, internal should be included by default
-		t.Assert(opts.IncludeInternal, true)
-		t.Assert(opts.IncludeExternal, false)
-	})
-}
-
-// Test ShouldInclude decision logic
-func Test_FilterOptions_ShouldInclude(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test internal package inclusion
-		opts := &FilterOptions{
-			IncludeInternal: true,
-			IncludeExternal: false,
-			IncludeStdLib:   true,
-		}
-
-		internalPkg := &PackageInfo{
-			Kind:     KindInternal,
-			IsStdLib: false,
-		}
-		externalPkg := &PackageInfo{
-			Kind:     KindExternal,
-			IsStdLib: false,
-		}
-		stdlibPkg := &PackageInfo{
-			Kind:     KindStdLib,
-			IsStdLib: true,
-		}
-
-		t.Assert(opts.ShouldInclude(internalPkg), true)
-		t.Assert(opts.ShouldInclude(externalPkg), false)
-		t.Assert(opts.ShouldInclude(stdlibPkg), true)
-	})
-}
-
-// Test TraversalContext Visit tracking
-func Test_TraversalContext_Visit(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		ctx := &TraversalContext{
-			visited: make(map[string]bool),
-		}
-
-		// First visit should return false
-		t.Assert(ctx.Visit("pkg1"), false)
-		// Second visit should return true
-		t.Assert(ctx.Visit("pkg1"), true)
-		// New package should return false
-		t.Assert(ctx.Visit("pkg2"), false)
-	})
-}
-
-// Test guessModuleRoot function
-func Test_GuessModuleRoot(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		tests := []struct {
-			input  string
-			expect string
-		}{
-			{"github.com/gogf/gf", "github.com/gogf/gf"},
-			{"github.com/gogf/gf/v2", "github.com/gogf/gf/v2"},
-			{"github.com/gogf/gf/v2/os/gfile", "github.com/gogf/gf/v2"},
-			{"github.com/gogf/gf/v2/os", "github.com/gogf/gf/v2"},
-		}
-
-		for _, test := range tests {
-			result := guessModuleRoot(test.input)
-			t.AssertEQ(result, test.expect)
-		}
-	})
-}
-
-// Test input to filter options conversion
-func Test_ConvertInputToFilterOptions(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		a := newAnalyzer()
-
-		input := Input{
-			Internal: true,
-			External: false,
-			NoStd:    true,
-			Module:   false,
-			Direct:   false,
-			Depth:    3,
-		}
-
-		opts := a.convertInputToFilterOptions(input)
-
-		t.Assert(opts.IncludeInternal, true)
-		t.Assert(opts.IncludeExternal, false)
-		t.Assert(opts.IncludeStdLib, false) // NoStd=true means !IncludeStdLib
-		t.Assert(opts.Depth, 3)
-	})
-}
-
-func Test_Dep_Tree(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		ctx := gctx.New()
-		_, err := Dep.Index(ctx, Input{
-			Package:  "./",
-			Format:   "tree",
-			Depth:    1,
-			Internal: true,
-			NoStd:    true,
-		})
-		t.AssertNil(err)
-	})
-}
-
-func Test_Dep_List(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		ctx := gctx.New()
-		_, err := Dep.Index(ctx, Input{
-			Package:  "./",
-			Format:   "list",
-			Depth:    1,
-			Internal: true,
-			NoStd:    true,
-		})
-		t.AssertNil(err)
-	})
-}
-
-func Test_Dep_Mermaid(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		ctx := gctx.New()
-		_, err := Dep.Index(ctx, Input{
-			Package:  "./",
-			Format:   "mermaid",
-			Depth:    1,
-			Internal: true,
-			NoStd:    true,
-		})
-		t.AssertNil(err)
-	})
-}
-
-func Test_Dep_Dot(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		ctx := gctx.New()
-		_, err := Dep.Index(ctx, Input{
-			Package:  "./",
-			Format:   "dot",
-			Depth:    1,
-			Internal: true,
-			NoStd:    true,
-		})
-		t.AssertNil(err)
-	})
-}
-
-func Test_Dep_JSON(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		ctx := gctx.New()
-		_, err := Dep.Index(ctx, Input{
-			Package:  "./",
-			Format:   "json",
-			Depth:    1,
-			Internal: true,
-			NoStd:    true,
-		})
-		t.AssertNil(err)
-	})
-}
-
-func Test_Dep_Reverse(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		ctx := gctx.New()
-		_, err := Dep.Index(ctx, Input{
-			Package:  "./",
-			Format:   "tree",
-			Depth:    1,
-			Internal: true,
-			NoStd:    true,
-			Reverse:  true,
-		})
-		t.AssertNil(err)
-	})
-}
-
-func Test_Dep_Group(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		ctx := gctx.New()
-		_, err := Dep.Index(ctx, Input{
-			Package:  "./",
-			Format:   "mermaid",
-			Depth:    1,
-			Internal: true,
-			NoStd:    true,
-			Group:    true,
-		})
-		t.AssertNil(err)
-	})
-}
-
-func Test_ModuleLevel_Direct(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		ctx := gctx.New()
-
-		// Test module level with direct only
-		in := Input{
-			Module: true,
-			Direct: true,
-			Format: "list",
-		}
-
-		t.Logf("Input.Module: %v, Input.Direct: %v", in.Module, in.Direct)
-
-		_, err := Dep.Index(ctx, in)
-		t.AssertNil(err)
-	})
-}

cmd/gf/internal/cmd/cmddep/static/app.js

@@ -1,946 +0,0 @@
-// Main Application Module
-let currentZoom = 1;
-let currentView = 'graph';
-let currentLayout = 'TD';
-let selectedPackage = null;
-let allPackages = [];
-let isRemoteMode = false;
-let currentRemoteModule = '';
-let packageListMode = 'tree'; // 'flat' or 'tree'
-let expandedNodes = new Set(); // Track expanded tree nodes
-
-// Pan and Zoom state
-let panX = 0;
-let panY = 0;
-let isPanning = false;
-let startPanX = 0;
-let startPanY = 0;
-let zoomIndicatorTimeout = null;
-
-const MIN_ZOOM = 0.1;
-const MAX_ZOOM = 10;
-const ZOOM_STEP = 0.1;
-
-// Theme Management
-const theme = {
-    current: 'light',
-    
-    init() {
-        const savedTheme = localStorage.getItem('dep-viewer-theme');
-        if (savedTheme) {
-            this.current = savedTheme;
-        } else {
-            if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
-                this.current = 'dark';
-            }
-        }
-        this.apply();
-        
-        window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => {
-            if (!localStorage.getItem('dep-viewer-theme')) {
-                this.current = e.matches ? 'dark' : 'light';
-                this.apply();
-            }
-        });
-        
-        const toggleBtn = document.getElementById('themeToggle');
-        if (toggleBtn) {
-            toggleBtn.addEventListener('click', () => this.toggle());
-        }
-    },
-    
-    toggle() {
-        this.current = this.current === 'dark' ? 'light' : 'dark';
-        localStorage.setItem('dep-viewer-theme', this.current);
-        this.apply();
-    },
-    
-    apply() {
-        if (this.current === 'dark') {
-            document.body.setAttribute('data-theme', 'dark');
-        } else {
-            document.body.removeAttribute('data-theme');
-        }
-        
-        mermaid.initialize({
-            startOnLoad: false,
-            theme: this.current === 'dark' ? 'dark' : 'default',
-            maxEdges: 2000,  // Increase edge limit for large dependency graphs
-            flowchart: {
-                useMaxWidth: false,
-                htmlLabels: true,
-                curve: 'basis'
-            }
-        });
-        
-        if (currentView === 'graph') {
-            refresh();
-        }
-    }
-};
-
-// Initialize mermaid
-mermaid.initialize({
-    startOnLoad: false,
-    theme: 'default',
-    maxEdges: 2000,  // Increase edge limit for large dependency graphs
-    flowchart: {
-        useMaxWidth: false,
-        htmlLabels: true,
-        curve: 'basis'
-    }
-});
-
-// Initialize application
-async function init() {
-    theme.init();
-    initPanZoom();
-    initRemoteModuleInput();
-    const hasLocalModule = await loadModuleName();
-    if (hasLocalModule) {
-        await loadPackages();
-        await refresh();
-    }
-}
-
-// Initialize remote module input
-function initRemoteModuleInput() {
-    const input = document.getElementById('remoteModuleInput');
-    if (input) {
-        // Fetch versions when input loses focus or Enter is pressed
-        input.addEventListener('blur', fetchVersions);
-        input.addEventListener('keypress', (e) => {
-            if (e.key === 'Enter') {
-                fetchVersions();
-            }
-        });
-    }
-}
-
-// Fetch versions for a module from Go proxy
-async function fetchVersions() {
-    const input = document.getElementById('remoteModuleInput');
-    const versionSelect = document.getElementById('versionSelect');
-    const spinner = document.getElementById('loadingSpinner');
-    
-    let modulePath = input.value.trim();
-    // Remove http:// or https:// prefix if present
-    modulePath = modulePath.replace(/^https?:\/\//, '');
-    input.value = modulePath;
-    
-    if (!modulePath) {
-        versionSelect.disabled = true;
-        versionSelect.innerHTML = `<option value="">${i18n.t('selectVersion')}</option>`;
-        return;
-    }
-    
-    spinner.classList.remove('hidden');
-    versionSelect.disabled = true;
-    
-    try {
-        const response = await fetch('/api/versions?module=' + encodeURIComponent(modulePath));
-        const data = await response.json();
-        
-        if (data.error) {
-            versionSelect.innerHTML = `<option value="">${i18n.t('errorFetchVersions')}</option>`;
-        } else if (data.versions && data.versions.length > 0) {
-            versionSelect.innerHTML = data.versions.map((v, i) => {
-                const label = i === 0 ? `${v} (${i18n.t('latestVersion')})` : v;
-                return `<option value="${v}">${label}</option>`;
-            }).join('');
-            versionSelect.disabled = false;
-        } else {
-            versionSelect.innerHTML = `<option value="">${i18n.t('noVersions')}</option>`;
-        }
-    } catch (e) {
-        console.error('Failed to fetch versions:', e);
-        versionSelect.innerHTML = `<option value="">${i18n.t('errorFetchVersions')}</option>`;
-    } finally {
-        spinner.classList.add('hidden');
-    }
-}
-
-// Analyze remote module
-async function analyzeRemoteModule() {
-    const input = document.getElementById('remoteModuleInput');
-    const versionSelect = document.getElementById('versionSelect');
-    const spinner = document.getElementById('loadingSpinner');
-    const analyzeBtn = document.getElementById('analyzeBtn');
-    
-    let modulePath = input.value.trim();
-    // Remove http:// or https:// prefix if present
-    modulePath = modulePath.replace(/^https?:\/\//, '');
-    input.value = modulePath;
-    
-    const version = versionSelect.value;
-    
-    if (!modulePath) {
-        alert('Please enter a module path');
-        return;
-    }
-    
-    spinner.classList.remove('hidden');
-    analyzeBtn.disabled = true;
-    analyzeBtn.textContent = i18n.t('analyzing');
-    
-    try {
-        const url = `/api/analyze?module=${encodeURIComponent(modulePath)}${version ? '&version=' + encodeURIComponent(version) : ''}`;
-        const response = await fetch(url);
-        const data = await response.json();
-        
-        if (data.error) {
-            alert(data.error);
-            return;
-        }
-        
-        // Switch to remote mode
-        isRemoteMode = true;
-        currentRemoteModule = modulePath + (version ? '@' + version : '');
-        document.getElementById('moduleName').textContent = currentRemoteModule;
-        
-        // Clear selection and reload
-        selectedPackage = null;
-        await loadPackages();
-        await refresh();
-    } catch (e) {
-        console.error('Failed to analyze module:', e);
-        alert(i18n.t('errorAnalyze'));
-    } finally {
-        spinner.classList.add('hidden');
-        analyzeBtn.disabled = false;
-        analyzeBtn.textContent = i18n.t('analyze');
-    }
-}
-
-// Reset to local module
-async function resetToLocal() {
-    const spinner = document.getElementById('loadingSpinner');
-    spinner.classList.remove('hidden');
-    
-    try {
-        await fetch('/api/reset');
-        
-        isRemoteMode = false;
-        currentRemoteModule = '';
-        document.getElementById('remoteModuleInput').value = '';
-        document.getElementById('versionSelect').innerHTML = `<option value="">${i18n.t('selectVersion')}</option>`;
-        document.getElementById('versionSelect').disabled = true;
-        
-        selectedPackage = null;
-        await loadModuleName();
-        await loadPackages();
-        await refresh();
-    } catch (e) {
-        console.error('Failed to reset:', e);
-    } finally {
-        spinner.classList.add('hidden');
-    }
-}
-
-// Initialize pan and zoom functionality
-function initPanZoom() {
-    const viewport = document.getElementById('graphView');
-    if (!viewport) return;
-
-    // Mouse wheel zoom
-    viewport.addEventListener('wheel', (e) => {
-        if (currentView !== 'graph') return;
-        e.preventDefault();
-        
-        const rect = viewport.getBoundingClientRect();
-        const mouseX = e.clientX - rect.left;
-        const mouseY = e.clientY - rect.top;
-        
-        // Calculate zoom
-        const delta = e.deltaY > 0 ? -ZOOM_STEP : ZOOM_STEP;
-        const newZoom = Math.min(MAX_ZOOM, Math.max(MIN_ZOOM, currentZoom + delta * currentZoom));
-        
-        if (newZoom !== currentZoom) {
-            // Zoom towards mouse position
-            const scale = newZoom / currentZoom;
-            panX = mouseX - (mouseX - panX) * scale;
-            panY = mouseY - (mouseY - panY) * scale;
-            currentZoom = newZoom;
-            applyTransform();
-            showZoomIndicator();
-        }
-    }, { passive: false });
-
-    // Pan with mouse drag
-    viewport.addEventListener('mousedown', (e) => {
-        if (currentView !== 'graph') return;
-        if (e.button !== 0) return; // Only left click
-        
-        isPanning = true;
-        startPanX = e.clientX - panX;
-        startPanY = e.clientY - panY;
-        viewport.style.cursor = 'grabbing';
-    });
-
-    document.addEventListener('mousemove', (e) => {
-        if (!isPanning) return;
-        
-        panX = e.clientX - startPanX;
-        panY = e.clientY - startPanY;
-        applyTransform();
-    });
-
-    document.addEventListener('mouseup', () => {
-        if (isPanning) {
-            isPanning = false;
-            const viewport = document.getElementById('graphViewport');
-            if (viewport) viewport.style.cursor = 'grab';
-        }
-    });
-
-    // Touch support for mobile
-    let lastTouchDistance = 0;
-    let lastTouchCenter = { x: 0, y: 0 };
-
-    viewport.addEventListener('touchstart', (e) => {
-        if (currentView !== 'graph') return;
-        
-        if (e.touches.length === 1) {
-            isPanning = true;
-            startPanX = e.touches[0].clientX - panX;
-            startPanY = e.touches[0].clientY - panY;
-        } else if (e.touches.length === 2) {
-            isPanning = false;
-            lastTouchDistance = getTouchDistance(e.touches);
-            lastTouchCenter = getTouchCenter(e.touches);
-        }
-    }, { passive: true });
-
-    viewport.addEventListener('touchmove', (e) => {
-        if (currentView !== 'graph') return;
-        e.preventDefault();
-        
-        if (e.touches.length === 1 && isPanning) {
-            panX = e.touches[0].clientX - startPanX;
-            panY = e.touches[0].clientY - startPanY;
-            applyTransform();
-        } else if (e.touches.length === 2) {
-            const distance = getTouchDistance(e.touches);
-            const center = getTouchCenter(e.touches);
-            
-            if (lastTouchDistance > 0) {
-                const scale = distance / lastTouchDistance;
-                const newZoom = Math.min(MAX_ZOOM, Math.max(MIN_ZOOM, currentZoom * scale));
-                
-                if (newZoom !== currentZoom) {
-                    const rect = viewport.getBoundingClientRect();
-                    const centerX = center.x - rect.left;
-                    const centerY = center.y - rect.top;
-                    
-                    const zoomScale = newZoom / currentZoom;
-                    panX = centerX - (centerX - panX) * zoomScale;
-                    panY = centerY - (centerY - panY) * zoomScale;
-                    currentZoom = newZoom;
-                    applyTransform();
-                    showZoomIndicator();
-                }
-            }
-            
-            lastTouchDistance = distance;
-            lastTouchCenter = center;
-        }
-    }, { passive: false });
-
-    viewport.addEventListener('touchend', () => {
-        isPanning = false;
-        lastTouchDistance = 0;
-    });
-}
-
-function getTouchDistance(touches) {
-    const dx = touches[0].clientX - touches[1].clientX;
-    const dy = touches[0].clientY - touches[1].clientY;
-    return Math.sqrt(dx * dx + dy * dy);
-}
-
-function getTouchCenter(touches) {
-    return {
-        x: (touches[0].clientX + touches[1].clientX) / 2,
-        y: (touches[0].clientY + touches[1].clientY) / 2
-    };
-}
-
-function applyTransform() {
-    const container = document.getElementById('mermaidContainer');
-    if (container) {
-        container.style.transform = `translate(${panX}px, ${panY}px) scale(${currentZoom})`;
-    }
-}
-
-function showZoomIndicator() {
-    const indicator = document.getElementById('zoomIndicator');
-    if (indicator) {
-        indicator.textContent = `${Math.round(currentZoom * 100)}%`;
-        indicator.classList.add('visible');
-        
-        if (zoomIndicatorTimeout) {
-            clearTimeout(zoomIndicatorTimeout);
-        }
-        zoomIndicatorTimeout = setTimeout(() => {
-            indicator.classList.remove('visible');
-        }, 1500);
-    }
-}
-
-// Load module name from server
-// Returns true if local module exists, false otherwise
-async function loadModuleName() {
-    try {
-        const response = await fetch('/api/module');
-        const data = await response.json();
-        document.getElementById('moduleName').textContent = data.name || '';
-        
-        // If no local module, set default value and auto-analyze
-        if (!data.name) {
-            const input = document.getElementById('remoteModuleInput');
-            if (input && !input.value) {
-                input.value = 'github.com/gogf/gf/v2';
-                // Fetch versions first, then auto-analyze
-                await fetchVersions();
-                analyzeRemoteModule();
-            }
-            return false;
-        }
-        return true;
-    } catch (e) {
-        console.error('Failed to load module name:', e);
-        return false;
-    }
-}
-
-// Load packages list
-async function loadPackages() {
-    try {
-        const internal = document.getElementById('internal').checked;
-        const external = document.getElementById('external') ? document.getElementById('external').checked : false;
-        const moduleLevel = document.getElementById('moduleLevel') ? document.getElementById('moduleLevel').checked : false;
-        const directOnly = document.getElementById('directOnly') ? document.getElementById('directOnly').checked : false;
-        const response = await fetch(`/api/packages?internal=${internal}&external=${external}&module=${moduleLevel}&direct=${directOnly}`);
-        const data = await response.json();
-        
-        // Handle new API response format with packages and statistics
-        if (data.packages && Array.isArray(data.packages)) {
-            allPackages = data.packages;
-            // Update statistics display if available
-            if (data.statistics) {
-                updateStatisticsDisplay(data.statistics);
-            }
-        } else if (Array.isArray(data)) {
-            // Fallback for old format
-            allPackages = data;
-        } else {
-            console.error('Unexpected API response format:', data);
-            allPackages = [];
-        }
-        
-        document.getElementById('packageCount').textContent = allPackages.length;
-        renderPackageList(allPackages);
-    } catch (e) {
-        console.error('Failed to load packages:', e);
-    }
-}
-
-// Update statistics display
-function updateStatisticsDisplay(statistics) {
-    if (statistics) {
-        document.getElementById('internalCount').textContent = statistics.internal || 0;
-        document.getElementById('externalCount').textContent = statistics.external || 0;
-        document.getElementById('stdlibCount').textContent = statistics.stdlib || 0;
-        
-        // Update total count
-        const totalCount = statistics.total || (statistics.internal + statistics.external + statistics.stdlib);
-        document.getElementById('nodeCount').textContent = totalCount;
-    }
-}
-
-// Get package name from package object or string
-function getPkgName(pkg) {
-    return typeof pkg === 'object' ? pkg.name : pkg;
-}
-
-// Set package list display mode
-function setPackageListMode(mode) {
-    packageListMode = mode;
-    document.getElementById('modeFlat').classList.toggle('active', mode === 'flat');
-    document.getElementById('modeTree').classList.toggle('active', mode === 'tree');
-    
-    const query = document.getElementById('searchInput').value.toLowerCase();
-    const filtered = query ? allPackages.filter(pkg => getPkgName(pkg).toLowerCase().includes(query)) : allPackages;
-    renderPackageList(filtered);
-}
-
-// Render package list in sidebar
-function renderPackageList(packages) {
-    const list = document.getElementById('packageList');
-    if (packages.length === 0) {
-        list.innerHTML = '<div class="loading">' + i18n.t('noPackages') + '</div>';
-        return;
-    }
-    
-    if (packageListMode === 'tree') {
-        renderPackageTree(packages, list);
-    } else {
-        renderPackageFlat(packages, list);
-    }
-}
-
-// Render flat package list
-function renderPackageFlat(packages, container) {
-    container.innerHTML = packages.map(pkg => {
-        const name = getPkgName(pkg);
-        const isActive = name === selectedPackage ? ' active' : '';
-        const escaped = name.replace(/'/g, "\\'");
-        
-        // Build stats display
-        let statsHtml = '';
-        if (typeof pkg === 'object') {
-            statsHtml = `<span class="pkg-stats-inline">
-                <span class="dep-count" title="${i18n.t('dependencies')}">→${pkg.depCount}</span>
-                <span class="used-count" title="${i18n.t('usedBy')}">←${pkg.usedByCount}</span>
-            </span>`;
-        }
-        
-        return `<div class="package-item${isActive}" onclick="selectPackage('${escaped}')" title="${name}">
-            <span class="pkg-name-text">${name}</span>${statsHtml}
-        </div>`;
-    }).join('');
-}
-
-// Build tree structure from package paths
-function buildPackageTree(packages) {
-    const root = { children: {}, packages: [] };
-    
-    packages.forEach(pkg => {
-        const name = getPkgName(pkg);
-        const parts = name.split('/');
-        let current = root;
-        
-        parts.forEach((part, index) => {
-            if (!current.children[part]) {
-                current.children[part] = { children: {}, packages: [], path: parts.slice(0, index + 1).join('/') };
-            }
-            current = current.children[part];
-        });
-        current.isPackage = true;
-        current.fullPath = name;
-        // Store stats if available
-        if (typeof pkg === 'object') {
-            current.depCount = pkg.depCount;
-            current.usedByCount = pkg.usedByCount;
-        }
-    });
-    
-    return root;
-}
-
-// Render package tree
-function renderPackageTree(packages, container) {
-    const tree = buildPackageTree(packages);
-    container.innerHTML = renderTreeNode(tree, '');
-}
-
-// Render a tree node recursively
-function renderTreeNode(node, path) {
-    const children = Object.keys(node.children).sort();
-    if (children.length === 0) return '';
-    
-    return children.map(name => {
-        const child = node.children[name];
-        const childPath = path ? `${path}/${name}` : name;
-        const hasChildren = Object.keys(child.children).length > 0;
-        const isExpanded = expandedNodes.has(childPath);
-        const isActive = child.fullPath === selectedPackage;
-        const isPackage = child.isPackage;
-        
-        const toggleClass = hasChildren ? (isExpanded ? 'expanded' : '') : 'empty';
-        const activeClass = isActive ? ' active' : '';
-        const nameClass = isPackage ? ' package' : '';
-        const icon = isPackage ? '📦' : '📁';
-        
-        // Build stats for packages
-        let statsHtml = '';
-        if (isPackage && child.depCount !== undefined) {
-            statsHtml = `<span class="pkg-stats-inline">
-                <span class="dep-count" title="${i18n.t('dependencies')}">→${child.depCount}</span>
-                <span class="used-count" title="${i18n.t('usedBy')}">←${child.usedByCount}</span>
-            </span>`;
-        }
-        
-        let html = `
-            <div class="tree-node" data-path="${childPath}">
-                <div class="tree-node-header${activeClass}">
-                    <span class="tree-node-toggle ${toggleClass}" onclick="handleToggleClick(event, '${childPath.replace(/'/g, "\\'")}', ${hasChildren})">▶</span>
-                    <span class="tree-node-icon">${icon}</span>
-                    <span class="tree-node-name${nameClass}" onclick="handleNameClick(event, '${childPath.replace(/'/g, "\\'")}', ${isPackage}, ${hasChildren})">${name}</span>
-                    ${statsHtml}
-                </div>`;
-        
-        if (hasChildren) {
-            const childrenHtml = renderTreeNode(child, childPath);
-            html += `<div class="tree-node-children${isExpanded ? ' expanded' : ''}">${childrenHtml}</div>`;
-        }
-        
-        html += '</div>';
-        return html;
-    }).join('');
-}
-
-// Handle toggle arrow click - expand/collapse
-function handleToggleClick(event, path, hasChildren) {
-    event.stopPropagation();
-    if (hasChildren) {
-        toggleTreeNode(path);
-    }
-}
-
-// Handle name click - select package or toggle if folder
-function handleNameClick(event, path, isPackage, hasChildren) {
-    event.stopPropagation();
-    if (isPackage) {
-        selectPackage(path);
-    } else if (hasChildren) {
-        toggleTreeNode(path);
-    }
-}
-
-// Toggle tree node expansion
-function toggleTreeNode(path) {
-    if (expandedNodes.has(path)) {
-        expandedNodes.delete(path);
-    } else {
-        expandedNodes.add(path);
-    }
-    
-    // Re-render with current filter
-    const query = document.getElementById('searchInput').value.toLowerCase();
-    const filtered = query ? allPackages.filter(pkg => getPkgName(pkg).toLowerCase().includes(query)) : allPackages;
-    renderPackageList(filtered);
-}
-
-// Filter packages by search query
-function filterPackages() {
-    const query = document.getElementById('searchInput').value.toLowerCase();
-    const filtered = allPackages.filter(pkg => getPkgName(pkg).toLowerCase().includes(query));
-    renderPackageList(filtered);
-}
-
-// Select a package
-async function selectPackage(pkg) {
-    selectedPackage = pkg;
-    
-    // Update flat list items
-    document.querySelectorAll('.package-item').forEach(el => {
-        el.classList.toggle('active', el.textContent === pkg);
-    });
-    
-    // Update tree items
-    document.querySelectorAll('.tree-node-header').forEach(el => {
-        const node = el.closest('.tree-node');
-        el.classList.toggle('active', node && node.dataset.path === pkg);
-    });
-    
-    await refresh();
-}
-
-// Clear package selection
-function clearSelection() {
-    selectedPackage = null;
-    document.querySelectorAll('.package-item').forEach(el => el.classList.remove('active'));
-    document.querySelectorAll('.tree-node-header').forEach(el => el.classList.remove('active'));
-    closePackageInfo();
-    refresh();
-}
-
-// Close package info sidebar
-function closePackageInfo() {
-    document.getElementById('packageInfo').classList.remove('visible');
-}
-
-// Set layout direction
-function setLayout(layout) {
-    currentLayout = layout;
-    document.getElementById('layoutTD').classList.toggle('active', layout === 'TD');
-    document.getElementById('layoutLR').classList.toggle('active', layout === 'LR');
-    refresh();
-}
-
-// Set view mode
-function setView(view) {
-    currentView = view;
-    document.getElementById('btnGraph').classList.toggle('active', view === 'graph');
-    document.getElementById('btnTree').classList.toggle('active', view === 'tree');
-    document.getElementById('btnList').classList.toggle('active', view === 'list');
-    document.getElementById('zoomControls').classList.toggle('hidden', view !== 'graph');
-    document.getElementById('layoutGroup').classList.toggle('hidden', view !== 'graph');
-    refresh();
-}
-
-// Main refresh function
-async function refresh() {
-    const depth = document.getElementById('depth').value;
-    const group = document.getElementById('group').checked;
-    const reverse = document.getElementById('reverse').checked;
-    const internal = document.getElementById('internal').checked;
-    const external = document.getElementById('external') ? document.getElementById('external').checked : false;
-    const moduleLevel = document.getElementById('moduleLevel') ? document.getElementById('moduleLevel').checked : false;
-    const directOnly = document.getElementById('directOnly') ? document.getElementById('directOnly').checked : false;
-
-    if (selectedPackage) {
-        await showPackageInfo(selectedPackage);
-    } else {
-        closePackageInfo();
-    }
-
-    if (currentView === 'graph') {
-        await refreshGraph(depth, group, reverse, internal, external, moduleLevel, directOnly);
-    } else if (currentView === 'tree') {
-        await refreshTree(depth, internal, external, moduleLevel, directOnly);
-    } else {
-        await refreshList(internal, external, moduleLevel, directOnly);
-    }
-}
-
-// Show package info panel
-async function showPackageInfo(pkg) {
-    try {
-        const response = await fetch('/api/package?name=' + encodeURIComponent(pkg));
-        const info = await response.json();
-        
-        const infoDiv = document.getElementById('packageInfo');
-        const contentDiv = document.getElementById('packageInfoContent');
-        
-        infoDiv.classList.add('visible');
-        contentDiv.innerHTML = `
-            <span class="pkg-name" title="${info.name}">${info.name}</span>
-            <div class="pkg-stats">
-                <div class="pkg-stat">
-                    <span class="pkg-stat-label">${i18n.t('dependencies')}:</span>
-                    <span class="pkg-stat-value">${info.dependencies.length}</span>
-                </div>
-                <div class="pkg-stat">
-                    <span class="pkg-stat-label">${i18n.t('usedBy')}:</span>
-                    <span class="pkg-stat-value">${info.usedBy.length}</span>
-                </div>
-            </div>
-        `;
-    } catch (e) {
-        console.error('Failed to load package info:', e);
-    }
-}
-
-// Refresh graph view
-async function refreshGraph(depth, group, reverse, internal, external, moduleLevel, directOnly) {
-    document.getElementById('graphView').classList.remove('hidden');
-    document.getElementById('textView').classList.add('hidden');
-
-    // Reset pan/zoom on refresh
-    currentZoom = 1;
-    panX = 0;
-    panY = 0;
-    applyTransform();
-
-    let url = `/api/graph?depth=${depth}&group=${group}&reverse=${reverse}&internal=${internal}`;
-    if (external !== undefined) {
-        url += `&external=${external}`;
-    }
-    if (moduleLevel !== undefined) {
-        url += `&module=${moduleLevel}`;
-    }
-    if (directOnly !== undefined) {
-        url += `&direct=${directOnly}`;
-    }
-    if (selectedPackage) {
-        url += '&package=' + encodeURIComponent(selectedPackage);
-    }
-
-    try {
-        const response = await fetch(url);
-        const data = await response.json();
-
-        document.getElementById('nodeCount').textContent = data.nodes.length;
-        document.getElementById('edgeCount').textContent = data.edges.length;
-
-        // Generate mermaid code
-        // Build node id to label map
-        const nodeLabels = {};
-        data.nodes.forEach(node => {
-            nodeLabels[node.id] = node.label;
-        });
-
-        // Use current layout direction
-        let mermaidCode = `graph ${currentLayout}\n`;
-        // First define all nodes with labels
-        data.nodes.forEach(node => {
-            mermaidCode += `    ${node.id}["${node.label}"]\n`;
-        });
-        // Then add edges
-        data.edges.forEach(edge => {
-            mermaidCode += `    ${edge.from} --> ${edge.to}\n`;
-        });
-
-        const container = document.getElementById('mermaidGraph');
-        container.innerHTML = mermaidCode;
-        container.removeAttribute('data-processed');
-        
-        await mermaid.run({ nodes: [container] });
-        
-        // Auto-fit if graph is large
-        setTimeout(() => {
-            autoFitGraph();
-        }, 100);
-    } catch (e) {
-        console.error('Failed to render graph:', e);
-        document.getElementById('mermaidGraph').innerHTML = 
-            `<div class="loading">${i18n.t('renderError')}</div>`;
-    }
-}
-
-// Auto-fit graph to viewport
-function autoFitGraph() {
-    const viewport = document.getElementById('graphView');
-    const svg = document.querySelector('.mermaid svg');
-    
-    if (!viewport || !svg) return;
-    
-    const viewportRect = viewport.getBoundingClientRect();
-    const svgRect = svg.getBoundingClientRect();
-    
-    if (svgRect.width === 0 || svgRect.height === 0) return;
-    
-    // Calculate scale to fit
-    const scaleX = (viewportRect.width - 40) / svgRect.width;
-    const scaleY = (viewportRect.height - 40) / svgRect.height;
-    const scale = Math.min(scaleX, scaleY, 1); // Don't zoom in beyond 100%
-    
-    if (scale < 1) {
-        currentZoom = scale;
-        // Center the graph
-        panX = (viewportRect.width - svgRect.width * scale) / 2;
-        panY = 20;
-        applyTransform();
-        showZoomIndicator();
-    }
-}
-
-// Refresh tree view
-async function refreshTree(depth, internal, external, moduleLevel, directOnly) {
-    document.getElementById('graphView').classList.add('hidden');
-    document.getElementById('textView').classList.remove('hidden');
-
-    let url = `/api/tree?depth=${depth}&internal=${internal}`;
-    if (external !== undefined) {
-        url += `&external=${external}`;
-    }
-    if (moduleLevel !== undefined) {
-        url += `&module=${moduleLevel}`;
-    }
-    if (directOnly !== undefined) {
-        url += `&direct=${directOnly}`;
-    }
-    if (selectedPackage) {
-        url += '&package=' + encodeURIComponent(selectedPackage);
-    }
-
-    try {
-        const response = await fetch(url);
-        const text = await response.text();
-        document.getElementById('textView').textContent = text;
-
-        const lines = text.split('\n').filter(l => l.trim());
-        document.getElementById('nodeCount').textContent = lines.length;
-        document.getElementById('edgeCount').textContent = '-';
-    } catch (e) {
-        console.error('Failed to load tree:', e);
-    }
-}
-
-// Refresh list view
-async function refreshList(internal, external, moduleLevel, directOnly) {
-    document.getElementById('graphView').classList.add('hidden');
-    document.getElementById('textView').classList.remove('hidden');
-
-    let url = `/api/list?internal=${internal}`;
-    if (external !== undefined) {
-        url += `&external=${external}`;
-    }
-    if (moduleLevel !== undefined) {
-        url += `&module=${moduleLevel}`;
-    }
-    if (directOnly !== undefined) {
-        url += `&direct=${directOnly}`;
-    }
-    if (selectedPackage) {
-        url += '&package=' + encodeURIComponent(selectedPackage);
-    }
-
-    try {
-        const response = await fetch(url);
-        const text = await response.text();
-        document.getElementById('textView').textContent = text;
-
-        const lines = text.split('\n').filter(l => l.trim());
-        document.getElementById('nodeCount').textContent = lines.length;
-        document.getElementById('edgeCount').textContent = '-';
-    } catch (e) {
-        console.error('Failed to load list:', e);
-    }
-}
-
-// Zoom functions
-function zoomIn() {
-    const viewport = document.getElementById('graphView');
-    if (!viewport) return;
-    
-    const rect = viewport.getBoundingClientRect();
-    const centerX = rect.width / 2;
-    const centerY = rect.height / 2;
-    
-    const newZoom = Math.min(MAX_ZOOM, currentZoom * 1.2);
-    const scale = newZoom / currentZoom;
-    
-    panX = centerX - (centerX - panX) * scale;
-    panY = centerY - (centerY - panY) * scale;
-    currentZoom = newZoom;
-    
-    applyTransform();
-    showZoomIndicator();
-}
-
-function zoomOut() {
-    const viewport = document.getElementById('graphView');
-    if (!viewport) return;
-    
-    const rect = viewport.getBoundingClientRect();
-    const centerX = rect.width / 2;
-    const centerY = rect.height / 2;
-    
-    const newZoom = Math.max(MIN_ZOOM, currentZoom / 1.2);
-    const scale = newZoom / currentZoom;
-    
-    panX = centerX - (centerX - panX) * scale;
-    panY = centerY - (centerY - panY) * scale;
-    currentZoom = newZoom;
-    
-    applyTransform();
-    showZoomIndicator();
-}
-
-function resetZoom() {
-    currentZoom = 1;
-    panX = 0;
-    panY = 0;
-    applyTransform();
-    showZoomIndicator();
-}
-
-function fitToScreen() {
-    autoFitGraph();
-}
-
-// Initialize when DOM is ready
-document.addEventListener('DOMContentLoaded', init);

cmd/gf/internal/cmd/cmddep/static/i18n.js

@@ -1,228 +0,0 @@
-// Internationalization (i18n) Module
-const i18n = {
-    currentLang: 'en',
-    
-    translations: {
-        en: {
-            title: 'Go Package Dependencies',
-            pageTitle: 'Package Dependency Viewer',
-            currentModule: 'Current:',
-            remoteModuleLabel: 'Analyze Module:',
-            remoteModulePlaceholder: 'e.g. github.com/gogf/gf/v2',
-            selectVersion: 'Version',
-            analyze: 'Analyze',
-            resetLocal: 'Reset',
-            fetchingVersions: 'Fetching...',
-            analyzing: 'Analyzing...',
-            viewLabel: 'View:',
-            viewGraph: 'Graph',
-            viewTree: 'Tree',
-            viewList: 'List',
-            depthLabel: 'Depth:',
-            depthUnlimited: 'Unlimited',
-            reverseLabel: 'Reverse (show who uses)',
-            groupLabel: 'Group by directory',
-            internalLabel: 'Internal only',
-            externalLabel: 'External packages',
-            moduleLevelLabel: 'Module level',
-            directOnlyLabel: 'Direct only',
-            statsInternal: 'Internal',
-            statsExternal: 'External',
-            statsStdlib: 'Stdlib',
-            layoutLabel: 'Layout:',
-            layoutTD: 'Top-Down',
-            layoutLR: 'Left-Right',
-            showAll: 'Show All',
-            packagesTitle: 'Packages',
-            searchPlaceholder: 'Search packages...',
-            flatMode: 'Flat list',
-            treeMode: 'Tree view',
-            statsPackages: 'Packages',
-            statsDependencies: 'Dependencies',
-            dependencies: 'Dependencies',
-            usedBy: 'Used by',
-            noPackages: 'No packages found',
-            renderError: 'Unable to render graph. Try reducing depth or selecting a specific package.',
-            packageNotFound: 'Package not found',
-            zoomIn: 'Zoom in',
-            zoomOut: 'Zoom out',
-            fitToScreen: 'Fit to screen',
-            resetZoom: 'Reset zoom',
-            dragToMove: 'Drag to move, scroll to zoom',
-            noVersions: 'No versions found',
-            latestVersion: 'Latest',
-            errorFetchVersions: 'Failed to fetch versions',
-            errorAnalyze: 'Failed to analyze module',
-            packageDetails: 'Package Details',
-            viewGraphTooltip: 'Visualize dependencies as a directed graph',
-            viewTreeTooltip: 'Show dependencies in a hierarchical tree structure',
-            viewListTooltip: 'Display dependencies as a text list',
-            depthTooltip: 'Limit dependency traversal depth',
-            reverseTooltip: 'Show reverse dependencies (who uses the selected package)',
-            groupTooltip: 'Group packages by directory structure',
-            internalTooltip: 'Show only internal packages from current module',
-            externalTooltip: 'Include external dependency packages',
-            moduleLevelTooltip: 'Show module-level dependencies (from go.mod)',
-            directOnlyTooltip: 'Show only direct dependencies (requires module level)',
-            layoutTDTooltip: 'Top-down layout for dependency graph',
-            layoutLRTooltip: 'Left-right layout for dependency graph',
-            showAllTooltip: 'Clear package selection and show all packages',
-            analyzeTooltip: 'Analyze remote Go module dependencies',
-            resetTooltip: 'Reset to local module analysis',
-            themeTooltip: 'Toggle light/dark theme',
-            langTooltip: 'Select language',
-            flatModeTooltip: 'Flat list view',
-            treeModeTooltip: 'Tree view',
-            zoomInTooltip: 'Zoom in',
-            zoomOutTooltip: 'Zoom out',
-            fitToScreenTooltip: 'Fit to screen',
-            resetZoomTooltip: 'Reset zoom',
-            remoteModuleTooltip: 'Enter a remote Go module path to analyze',
-            versionSelectTooltip: 'Select module version (optional)',
-            searchTooltip: 'Search packages by name'
-        },
-        zh: {
-            title: 'Go 包依赖分析',
-            pageTitle: '包依赖查看器',
-            currentModule: '当前模块:',
-            remoteModuleLabel: '分析模块:',
-            remoteModulePlaceholder: '例如 github.com/gogf/gf/v2',
-            selectVersion: '版本',
-            analyze: '分析',
-            resetLocal: '重置',
-            fetchingVersions: '获取中...',
-            analyzing: '分析中...',
-            viewLabel: '视图:',
-            viewGraph: '图表',
-            viewTree: '树形',
-            viewList: '列表',
-            depthLabel: '深度:',
-            depthUnlimited: '无限制',
-            reverseLabel: '反向依赖 (谁引用了它)',
-            groupLabel: '按目录分组',
-            internalLabel: '仅内部包',
-            externalLabel: '外部依赖包',
-            moduleLevelLabel: '模块级别',
-            directOnlyLabel: '仅直接依赖',
-            statsInternal: '内部',
-            statsExternal: '外部',
-            statsStdlib: '标准库',
-            layoutLabel: '布局:',
-            layoutTD: '从上到下',
-            layoutLR: '从左到右',
-            showAll: '显示全部',
-            packagesTitle: '包列表',
-            searchPlaceholder: '搜索包...',
-            flatMode: '平铺列表',
-            treeMode: '目录树',
-            statsPackages: '包数量',
-            statsDependencies: '依赖数',
-            dependencies: '依赖',
-            usedBy: '被引用',
-            noPackages: '未找到包',
-            renderError: '无法渲染图表。请尝试减少深度或选择特定的包。',
-            packageNotFound: '未找到包',
-            zoomIn: '放大',
-            zoomOut: '缩小',
-            fitToScreen: '适应屏幕',
-            resetZoom: '重置缩放',
-            dragToMove: '拖拽移动，滚轮缩放',
-            noVersions: '未找到版本',
-            latestVersion: '最新版本',
-            errorFetchVersions: '获取版本失败',
-            errorAnalyze: '分析模块失败',
-            packageDetails: '包详情',
-            viewGraphTooltip: '以有向图形式可视化依赖关系',
-            viewTreeTooltip: '以层次树结构显示依赖关系',
-            viewListTooltip: '以文本列表形式显示依赖关系',
-            depthTooltip: '限制依赖遍历的深度',
-            reverseTooltip: '显示反向依赖（谁引用了选中的包）',
-            groupTooltip: '按目录结构分组显示包',
-            internalTooltip: '仅显示当前模块的内部包',
-            externalTooltip: '包含外部依赖包',
-            moduleLevelTooltip: '显示模块级别依赖（来自go.mod）',
-            directOnlyTooltip: '仅显示直接依赖（需要启用模块级别）',
-            layoutTDTooltip: '依赖图从上到下布局',
-            layoutLRTooltip: '依赖图从左到右布局',
-            showAllTooltip: '清除包选择，显示所有包',
-            analyzeTooltip: '分析远程Go模块依赖',
-            resetTooltip: '重置为本地模块分析',
-            themeTooltip: '切换明暗主题',
-            langTooltip: '选择语言',
-            flatModeTooltip: '平铺列表视图',
-            treeModeTooltip: '树形视图',
-            zoomInTooltip: '放大',
-            zoomOutTooltip: '缩小',
-            fitToScreenTooltip: '适应屏幕',
-            resetZoomTooltip: '重置缩放',
-            remoteModuleTooltip: '输入远程Go模块路径进行分析',
-            versionSelectTooltip: '选择模块版本（可选）',
-            searchTooltip: '按名称搜索包'
-        }
-    },
-    
-    init() {
-        // Load saved language preference
-        const savedLang = localStorage.getItem('dep-viewer-lang');
-        if (savedLang && this.translations[savedLang]) {
-            this.currentLang = savedLang;
-        } else {
-            // Detect browser language
-            const browserLang = navigator.language.toLowerCase();
-            if (browserLang.startsWith('zh')) {
-                this.currentLang = 'zh';
-            }
-        }
-        
-        // Set select value
-        const langSelect = document.getElementById('langSelect');
-        if (langSelect) {
-            langSelect.value = this.currentLang;
-            langSelect.addEventListener('change', (e) => {
-                this.setLanguage(e.target.value);
-            });
-        }
-        
-        this.applyTranslations();
-    },
-    
-    setLanguage(lang) {
-        if (this.translations[lang]) {
-            this.currentLang = lang;
-            localStorage.setItem('dep-viewer-lang', lang);
-            this.applyTranslations();
-        }
-    },
-    
-    t(key) {
-        return this.translations[this.currentLang][key] || this.translations['en'][key] || key;
-    },
-    
-    applyTranslations() {
-        // Update elements with data-i18n attribute
-        document.querySelectorAll('[data-i18n]').forEach(el => {
-            const key = el.getAttribute('data-i18n');
-            el.textContent = this.t(key);
-        });
-        
-        // Update placeholders
-        document.querySelectorAll('[data-i18n-placeholder]').forEach(el => {
-            const key = el.getAttribute('data-i18n-placeholder');
-            el.placeholder = this.t(key);
-        });
-        
-        // Update title attributes
-        document.querySelectorAll('[data-i18n-title]').forEach(el => {
-            const key = el.getAttribute('data-i18n-title');
-            el.title = this.t(key);
-        });
-        
-        // Update page title
-        document.title = this.t('title');
-    }
-};
-
-// Initialize i18n when DOM is ready
-document.addEventListener('DOMContentLoaded', () => {
-    i18n.init();
-});

cmd/gf/internal/cmd/cmddep/static/index.html

@@ -1,161 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title data-i18n="title">Go Package Dependencies</title>
-    <link rel="stylesheet" href="/static/style.css">
-    <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
-</head>
-<body>
-    <div class="header">
-        <div class="header-left">
-            <h1 data-i18n="pageTitle">Package Dependency Viewer</h1>
-            <div class="module-info">
-                <span data-i18n="currentModule">Current:</span>
-                <span class="module" id="moduleName"></span>
-            </div>
-        </div>
-        <div class="header-center">
-            <div class="remote-input-group">
-                <label for="remoteModuleInput" data-i18n="remoteModuleLabel">Module:</label>
-                <input type="text" id="remoteModuleInput" data-i18n-placeholder="remoteModulePlaceholder" placeholder="e.g. github.com/gogf/gf/v2" data-i18n-title="remoteModuleTooltip">
-                <select id="versionSelect" disabled data-i18n-title="versionSelectTooltip">
-                    <option value="" data-i18n="selectVersion">Select version</option>
-                </select>
-                <button class="btn btn-sm" id="analyzeBtn" onclick="analyzeRemoteModule()" data-i18n="analyze" data-i18n-title="analyzeTooltip">Analyze</button>
-                <button class="btn btn-sm btn-secondary" id="resetBtn" onclick="resetToLocal()" data-i18n="resetLocal" data-i18n-title="resetTooltip">Reset</button>
-                <span class="loading-spinner hidden" id="loadingSpinner"></span>
-            </div>
-        </div>
-        <div class="header-right">
-            <div class="theme-switch">
-                <button class="icon-btn" id="themeToggle" data-i18n-title="themeTooltip">
-                    <span class="icon-sun">☀️</span>
-                    <span class="icon-moon">🌙</span>
-                </button>
-            </div>
-            <div class="lang-switch">
-                <select id="langSelect" data-i18n-title="langTooltip">
-                    <option value="en">English</option>
-                    <option value="zh">中文</option>
-                </select>
-            </div>
-        </div>
-    </div>
-    <div class="controls">
-        <div class="control-group">
-            <label data-i18n="viewLabel">View:</label>
-            <div class="btn-group">
-                <button class="btn active" id="btnGraph" onclick="setView('graph')" data-i18n="viewGraph" data-i18n-title="viewGraphTooltip">Graph</button>
-                <button class="btn" id="btnTree" onclick="setView('tree')" data-i18n="viewTree" data-i18n-title="viewTreeTooltip">Tree</button>
-                <button class="btn" id="btnList" onclick="setView('list')" data-i18n="viewList" data-i18n-title="viewListTooltip">List</button>
-            </div>
-        </div>
-        <div class="control-group">
-            <label data-i18n="depthLabel">Depth:</label>
-            <select id="depth" onchange="refresh()" data-i18n-title="depthTooltip">
-                <option value="1">1</option>
-                <option value="2">2</option>
-                <option value="3" selected>3</option>
-                <option value="5">5</option>
-                <option value="0" data-i18n="depthUnlimited">Unlimited</option>
-            </select>
-        </div>
-        <div class="control-group">
-            <input type="checkbox" id="reverse" onchange="refresh()" data-i18n-title="reverseTooltip">
-            <label for="reverse" data-i18n="reverseLabel">Reverse (show who uses)</label>
-        </div>
-        <div class="control-group">
-            <input type="checkbox" id="group" onchange="refresh()" data-i18n-title="groupTooltip">
-            <label for="group" data-i18n="groupLabel">Group by directory</label>
-        </div>
-        <div class="control-group">
-            <input type="checkbox" id="internal" checked onchange="refresh()" data-i18n-title="internalTooltip">
-            <label for="internal" data-i18n="internalLabel">Internal only</label>
-        </div>
-        <div class="control-group">
-            <input type="checkbox" id="external" onchange="refresh()" data-i18n-title="externalTooltip">
-            <label for="external" data-i18n="externalLabel">External packages</label>
-        </div>
-        <div class="control-group">
-            <input type="checkbox" id="moduleLevel" onchange="refresh()" data-i18n-title="moduleLevelTooltip">
-            <label for="moduleLevel" data-i18n="moduleLevelLabel">Module level</label>
-        </div>
-        <div class="control-group">
-            <input type="checkbox" id="directOnly" onchange="refresh()" data-i18n-title="directOnlyTooltip">
-            <label for="directOnly" data-i18n="directOnlyLabel">Direct only</label>
-        </div>
-        <div class="control-group graph-only" id="layoutGroup">
-            <label data-i18n="layoutLabel">Layout:</label>
-            <div class="btn-group">
-                <button class="btn active" id="layoutTD" onclick="setLayout('TD')" data-i18n="layoutTD" data-i18n-title="layoutTDTooltip">Top-Down</button>
-                <button class="btn" id="layoutLR" onclick="setLayout('LR')" data-i18n="layoutLR" data-i18n-title="layoutLRTooltip">Left-Right</button>
-            </div>
-        </div>
-        <button class="btn btn-secondary" onclick="clearSelection()" data-i18n="showAll" data-i18n-title="showAllTooltip">Show All</button>
-    </div>
-    <div class="main-content">
-        <div class="sidebar">
-            <div class="sidebar-header">
-                <div class="sidebar-title">
-                    <h3 data-i18n="packagesTitle">Packages</h3>
-                    <span class="count" id="packageCount">0</span>
-                </div>
-                <div class="sidebar-mode">
-                    <button class="mode-btn" id="modeFlat" onclick="setPackageListMode('flat')" data-i18n-title="flatModeTooltip">☰</button>
-                    <button class="mode-btn active" id="modeTree" onclick="setPackageListMode('tree')" data-i18n-title="treeModeTooltip">🌲</button>
-                </div>
-            </div>
-            <div class="search-box">
-                <input type="text" id="searchInput" data-i18n-placeholder="searchPlaceholder" placeholder="Search packages..." oninput="filterPackages()" data-i18n-title="searchTooltip">
-            </div>
-            <div class="package-list" id="packageList"></div>
-        </div>
-        <div class="content-area">
-            <div class="stats">
-                <div class="stat-card">
-                    <div class="value" id="nodeCount">0</div>
-                    <div class="label" data-i18n="statsPackages">Packages</div>
-                </div>
-                <div class="stat-card">
-                    <div class="value" id="edgeCount">0</div>
-                    <div class="label" data-i18n="statsDependencies">Dependencies</div>
-                </div>
-                <div class="stat-card">
-                    <div class="value" id="internalCount">0</div>
-                    <div class="label" data-i18n="statsInternal">Internal</div>
-                </div>
-                <div class="stat-card">
-                    <div class="value" id="externalCount">0</div>
-                    <div class="label" data-i18n="statsExternal">External</div>
-                </div>
-                <div class="stat-card">
-                    <div class="value" id="stdlibCount">0</div>
-                    <div class="label" data-i18n="statsStdlib">Stdlib</div>
-                </div>
-                <div class="package-info" id="packageInfo">
-                    <div class="package-info-content" id="packageInfoContent"></div>
-                </div>
-            </div>
-            <div class="graph-container" id="graphContainer">
-                <div id="graphView" class="graph-viewport">
-                    <div class="mermaid-container" id="mermaidContainer">
-                        <div class="mermaid" id="mermaidGraph"></div>
-                    </div>
-                    <div class="zoom-indicator" id="zoomIndicator">100%</div>
-                </div>
-                <div id="textView" class="text-output hidden"></div>
-            </div>
-        </div>
-    </div>
-    <div class="zoom-controls" id="zoomControls">
-        <button class="zoom-btn" onclick="zoomIn()" data-i18n-title="zoomInTooltip">+</button>
-        <button class="zoom-btn" onclick="zoomOut()" data-i18n-title="zoomOutTooltip">−</button>
-        <button class="zoom-btn" onclick="fitToScreen()" data-i18n-title="fitToScreenTooltip">⊡</button>
-        <button class="zoom-btn" onclick="resetZoom()" data-i18n-title="resetZoomTooltip">⟲</button>
-    </div>
-    <script src="/static/i18n.js"></script>
-    <script src="/static/app.js"></script>
-</body>
-</html>

cmd/gf/internal/cmd/cmddep/static/style.css

@@ -1,811 +0,0 @@
-/* CSS Variables for Theming */
-:root {
-    /* Light Theme (Default) */
-    --bg-primary: #f8fafc;
-    --bg-secondary: #ffffff;
-    --bg-tertiary: #f1f5f9;
-    --bg-hover: #e2e8f0;
-    --text-primary: #1e293b;
-    --text-secondary: #475569;
-    --text-muted: #94a3b8;
-    --border-color: #e2e8f0;
-    --accent-color: #3b82f6;
-    --accent-hover: #2563eb;
-    --accent-light: #dbeafe;
-    --success-color: #10b981;
-    --card-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-    --input-bg: #ffffff;
-    --input-border: #cbd5e1;
-}
-
-[data-theme="dark"] {
-    --bg-primary: #0f172a;
-    --bg-secondary: #1e293b;
-    --bg-tertiary: #334155;
-    --bg-hover: #475569;
-    --text-primary: #f1f5f9;
-    --text-secondary: #cbd5e1;
-    --text-muted: #64748b;
-    --border-color: #334155;
-    --accent-color: #60a5fa;
-    --accent-hover: #3b82f6;
-    --accent-light: #1e3a5f;
-    --success-color: #34d399;
-    --card-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-    --input-bg: #1e293b;
-    --input-border: #475569;
-}
-
-/* Reset & Base */
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-}
-
-html, body {
-    height: 100%;
-    overflow: hidden;
-}
-
-body {
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
-    background: var(--bg-primary);
-    color: var(--text-primary);
-    display: flex;
-    flex-direction: column;
-    transition: background-color 0.3s, color 0.3s;
-}
-
-/* Header */
-.header {
-    background: var(--bg-secondary);
-    padding: 12px 24px;
-    border-bottom: 1px solid var(--border-color);
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 20px;
-    box-shadow: var(--card-shadow);
-    flex-shrink: 0;
-}
-
-.header-left {
-    flex-shrink: 0;
-}
-
-.header-left h1 {
-    font-size: 18px;
-    font-weight: 600;
-    color: var(--text-primary);
-}
-
-.header-left .module-info {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    color: var(--text-muted);
-    font-size: 12px;
-    margin-top: 2px;
-}
-
-.header-left .module {
-    color: var(--accent-color);
-    font-weight: 500;
-    max-width: 200px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-/* Header Center - Remote Module Input */
-.header-center {
-    flex: 1;
-    display: flex;
-    justify-content: center;
-}
-
-.remote-input-group {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.remote-input-group input[type="text"] {
-    width: 320px;
-    background: var(--input-bg);
-    border: 1px solid var(--input-border);
-    color: var(--text-primary);
-    padding: 6px 12px;
-    border-radius: 6px;
-    font-size: 13px;
-    transition: border-color 0.2s;
-}
-
-.remote-input-group input[type="text"]:focus {
-    outline: none;
-    border-color: var(--accent-color);
-}
-
-.remote-input-group select {
-    width: 160px;
-    background: var(--input-bg);
-    border: 1px solid var(--input-border);
-    color: var(--text-primary);
-    padding: 6px 10px;
-    border-radius: 6px;
-    font-size: 13px;
-    cursor: pointer;
-}
-
-.remote-input-group select:disabled {
-    opacity: 0.6;
-    cursor: not-allowed;
-}
-
-.btn-sm {
-    padding: 6px 12px;
-    font-size: 12px;
-}
-
-.loading-spinner {
-    width: 18px;
-    height: 18px;
-    border: 2px solid var(--border-color);
-    border-top-color: var(--accent-color);
-    border-radius: 50%;
-    animation: spin 0.8s linear infinite;
-}
-
-@keyframes spin {
-    to { transform: rotate(360deg); }
-}
-
-.header-right {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-}
-
-.icon-btn {
-    background: var(--bg-tertiary);
-    border: 1px solid var(--border-color);
-    border-radius: 8px;
-    padding: 8px 12px;
-    cursor: pointer;
-    font-size: 16px;
-    transition: all 0.2s;
-}
-
-.icon-btn:hover {
-    background: var(--bg-hover);
-}
-
-.icon-sun, .icon-moon {
-    display: none;
-}
-
-body:not([data-theme="dark"]) .icon-moon {
-    display: inline;
-}
-
-[data-theme="dark"] .icon-sun {
-    display: inline;
-}
-
-.lang-switch select {
-    background: var(--bg-tertiary);
-    border: 1px solid var(--border-color);
-    color: var(--text-primary);
-    padding: 8px 12px;
-    border-radius: 8px;
-    font-size: 13px;
-    cursor: pointer;
-}
-
-/* Controls */
-.controls {
-    background: var(--bg-secondary);
-    padding: 12px 24px;
-    display: flex;
-    gap: 20px;
-    flex-wrap: wrap;
-    align-items: center;
-    border-bottom: 1px solid var(--border-color);
-}
-
-.control-group {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.control-group label {
-    font-size: 13px;
-    color: var(--text-secondary);
-    font-weight: 500;
-}
-
-.control-group select {
-    background: var(--input-bg);
-    border: 1px solid var(--input-border);
-    color: var(--text-primary);
-    padding: 6px 12px;
-    border-radius: 6px;
-    font-size: 13px;
-    cursor: pointer;
-}
-
-.control-group input[type="checkbox"] {
-    width: 16px;
-    height: 16px;
-    accent-color: var(--accent-color);
-}
-
-/* Buttons */
-.btn {
-    background: var(--accent-color);
-    color: white;
-    border: none;
-    padding: 8px 16px;
-    border-radius: 6px;
-    cursor: pointer;
-    font-size: 13px;
-    font-weight: 500;
-    transition: all 0.2s;
-}
-
-.btn:hover {
-    background: var(--accent-hover);
-}
-
-.btn.active {
-    background: var(--accent-color);
-    box-shadow: 0 0 0 2px var(--accent-light);
-}
-
-.btn-secondary {
-    background: var(--bg-tertiary);
-    color: var(--text-primary);
-    border: 1px solid var(--border-color);
-}
-
-.btn-secondary:hover {
-    background: var(--bg-hover);
-}
-
-.btn-group {
-    display: flex;
-    gap: 0;
-}
-
-.btn-group .btn {
-    border-radius: 0;
-    border-right: 1px solid rgba(255, 255, 255, 0.2);
-}
-
-.btn-group .btn:first-child {
-    border-radius: 6px 0 0 6px;
-}
-
-.btn-group .btn:last-child {
-    border-radius: 0 6px 6px 0;
-    border-right: none;
-}
-
-.btn-group .btn:not(.active) {
-    background: var(--bg-tertiary);
-    color: var(--text-primary);
-}
-
-.btn-group .btn:not(.active):hover {
-    background: var(--bg-hover);
-}
-
-/* Main Content */
-.main-content {
-    display: flex;
-    flex: 1;
-    overflow: hidden;
-    min-height: 0; /* Important for flex children to respect overflow */
-}
-
-/* Sidebar */
-.sidebar {
-    width: 280px;
-    min-width: 280px;
-    background: var(--bg-secondary);
-    border-right: 1px solid var(--border-color);
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    height: 100%; /* Ensure sidebar takes full height */
-}
-
-.sidebar-header {
-    padding: 10px 16px;
-    border-bottom: 1px solid var(--border-color);
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-shrink: 0; /* Prevent shrinking */
-}
-
-.sidebar-title {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.sidebar-title h3 {
-    font-size: 14px;
-    font-weight: 600;
-    color: var(--text-secondary);
-}
-
-.sidebar-title .count {
-    background: var(--accent-color);
-    color: white;
-    padding: 2px 10px;
-    border-radius: 12px;
-    font-size: 12px;
-    font-weight: 500;
-}
-
-.sidebar-mode {
-    display: flex;
-    gap: 4px;
-}
-
-.mode-btn {
-    width: 28px;
-    height: 28px;
-    border: 1px solid var(--border-color);
-    background: var(--bg-tertiary);
-    border-radius: 6px;
-    cursor: pointer;
-    font-size: 12px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transition: all 0.2s;
-}
-
-.mode-btn:hover {
-    background: var(--bg-hover);
-}
-
-.mode-btn.active {
-    background: var(--accent-color);
-    border-color: var(--accent-color);
-    color: white;
-}
-
-.search-box {
-    padding: 12px 16px;
-    border-bottom: 1px solid var(--border-color);
-    flex-shrink: 0; /* Prevent shrinking */
-}
-
-.search-box input {
-    width: 100%;
-    background: var(--input-bg);
-    border: 1px solid var(--input-border);
-    color: var(--text-primary);
-    padding: 10px 14px;
-    border-radius: 8px;
-    font-size: 13px;
-    transition: border-color 0.2s;
-}
-
-.search-box input:focus {
-    outline: none;
-    border-color: var(--accent-color);
-}
-
-.search-box input::placeholder {
-    color: var(--text-muted);
-}
-
-.package-list {
-    flex: 1;
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 8px 0;
-    min-height: 0; /* Important for flex overflow to work */
-}
-
-.package-item {
-    padding: 10px 16px;
-    cursor: pointer;
-    font-size: 13px;
-    color: var(--text-secondary);
-    border-left: 3px solid transparent;
-    transition: all 0.15s;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.package-item .pkg-name-text {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    flex: 1;
-    min-width: 0;
-}
-
-.pkg-stats-inline {
-    display: flex;
-    gap: 6px;
-    font-size: 11px;
-    margin-left: 8px;
-    flex-shrink: 0;
-}
-
-.pkg-stats-inline .dep-count {
-    color: var(--accent-color);
-    opacity: 0.8;
-}
-
-.pkg-stats-inline .used-count {
-    color: #10b981;
-    opacity: 0.8;
-}
-
-.package-item:hover {
-    background: var(--bg-hover);
-    color: var(--text-primary);
-}
-
-.package-item.active {
-    background: var(--accent-light);
-    border-left-color: var(--accent-color);
-    color: var(--accent-color);
-    font-weight: 500;
-}
-
-/* Tree View Styles */
-.tree-node {
-    user-select: none;
-}
-
-.tree-node-header {
-    display: flex;
-    align-items: center;
-    padding: 6px 12px;
-    cursor: pointer;
-    font-size: 13px;
-    color: var(--text-secondary);
-    transition: all 0.15s;
-}
-
-.tree-node-header .pkg-stats-inline {
-    margin-left: auto;
-    padding-left: 8px;
-}
-
-.tree-node-header:hover {
-    background: var(--bg-hover);
-    color: var(--text-primary);
-}
-
-.tree-node-toggle {
-    width: 20px;
-    height: 20px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-right: 2px;
-    font-size: 10px;
-    color: var(--text-muted);
-    transition: transform 0.2s;
-    cursor: pointer;
-    border-radius: 4px;
-}
-
-.tree-node-toggle:hover {
-    background: var(--bg-hover);
-    color: var(--text-primary);
-}
-
-.tree-node-toggle.expanded {
-    transform: rotate(90deg);
-}
-
-.tree-node-toggle.empty {
-    visibility: hidden;
-}
-
-.tree-node-icon {
-    margin-right: 6px;
-    font-size: 12px;
-}
-
-.tree-node-name {
-    flex: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    cursor: pointer;
-    padding: 2px 4px;
-    border-radius: 4px;
-}
-
-.tree-node-name:hover {
-    background: var(--bg-hover);
-}
-
-.tree-node-name.package {
-    color: var(--accent-color);
-}
-
-.tree-node-children {
-    padding-left: 16px;
-    display: none;
-}
-
-.tree-node-children.expanded {
-    display: block;
-}
-
-.tree-node-header.active {
-    background: var(--accent-light);
-    color: var(--accent-color);
-}
-
-.tree-node-header.active .tree-node-name {
-    font-weight: 500;
-}
-
-/* Content Area */
-.content-area {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-}
-
-/* Stats */
-.stats {
-    display: flex;
-    align-items: center;
-    gap: 16px;
-    padding: 12px 24px;
-    background: var(--bg-secondary);
-    border-bottom: 1px solid var(--border-color);
-}
-
-.stat-card {
-    background: var(--bg-tertiary);
-    padding: 10px 20px;
-    border-radius: 10px;
-    text-align: center;
-    min-width: 90px;
-}
-
-.stat-card .value {
-    font-size: 20px;
-    font-weight: 700;
-    color: var(--accent-color);
-}
-
-.stat-card .label {
-    font-size: 11px;
-    color: var(--text-muted);
-    margin-top: 2px;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-}
-
-/* Package Info - in stats bar */
-.package-info {
-    display: none;
-    align-items: center;
-    gap: 16px;
-    background: var(--bg-tertiary);
-    padding: 8px 16px;
-    border-radius: 10px;
-}
-
-.package-info.visible {
-    display: flex;
-}
-
-.package-info-content {
-    display: flex;
-    align-items: center;
-    gap: 20px;
-}
-
-.package-info-content .pkg-name {
-    font-size: 14px;
-    font-weight: 600;
-    color: var(--accent-color);
-    max-width: 300px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-.package-info-content .pkg-stats {
-    display: flex;
-    gap: 16px;
-}
-
-.package-info-content .pkg-stat {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    font-size: 13px;
-}
-
-.package-info-content .pkg-stat-label {
-    color: var(--text-muted);
-}
-
-.package-info-content .pkg-stat-value {
-    color: var(--text-primary);
-    font-weight: 600;
-}
-
-/* Graph Container */
-.graph-container {
-    flex: 1;
-    padding: 24px;
-    overflow: hidden;
-    background: var(--bg-primary);
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    min-height: 0; /* Important for flex overflow */
-}
-
-.graph-viewport {
-    flex: 1;
-    width: 100%;
-    overflow: hidden;
-    position: relative;
-    cursor: grab;
-    min-height: 0; /* Important for flex overflow */
-}
-
-.graph-viewport:active {
-    cursor: grabbing;
-}
-
-.mermaid-container {
-    display: inline-block;
-    min-width: 100%;
-    min-height: 100%;
-    transform-origin: 0 0;
-    transition: none;
-}
-
-.mermaid {
-    display: inline-block;
-    padding: 20px;
-}
-
-.mermaid svg {
-    display: block;
-    max-width: none !important;
-    height: auto;
-}
-
-.zoom-indicator {
-    position: absolute;
-    bottom: 16px;
-    left: 16px;
-    background: var(--bg-secondary);
-    border: 1px solid var(--border-color);
-    padding: 6px 12px;
-    border-radius: 6px;
-    font-size: 12px;
-    color: var(--text-secondary);
-    box-shadow: var(--card-shadow);
-    pointer-events: none;
-    opacity: 0;
-    transition: opacity 0.3s;
-}
-
-.zoom-indicator.visible {
-    opacity: 1;
-}
-
-.text-output {
-    flex: 1;
-    background: var(--bg-secondary);
-    border: 1px solid var(--border-color);
-    border-radius: 10px;
-    padding: 20px;
-    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', monospace;
-    font-size: 13px;
-    line-height: 1.7;
-    white-space: pre;
-    overflow: auto;
-    min-height: 0; /* Important for flex overflow */
-    color: var(--text-primary);
-}
-
-/* Zoom Controls */
-.zoom-controls {
-    position: fixed;
-    bottom: 24px;
-    right: 24px;
-    display: flex;
-    gap: 8px;
-}
-
-.zoom-btn {
-    width: 40px;
-    height: 40px;
-    border-radius: 10px;
-    background: var(--bg-secondary);
-    color: var(--text-primary);
-    border: 1px solid var(--border-color);
-    font-size: 18px;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    transition: all 0.2s;
-    box-shadow: var(--card-shadow);
-}
-
-.zoom-btn:hover {
-    background: var(--accent-color);
-    color: white;
-    border-color: var(--accent-color);
-}
-
-/* Utility Classes */
-.hidden {
-    display: none !important;
-}
-
-.loading {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 200px;
-    color: var(--text-muted);
-    font-size: 14px;
-}
-
-/* Scrollbar Styling */
-::-webkit-scrollbar {
-    width: 8px;
-    height: 8px;
-}
-
-::-webkit-scrollbar-track {
-    background: var(--bg-tertiary);
-}
-
-::-webkit-scrollbar-thumb {
-    background: var(--text-muted);
-    border-radius: 4px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-    background: var(--text-secondary);
-}
-
-/* Responsive */
-@media (max-width: 768px) {
-    .sidebar {
-        width: 220px;
-    }
-    
-    .controls {
-        padding: 10px 16px;
-        gap: 12px;
-    }
-    
-    .header {
-        padding: 12px 16px;
-    }
-}

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

@@ -9,14 +9,13 @@ package genctrl
 import (
 	"context"
 
-	"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/gtime"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gtag"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
+	"github.com/gogf/gf/v3/container/gset"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gtime"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gtag"
 )
 
 const (
@@ -89,11 +88,28 @@ func (c CGenCtrl) Ctrl(ctx context.Context, in CGenCtrlInput) (out *CGenCtrlOutp
 	if !gfile.Exists(in.SrcFolder) {
 		mlog.Fatalf(`source folder path "%s" does not exist`, in.SrcFolder)
 	}
-
-	err = c.generateByModules(in)
+	// retrieve all api modules.
+	apiModuleFolderPaths, err := gfile.ScanDir(in.SrcFolder, "*", false)
 	if err != nil {
 		return nil, err
 	}
+	for _, apiModuleFolderPath := range apiModuleFolderPaths {
+		if !gfile.IsDir(apiModuleFolderPath) {
+			continue
+		}
+		// generate go files by api module.
+		var (
+			module              = gfile.Basename(apiModuleFolderPath)
+			dstModuleFolderPath = gfile.Join(in.DstFolder, module)
+		)
+		err = c.generateByModule(
+			apiModuleFolderPath, dstModuleFolderPath, in.SdkPath,
+			in.SdkStdVersion, in.SdkNoV1, in.Clear, in.Merge,
+		)
+		if err != nil {
+			return nil, err
+		}
+	}
 
 	mlog.Print(`done!`)
 	return
@@ -146,56 +162,6 @@ func (c CGenCtrl) generateByWatchFile(watchFile, sdkPath string, sdkStdVersion,
 	)
 }
 
-// generateByModules recursively calls generateByModule for multi-level modules generation.
-func (c CGenCtrl) generateByModules(in CGenCtrlInput) (err error) {
-	// read root folder, example: api/user or api/app
-	moduleFolderPaths, err := gfile.ScanDir(in.SrcFolder, "*", false)
-	if err != nil {
-		return err
-	}
-	for _, moduleFolder := range moduleFolderPaths {
-		if !gfile.IsDir(moduleFolder) {
-			continue
-		}
-
-		// read children folder, example: api/user/v1 or api/app/user
-		childrenFolderPaths, err := gfile.ScanDir(moduleFolder, "*", false)
-		if err != nil {
-			return err
-		}
-		for _, childrenFolderPath := range childrenFolderPaths {
-			if !gfile.IsDir(childrenFolderPath) {
-				continue
-			}
-
-			var (
-				inCopy = in
-				module = gfile.Basename(moduleFolder)
-			)
-			inCopy.SrcFolder = gfile.Join(in.SrcFolder, module)
-			inCopy.DstFolder = gfile.Join(in.DstFolder, module)
-			err = c.generateByModules(inCopy)
-			if err != nil {
-				return err
-			}
-		}
-
-		// generate go files by api module.
-		var (
-			module              = gfile.Basename(moduleFolder)
-			dstModuleFolderPath = gfile.Join(in.DstFolder, module)
-		)
-		err = c.generateByModule(
-			moduleFolder, dstModuleFolderPath, in.SdkPath,
-			in.SdkStdVersion, in.SdkNoV1, in.Clear, in.Merge,
-		)
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
 // parseApiModule parses certain api and generate associated go files by certain module, not all api modules.
 func (c CGenCtrl) generateByModule(
 	apiModuleFolderPath, dstModuleFolderPath, sdkPath string,

cmd/gf/internal/cmd/genctrl/genctrl_api_item.go

@@ -9,7 +9,7 @@ package genctrl
 import (
 	"fmt"
 
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 type apiItem struct {

cmd/gf/internal/cmd/genctrl/genctrl_ast_parse.go

@@ -13,8 +13,8 @@ import (
 	"go/printer"
 	"go/token"
 
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 type structInfo struct {

cmd/gf/internal/cmd/genctrl/genctrl_ast_parse_clear.go

@@ -13,7 +13,7 @@ import (
 	"go/printer"
 	"go/token"
 
-	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v3/os/gfile"
 )
 
 // getFuncInDst retrieves all function declarations and bodies in the file.

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

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

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

@@ -8,19 +8,16 @@ package genctrl
 
 import (
 	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
 	"path/filepath"
 	"strings"
 
-	"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/v3/container/gset"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/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/v3/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 type controllerGenerator struct{}
@@ -147,8 +144,8 @@ func (c *controllerGenerator) doGenerateCtrlItem(dstModuleFolderPath string, ite
 			"{MethodName}":    item.MethodName,
 			"{MethodComment}": item.GetComment(),
 		})
-		// Use AST-based checking for more accurate method detection
-		if methodExists(methodFilePath, ctrlName, item.MethodName) {
+
+		if gstr.Contains(gfile.GetContents(methodFilePath), fmt.Sprintf(`func (c *%v) %v(`, ctrlName, item.MethodName)) {
 			return
 		}
 		if err = gfile.PutContentsAppend(methodFilePath, gstr.TrimLeft(content)); err != nil {
@@ -173,6 +170,7 @@ func (c *controllerGenerator) doGenerateCtrlItem(dstModuleFolderPath string, ite
 
 // use -merge
 func (c *controllerGenerator) doGenerateCtrlMergeItem(dstModuleFolderPath string, apiItems []apiItem, doneApiSet *gset.StrSet) (err error) {
+
 	type controllerFileItem struct {
 		module     string
 		version    string
@@ -195,23 +193,13 @@ func (c *controllerGenerator) doGenerateCtrlMergeItem(dstModuleFolderPath string
 			ctrlFileItemMap[api.FileName] = ctrlFileItem
 		}
 
-		ctrlName := fmt.Sprintf(`Controller%s`, gstr.UcFirst(api.Version))
 		ctrl := gstr.TrimLeft(gstr.ReplaceByMap(consts.TemplateGenCtrlControllerMethodFuncMerge, g.MapStrStr{
 			"{Module}":        api.Module,
-			"{CtrlName}":      ctrlName,
+			"{CtrlName}":      fmt.Sprintf(`Controller%s`, gstr.UcFirst(api.Version)),
 			"{Version}":       api.Version,
 			"{MethodName}":    api.MethodName,
 			"{MethodComment}": api.GetComment(),
 		}))
-
-		ctrlFilePath := gfile.Join(dstModuleFolderPath, fmt.Sprintf(
-			`%s_%s_%s.go`, ctrlFileItem.module, ctrlFileItem.version, api.FileName,
-		))
-		// Use AST-based checking for more accurate method detection
-		if methodExists(ctrlFilePath, ctrlName, api.MethodName) {
-			return
-		}
-
 		ctrlFileItem.controllers.WriteString(ctrl)
 		doneApiSet.Add(api.String())
 	}
@@ -241,41 +229,3 @@ func (c *controllerGenerator) doGenerateCtrlMergeItem(dstModuleFolderPath string
 	}
 	return
 }
-
-// methodExists checks if a method with the given receiver type and name exists in the file.
-// It uses AST parsing to accurately detect method definitions regardless of formatting.
-// This handles various code formatting styles including multi-line method signatures.
-func methodExists(filePath, ctrlName, methodName string) bool {
-	fset := token.NewFileSet()
-	node, err := parser.ParseFile(fset, filePath, nil, parser.ParseComments)
-	if err != nil {
-		// If parsing fails (e.g., file doesn't exist or invalid syntax), return false
-		return false
-	}
-	for _, decl := range node.Decls {
-		funcDecl, ok := decl.(*ast.FuncDecl)
-		if !ok {
-			continue
-		}
-		// Check if it's a method (has receiver)
-		if funcDecl.Recv != nil && len(funcDecl.Recv.List) > 0 {
-			// Extract receiver type name
-			// Handle both *T and T patterns
-			recvType := ""
-			switch t := funcDecl.Recv.List[0].Type.(type) {
-			case *ast.StarExpr:
-				if ident, ok := t.X.(*ast.Ident); ok {
-					recvType = ident.Name
-				}
-			case *ast.Ident:
-				recvType = t.Name
-			}
-
-			// Check if both receiver type and method name match
-			if recvType == ctrlName && funcDecl.Name.Name == methodName {
-				return true
-			}
-		}
-	}
-	return false
-}

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

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

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

@@ -10,16 +10,16 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"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/v3/container/gmap"
+	"github.com/gogf/gf/v3/container/gset"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/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"
+	"github.com/gogf/gf/cmd/gf/v3/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/utils"
 )
 
 type apiInterfaceGenerator struct{}

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

@@ -10,14 +10,14 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"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/v3/container/gset"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/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/v3/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 type apiSdkGenerator struct{}

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

@@ -9,27 +9,23 @@ package gendao
 import (
 	"context"
 	"fmt"
-	"sort"
 	"strings"
 
-	"github.com/olekukonko/tablewriter"
-	"github.com/olekukonko/tablewriter/renderer"
-	"github.com/olekukonko/tablewriter/tw"
 	"golang.org/x/mod/modfile"
 
-	"github.com/gogf/gf/v2/container/garray"
-	"github.com/gogf/gf/v2/container/gset"
-	"github.com/gogf/gf/v2/database/gdb"
-	"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/os/gtime"
-	"github.com/gogf/gf/v2/os/gview"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/container/garray"
+	"github.com/gogf/gf/v3/container/gset"
+	"github.com/gogf/gf/v3/database/gdb"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gproc"
+	"github.com/gogf/gf/v3/os/gtime"
+	"github.com/gogf/gf/v3/os/gview"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/text/gstr"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/utils"
 )
 
 type (
@@ -48,10 +44,8 @@ type (
 		JsonCase           string   `name:"jsonCase"            short:"j"  brief:"{CGenDaoBriefJsonCase}" d:"CamelLower"`
 		ImportPrefix       string   `name:"importPrefix"        short:"i"  brief:"{CGenDaoBriefImportPrefix}"`
 		DaoPath            string   `name:"daoPath"             short:"d"  brief:"{CGenDaoBriefDaoPath}" d:"dao"`
-		TablePath          string   `name:"tablePath"           short:"tp" brief:"{CGenDaoBriefTablePath}" d:"table"`
 		DoPath             string   `name:"doPath"              short:"o"  brief:"{CGenDaoBriefDoPath}" d:"model/do"`
 		EntityPath         string   `name:"entityPath"          short:"e"  brief:"{CGenDaoBriefEntityPath}" d:"model/entity"`
-		TplDaoTablePath    string   `name:"tplDaoTablePath"     short:"t0" brief:"{CGenDaoBriefTplDaoTablePath}"`
 		TplDaoIndexPath    string   `name:"tplDaoIndexPath"     short:"t1" brief:"{CGenDaoBriefTplDaoIndexPath}"`
 		TplDaoInternalPath string   `name:"tplDaoInternalPath"  short:"t2" brief:"{CGenDaoBriefTplDaoInternalPath}"`
 		TplDaoDoPath       string   `name:"tplDaoDoPath"        short:"t3" brief:"{CGenDaoBriefTplDaoDoPathPath}"`
@@ -64,7 +58,6 @@ type (
 		NoJsonTag          bool     `name:"noJsonTag"           short:"k"  brief:"{CGenDaoBriefNoJsonTag}" orphan:"true"`
 		NoModelComment     bool     `name:"noModelComment"      short:"m"  brief:"{CGenDaoBriefNoModelComment}" orphan:"true"`
 		Clear              bool     `name:"clear"               short:"a"  brief:"{CGenDaoBriefClear}" orphan:"true"`
-		GenTable           bool     `name:"genTable"            short:"gt" brief:"{CGenDaoBriefGenTable}" orphan:"true"`
 
 		TypeMapping  map[DBFieldTypeName]CustomAttributeType  `name:"typeMapping"  short:"y"  brief:"{CGenDaoBriefTypeMapping}"  orphan:"true"`
 		FieldMapping map[DBTableFieldName]CustomAttributeType `name:"fieldMapping" short:"fm" brief:"{CGenDaoBriefFieldMapping}" orphan:"true"`
@@ -105,25 +98,7 @@ var (
 		"smallmoney": {
 			Type: "float64",
 		},
-		"uuid": {
-			Type:   "uuid.UUID",
-			Import: "github.com/google/uuid",
-		},
 	}
-
-	// tablewriter Options
-	twRenderer = tablewriter.WithRenderer(renderer.NewBlueprint(tw.Rendition{
-		Borders: tw.Border{Top: tw.Off, Bottom: tw.Off, Left: tw.Off, Right: tw.Off},
-		Settings: tw.Settings{
-			Separators: tw.Separators{BetweenRows: tw.Off, BetweenColumns: tw.Off},
-		},
-		Symbols: tw.NewSymbols(tw.StyleASCII),
-	}))
-	twConfig = tablewriter.WithConfig(tablewriter.Config{
-		Row: tw.CellConfig{
-			Formatting: tw.CellFormatting{AutoWrap: tw.WrapNone},
-		},
-	})
 )
 
 func (c CGenDao) Dao(ctx context.Context, in CGenDaoInput) (out *CGenDaoOutput, err error) {
@@ -188,27 +163,7 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 
 	var tableNames []string
 	if in.Tables != "" {
-		inputTables := gstr.SplitAndTrim(in.Tables, ",")
-		// Check if any table pattern contains wildcard characters.
-		// https://github.com/gogf/gf/issues/4629
-		var hasPattern bool
-		for _, t := range inputTables {
-			if containsWildcard(t) {
-				hasPattern = true
-				break
-			}
-		}
-		if hasPattern {
-			// Fetch all tables first, then filter by patterns.
-			allTables, err := db.Tables(context.TODO())
-			if err != nil {
-				mlog.Fatalf("fetching tables failed: %+v", err)
-			}
-			tableNames = filterTablesByPatterns(allTables, inputTables)
-		} else {
-			// Use exact table names as before.
-			tableNames = inputTables
-		}
+		tableNames = gstr.SplitAndTrim(in.Tables, ",")
 	} else {
 		tableNames, err = db.Tables(context.TODO())
 		if err != nil {
@@ -218,18 +173,8 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 	// Table excluding.
 	if in.TablesEx != "" {
 		array := garray.NewStrArrayFrom(tableNames)
-		for _, p := range gstr.SplitAndTrim(in.TablesEx, ",") {
-			if containsWildcard(p) {
-				// Use exact match with ^ and $ anchors for consistency with tables pattern.
-				regPattern := "^" + patternToRegex(p) + "$"
-				for _, v := range array.Clone().Slice() {
-					if gregex.IsMatchString(regPattern, v) {
-						array.RemoveValue(v)
-					}
-				}
-			} else {
-				array.RemoveValue(p)
-			}
+		for _, v := range gstr.SplitAndTrim(in.TablesEx, ",") {
+			array.RemoveValue(v)
 		}
 		tableNames = array.Slice()
 	}
@@ -250,22 +195,13 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 		newTableNames       = make([]string, len(tableNames))
 		shardingNewTableSet = gset.NewStrSet()
 	)
-	// Sort sharding patterns by length descending, so that longer (more specific) patterns
-	// are matched first. This prevents shorter patterns like "a_?" from incorrectly matching
-	// tables that should match longer patterns like "a_b_?" or "a_c_?".
-	// https://github.com/gogf/gf/issues/4603
-	sortedShardingPatterns := make([]string, len(in.ShardingPattern))
-	copy(sortedShardingPatterns, in.ShardingPattern)
-	sort.Slice(sortedShardingPatterns, func(i, j int) bool {
-		return len(sortedShardingPatterns[i]) > len(sortedShardingPatterns[j])
-	})
 	for i, tableName := range tableNames {
 		newTableName := tableName
 		for _, v := range removePrefixArray {
 			newTableName = gstr.TrimLeftStr(newTableName, v, 1)
 		}
-		if len(sortedShardingPatterns) > 0 {
-			for _, pattern := range sortedShardingPatterns {
+		if len(in.ShardingPattern) > 0 {
+			for _, pattern := range in.ShardingPattern {
 				var (
 					match      []string
 					regPattern = gstr.Replace(pattern, "?", `(.+)`)
@@ -281,21 +217,16 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 				newTableName = gstr.Trim(newTableName, `_.-`)
 				if shardingNewTableSet.Contains(newTableName) {
 					tableNames[i] = ""
-					break
+					continue
 				}
-				// Add prefix to sharding table name, if not, the isSharding check would not match.
-				shardingNewTableSet.Add(in.Prefix + newTableName)
-				break
+				shardingNewTableSet.Add(newTableName)
 			}
 		}
 		newTableName = in.Prefix + newTableName
-		if tableNames[i] != "" {
-			// If shardingNewTableSet contains newTableName (tableName is empty), it should not be added to tableNames, make it empty and filter later.
-			newTableNames[i] = newTableName
-		}
+		newTableNames[i] = newTableName
 	}
 	tableNames = garray.NewStrArrayFrom(tableNames).FilterEmpty().Slice()
-	newTableNames = garray.NewStrArrayFrom(newTableNames).FilterEmpty().Slice() // Filter empty table names. make sure that newTableNames and tableNames have the same length.
+
 	in.genItems.Scale()
 
 	// Dao: index and internal.
@@ -306,14 +237,6 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 		NewTableNames:    newTableNames,
 		ShardingTableSet: shardingNewTableSet,
 	})
-	// Table: table fields.
-	generateTable(ctx, CGenDaoInternalInput{
-		CGenDaoInput:     in,
-		DB:               db,
-		TableNames:       tableNames,
-		NewTableNames:    newTableNames,
-		ShardingTableSet: shardingNewTableSet,
-	})
 	// Do.
 	generateDo(ctx, CGenDaoInternalInput{
 		CGenDaoInput:  in,
@@ -335,19 +258,19 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 func getImportPartContent(ctx context.Context, source string, isDo bool, appendImports []string) string {
 	var packageImportsArray = garray.NewStrArray()
 	if isDo {
-		packageImportsArray.Append(`"github.com/gogf/gf/v2/frame/g"`)
+		packageImportsArray.Append(`"github.com/gogf/gf/v3/frame/g"`)
 	}
 
 	// Time package recognition.
 	if strings.Contains(source, "gtime.Time") {
-		packageImportsArray.Append(`"github.com/gogf/gf/v2/os/gtime"`)
+		packageImportsArray.Append(`"github.com/gogf/gf/v3/os/gtime"`)
 	} else if strings.Contains(source, "time.Time") {
 		packageImportsArray.Append(`"time"`)
 	}
 
 	// Json type.
 	if strings.Contains(source, "gjson.Json") {
-		packageImportsArray.Append(`"github.com/gogf/gf/v2/encoding/gjson"`)
+		packageImportsArray.Append(`"github.com/gogf/gf/v3/encoding/gjson"`)
 	}
 
 	// Check and update imports in go.mod
@@ -431,61 +354,3 @@ func getTemplateFromPathOrDefault(filePath string, def string) string {
 	}
 	return def
 }
-
-// containsWildcard checks if the pattern contains wildcard characters (* or ?).
-func containsWildcard(pattern string) bool {
-	return gstr.Contains(pattern, "*") || gstr.Contains(pattern, "?")
-}
-
-// patternToRegex converts a wildcard pattern to a regex pattern.
-// Wildcard characters: * matches any characters, ? matches single character.
-func patternToRegex(pattern string) string {
-	pattern = gstr.ReplaceByMap(pattern, map[string]string{
-		"\r": "",
-		"\n": "",
-	})
-	pattern = gstr.ReplaceByMap(pattern, map[string]string{
-		"*": "\r",
-		"?": "\n",
-	})
-	pattern = gregex.Quote(pattern)
-	pattern = gstr.ReplaceByMap(pattern, map[string]string{
-		"\r": ".*",
-		"\n": ".",
-	})
-	return pattern
-}
-
-// filterTablesByPatterns filters tables by given patterns.
-// Patterns support wildcard characters: * matches any characters, ? matches single character.
-// https://github.com/gogf/gf/issues/4629
-func filterTablesByPatterns(allTables []string, patterns []string) []string {
-	var result []string
-	matched := make(map[string]bool)
-	allTablesSet := make(map[string]bool)
-	for _, t := range allTables {
-		allTablesSet[t] = true
-	}
-	for _, p := range patterns {
-		if containsWildcard(p) {
-			regPattern := "^" + patternToRegex(p) + "$"
-			for _, table := range allTables {
-				if !matched[table] && gregex.IsMatchString(regPattern, table) {
-					result = append(result, table)
-					matched[table] = true
-				}
-			}
-		} else {
-			// Exact table name, use direct string comparison.
-			if !allTablesSet[p] {
-				mlog.Printf(`table "%s" does not exist, skipped`, p)
-				continue
-			}
-			if !matched[p] {
-				result = append(result, p)
-				matched[p] = true
-			}
-		}
-	}
-	return result
-}

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

@@ -7,10 +7,10 @@
 package gendao
 
 import (
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/text/gstr"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 func doClear(items *CGenDaoInternalGenItems) {

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

@@ -15,15 +15,15 @@ import (
 
 	"github.com/olekukonko/tablewriter"
 
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gview"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/database/gdb"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gview"
+	"github.com/gogf/gf/v3/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"
+	"github.com/gogf/gf/cmd/gf/v3/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/utils"
 )
 
 func generateDao(ctx context.Context, in CGenDaoInternalInput) {
@@ -127,7 +127,6 @@ func generateDaoIndex(in generateDaoIndexInput) {
 		tplView.ClearAssigns()
 		tplView.Assigns(gview.Params{
 			tplVarTableSharding:           in.IsSharding,
-			tplVarTableShardingPrefix:     in.NewTableName + "_",
 			tplVarImportPrefix:            in.ImportPrefix,
 			tplVarTableName:               in.TableName,
 			tplVarTableNameCamelCase:      in.TableNameCamelCase,
@@ -211,9 +210,13 @@ func generateColumnNamesForDao(fieldMap map[string]*gdb.TableField, removeFieldP
 			fmt.Sprintf(` #"%s",`, field.Name),
 		}
 	}
-	table := tablewriter.NewTable(buffer, twRenderer, twConfig)
-	table.Bulk(array)
-	table.Render()
+	tw := tablewriter.NewWriter(buffer)
+	tw.SetBorder(false)
+	tw.SetRowLine(false)
+	tw.SetAutoWrapText(false)
+	tw.SetColumnSeparator("")
+	tw.AppendBulk(array)
+	tw.Render()
 	namesContent := buffer.String()
 	// Let's do this hack of table writer for indent!
 	namesContent = gstr.Replace(namesContent, "  #", "")
@@ -248,9 +251,13 @@ func generateColumnDefinitionForDao(fieldMap map[string]*gdb.TableField, removeF
 			" #" + fmt.Sprintf(`// %s`, comment),
 		}
 	}
-	table := tablewriter.NewTable(buffer, twRenderer, twConfig)
-	table.Bulk(array)
-	table.Render()
+	tw := tablewriter.NewWriter(buffer)
+	tw.SetBorder(false)
+	tw.SetRowLine(false)
+	tw.SetAutoWrapText(false)
+	tw.SetColumnSeparator("")
+	tw.AppendBulk(array)
+	tw.Render()
 	defineContent := buffer.String()
 	// Let's do this hack of table writer for indent!
 	defineContent = gstr.Replace(defineContent, "  #", "")

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

@@ -12,14 +12,14 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gview"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gview"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/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"
+	"github.com/gogf/gf/cmd/gf/v3/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/utils"
 )
 
 func generateDo(ctx context.Context, in CGenDaoInternalInput) {
@@ -45,14 +45,14 @@ func generateDo(ctx context.Context, in CGenDaoInternalInput) {
 				IsDo:                 true,
 			})
 		)
-		// replace all types to any.
+		// replace all types to interface{}.
 		structDefinition, _ = gregex.ReplaceStringFuncMatch(
 			"([A-Z]\\w*?)\\s+([\\w\\*\\.]+?)\\s+(//)",
 			structDefinition,
 			func(match []string) string {
 				// If the type is already a pointer/slice/map, it does nothing.
 				if !gstr.HasPrefix(match[2], "*") && !gstr.HasPrefix(match[2], "[]") && !gstr.HasPrefix(match[2], "map") {
-					return fmt.Sprintf(`%s any %s`, match[1], match[3])
+					return fmt.Sprintf(`%s interface{} %s`, match[1], match[3])
 				}
 				return match[0]
 			},

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

@@ -11,13 +11,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gview"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/os/gview"
+	"github.com/gogf/gf/v3/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"
+	"github.com/gogf/gf/cmd/gf/v3/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/utils"
 )
 
 func generateEntity(ctx context.Context, in CGenDaoInternalInput) {

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

@@ -14,10 +14,10 @@ import (
 
 	"github.com/olekukonko/tablewriter"
 
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/database/gdb"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 type generateStructDefinitionInput struct {
@@ -41,55 +41,28 @@ func generateStructDefinition(ctx context.Context, in generateStructDefinitionIn
 			appendImports = append(appendImports, imports)
 		}
 	}
-	table := tablewriter.NewTable(buffer, twRenderer, twConfig)
-	table.Bulk(array)
-	table.Render()
+	tw := tablewriter.NewWriter(buffer)
+	tw.SetBorder(false)
+	tw.SetRowLine(false)
+	tw.SetAutoWrapText(false)
+	tw.SetColumnSeparator("")
+	tw.AppendBulk(array)
+	tw.Render()
 	stContent := buffer.String()
 	// Let's do this hack of table writer for indent!
 	stContent = gstr.Replace(stContent, "  #", "")
 	stContent = gstr.Replace(stContent, "` ", "`")
 	stContent = gstr.Replace(stContent, "``", "")
 	buffer.Reset()
-	fmt.Fprintf(buffer, "type %s struct {\n", in.StructName)
+	buffer.WriteString(fmt.Sprintf("type %s struct {\n", in.StructName))
 	if in.IsDo {
-		fmt.Fprintf(buffer, "g.Meta `orm:\"table:%s, do:true\"`\n", in.TableName)
+		buffer.WriteString(fmt.Sprintf("g.Meta `orm:\"table:%s, do:true\"`\n", in.TableName))
 	}
 	buffer.WriteString(stContent)
 	buffer.WriteString("}")
 	return buffer.String(), appendImports
 }
 
-func getTypeMappingInfo(
-	ctx context.Context, fieldType string, inTypeMapping map[DBFieldTypeName]CustomAttributeType,
-) (typeNameStr, importStr string) {
-	if typeMapping, ok := inTypeMapping[strings.ToLower(fieldType)]; ok {
-		typeNameStr = typeMapping.Type
-		importStr = typeMapping.Import
-		return
-	}
-	tryTypeMatch, _ := gregex.MatchString(`(.+?)\(([^\(\)]+)\)([\s\)]*)`, fieldType)
-	var (
-		tryTypeName string
-		moreTry     bool
-	)
-	if len(tryTypeMatch) == 4 {
-		tryTypeMatch3, _ := gregex.ReplaceString(`\s+`, "", tryTypeMatch[3])
-		tryTypeName = gstr.Trim(tryTypeMatch[1]) + tryTypeMatch3
-		moreTry = tryTypeMatch3 != ""
-	} else {
-		tryTypeName = gstr.Split(fieldType, " ")[0]
-	}
-	if tryTypeName != "" {
-		if typeMapping, ok := inTypeMapping[strings.ToLower(tryTypeName)]; ok {
-			typeNameStr = typeMapping.Type
-			importStr = typeMapping.Import
-		} else if moreTry {
-			typeNameStr, importStr = getTypeMappingInfo(ctx, tryTypeName, inTypeMapping)
-		}
-	}
-	return
-}
-
 // generateStructFieldDefinition generates and returns the attribute definition for specified field.
 func generateStructFieldDefinition(
 	ctx context.Context, field *gdb.TableField, in generateStructDefinitionInput,
@@ -98,10 +71,25 @@ func generateStructFieldDefinition(
 		err              error
 		localTypeName    gdb.LocalType
 		localTypeNameStr string
+		jsonTag          = gstr.CaseConvert(field.Name, gstr.CaseTypeMatch(in.JsonCase))
 	)
 
 	if in.TypeMapping != nil && len(in.TypeMapping) > 0 {
-		localTypeNameStr, appendImport = getTypeMappingInfo(ctx, field.Type, in.TypeMapping)
+		var (
+			tryTypeName string
+		)
+		tryTypeMatch, _ := gregex.MatchString(`(.+?)\((.+)\)`, field.Type)
+		if len(tryTypeMatch) == 3 {
+			tryTypeName = gstr.Trim(tryTypeMatch[1])
+		} else {
+			tryTypeName = gstr.Split(field.Type, " ")[0]
+		}
+		if tryTypeName != "" {
+			if typeMapping, ok := in.TypeMapping[strings.ToLower(tryTypeName)]; ok {
+				localTypeNameStr = typeMapping.Type
+				appendImport = typeMapping.Import
+			}
+		}
 	}
 
 	if localTypeNameStr == "" {
@@ -155,8 +143,6 @@ func generateStructFieldDefinition(
 		"    #" + formatFieldName(newFiledName, FieldNameCaseCamel),
 		" #" + localTypeNameStr,
 	}
-
-	jsonTag := gstr.CaseConvert(newFiledName, gstr.CaseTypeMatch(in.JsonCase))
 	attrLines = append(attrLines, fmt.Sprintf(` #%sjson:"%s"`, tagKey, jsonTag))
 	// orm tag
 	if !in.IsDo {

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

@@ -1,147 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gendao
-
-import (
-	"bytes"
-	"context"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/os/gview"
-	"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"
-)
-
-// generateTable generates dao files for given tables.
-func generateTable(ctx context.Context, in CGenDaoInternalInput) {
-	dirPathTable := gfile.Join(in.Path, in.TablePath)
-	if !in.GenTable {
-		if gfile.Exists(dirPathTable) {
-			in.genItems.AppendDirPath(dirPathTable)
-		}
-		return
-	}
-	in.genItems.AppendDirPath(dirPathTable)
-	for i := 0; i < len(in.TableNames); i++ {
-		var (
-			realTableName = in.TableNames[i]
-			newTableName  = in.NewTableNames[i]
-		)
-		generateTableSingle(ctx, generateTableSingleInput{
-			CGenDaoInternalInput: in,
-			TableName:            realTableName,
-			NewTableName:         newTableName,
-			DirPathTable:         dirPathTable,
-		})
-	}
-}
-
-// generateTableSingleInput is the input parameter for generateTableSingle.
-type generateTableSingleInput struct {
-	CGenDaoInternalInput
-	// TableName specifies the table name of the table.
-	TableName string
-	// NewTableName specifies the prefix-stripped or custom edited name of the table.
-	NewTableName string
-	DirPathTable string
-}
-
-// generateTableSingle generates dao files for a single table.
-func generateTableSingle(ctx context.Context, in generateTableSingleInput) {
-	// Generating table data preparing.
-	fieldMap, err := in.DB.TableFields(ctx, in.TableName)
-	if err != nil {
-		mlog.Fatalf(`fetching tables fields failed for table "%s": %+v`, in.TableName, err)
-	}
-
-	tableNameSnakeCase := gstr.CaseSnake(in.NewTableName)
-	fileName := gstr.Trim(tableNameSnakeCase, "-_.")
-	if len(fileName) > 5 && fileName[len(fileName)-5:] == "_test" {
-		// Add suffix to avoid the table name which contains "_test",
-		// which would make the go file a testing file.
-		fileName += "_table"
-	}
-	path := filepath.FromSlash(gfile.Join(in.DirPathTable, fileName+".go"))
-	in.genItems.AppendGeneratedFilePath(path)
-	if in.OverwriteDao || !gfile.Exists(path) {
-		var (
-			ctx        = context.Background()
-			tplContent = getTemplateFromPathOrDefault(
-				in.TplDaoTablePath, consts.TemplateGenTableContent,
-			)
-		)
-		tplView.ClearAssigns()
-		tplView.Assigns(gview.Params{
-			tplVarGroupName:          in.Group,
-			tplVarTableName:          in.TableName,
-			tplVarTableNameCamelCase: formatFieldName(in.NewTableName, FieldNameCaseCamel),
-			tplVarPackageName:        filepath.Base(in.TablePath),
-			tplVarTableFields:        generateTableFields(fieldMap),
-		})
-		indexContent, err := tplView.ParseContent(ctx, tplContent)
-		if err != nil {
-			mlog.Fatalf("parsing template content failed: %v", err)
-		}
-		if err = gfile.PutContents(path, strings.TrimSpace(indexContent)); err != nil {
-			mlog.Fatalf("writing content to '%s' failed: %v", path, err)
-		} else {
-			utils.GoFmt(path)
-			mlog.Print("generated:", gfile.RealPath(path))
-		}
-	}
-}
-
-// generateTableFields generates and returns the field definition content for specified table.
-func generateTableFields(fields map[string]*gdb.TableField) string {
-	var buf bytes.Buffer
-	fieldNames := make([]string, 0, len(fields))
-	for fieldName := range fields {
-		fieldNames = append(fieldNames, fieldName)
-	}
-	sort.Slice(fieldNames, func(i, j int) bool {
-		return fields[fieldNames[i]].Index < fields[fieldNames[j]].Index // asc
-	})
-	for index, fieldName := range fieldNames {
-		field := fields[fieldName]
-		buf.WriteString("    " + strconv.Quote(field.Name) + ": {\n")
-		buf.WriteString("        Index:   " + gconv.String(field.Index) + ",\n")
-		buf.WriteString("        Name:    " + strconv.Quote(field.Name) + ",\n")
-		buf.WriteString("        Type:    " + strconv.Quote(field.Type) + ",\n")
-		buf.WriteString("        Null:    " + gconv.String(field.Null) + ",\n")
-		buf.WriteString("        Key:     " + strconv.Quote(field.Key) + ",\n")
-		buf.WriteString("        Default: " + generateDefaultValue(field.Default) + ",\n")
-		buf.WriteString("        Extra:   " + strconv.Quote(field.Extra) + ",\n")
-		buf.WriteString("        Comment: " + strconv.Quote(field.Comment) + ",\n")
-		buf.WriteString("    },")
-		if index != len(fieldNames)-1 {
-			buf.WriteString("\n")
-		}
-	}
-	return buf.String()
-}
-
-// generateDefaultValue generates and returns the default value definition for specified field.
-func generateDefaultValue(value interface{}) string {
-	if value == nil {
-		return "nil"
-	}
-	switch v := value.(type) {
-	case string:
-		return strconv.Quote(v)
-	default:
-		return gconv.String(v)
-	}
-}

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

@@ -7,8 +7,8 @@
 package gendao
 
 import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/util/gtag"
 )
 
 const (
@@ -60,7 +60,6 @@ CONFIGURATION SUPPORT
 	CGenDaoBriefGJsonSupport      = `use gJsonSupport to use *gjson.Json instead of string for generated json fields of tables`
 	CGenDaoBriefImportPrefix      = `custom import prefix for generated go files`
 	CGenDaoBriefDaoPath           = `directory path for storing generated dao files under path`
-	CGenDaoBriefTablePath         = `directory path for storing generated table files under path`
 	CGenDaoBriefDoPath            = `directory path for storing generated do files under path`
 	CGenDaoBriefEntityPath        = `directory path for storing generated entity files under path`
 	CGenDaoBriefOverwriteDao      = `overwrite all dao files both inside/outside internal folder`
@@ -70,7 +69,6 @@ CONFIGURATION SUPPORT
 	CGenDaoBriefNoJsonTag         = `no json tag will be added for each field`
 	CGenDaoBriefNoModelComment    = `no model comment will be added for each field`
 	CGenDaoBriefClear             = `delete all generated go files that do not exist in database`
-	CGenDaoBriefGenTable          = `generate table files`
 	CGenDaoBriefTypeMapping       = `custom local type mapping for generated struct attributes relevant to fields of table`
 	CGenDaoBriefFieldMapping      = `custom local type mapping for generated struct attributes relevant to specific fields of table`
 	CGenDaoBriefShardingPattern   = `sharding pattern for table name, e.g. "users_?" will be replace tables "users_001,users_002,..." to "users" dao`
@@ -99,8 +97,6 @@ generated json tag case for model struct, cases are as follows:
 	tplVarTableNameCamelCase      = `TplTableNameCamelCase`
 	tplVarTableNameCamelLowerCase = `TplTableNameCamelLowerCase`
 	tplVarTableSharding           = `TplTableSharding`
-	tplVarTableShardingPrefix     = `TplTableShardingPrefix`
-	tplVarTableFields             = `TplTableFields`
 	tplVarPackageImports          = `TplPackageImports`
 	tplVarImportPrefix            = `TplImportPrefix`
 	tplVarStructDefine            = `TplStructDefine`
@@ -129,7 +125,6 @@ func init() {
 		`CGenDaoBriefStdTime`:            CGenDaoBriefStdTime,
 		`CGenDaoBriefWithTime`:           CGenDaoBriefWithTime,
 		`CGenDaoBriefDaoPath`:            CGenDaoBriefDaoPath,
-		`CGenDaoBriefTablePath`:          CGenDaoBriefTablePath,
 		`CGenDaoBriefDoPath`:             CGenDaoBriefDoPath,
 		`CGenDaoBriefEntityPath`:         CGenDaoBriefEntityPath,
 		`CGenDaoBriefGJsonSupport`:       CGenDaoBriefGJsonSupport,
@@ -141,7 +136,6 @@ func init() {
 		`CGenDaoBriefNoJsonTag`:          CGenDaoBriefNoJsonTag,
 		`CGenDaoBriefNoModelComment`:     CGenDaoBriefNoModelComment,
 		`CGenDaoBriefClear`:              CGenDaoBriefClear,
-		`CGenDaoBriefGenTable`:           CGenDaoBriefGenTable,
 		`CGenDaoBriefTypeMapping`:        CGenDaoBriefTypeMapping,
 		`CGenDaoBriefFieldMapping`:       CGenDaoBriefFieldMapping,
 		`CGenDaoBriefShardingPattern`:    CGenDaoBriefShardingPattern,

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

@@ -1,182 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gendao
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-// Test containsWildcard function.
-func Test_containsWildcard(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		t.Assert(containsWildcard("trade_*"), true)
-		t.Assert(containsWildcard("user_?"), true)
-		t.Assert(containsWildcard("*"), true)
-		t.Assert(containsWildcard("?"), true)
-		t.Assert(containsWildcard("trade_order"), false)
-		t.Assert(containsWildcard(""), false)
-	})
-}
-
-// Test patternToRegex function.
-func Test_patternToRegex(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// * should become .*
-		t.Assert(patternToRegex("trade_*"), "trade_.*")
-		// ? should become .
-		t.Assert(patternToRegex("user_???"), "user_...")
-		// Mixed
-		t.Assert(patternToRegex("*_order_?"), ".*_order_.")
-		// No wildcards - should escape special regex chars
-		t.Assert(patternToRegex("trade_order"), "trade_order")
-		// Just *
-		t.Assert(patternToRegex("*"), ".*")
-	})
-}
-
-// Test filterTablesByPatterns with * wildcard.
-func Test_filterTablesByPatterns_Star(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		allTables := []string{"trade_order", "trade_item", "user_info", "user_log", "config"}
-
-		// Single pattern with *
-		result := filterTablesByPatterns(allTables, []string{"trade_*"})
-		t.Assert(len(result), 2)
-		t.AssertIN("trade_order", result)
-		t.AssertIN("trade_item", result)
-
-		// Multiple patterns with *
-		result = filterTablesByPatterns(allTables, []string{"trade_*", "user_*"})
-		t.Assert(len(result), 4)
-		t.AssertIN("trade_order", result)
-		t.AssertIN("trade_item", result)
-		t.AssertIN("user_info", result)
-		t.AssertIN("user_log", result)
-	})
-}
-
-// Test filterTablesByPatterns with ? wildcard.
-func Test_filterTablesByPatterns_Question(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		allTables := []string{"trade_order", "trade_item", "user_info", "user_log", "config"}
-
-		// ? matches single character: user_log (3 chars) but not user_info (4 chars)
-		result := filterTablesByPatterns(allTables, []string{"user_???"})
-		t.Assert(len(result), 1)
-		t.AssertIN("user_log", result)
-		t.AssertNI("user_info", result)
-
-		// user_???? should match user_info (4 chars)
-		result = filterTablesByPatterns(allTables, []string{"user_????"})
-		t.Assert(len(result), 1)
-		t.AssertIN("user_info", result)
-		t.AssertNI("user_log", result)
-	})
-}
-
-// Test filterTablesByPatterns with mixed patterns and exact names.
-func Test_filterTablesByPatterns_Mixed(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		allTables := []string{"trade_order", "trade_item", "user_info", "user_log", "config"}
-
-		// Pattern + exact name
-		result := filterTablesByPatterns(allTables, []string{"trade_*", "config"})
-		t.Assert(len(result), 3)
-		t.AssertIN("trade_order", result)
-		t.AssertIN("trade_item", result)
-		t.AssertIN("config", result)
-		t.AssertNI("user_info", result)
-		t.AssertNI("user_log", result)
-	})
-}
-
-// Test filterTablesByPatterns with exact names only (backward compatibility).
-func Test_filterTablesByPatterns_ExactNames(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		allTables := []string{"trade_order", "trade_item", "user_info", "user_log", "config"}
-
-		// Exact names only
-		result := filterTablesByPatterns(allTables, []string{"trade_order", "config"})
-		t.Assert(len(result), 2)
-		t.AssertIN("trade_order", result)
-		t.AssertIN("config", result)
-		t.AssertNI("trade_item", result)
-	})
-}
-
-// Test filterTablesByPatterns - no duplicates when table matches multiple patterns.
-func Test_filterTablesByPatterns_NoDuplicates(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		allTables := []string{"trade_order", "trade_item", "user_info"}
-
-		// trade_order matches both patterns, should only appear once
-		result := filterTablesByPatterns(allTables, []string{"trade_*", "trade_order"})
-		t.Assert(len(result), 2) // trade_order, trade_item
-
-		// Count occurrences of trade_order
-		count := 0
-		for _, v := range result {
-			if v == "trade_order" {
-				count++
-			}
-		}
-		t.Assert(count, 1) // No duplicates
-	})
-}
-
-// Test filterTablesByPatterns - pattern matches nothing.
-func Test_filterTablesByPatterns_NoMatch(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		allTables := []string{"trade_order", "trade_item", "user_info"}
-
-		// Pattern that matches nothing
-		result := filterTablesByPatterns(allTables, []string{"nonexistent_*"})
-		t.Assert(len(result), 0)
-	})
-}
-
-// Test filterTablesByPatterns - empty input.
-func Test_filterTablesByPatterns_Empty(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		allTables := []string{"trade_order", "trade_item"}
-
-		// Empty patterns
-		result := filterTablesByPatterns(allTables, []string{})
-		t.Assert(len(result), 0)
-
-		// Empty tables
-		result = filterTablesByPatterns([]string{}, []string{"trade_*"})
-		t.Assert(len(result), 0)
-	})
-}
-
-// Test filterTablesByPatterns - "*" matches all tables.
-func Test_filterTablesByPatterns_MatchAll(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		allTables := []string{"trade_order", "trade_item", "user_info", "user_log", "config"}
-
-		// "*" should match all tables
-		result := filterTablesByPatterns(allTables, []string{"*"})
-		t.Assert(len(result), 5)
-	})
-}
-
-// Test filterTablesByPatterns - non-existent exact table name should be skipped.
-func Test_filterTablesByPatterns_NonExistent(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		allTables := []string{"trade_order", "trade_item", "user_info"}
-
-		// Mix of existing and non-existing tables
-		result := filterTablesByPatterns(allTables, []string{"trade_order", "nonexistent", "user_info"})
-		t.Assert(len(result), 2)
-		t.AssertIN("trade_order", result)
-		t.AssertIN("user_info", result)
-		t.AssertNI("nonexistent", result)
-	})
-}

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

@@ -11,13 +11,13 @@ import (
 
 	"golang.org/x/tools/go/packages"
 
-	"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/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/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/v3/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 type (
@@ -55,13 +55,6 @@ func (c CGenEnums) Enums(ctx context.Context, in CGenEnumsInput) (out *CGenEnums
 	if realPath == "" {
 		mlog.Fatalf(`source folder path "%s" does not exist`, in.Src)
 	}
-	// Convert output path to absolute before Chdir, so it remains correct after directory change.
-	// See: https://github.com/gogf/gf/issues/4387
-	outputPath := gfile.Abs(in.Path)
-
-	originPwd := gfile.Pwd()
-	defer gfile.Chdir(originPwd)
-
 	err = gfile.Chdir(realPath)
 	if err != nil {
 		mlog.Fatal(err)
@@ -79,14 +72,14 @@ func (c CGenEnums) Enums(ctx context.Context, in CGenEnumsInput) (out *CGenEnums
 	p := NewEnumsParser(in.Prefixes)
 	p.ParsePackages(pkgs)
 	var enumsContent = gstr.ReplaceByMap(consts.TemplateGenEnums, g.MapStrStr{
-		"{PackageName}": gfile.Basename(gfile.Dir(outputPath)),
+		"{PackageName}": gfile.Basename(gfile.Dir(in.Path)),
 		"{EnumsJson}":   "`" + p.Export() + "`",
 	})
 	enumsContent = gstr.Trim(enumsContent)
-	if err = gfile.PutContents(outputPath, enumsContent); err != nil {
+	if err = gfile.PutContents(in.Path, enumsContent); err != nil {
 		return
 	}
-	mlog.Printf(`generated enums go file: %s`, outputPath)
+	mlog.Printf(`generated enums go file: %s`, in.Path)
 	mlog.Print("done!")
 	return
 }

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

@@ -12,9 +12,9 @@ import (
 
 	"golang.org/x/tools/go/packages"
 
-	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v3/encoding/gjson"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
 )
 
 const pkgLoadMode = 0xffffff
@@ -113,12 +113,12 @@ func (p *EnumsParser) ParsePackage(pkg *packages.Package) {
 }
 
 func (p *EnumsParser) Export() string {
-	var typeEnumMap = make(map[string][]any)
+	var typeEnumMap = make(map[string][]interface{})
 	for _, enum := range p.enums {
 		if typeEnumMap[enum.Type] == nil {
-			typeEnumMap[enum.Type] = make([]any, 0)
+			typeEnumMap[enum.Type] = make([]interface{}, 0)
 		}
-		var value any
+		var value interface{}
 		switch enum.Kind {
 		case constant.Int:
 			value = gconv.Int64(enum.Value)

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

@@ -1,368 +0,0 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package genenums
-
-import (
-	"go/constant"
-	"path/filepath"
-	"testing"
-
-	"golang.org/x/tools/go/packages"
-
-	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/guid"
-)
-
-func Test_NewEnumsParser(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test creating parser without prefixes
-		p := NewEnumsParser(nil)
-		t.AssertNE(p, nil)
-		t.Assert(len(p.enums), 0)
-		t.Assert(len(p.prefixes), 0)
-		t.AssertNE(p.parsedPkg, nil)
-		t.AssertNE(p.standardPackages, nil)
-	})
-}
-
-func Test_NewEnumsParser_WithPrefixes(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test creating parser with prefixes
-		prefixes := []string{"github.com/gogf", "github.com/test"}
-		p := NewEnumsParser(prefixes)
-		t.AssertNE(p, nil)
-		t.Assert(len(p.prefixes), 2)
-		t.Assert(p.prefixes[0], "github.com/gogf")
-		t.Assert(p.prefixes[1], "github.com/test")
-	})
-}
-
-func Test_EnumsParser_Export_Empty(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test exporting empty enums
-		p := NewEnumsParser(nil)
-		result := p.Export()
-		t.Assert(result, "{}")
-	})
-}
-
-func Test_EnumsParser_Export_WithEnums(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test exporting with manually added enums
-		p := NewEnumsParser(nil)
-
-		// Add some test enums
-		p.enums = []EnumItem{
-			{
-				Name:  "StatusActive",
-				Value: "1",
-				Type:  "pkg.Status",
-				Kind:  constant.Int,
-			},
-			{
-				Name:  "StatusInactive",
-				Value: "0",
-				Type:  "pkg.Status",
-				Kind:  constant.Int,
-			},
-			{
-				Name:  "TypeA",
-				Value: "type_a",
-				Type:  "pkg.Type",
-				Kind:  constant.String,
-			},
-		}
-
-		result := p.Export()
-		t.AssertNE(result, "")
-
-		// Parse the result to verify - use raw map to avoid gjson path issues with "."
-		var resultMap map[string][]interface{}
-		err := gjson.DecodeTo(result, &resultMap)
-		t.AssertNil(err)
-
-		// Verify Status type has 2 values
-		statusValues := resultMap["pkg.Status"]
-		t.Assert(len(statusValues), 2)
-
-		// Verify Type type has 1 value
-		typeValues := resultMap["pkg.Type"]
-		t.Assert(len(typeValues), 1)
-		t.Assert(typeValues[0], "type_a")
-	})
-}
-
-func Test_EnumsParser_Export_IntValues(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		p := NewEnumsParser(nil)
-		p.enums = []EnumItem{
-			{Name: "One", Value: "1", Type: "pkg.Int", Kind: constant.Int},
-			{Name: "Two", Value: "2", Type: "pkg.Int", Kind: constant.Int},
-			{Name: "Negative", Value: "-5", Type: "pkg.Int", Kind: constant.Int},
-		}
-
-		result := p.Export()
-		var resultMap map[string][]interface{}
-		err := gjson.DecodeTo(result, &resultMap)
-		t.AssertNil(err)
-
-		values := resultMap["pkg.Int"]
-		t.Assert(len(values), 3)
-		// Int values should be exported as integers (stored as float64 in JSON)
-		t.Assert(values[0], float64(1))
-		t.Assert(values[1], float64(2))
-		t.Assert(values[2], float64(-5))
-	})
-}
-
-func Test_EnumsParser_Export_FloatValues(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		p := NewEnumsParser(nil)
-		p.enums = []EnumItem{
-			{Name: "Pi", Value: "3.14159", Type: "pkg.Float", Kind: constant.Float},
-			{Name: "E", Value: "2.71828", Type: "pkg.Float", Kind: constant.Float},
-		}
-
-		result := p.Export()
-		var resultMap map[string][]interface{}
-		err := gjson.DecodeTo(result, &resultMap)
-		t.AssertNil(err)
-
-		values := resultMap["pkg.Float"]
-		t.Assert(len(values), 2)
-	})
-}
-
-func Test_EnumsParser_Export_BoolValues(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		p := NewEnumsParser(nil)
-		p.enums = []EnumItem{
-			{Name: "True", Value: "true", Type: "pkg.Bool", Kind: constant.Bool},
-			{Name: "False", Value: "false", Type: "pkg.Bool", Kind: constant.Bool},
-		}
-
-		result := p.Export()
-		var resultMap map[string][]interface{}
-		err := gjson.DecodeTo(result, &resultMap)
-		t.AssertNil(err)
-
-		values := resultMap["pkg.Bool"]
-		t.Assert(len(values), 2)
-		t.Assert(values[0], true)
-		t.Assert(values[1], false)
-	})
-}
-
-func Test_EnumsParser_Export_StringValues(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		p := NewEnumsParser(nil)
-		p.enums = []EnumItem{
-			{Name: "Hello", Value: "hello", Type: "pkg.Str", Kind: constant.String},
-			{Name: "World", Value: "world", Type: "pkg.Str", Kind: constant.String},
-		}
-
-		result := p.Export()
-		var resultMap map[string][]interface{}
-		err := gjson.DecodeTo(result, &resultMap)
-		t.AssertNil(err)
-
-		values := resultMap["pkg.Str"]
-		t.Assert(len(values), 2)
-		t.Assert(values[0], "hello")
-		t.Assert(values[1], "world")
-	})
-}
-
-func Test_EnumsParser_Export_MixedTypes(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		p := NewEnumsParser(nil)
-		p.enums = []EnumItem{
-			{Name: "IntVal", Value: "42", Type: "pkg.IntType", Kind: constant.Int},
-			{Name: "StrVal", Value: "test", Type: "pkg.StrType", Kind: constant.String},
-			{Name: "BoolVal", Value: "true", Type: "pkg.BoolType", Kind: constant.Bool},
-		}
-
-		result := p.Export()
-		var resultMap map[string][]interface{}
-		err := gjson.DecodeTo(result, &resultMap)
-		t.AssertNil(err)
-
-		// Each type should have its own array
-		t.Assert(len(resultMap["pkg.IntType"]), 1)
-		t.Assert(len(resultMap["pkg.StrType"]), 1)
-		t.Assert(len(resultMap["pkg.BoolType"]), 1)
-	})
-}
-
-func Test_EnumItem_Structure(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Test EnumItem structure
-		item := EnumItem{
-			Name:  "TestEnum",
-			Value: "test_value",
-			Type:  "github.com/test/pkg.EnumType",
-			Kind:  constant.String,
-		}
-
-		t.Assert(item.Name, "TestEnum")
-		t.Assert(item.Value, "test_value")
-		t.Assert(item.Type, "github.com/test/pkg.EnumType")
-		t.Assert(item.Kind, constant.String)
-	})
-}
-
-func Test_EnumsParser_ParsePackages_Integration(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Create a temporary directory with a Go package containing enums
-		// Note: The module path must contain "/" for enums to be parsed
-		// (the parser skips std types without "/" in the type name)
-		tempDir := gfile.Temp(guid.S())
-		err := gfile.Mkdir(tempDir)
-		t.AssertNil(err)
-		defer gfile.Remove(tempDir)
-
-		// Create go.mod with a path containing "/"
-		goModContent := `module github.com/test/enumtest
-
-go 1.21
-`
-		err = gfile.PutContents(filepath.Join(tempDir, "go.mod"), goModContent)
-		t.AssertNil(err)
-
-		// Create a Go file with enum definitions
-		enumsContent := `package enumtest
-
-type Status int
-
-const (
-	StatusActive   Status = 1
-	StatusInactive Status = 0
-)
-
-type Color string
-
-const (
-	ColorRed   Color = "red"
-	ColorGreen Color = "green"
-	ColorBlue  Color = "blue"
-)
-`
-		err = gfile.PutContents(filepath.Join(tempDir, "enums.go"), enumsContent)
-		t.AssertNil(err)
-
-		// Load the package
-		cfg := &packages.Config{
-			Dir:   tempDir,
-			Mode:  pkgLoadMode,
-			Tests: false,
-		}
-		pkgs, err := packages.Load(cfg)
-		t.AssertNil(err)
-		t.Assert(len(pkgs) > 0, true)
-
-		// Parse the packages
-		p := NewEnumsParser(nil)
-		p.ParsePackages(pkgs)
-
-		// Export and verify - result should contain parsed enums
-		result := p.Export()
-		// Verify the export contains some data
-		t.Assert(len(result) > 2, true) // More than just "{}"
-
-		// Parse result as raw map to handle keys with "/"
-		var resultMap map[string][]interface{}
-		err = gjson.DecodeTo(result, &resultMap)
-		t.AssertNil(err)
-
-		// Verify Status enum was parsed (type will be "github.com/test/enumtest.Status")
-		statusKey := "github.com/test/enumtest.Status"
-		statusValues, hasStatus := resultMap[statusKey]
-		t.Assert(hasStatus, true)
-		t.Assert(len(statusValues), 2)
-
-		// Verify Color enum was parsed
-		colorKey := "github.com/test/enumtest.Color"
-		colorValues, hasColor := resultMap[colorKey]
-		t.Assert(hasColor, true)
-		t.Assert(len(colorValues), 3)
-	})
-}
-
-func Test_EnumsParser_ParsePackages_WithPrefixes(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		// Create a temporary directory with a Go package
-		tempDir := gfile.Temp(guid.S())
-		err := gfile.Mkdir(tempDir)
-		t.AssertNil(err)
-		defer gfile.Remove(tempDir)
-
-		// Create go.mod with a specific module name
-		goModContent := `module github.com/allowed/pkg
-
-go 1.21
-`
-		err = gfile.PutContents(filepath.Join(tempDir, "go.mod"), goModContent)
-		t.AssertNil(err)
-
-		// Create a Go file with enum definitions
-		enumsContent := `package pkg
-
-type Status int
-
-const (
-	StatusOK Status = 1
-)
-`
-		err = gfile.PutContents(filepath.Join(tempDir, "enums.go"), enumsContent)
-		t.AssertNil(err)
-
-		// Load the package
-		cfg := &packages.Config{
-			Dir:   tempDir,
-			Mode:  pkgLoadMode,
-			Tests: false,
-		}
-		pkgs, err := packages.Load(cfg)
-		t.AssertNil(err)
-
-		// Parse with prefix filter that matches
-		p := NewEnumsParser([]string{"github.com/allowed"})
-		p.ParsePackages(pkgs)
-
-		result := p.Export()
-		// Should have enums because prefix matches
-		t.AssertNE(result, "{}")
-
-		// Parse with prefix filter that doesn't match
-		p2 := NewEnumsParser([]string{"github.com/other"})
-		p2.ParsePackages(pkgs)
-
-		result2 := p2.Export()
-		// Should be empty because prefix doesn't match
-		t.Assert(result2, "{}")
-	})
-}
-
-func Test_getStandardPackages(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		stdPkgs := getStandardPackages()
-		t.AssertNE(stdPkgs, nil)
-		t.Assert(len(stdPkgs) > 0, true)
-
-		// Verify some common standard packages are included
-		_, hasFmt := stdPkgs["fmt"]
-		t.Assert(hasFmt, true)
-
-		_, hasOs := stdPkgs["os"]
-		t.Assert(hasOs, true)
-
-		_, hasContext := stdPkgs["context"]
-		t.Assert(hasContext, true)
-	})
-}