fix: cache value assertion panic if the cache adapter is not in-memory for soft time feature of package gdb; improve converting performance for gconv.Scan (#3351 )

enhance: update contrib/drivers/README.MD (#3355 )
feat: version v2.6.4 (#3352 )
2026-06-07 18:26:02 +08:00 · 2024-03-07 11:36:42 +08:00 · 2024-03-07 11:34:49 +08:00 · 2024-03-07 10:12:58 +08:00 · 2024-03-06 19:27:52 +08:00 · 2024-03-06 19:22:58 +08:00
617 changed files with 21565 additions and 8064 deletions
--- a/.gitee/ISSUE_TEMPLATE.MD
+++ b/.gitee/ISSUE_TEMPLATE.MD
--- a/.github/ISSUE_TEMPLATE.MD
+++ b/.github/ISSUE_TEMPLATE.MD
@ -1,38 +0,0 @@
-<!-- Please answer these questions before submitting your issue. Thanks! -->
-
-<!-- 为高效处理您的疑问，如果觉得是BUG类问题，请您务必提供可复现该问题的最小可运行代码！否则issue可能会被延期处理！ -->
-<!-- 为高效处理您的疑问，如果觉得是BUG类问题，请您务必提供可复现该问题的最小可运行代码！否则issue可能会被延期处理！ -->
-<!-- 为高效处理您的疑问，如果觉得是BUG类问题，请您务必提供可复现该问题的最小可运行代码！否则issue可能会被延期处理！ -->
-<!-- 重要的事情说三遍！ -->
-
-### 1. What version of `Go` and system type/arch are you using?
-<!-- 
-Please paste the output of command `go version` from your terminal.
-What expect to see is like: `go 1.12, linux/amd64`
-->
-
-
-### 2. What version of `GoFrame` are you using?
-<!-- You can find the GF version from your `go.mod`, or from the `version.go` in `GF` -->
-
-
-### 3. Can this issue be re-produced with the latest release?
-
-
-
-### 4. What did you do?
-<!--
-If possible, provide a copy of shortest codes for reproducing the error.
-A complete runnable program is best.
-->
-
-
-
-### 5. What did you expect to see?
-
-
-
-### 6. What did you see instead?
-
-
-
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!-- Please answer these questions before submitting your issue. Thanks! -->
+
+<!-- 为高效处理 Bug，请您务必提供可复现该问题的最小可运行代码！否则 issue 可能会被延期处理！ -->
+<!-- 为高效处理 Bug，请您务必提供可复现该问题的最小可运行代码！否则 issue 可能会被延期处理！ -->
+<!-- 为高效处理 Bug，如请您务必提供可复现该问题的最小可运行代码！否则 issue 可能会被延期处理！ -->
+<!-- 重要的事情说三遍！ -->
+
+**What version of `Go` and system type/arch are you using?**
+<!-- 
+Please paste the output of command `go version` from your terminal.
+What expects to see is like: `go 1.12, linux/amd64`
+-->
+
+
+**What version of `GoFrame` are you using?**
+<!-- You can find the GF version from your `go.mod`, or from the `version.go` in `GF` -->
+
+
+**Can this bug be re-produced with the latest release?**
+
+
+**What did you do?**
+<!--
+If possible, provide a copy of shortest codes for reproducing the error.
+A complete runnable program is best.
+-->
+
+
+**What did you expect to see?**
+
+
+**What did you see instead?**
--- a/.github/ISSUE_TEMPLATE/enhancement-request.md
+++ b/.github/ISSUE_TEMPLATE/enhancement-request.md
@ -0,0 +1,16 @@
+---
+name: Enhancement request
+about: Enhance an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Package that You wish to enhance**
+
+
+**Enhancement description**
+
+
+**Additional**
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+
+
+**Describe the solution you'd like**
+
+
+**Describe alternatives you've considered**
+
+
+**Additional**
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@ -0,0 +1,11 @@
+---
+name: Question
+about: I want to ask a question
+title: ''
+labels: question
+assignees: ''
+
+---
+
+<!-- 请优先仔细阅读文档 -->
+**What do you want to ask**
--- a/.github/workflows/build_and_test.sh
+++ b/.github/workflows/build_and_test.sh
@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-
-for file in `find . -name go.mod`; do
-    dirpath=$(dirname $file)
-    echo $dirpath
-
-    # package kuhecm needs golang >= v1.18
-    if [ "kubecm" = $(basename $dirpath) ]; then
-        if ! go version|grep -q "1.19"; then
-          echo "ignore kubecm as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package etcd needs golang >= v1.19
-    if [ "etcd" = $(basename $dirpath) ]; then
-        if ! go version|grep -q "1.19"; then
-          echo "ignore etcd as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package example needs golang >= v1.19
-    if [ "example" = $(basename $dirpath) ]; then
-        if ! go version|grep -q "1.19"; then
-          echo "ignore example as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package otlpgrpc needs golang >= v1.20
-    if [ "otlpgrpc" = $(basename $dirpath) ]; then
-        if ! go version|grep -q "1.20"; then
-          echo "ignore otlpgrpc as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    # package otlphttp needs golang >= v1.20
-    if [ "otlphttp" = $(basename $dirpath) ]; then
-        if ! go version|grep -q "1.20"; then
-          echo "ignore otlphttp as go version: $(go version)"
-          continue 1
-        fi
-    fi
-
-    cd $dirpath
-    go mod tidy
-    go build ./...
-    go test ./... -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
-
-    cd -
-done
--- a/.github/workflows/ci-main.sh
+++ b/.github/workflows/ci-main.sh
@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+
+coverage=$1
+
+# find all path that contains go.mod.
+for file in `find . -name go.mod`; do
+    dirpath=$(dirname $file)
+    echo $dirpath
+
+    if [[ $file =~ "/testdata/" ]]; then
+        echo "ignore testdata path $file"
+        continue 1
+    fi
+
+    # package kuhecm needs golang >= v1.19
+    if [ "kubecm" = $(basename $dirpath) ]; then
+        continue 1
+        if ! go version|grep -qE "go1.19|go1.[2-9][0-9]"; then
+          echo "ignore kubecm as go version: $(go version)"
+          continue 1
+        fi
+    fi
+
+    # package consul needs golang >= v1.19
+    if [ "consul" = $(basename $dirpath) ]; then
+        continue 1
+        if ! go version|grep -qE "go1.19|go1.[2-9][0-9]"; then
+          echo "ignore consul as go version: $(go version)"
+          continue 1
+        fi
+    fi
+
+    # package etcd needs golang >= v1.19
+    if [ "etcd" = $(basename $dirpath) ]; then
+        if ! go version|grep -qE "go1.19|go1.[2-9][0-9]"; then
+          echo "ignore etcd as go version: $(go version)"
+          continue 1
+        fi
+    fi
+
+    # package polaris needs golang >= v1.19
+    if [ "polaris" = $(basename $dirpath) ]; then
+        if ! go version|grep -qE "go1.19|go1.[2-9][0-9]"; then
+          echo "ignore polaris as go version: $(go version)"
+          continue 1
+        fi
+    fi
+
+    # package example needs golang >= v1.20
+    if [ "example" = $(basename $dirpath) ]; then
+        if ! go version|grep -qE "go1.[2-9][0-9]"; then
+          echo "ignore example as go version: $(go version)"
+          continue 1
+        fi
+    fi
+
+    # package otlpgrpc needs golang >= v1.20
+    if [ "otlpgrpc" = $(basename $dirpath) ]; then
+        if ! go version|grep -qE "go1.[2-9][0-9]"; then
+          echo "ignore otlpgrpc as go version: $(go version)"
+          continue 1
+        fi
+    fi
+
+    # package otlphttp needs golang >= v1.20
+    if [ "otlphttp" = $(basename $dirpath) ]; then
+        if ! go version|grep -qE "go1.[2-9][0-9]"; then
+          echo "ignore otlphttp as go version: $(go version)"
+          continue 1
+        fi
+    fi
+
+    cd $dirpath
+    go mod tidy
+    go build ./...
+    # check coverage
+    if [ "${coverage}" = "coverage" ]; then
+      go test ./... -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
+    else
+      go test ./... -race || exit 1
+    fi
+
+    cd -
+done
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@ -1,3 +1,4 @@
+# The main codes build and unit testing running workflow.
 name: GoFrame Main CI


@ -65,10 +66,23 @@ jobs:
        ports:
          - 3306:3306

+      # MariaDb backend server.
+      mariadb:
+        image: loads/mariadb:10.4
+        env:
+          MARIADB_DATABASE: test
+          MARIADB_ROOT_PASSWORD: 12345678
+        ports:
+          - 3307:3306
+
      # PostgreSQL backend server.
-      # docker run -d --name postgres -p 5432:5432 \
-      # -e POSTGRES_PASSWORD=12345678 -e POSTGRES_USER=postgres -e POSTGRES_DB=test \
-      # -v postgres:/Users/john/Temp/postgresql/data loads/postgres:13
+      # docker run -d --name postgres \
+      # -p 5432:5432 \
+      # -e POSTGRES_PASSWORD=12345678 \
+      # -e POSTGRES_USER=postgres \
+      # -e POSTGRES_DB=test \
+      # -v postgres:/Users/john/Temp/postgresql/data \
+      # loads/postgres:13
      postgres:
        image: loads/postgres:13
        env:
@ -86,7 +100,8 @@ jobs:
          --health-retries 5

      # MSSQL backend server.
-      # docker run -d --name mssql -p 1433:1433 \
+      # docker run \
+      # -p 1433:1433 \
      # -e ACCEPT_EULA=Y \
      # -e SA_PASSWORD=LoremIpsum86 \
      # -e MSSQL_DB=test \
@ -122,10 +137,15 @@ jobs:
          - 9001:9001

      # Polaris backend server.
-      # docker run -d --name polaris -p 8090:8090 -p 8091:8091 -p 8093:8093  -p 9090:9090 -p 9091:9091 loads/polaris-server-standalone:1.11.2
-      # docker run -d --name polaris -p 8090:8090 -p 8091:8091 -p 8093:8093  -p 9090:9090 -p 9091:9091 loads/polaris-standalone:v1.16.3
+      # docker run -d --name polaris \
+      # -p 8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091 \
+      # loads/polaris-server-standalone:1.11.2
+      #
+      # docker run -d --name polaris \
+      # -p 8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091 \
+      # loads/polaris-standalone:v1.16.3
      polaris:
-        image: loads/polaris-standalone:v1.16.4
+        image: loads/polaris-standalone:v1.17.2
        ports:
          - 8090:8090
          - 8091:8091
@ -133,7 +153,14 @@ jobs:
          - 9090:9090
          - 9091:9091

-      # Oracle 11g server
+      # Oracle 11g server.
+      # docker run \
+      # -e ORACLE_ALLOW_REMOTE=true \
+      # -e ORACLE_SID=XE \
+      # -e ORACLE_DB_USER_NAME=system \
+      # -e ORACLE_DB_PASSWORD=oracle \
+      # -p 1521:1521 \
+      # loads/oracle-xe-11g-r2:11.2.0
      oracle-server:
        image: loads/oracle-xe-11g-r2:11.2.0
        env:
@ -145,7 +172,7 @@ jobs:
          - 1521:1521

      # dm8 server
-      # docker run -d --name dm -p 5236:5236 loads/dm:v8.1.2.128_ent_x86_64_ctm_pack4
+      # docker run -p 5236:5236 loads/dm:v8.1.2.128_ent_x86_64_ctm_pack4
      dm-server:
        image: loads/dm:v8.1.2.128_ent_x86_64_ctm_pack4
        ports:
@ -158,7 +185,7 @@ jobs:

    strategy:
      matrix:
-        go-version: [ "1.18", "1.19", "1.20" ]
+        go-version: [ "1.18", "1.19", "1.20", "1.21", "1.22" ]
        goarch: [ "386", "amd64" ]

    steps:
@ -169,7 +196,7 @@ jobs:
        timezoneLinux: "Asia/Shanghai"

    - name: Checkout Repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4

    - name: Start Apollo Containers
      run:  docker-compose -f ".github/workflows/apollo/docker-compose.yml" up -d --build
@ -180,21 +207,25 @@ jobs:
    - name: Start Redis Cluster Containers
      run:  docker-compose -f ".github/workflows/redis/docker-compose.yml" up -d --build

-    - name: Start Minikube
-      uses: medyagh/setup-minikube@master
+    - name: Start Consul Containers
+      run:  docker-compose -f ".github/workflows/consul/docker-compose.yml" up -d --build

    - name: Setup Golang ${{ matrix.go-version }}
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
      with:
        go-version: ${{ matrix.go-version }}
-        cache: true
-        cache-dependency-path: '**/go.sum'
+        cache-dependency-path: '**/go.sum' 

    - name: Before Script
      run:  bash .github/workflows/before_script.sh

    - name: Build & Test
-      run:  bash .github/workflows/build_and_test.sh
+      if: ${{ (github.event_name == 'push' && github.ref != 'refs/heads/master') || github.event_name == 'pull_request' }}
+      run: bash .github/workflows/ci-main.sh
+
+    - name: Build & Test & Coverage
+      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+      run: bash .github/workflows/ci-main.sh coverage

    - name: Stop Redis Cluster Containers
      run:  docker-compose -f ".github/workflows/redis/docker-compose.yml" down
@ -205,8 +236,11 @@ jobs:
    - name: Stop Nacos Containers
      run:  docker-compose -f ".github/workflows/nacos/docker-compose.yml" down

+    - name: Stop Consul Containers
+      run:  docker-compose -f ".github/workflows/consul/docker-compose.yml" down
+
    - name: Report Coverage
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
+      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
      with:
        flags: go-${{ matrix.go-version }}-${{ matrix.goarch }}
-
--- a/.github/workflows/ci-sub.sh
+++ b/.github/workflows/ci-sub.sh
@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+coverage=$1
+
+# find all path that contains go.mod.
+for file in `find . -name go.mod`; do
+    dirpath=$(dirname $file)
+    echo $dirpath
+
+    # package kuhecm needs golang >= v1.19
+    if [ "kubecm" = $(basename $dirpath) ]; then
+        if ! go version|grep -qE "go1.19|go1.[2-9][0-9]"; then
+          echo "ignore kubecm as go version: $(go version)"
+          continue 1
+        fi
+    else
+      continue 1
+    fi
+
+    cd $dirpath
+
+    go mod tidy
+    go build ./...
+    go test ./... -race || exit 1
+
+    cd -
+done
--- a/.github/workflows/ci-sub.yml
+++ b/.github/workflows/ci-sub.yml
@ -0,0 +1,67 @@
+# The sub codes build and unit testing running workflow.
+# It maintains the ci of unimportant packages.
+name: GoFrame Sub CI
+
+
+on:
+  push:
+    branches:
+    - master
+    - develop
+    - personal/**
+    - feature/**
+    - enhance/**
+    - fix/**
+
+  pull_request:
+    branches:
+    - master
+    - develop
+    - personal/**
+    - feature/**
+    - enhance/**
+    - fix/**
+
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+env:
+  TZ: "Asia/Shanghai"
+
+
+jobs:
+  code-test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        go-version: [ "1.18", "1.19", "1.20", "1.22" ]
+        goarch: [ "386", "amd64" ]
+
+    steps:
+    - name: Setup Timezone
+      uses: szenius/set-timezone@v1.1
+      with:
+        timezoneLinux: "Asia/Shanghai"
+
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Start Minikube
+      uses: medyagh/setup-minikube@master
+
+    - name: Setup Golang ${{ matrix.go-version }}
+      uses: actions/setup-go@v5
+      with:
+        go-version: ${{ matrix.go-version }}
+        cache-dependency-path: '**/go.sum' 
+
+    - name: Before Script
+      run:  bash .github/workflows/before_script.sh
+
+    - name: Build & Test
+      run: bash .github/workflows/ci-sub.sh
+
+
--- a/.github/workflows/consul/client.json
+++ b/.github/workflows/consul/client.json
@ -0,0 +1,7 @@
+{
+    "node_name": "consul-client",
+    "data_dir": "/consul/data",
+    "retry_join":[
+        "consul-server"
+     ]
+}
--- a/.github/workflows/consul/docker-compose.yml
+++ b/.github/workflows/consul/docker-compose.yml
@ -0,0 +1,31 @@
+version: '3.7'
+
+services:
+
+  consul-server:
+    image: loads/consul:1.15
+    container_name: consul-server
+    restart: always
+    volumes:
+     - ./server.json:/consul/config/server.json:ro
+    networks:
+      - consul
+    ports:
+      - "8500:8500"
+      - "8600:8600/tcp"
+      - "8600:8600/udp"
+    command: "agent"
+
+  consul-client:
+    image: loads/consul:1.15
+    container_name: consul-client
+    restart: always
+    volumes:
+     - ./client.json:/consul/config/client.json:ro
+    networks:
+      - consul
+    command: "agent"
+
+networks:
+  consul:
+    driver: bridge
--- a/.github/workflows/consul/server.json
+++ b/.github/workflows/consul/server.json
@ -0,0 +1,12 @@
+{
+    "node_name": "consul-server",
+    "server": true,
+    "bootstrap" : true,
+    "ui_config": {
+        "enabled" : true
+    },
+    "data_dir": "/consul/data",
+    "addresses": {
+        "http" : "0.0.0.0"
+    }
+}
--- a/.github/workflows/doc-build.yml
+++ b/.github/workflows/doc-build.yml
@ -0,0 +1,38 @@
+name: Deploy to GitHub Pages
+
+on:
+  push:
+    branches:
+      - 'doc-build'
+  schedule:
+    - cron: '0 15 * * *'
+
+jobs:
+  deploy:
+    name: Deploy to GitHub Pages
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: doc-build
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: npm
+      - name: Set Up Golang Environment
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.20.4
+          cache: false
+      - name: download goframe docs
+        run: ./download.sh
+      - name: Install dependencies
+        run: npm ci
+      - name: Build website
+        run: npm run build
+      - name: Deploy to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./build
+          cname: pages.goframe.org
--- a/.github/workflows/gitee-sync.yml
+++ b/.github/workflows/gitee-sync.yml
@ -1,7 +1,7 @@
 on:
  push:
    branches:
-      - main
+      - master
    tags:
      - "*"

@ -12,9 +12,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout source code
-        uses: actions/checkout@v3
-      - name: Mirror Github to Gitee
-        uses: Yikun/hub-mirror-action@v1.2
+        uses: actions/checkout@v4
+      - name: Mirror GitHub to Gitee
+        uses: Yikun/hub-mirror-action@v1.3
        with:
          src: github/gogf
          dst: gitee/johng
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@ -36,19 +36,19 @@ jobs:
  golangci:
    strategy:
      matrix:
-        go-version: [ '1.18','1.19','1.20' ]
+        go-version: [ '1.18','1.19','1.20','1.21.4','1.22' ]
    name: golangci-lint
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Setup Golang ${{ matrix.go-version }}
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
        with:
          go-version: ${{ matrix.go-version }}
      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
        with:
          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.52.2
+          version: v1.56.2
          args: --timeout 3m0s
--- a/.github/workflows/issue-remove-inactive.yml
+++ b/.github/workflows/issue-remove-inactive.yml
@ -21,9 +21,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: remove inactive
-        if: github.event.issue.state == 'open' && github.actor == github.event.issue.user.login
+        if: github.event.issue.state == 'open'
        uses: actions-cool/issues-helper@v3
        with:
          actions: 'remove-labels'
          issue-number: ${{ github.event.issue.number }}
-          labels: 'inactive'
+          labels: 'inactive'
--- a/.github/workflows/nacos/docker-compose.yml
+++ b/.github/workflows/nacos/docker-compose.yml
@ -15,22 +15,6 @@ services:
      interval: 5s
      timeout: 3s
      retries: 10
-    depends_on:
-      mysql:
-        condition: service_healthy
-
-  mysql:
-    build:
-      context: .
-      dockerfile: ./image/mysql/Dockerfile
-    container_name: mysql
-    env_file:
-      - ./env/mysql.env
-    healthcheck:
-      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      interval: 5s
-      timeout: 3s
-      retries: 10

  initializer:
    image: loads/curl:latest
--- a/.github/workflows/nacos/env/mysql.env
+++ b/.github/workflows/nacos/env/mysql.env
@ -1,4 +0,0 @@
-MYSQL_ROOT_PASSWORD=root
-MYSQL_DATABASE=nacos_devtest
-MYSQL_USER=nacos
-MYSQL_PASSWORD=nacos
--- a/.github/workflows/nacos/env/nacos.env
+++ b/.github/workflows/nacos/env/nacos.env
@ -1,9 +1,2 @@
 PREFER_HOST_MODE=hostname
 MODE=standalone
-SPRING_DATASOURCE_PLATFORM=mysql
-MYSQL_SERVICE_HOST=mysql
-MYSQL_SERVICE_DB_NAME=nacos_devtest
-MYSQL_SERVICE_PORT=3306
-MYSQL_SERVICE_USER=nacos
-MYSQL_SERVICE_PASSWORD=nacos
-MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true
--- a/.github/workflows/nacos/image/mysql/Dockerfile
+++ b/.github/workflows/nacos/image/mysql/Dockerfile
@ -1,5 +0,0 @@
-FROM loads/mysql:5.7
-ADD https://raw.githubusercontent.com/alibaba/nacos/develop/distribution/conf/mysql-schema.sql /docker-entrypoint-initdb.d/nacos-mysql.sql
-RUN chown -R mysql:mysql /docker-entrypoint-initdb.d/nacos-mysql.sql
-EXPOSE 3306
-CMD ["mysqld", "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci"]
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,4 +1,4 @@
-name: GoFrame CLI Build Release
+name: GoFrame Release

 on:
  push:
@ -16,12 +16,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Github Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      
      - name: Set Up Golang Environment
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
        with:
-          go-version: 1.20.6
+          go-version: 1.20.8
      
      - name: Build CLI Binary
        run: |
@ -34,7 +34,7 @@ jobs:
      - name: Build CLI Binary For All Platform
        run: |
          cd cmd/gf
-          gf build main.go -n gf -a all -s all
+          gf build main.go -n gf -a all -s all -p temp

      - name: Move Files Before Release
        run: |
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@ -17,14 +17,23 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Github Code
-        uses: actions/checkout@v3
+        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
              git tag $tag
              git push origin $tag
          done
+          
+          # auto create tag for cli tool
+          for file in `find cmd -name go.mod`; do
+              tag=$(dirname $file)/$GITHUB_REF_NAME
+              git tag $tag
+              git push origin $tag
+          done
--- a/.gitignore
+++ b/.gitignore
@ -13,6 +13,12 @@ bin/
 .test/
 cmd/gf/main
 cmd/gf/gf
+temp/
 go.work
 go.work.sum
-temp/
+!cmd/gf/go.work
+
+# Ignore for docs
+node_modules
+.docusaurus
+output
--- a/.golangci.yml
+++ b/.golangci.yml
@ -262,7 +262,7 @@ linters-settings:
    # Select the Go version to target.
    # Default: "1.13"
    # Deprecated: use the global `run.go` instead.
-    go: "1.15"
+    go: "1.20"
    # SAxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
    # Default: ["*"]
    checks: [ "all","-SA1019","-SA4015","-SA1029","-SA1016","-SA9003","-SA4006","-SA6003" ]
--- a/.set_version.sh
+++ b/.set_version.sh
@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 if [ $# -ne 2 ]; then
    echo "Parameter exception, please execute in the format of $0 [directory] [version number]"
    echo "PS：$0 ./ v2.4.0"
@ -16,10 +15,17 @@ if [[ "$2" != v* ]]; then
    exit 1
 fi

-workdir=$1
+workdir=.
 newVersion=$2
 echo "Prepare to replace the GF library version numbers in all go.mod files in the ${workdir} directory with ${newVersion}"

+# check find command support or not
+output=$(find "${workdir}" -name go.mod 2>&1)
+if [[ $? -ne 0 ]]; then
+    echo "Error: please use bash or zsh to run!"
+    exit 1
+fi
+
 if [[ true ]]; then
    echo "package gf" > version.go
    echo "" >> version.go
@ -39,11 +45,34 @@ for file in `find ${workdir} -name go.mod`; do
    echo ""
    echo "processing dir: $goModPath"
    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
+    # else
+    #     cd -
+    #     continue 1
+    fi
    go mod tidy
    # Upgrading only GF 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 
    go mod tidy
+    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
+        mv go.work.version.bak go.work
+    fi
    cd -
 done

--- a/README.MD
+++ b/README.MD
@ -4,11 +4,20 @@
 <img src="https://goframe.org/statics/image/logo2.png?v=1" width="300"/>

 [![Go Reference](https://pkg.go.dev/badge/github.com/gogf/gf/v2.svg)](https://pkg.go.dev/github.com/gogf/gf/v2)
-[![GoFrame CI](https://github.com/gogf/gf/actions/workflows/gf.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/gf.yml)
+[![GoFrame CI](https://github.com/gogf/gf/actions/workflows/ci-main.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/ci-main.yml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/gogf/gf/v2)](https://goreportcard.com/report/github.com/gogf/gf/v2)
 [![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf)
-[![Production Ready](https://img.shields.io/badge/production-ready-blue.svg)](https://github.com/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>

 `GoFrame` is a modular, powerful, high-performance and enterprise-class application development framework of Golang.
@ -41,7 +50,7 @@ go get -u -v github.com/gogf/gf/v2
 ## cli tool

 ```bash
-go install github.com/gogf/gf/cmd/gf/v2
+go install github.com/gogf/gf/cmd/gf/v2@latest
 ```

 # Limitation
@ -50,15 +59,11 @@ go install github.com/gogf/gf/cmd/gf/v2
 golang version >= 1.18
 ```

-# Architecture
-
-<div align=center>
-<img src="https://goframe.org/download/attachments/1114119/arch.png"/>
-</div>
-
 # Documentation

 - Chinese Official Site(中文官网): [https://goframe.org](https://goframe.org/display/gf)
+- Chinese Pages Document(中文镜像文档): [https://pages.goframe.org](https://pages.goframe.org)
+- Chinese Offline Document(中文离线文档): [https://github.com/gogf/goframe.org-pdf](https://github.com/gogf/goframe.org-pdf)
 - GoDoc API: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2)

 # License
--- a/cmd/gf/README.MD
+++ b/cmd/gf/README.MD
@ -21,22 +21,24 @@ You can also install `gf` tool using pre-built binaries: <https://github.com/gog

 3. Database support

-   | DB | support | remarks |
-   | :------: | :------: | :------: |
-   | mysql | yes | - |
-   | mariadb | yes | - |
-   | tidb | yes | - |
-   | mssql | yes | - |
-   | oracle | yes | - |
-   | pgsql | yes | - |
-   | sqlite | yes | - |
-   | clickhouse | no | manually make some changes to the [source codes](./internal/cmd/cmd_gen_dao.go) and do the building. |
-   | dm | no | manually make some changes 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
-git clone https://github.com/gogf/gf && cd gf/cmd/gf && go install
+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)
 ```

 ## 2. Commands
@ -47,22 +49,24 @@ USAGE
    gf COMMAND [OPTION]

 COMMAND
-    env        show current Golang environment variables
-    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
+   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.
--- a/cmd/gf/gfcmd/gfcmd.go
+++ b/cmd/gf/gfcmd/gfcmd.go
@ -7,20 +7,21 @@
 package gfcmd

 import (
-	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
+	"context"
+	"runtime"
+
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
-
-	"context"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
+	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 const (
@ -99,6 +100,9 @@ func GetCommand(ctx context.Context) (*Command, error) {

 // zsh alias "git fetch" conflicts checks.
 func handleZshAlias() {
+	if runtime.GOOS == "windows" {
+		return
+	}
 	if home, err := gfile.Home(); err == nil {
 		zshPath := gfile.Join(home, ".zshrc")
 		if gfile.Exists(zshPath) {
--- a/cmd/gf/go.mod
+++ b/cmd/gf/go.mod
@ -3,14 +3,14 @@ module github.com/gogf/gf/cmd/gf/v2
 go 1.18

 require (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.5.3
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.5.3
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.3
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.5.3
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.5.3
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.5.3
-	github.com/gogf/gf/v2 v2.5.3
-	github.com/minio/selfupdate v0.6.0
+	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.6.4
+	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.6.4
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.4
+	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.6.4
+	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.6.4
+	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.6.4
+	github.com/gogf/gf/v2 v2.6.4
+	github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
 	github.com/olekukonko/tablewriter v0.0.5
 	golang.org/x/mod v0.9.0
 	golang.org/x/tools v0.7.0
@ -24,7 +24,7 @@ require (
 	github.com/denisenkom/go-mssqldb v0.12.3 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.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.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@ -37,7 +37,7 @@ require (
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/paulmach/orb v0.7.1 // indirect
 	github.com/pierrec/lz4/v4 v4.1.14 // indirect
@ -48,23 +48,13 @@ require (
 	go.opentelemetry.io/otel v1.14.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.14.0 // indirect
 	go.opentelemetry.io/otel/trace v1.14.0 // indirect
-	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/libc v1.22.5 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
 	modernc.org/memory v1.5.0 // indirect
 	modernc.org/sqlite v1.23.1 // indirect
 )
-
-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/v2 => ../../
-)
--- a/cmd/gf/go.sum
+++ b/cmd/gf/go.sum
@ -23,8 +23,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
 github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+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=
@ -38,6 +38,8 @@ 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/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=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
@ -67,14 +69,12 @@ github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPK
 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.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+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.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/minio/selfupdate v0.6.0 h1:i76PgT0K5xO9+hjzKcacQtO7+MjJ4JKA8Ak8XQ9DDwU=
-github.com/minio/selfupdate v0.6.0/go.mod h1:bO02GTIPCMQFTEvE5h4DjYB58bCoZ35XLeBf0buTDdM=
 github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615/go.mod h1:Ad7oeElCZqA1Ufj0U9/liOF4BtVepxRcTvr2ey7zTvM=
 github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
@ -126,10 +126,9 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 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.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
@ -140,8 +139,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
-golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 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=
@ -159,17 +158,16 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 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=
--- a/cmd/gf/go.work
+++ b/cmd/gf/go.work
@ -0,0 +1,20 @@
+go 1.18
+
+use (
+	./
+)
+
+// =====================================================================================================
+// NOTE:
+// Please update associated commands in ../../.set_version.sh if any of the follows replacements change.
+// =====================================================================================================
+
+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/v2 => ../../
+)
--- a/cmd/gf/internal/cmd/cmd.go
+++ b/cmd/gf/internal/cmd/cmd.go
@ -55,6 +55,7 @@ func (c cGF) Index(ctx context.Context, in cGFInput) (out *cGFOutput, err error)
 		_, err = Version.Index(ctx, cVersionInput{})
 		return
 	}
+
 	answer := "n"
 	// No argument or option, do installation checks.
 	if data, isInstalled := service.Install.IsInstalled(); !isInstalled {
@ -71,6 +72,7 @@ func (c cGF) Index(ctx context.Context, in cGFInput) (out *cGFOutput, err error)
 		gcmd.Scan("press `Enter` to exit...")
 		return
 	}
+
 	// Print help content.
 	gcmd.CommandFromCtx(ctx).Print()
 	return
--- a/cmd/gf/internal/cmd/cmd_build.go
+++ b/cmd/gf/internal/cmd/cmd_build.go
@ -44,8 +44,9 @@ type cBuild struct {
 }

 const (
-	cBuildBrief = `cross-building go project for lots of platforms`
-	cBuildEg    = `
+	cBuildDefaultFile = "main.go"
+	cBuildBrief       = `cross-building go project for lots of platforms`
+	cBuildEg          = `
 gf build main.go
 gf build main.go --ps public,template
 gf build main.go --cgo
@ -123,7 +124,7 @@ type cBuildInput struct {
 	Arch          string `short:"a"  name:"arch"    brief:"output binary architecture, multiple arch separated with ','"`
 	System        string `short:"s"  name:"system"  brief:"output binary system, multiple os separated with ','"`
 	Output        string `short:"o"  name:"output"  brief:"output binary path, used when building single binary file"`
-	Path          string `short:"p"  name:"path"    brief:"output binary directory path, default is './temp'" d:"./temp"`
+	Path          string `short:"p"  name:"path"    brief:"output binary directory path, default is '.'" d:"."`
 	Extra         string `short:"e"  name:"extra"   brief:"extra custom \"go build\" options"`
 	Mod           string `short:"m"  name:"mod"     brief:"like \"-mod\" option of \"go build\", use \"-m none\" to disable go module"`
 	Cgo           bool   `short:"c"  name:"cgo"     brief:"enable or disable cgo feature, it's disabled in default" orphan:"true"`
@ -152,14 +153,15 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e

 	var (
 		parser = gcmd.ParserFromCtx(ctx)
-		file   = parser.GetArg(2).String()
+		file   = in.File
 	)
-	if len(file) < 1 {
+	if file == "" {
+		file = parser.GetArg(2).String()
 		// Check and use the main.go file.
-		if gfile.Exists("main.go") {
-			file = "main.go"
+		if gfile.Exists(cBuildDefaultFile) {
+			file = cBuildDefaultFile
 		} else {
-			mlog.Fatal("build file path cannot be empty")
+			mlog.Fatal("build file path is empty or main.go not found in current working directory")
 		}
 	}
 	if in.Name == "" {
@ -239,13 +241,7 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e
 	} else {
 		genv.MustSet("CGO_ENABLED", "0")
 	}
-	var (
-		cmd = ""
-		ext = ""
-	)
 	for system, item := range platformMap {
-		cmd = ""
-		ext = ""
 		if len(customSystems) > 0 && customSystems[0] != "all" && !gstr.InArray(customSystems, system) {
 			continue
 		}
@ -254,44 +250,25 @@ func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, e
 				continue
 			}
 			if len(customSystems) == 0 && len(customArches) == 0 {
-				if runtime.GOOS == "windows" {
-					ext = ".exe"
-				}
 				// Single binary building, output the binary to current working folder.
-				output := ""
-				if len(in.Output) > 0 {
-					output = "-o " + in.Output + ext
-				} else {
-					output = "-o " + in.Name + ext
-				}
-				cmd = fmt.Sprintf(`go build %s -ldflags "%s" %s %s`, output, ldFlags, in.Extra, file)
-			} else {
-				// Cross-building, output the compiled binary to specified path.
-				if system == "windows" {
-					ext = ".exe"
-				}
-				genv.MustSet("GOOS", system)
-				genv.MustSet("GOARCH", arch)
-				cmd = fmt.Sprintf(
-					`go build -o %s/%s/%s%s -ldflags "%s" %s%s`,
-					in.Path, system+"_"+arch, in.Name, ext, ldFlags, in.Extra, file,
+				// For example:
+				// `gf build`
+				// `gf build -o main.exe`
+				c.doBinaryBuild(
+					ctx, file,
+					in.Output, in.Path,
+					runtime.GOOS, runtime.GOARCH, in.Name, ldFlags, in.Extra,
+					in.ExitWhenError,
+					true,
 				)
-			}
-			mlog.Debug(cmd)
-			// It's not necessary printing the complete command string.
-			cmdShow, _ := gregex.ReplaceString(`\s+(-ldflags ".+?")\s+`, " ", cmd)
-			mlog.Print(cmdShow)
-			if result, err := gproc.ShellExec(ctx, cmd); err != nil {
-				mlog.Printf(
-					"failed to build, os:%s, arch:%s, error:\n%s\n\n%s\n",
-					system, arch, gstr.Trim(result),
-					`you may use command option "--debug" to enable debug info and check the details`,
-				)
-				if in.ExitWhenError {
-					os.Exit(1)
-				}
 			} else {
-				mlog.Debug(gstr.Trim(result))
+				c.doBinaryBuild(
+					ctx, file,
+					in.Output, in.Path,
+					system, arch, in.Name, ldFlags, in.Extra,
+					in.ExitWhenError,
+					false,
+				)
 			}
 			// single binary building.
 			if len(customSystems) == 0 && len(customArches) == 0 {
@ -305,6 +282,68 @@ buildDone:
 	return
 }

+func (c cBuild) doBinaryBuild(
+	ctx context.Context,
+	filePath string,
+	outputPath, dirPath string,
+	system, arch, name, ldFlags, extra string,
+	exitWhenError bool,
+	singleBuild bool,
+) {
+	var (
+		cmd string
+		ext string
+	)
+	// Cross-building, output the compiled binary to specified path.
+	if system == "windows" {
+		ext = ".exe"
+	}
+	genv.MustSet("GOOS", system)
+	genv.MustSet("GOARCH", arch)
+
+	if outputPath != "" {
+		outputPath = "-o " + outputPath
+	} else {
+		if dirPath == "" {
+			dirPath = "."
+		} else {
+			dirPath = gstr.TrimRight(dirPath, "/")
+		}
+		if singleBuild {
+			outputPath = fmt.Sprintf(
+				"-o %s/%s%s",
+				dirPath, name, ext,
+			)
+		} else {
+			outputPath = fmt.Sprintf(
+				"-o %s/%s/%s%s",
+				dirPath, system+"_"+arch, name, ext,
+			)
+		}
+	}
+	cmd = fmt.Sprintf(
+		`go build %s -ldflags "%s" %s%s`,
+		outputPath, ldFlags, extra, filePath,
+	)
+	mlog.Debug(fmt.Sprintf("build for GOOS=%s GOARCH=%s", system, arch))
+	mlog.Debug(cmd)
+	// It's not necessary printing the complete command string, filtering ldFlags.
+	cmdShow, _ := gregex.ReplaceString(`\s+(-ldflags ".+?")\s+`, " ", cmd)
+	mlog.Print(cmdShow)
+	if result, err := gproc.ShellExec(ctx, cmd); err != nil {
+		mlog.Printf(
+			"failed to build, os:%s, arch:%s, error:\n%s\n\n%s\n",
+			system, arch, gstr.Trim(result),
+			`you may use command option "--debug" to enable debug info and check the details`,
+		)
+		if exitWhenError {
+			os.Exit(1)
+		}
+	} else {
+		mlog.Debug(gstr.Trim(result))
+	}
+}
+
 // getBuildInVarStr retrieves and returns the custom build-in variables in configuration
 // file as json.
 func (c cBuild) getBuildInVarStr(ctx context.Context, in cBuildInput) string {
--- a/cmd/gf/internal/cmd/cmd_fix_test.go
+++ b/cmd/gf/internal/cmd/cmd_fix_test.go
@ -1,20 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func Test_Fix_doFixV25Content(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			content = gtest.DataContent(`fix25_content.go.txt`)
-			f       = cFix{}
-		)
-		newContent, err := f.doFixV25Content(content)
-		t.AssertNil(err)
-		fmt.Println(newContent)
-	})
-}
--- a/cmd/gf/internal/cmd/cmd_run.go
+++ b/cmd/gf/internal/cmd/cmd_run.go
@ -1,4 +1,4 @@
-// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
+// 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,
@ -9,6 +9,7 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"path/filepath"
 	"runtime"
 	"strings"

@ -33,10 +34,11 @@ type cRun struct {
 }

 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.
+	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 (
@ -46,15 +48,17 @@ const (
 gf run main.go
 gf run main.go --args "server -p 8080"
 gf run main.go -mod=vendor
+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 "manifest/output" in default`
-	cRunExtraBrief = `the same options as "go run"/"go build" except some options as follows defined`
-	cRunArgsBrief  = `custom arguments for your process`
+	cRunFileBrief       = `building file path.`
+	cRunPathBrief       = `output directory path for built binary file. it's "manifest/output" 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 (
@ -63,24 +67,26 @@ var (

 func init() {
 	gtag.Sets(g.MapStrStr{
-		`cRunUsage`:      cRunUsage,
-		`cRunBrief`:      cRunBrief,
-		`cRunEg`:         cRunEg,
-		`cRunDc`:         cRunDc,
-		`cRunFileBrief`:  cRunFileBrief,
-		`cRunPathBrief`:  cRunPathBrief,
-		`cRunExtraBrief`: cRunExtraBrief,
-		`cRunArgsBrief`:  cRunArgsBrief,
+		`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"`
-		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}"`
+		g.Meta     `name:"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{}
 )
@ -91,31 +97,52 @@ 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`)
 	}

+	if len(in.WatchPaths) == 1 {
+		in.WatchPaths = strings.Split(in.WatchPaths[0], ",")
+		mlog.Printf("watchPaths: %v", in.WatchPaths)
+	}
+
 	app := &cRunApp{
-		File:    in.File,
-		Path:    in.Path,
-		Options: in.Extra,
-		Args:    in.Args,
+		File:       in.File,
+		Path:       in.Path,
+		Options:    in.Extra,
+		Args:       in.Args,
+		WatchPaths: in.WatchPaths,
 	}
 	dirty := gtype.NewBool()
-	_, err = gfsnotify.Add(gfile.RealPath("."), func(event *gfsnotify.Event) {
+
+	callbackFunc := func(event *gfsnotify.Event) {
 		if gfile.ExtName(event.Path) != "go" {
 			return
 		}
+
 		// Variable `dirty` is used for running the changes only one in one second.
 		if !dirty.Cas(false, true) {
 			return
 		}
+
 		// With some delay in case of multiple code changes in very short interval.
 		gtimer.SetTimeout(ctx, 1500*gtime.MS, func(ctx context.Context) {
 			defer dirty.Set(false)
-			mlog.Printf(`go file changes: %s`, event.String())
+			mlog.Printf(`watched file changes: %s`, event.String())
 			app.Run(ctx)
 		})
-	})
-	if err != nil {
-		mlog.Fatal(err)
 	}
+
+	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)
+		}
+	}
+
 	go app.Run(ctx)
 	select {}
 }
@ -152,7 +179,6 @@ func (app *cRunApp) Run(ctx context.Context) {
 	if process != nil {
 		if err := process.Kill(); err != nil {
 			mlog.Debugf("kill process error: %s", err.Error())
-			//return
 		}
 	}
 	// Run the binary file.
@ -171,3 +197,22 @@ func (app *cRunApp) Run(ctx context.Context) {
 		mlog.Printf("build running pid: %d", pid)
 	}
 }
+
+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
+		}
+		matched, err := filepath.Match(absPath, eventPath)
+		if err != nil {
+			mlog.Printf("match watchPath '%s' error: %s", path, err.Error())
+			continue
+		}
+		if matched {
+			return true
+		}
+	}
+	return false
+}
--- a/cmd/gf/internal/cmd/cmd_up.go
+++ b/cmd/gf/internal/cmd/cmd_up.go
@ -11,7 +11,7 @@ import (
 	"fmt"
 	"runtime"

-	"github.com/minio/selfupdate"
+	"github.com/gogf/selfupdate"

 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
--- a/cmd/gf/internal/cmd/cmd_version.go
+++ b/cmd/gf/internal/cmd/cmd_version.go
@ -7,14 +7,19 @@
 package cmd

 import (
+	"bytes"
 	"context"
 	"fmt"
+	"runtime"
+	"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"

@ -25,6 +30,10 @@ var (
 	Version = cVersion{}
 )

+const (
+	defaultIndent = "{{indent}}"
+)
+
 type cVersion struct {
 	g.Meta `name:"version" brief:"show version information of current binary"`
 }
@ -36,34 +45,90 @@ type cVersionInput struct {
 type cVersionOutput struct{}

 func (c cVersion) Index(ctx context.Context, in cVersionInput) (*cVersionOutput, error) {
-	info := gbuild.Info()
-	if info.Git == "" {
-		info.Git = "none"
-	}
-	mlog.Printf(`GoFrame CLI Tool %s, https://goframe.org`, gf.VERSION)
-	gfVersion, err := c.getGFVersionOfCurrentProject()
-	if err != nil {
-		gfVersion = err.Error()
+	detailBuffer := &detailBuffer{}
+	detailBuffer.WriteString(fmt.Sprintf("%s", gf.VERSION))
+
+	detailBuffer.appendLine(0, "Welcome to GoFrame!")
+
+	detailBuffer.appendLine(0, "Env Detail:")
+	goVersion, ok := getGoVersion()
+	if ok {
+		detailBuffer.appendLine(1, fmt.Sprintf("Go Version: %s", goVersion))
+		detailBuffer.appendLine(1, fmt.Sprintf("GF Version(go.mod): %s", getGoFrameVersion(2)))
 	} else {
-		gfVersion = gfVersion + " in current go.mod"
-	}
-	mlog.Printf(`GoFrame Version: %s`, gfVersion)
-	mlog.Printf(`CLI Installed At: %s`, gfile.SelfPath())
-	if info.GoFrame == "" {
-		mlog.Print(`Current is a custom installed version, no installation information.`)
-		return nil, nil
+		v, err := c.getGFVersionOfCurrentProject()
+		if err == nil {
+			detailBuffer.appendLine(1, fmt.Sprintf("GF Version(go.mod): %s", v))
+		} else {
+			detailBuffer.appendLine(1, fmt.Sprintf("GF Version(go.mod): %s", err.Error()))
+		}
 	}

-	mlog.Print(gstr.Trim(fmt.Sprintf(`
-CLI Built Detail:
-  Go Version:  %s
-  GF Version:  %s
-  Git Commit:  %s
-  Build Time:  %s
-`, info.Golang, info.GoFrame, info.Git, info.Time)))
+	detailBuffer.appendLine(0, "CLI Detail:")
+	detailBuffer.appendLine(1, fmt.Sprintf("Installed At: %s", gfile.SelfPath()))
+	info := gbuild.Info()
+	if info.GoFrame == "" {
+		detailBuffer.appendLine(1, fmt.Sprintf("Built Go Version: %s", runtime.Version()))
+		detailBuffer.appendLine(1, fmt.Sprintf("Built GF Version: %s", gf.VERSION))
+	} else {
+		if info.Git == "" {
+			info.Git = "none"
+		}
+		detailBuffer.appendLine(1, fmt.Sprintf("Built Go Version: %s", info.Golang))
+		detailBuffer.appendLine(1, fmt.Sprintf("Built GF Version: %s", info.GoFrame))
+		detailBuffer.appendLine(1, fmt.Sprintf("Git Commit: %s", info.Git))
+		detailBuffer.appendLine(1, fmt.Sprintf("Built Time: %s", info.Time))
+	}
+
+	detailBuffer.appendLine(0, "Others Detail:")
+	detailBuffer.appendLine(1, "Docs: https://goframe.org")
+	detailBuffer.appendLine(1, fmt.Sprintf("Now : %s", time.Now().Format(time.RFC3339)))
+
+	mlog.Print(detailBuffer.replaceAllIndent("  "))
 	return nil, nil
 }

+// detailBuffer is a buffer for detail information.
+type detailBuffer struct {
+	bytes.Buffer
+}
+
+// appendLine appends a line to the buffer with given indent level.
+func (d *detailBuffer) appendLine(indentLevel int, line string) {
+	d.WriteString(fmt.Sprintf("\n%s%s", strings.Repeat(defaultIndent, indentLevel), line))
+}
+
+// replaceAllIndent replaces the tab with given indent string and prints the buffer content.
+func (d *detailBuffer) replaceAllIndent(indentStr string) string {
+	return strings.ReplaceAll(d.String(), defaultIndent, indentStr)
+}
+
+// getGoFrameVersion returns the goframe version of current project using.
+func getGoFrameVersion(indentLevel int) (gfVersion string) {
+	pkgInfo, err := gproc.ShellExec(context.Background(), `go list -f "{{if (not .Main)}}{{.Path}}@{{.Version}}{{end}}" -m all`)
+	if err != nil {
+		return "cannot find go.mod"
+	}
+	pkgList := gstr.Split(pkgInfo, "\n")
+	for _, v := range pkgList {
+		if strings.HasPrefix(v, "github.com/gogf/gf") {
+			gfVersion += fmt.Sprintf("\n%s%s", strings.Repeat(defaultIndent, indentLevel), v)
+		}
+	}
+	return
+}
+
+// getGoVersion returns the go version
+func getGoVersion() (goVersion string, ok bool) {
+	goVersion, err := gproc.ShellExec(context.Background(), "go version")
+	if err != nil {
+		return "", false
+	}
+	goVersion = gstr.TrimLeftStr(goVersion, "go version ")
+	goVersion = gstr.TrimRightStr(goVersion, "\n")
+	return goVersion, true
+}
+
 // getGFVersionOfCurrentProject checks and returns the GoFrame version current project using.
 func (c cVersion) getGFVersionOfCurrentProject() (string, error) {
 	goModPath := gfile.Join(gfile.Pwd(), "go.mod")
--- a/cmd/gf/internal/cmd/cmd_z_init_test.go
+++ b/cmd/gf/internal/cmd/cmd_z_init_test.go
@ -0,0 +1,38 @@
+// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package cmd
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/test/gtest"
+)
+
+var (
+	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{
+		Link: link,
+	})
+	if err != nil {
+		panic(err)
+	}
+}
+
+func dropTableWithDb(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)
+	}
+}
--- a/cmd/gf/internal/cmd/cmd_z_unit_build_test.go
+++ b/cmd/gf/internal/cmd/cmd_z_unit_build_test.go
@ -0,0 +1,151 @@
+// 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/os/gfile"
+	"github.com/gogf/gf/v2/os/gproc"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/text/gstr"
+)
+
+func Test_Build_Single(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			buildPath  = gtest.DataPath(`build`, `single`)
+			pwd        = gfile.Pwd()
+			binaryName = `t.test`
+			binaryPath = gtest.DataPath(`build`, `single`, binaryName)
+			f          = cBuild{}
+		)
+		defer gfile.Chdir(pwd)
+		defer gfile.Remove(binaryPath)
+		err := gfile.Chdir(buildPath)
+		t.AssertNil(err)
+
+		t.Assert(gfile.Exists(binaryPath), false)
+		_, err = f.Index(ctx, cBuildInput{
+			File: cBuildDefaultFile,
+			Name: binaryName,
+		})
+		t.AssertNil(err)
+		t.Assert(gfile.Exists(binaryPath), true)
+	})
+}
+
+func Test_Build_Single_Output(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			buildPath     = gtest.DataPath(`build`, `single`)
+			pwd           = gfile.Pwd()
+			binaryName    = `tt`
+			binaryDirPath = gtest.DataPath(`build`, `single`, `tt`)
+			binaryPath    = gtest.DataPath(`build`, `single`, `tt`, binaryName)
+			f             = cBuild{}
+		)
+		defer gfile.Chdir(pwd)
+		defer gfile.Remove(binaryDirPath)
+		err := gfile.Chdir(buildPath)
+		t.AssertNil(err)
+
+		t.Assert(gfile.Exists(binaryPath), false)
+		_, err = f.Index(ctx, cBuildInput{
+			Output: "./tt/tt",
+		})
+		t.AssertNil(err)
+		t.Assert(gfile.Exists(binaryPath), true)
+	})
+}
+
+func Test_Build_Single_Path(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			buildPath     = gtest.DataPath(`build`, `single`)
+			pwd           = gfile.Pwd()
+			dirName       = "ttt"
+			binaryName    = `main`
+			binaryDirPath = gtest.DataPath(`build`, `single`, dirName)
+			binaryPath    = gtest.DataPath(`build`, `single`, dirName, binaryName)
+			f             = cBuild{}
+		)
+		defer gfile.Chdir(pwd)
+		defer gfile.Remove(binaryDirPath)
+		err := gfile.Chdir(buildPath)
+		t.AssertNil(err)
+
+		t.Assert(gfile.Exists(binaryPath), false)
+		_, err = f.Index(ctx, cBuildInput{
+			Path: "ttt",
+		})
+		t.AssertNil(err)
+		t.Assert(gfile.Exists(binaryPath), true)
+	})
+}
+
+func Test_Build_Single_VarMap(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			buildPath  = gtest.DataPath(`build`, `varmap`)
+			pwd        = gfile.Pwd()
+			binaryName = `main`
+			binaryPath = gtest.DataPath(`build`, `varmap`, binaryName)
+			f          = cBuild{}
+		)
+		defer gfile.Chdir(pwd)
+		defer gfile.Remove(binaryPath)
+		err := gfile.Chdir(buildPath)
+		t.AssertNil(err)
+
+		t.Assert(gfile.Exists(binaryPath), false)
+		_, err = f.Index(ctx, cBuildInput{
+			VarMap: map[string]interface{}{
+				"a": "1",
+				"b": "2",
+			},
+		})
+		t.AssertNil(err)
+		t.Assert(gfile.Exists(binaryPath), true)
+
+		result, err := gproc.ShellExec(ctx, binaryPath)
+		t.AssertNil(err)
+		t.Assert(gstr.Contains(result, `a: 1`), true)
+		t.Assert(gstr.Contains(result, `b: 2`), true)
+	})
+}
+
+func Test_Build_Multiple(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			buildPath         = gtest.DataPath(`build`, `multiple`)
+			pwd               = gfile.Pwd()
+			binaryDirPath     = gtest.DataPath(`build`, `multiple`, `temp`)
+			binaryPathLinux   = gtest.DataPath(`build`, `multiple`, `temp`, `v1.1`, `linux_amd64`, `ttt`)
+			binaryPathWindows = gtest.DataPath(`build`, `multiple`, `temp`, `v1.1`, `windows_amd64`, `ttt.exe`)
+			f                 = cBuild{}
+		)
+		defer gfile.Chdir(pwd)
+		defer gfile.Remove(binaryDirPath)
+		err := gfile.Chdir(buildPath)
+		t.AssertNil(err)
+
+		t.Assert(gfile.Exists(binaryPathLinux), false)
+		t.Assert(gfile.Exists(binaryPathWindows), false)
+		_, err = f.Index(ctx, cBuildInput{
+			File:    "multiple.go",
+			Name:    "ttt",
+			Version: "v1.1",
+			Arch:    "amd64",
+			System:  "linux, windows",
+			Path:    "temp",
+		})
+		t.AssertNil(err)
+		t.Assert(gfile.Exists(binaryPathLinux), true)
+		t.Assert(gfile.Exists(binaryPathWindows), true)
+	})
+}
--- a/cmd/gf/internal/cmd/cmd_z_unit_fix_test.go
+++ b/cmd/gf/internal/cmd/cmd_z_unit_fix_test.go
@ -0,0 +1,24 @@
+// 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"
+)
+
+func Test_Fix_doFixV25Content(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			content = gtest.DataContent(`fix`, `fix25_content.go`)
+			f       = cFix{}
+		)
+		_, err := f.doFixV25Content(content)
+		t.AssertNil(err)
+	})
+}
--- a/cmd/gf/internal/cmd/cmd_z_unit_gen_ctrl_test.go
+++ b/cmd/gf/internal/cmd/cmd_z_unit_gen_ctrl_test.go
@ -0,0 +1,86 @@
+// 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/cmd/gf/v2/internal/cmd/genctrl"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/guid"
+	"github.com/gogf/gf/v2/util/gutil"
+)
+
+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", "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.Remove(path)
+
+		_, err = genctrl.CGenCtrl{}.Ctrl(ctx, in)
+		if err != nil {
+			panic(err)
+		}
+
+		// apiInterface file
+		var (
+			genApi       = apiFolder + filepath.FromSlash("/article/article.go")
+			genApiExpect = apiFolder + filepath.FromSlash("/article/article_expect.go")
+		)
+		defer gfile.Remove(genApi)
+		t.Assert(gfile.GetContents(genApi), gfile.GetContents(genApiExpect))
+
+		// files
+		files, err := gfile.ScanDir(path, "*.go", true)
+		t.AssertNil(err)
+		t.Assert(files, []string{
+			path + filepath.FromSlash("/article/article.go"),
+			path + filepath.FromSlash("/article/article_new.go"),
+			path + filepath.FromSlash("/article/article_v1_create.go"),
+			path + filepath.FromSlash("/article/article_v1_get_list.go"),
+			path + filepath.FromSlash("/article/article_v1_get_one.go"),
+			path + filepath.FromSlash("/article/article_v1_update.go"),
+			path + filepath.FromSlash("/article/article_v2_create.go"),
+			path + filepath.FromSlash("/article/article_v2_update.go"),
+		})
+
+		// content
+		testPath := gtest.DataPath("genctrl", "controller")
+		expectFiles := []string{
+			testPath + filepath.FromSlash("/article/article.go"),
+			testPath + filepath.FromSlash("/article/article_new.go"),
+			testPath + filepath.FromSlash("/article/article_v1_create.go"),
+			testPath + filepath.FromSlash("/article/article_v1_get_list.go"),
+			testPath + filepath.FromSlash("/article/article_v1_get_one.go"),
+			testPath + filepath.FromSlash("/article/article_v1_update.go"),
+			testPath + filepath.FromSlash("/article/article_v2_create.go"),
+			testPath + filepath.FromSlash("/article/article_v2_update.go"),
+		}
+		for i := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}
--- a/cmd/gf/internal/cmd/cmd_z_unit_gen_dao_test.go
+++ b/cmd/gf/internal/cmd/cmd_z_unit_gen_dao_test.go
@ -0,0 +1,470 @@
+// 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 (
+	"fmt"
+	"path/filepath"
+	"testing"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/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"
+)
+
+func Test_Gen_Dao_Default(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err        error
+			db         = testDB
+			table      = "table_user"
+			sqlContent = fmt.Sprintf(
+				gtest.DataContent(`gendao`, `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())
+			group = "test"
+			in    = gendao.CGenDaoInput{
+				Path:               path,
+				Link:               link,
+				Tables:             "",
+				TablesEx:           "",
+				Group:              group,
+				Prefix:             "",
+				RemovePrefix:       "",
+				JsonCase:           "SnakeScreaming",
+				ImportPrefix:       "",
+				DaoPath:            "",
+				DoPath:             "",
+				EntityPath:         "",
+				TplDaoIndexPath:    "",
+				TplDaoInternalPath: "",
+				TplDaoDoPath:       "",
+				TplDaoEntityPath:   "",
+				StdTime:            false,
+				WithTime:           false,
+				GJsonSupport:       false,
+				OverwriteDao:       false,
+				DescriptionTag:     false,
+				NoJsonTag:          false,
+				NoModelComment:     false,
+				Clear:              false,
+				TypeMapping:        nil,
+			}
+		)
+		err = gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+
+		// for go mod import path auto retrieve.
+		err = gfile.Copy(
+			gtest.DataPath("gendao", "go.mod.txt"),
+			gfile.Join(path, "go.mod"),
+		)
+		t.AssertNil(err)
+
+		_, err = gendao.CGenDao{}.Dao(ctx, in)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		// files
+		files, err := gfile.ScanDir(path, "*.go", true)
+		t.AssertNil(err)
+		t.Assert(files, []string{
+			filepath.FromSlash(path + "/dao/internal/table_user.go"),
+			filepath.FromSlash(path + "/dao/table_user.go"),
+			filepath.FromSlash(path + "/model/do/table_user.go"),
+			filepath.FromSlash(path + "/model/entity/table_user.go"),
+		})
+		// content
+		testPath := gtest.DataPath("gendao", "generated_user")
+		expectFiles := []string{
+			filepath.FromSlash(testPath + "/dao/internal/table_user.go"),
+			filepath.FromSlash(testPath + "/dao/table_user.go"),
+			filepath.FromSlash(testPath + "/model/do/table_user.go"),
+			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
+		}
+		for i, _ := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}
+
+func Test_Gen_Dao_TypeMapping(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err        error
+			db         = testDB
+			table      = "table_user"
+			sqlContent = fmt.Sprintf(
+				gtest.DataContent(`gendao`, `user.tpl.sql`),
+				table,
+			)
+		)
+		defer 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())
+			group = "test"
+			in    = gendao.CGenDaoInput{
+				Path:               path,
+				Link:               link,
+				Tables:             "",
+				TablesEx:           "",
+				Group:              group,
+				Prefix:             "",
+				RemovePrefix:       "",
+				JsonCase:           "",
+				ImportPrefix:       "",
+				DaoPath:            "",
+				DoPath:             "",
+				EntityPath:         "",
+				TplDaoIndexPath:    "",
+				TplDaoInternalPath: "",
+				TplDaoDoPath:       "",
+				TplDaoEntityPath:   "",
+				StdTime:            false,
+				WithTime:           false,
+				GJsonSupport:       false,
+				OverwriteDao:       false,
+				DescriptionTag:     false,
+				NoJsonTag:          false,
+				NoModelComment:     false,
+				Clear:              false,
+				TypeMapping: map[gendao.DBFieldTypeName]gendao.CustomAttributeType{
+					"int": {
+						Type:   "int64",
+						Import: "",
+					},
+					"decimal": {
+						Type:   "decimal.Decimal",
+						Import: "github.com/shopspring/decimal",
+					},
+				},
+			}
+		)
+		err = gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+
+		// for go mod import path auto retrieve.
+		err = gfile.Copy(
+			gtest.DataPath("gendao", "go.mod.txt"),
+			gfile.Join(path, "go.mod"),
+		)
+		t.AssertNil(err)
+
+		_, err = gendao.CGenDao{}.Dao(ctx, in)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		// files
+		files, err := gfile.ScanDir(path, "*.go", true)
+		t.AssertNil(err)
+		t.Assert(files, []string{
+			filepath.FromSlash(path + "/dao/internal/table_user.go"),
+			filepath.FromSlash(path + "/dao/table_user.go"),
+			filepath.FromSlash(path + "/model/do/table_user.go"),
+			filepath.FromSlash(path + "/model/entity/table_user.go"),
+		})
+		// content
+		testPath := gtest.DataPath("gendao", "generated_user_type_mapping")
+		expectFiles := []string{
+			filepath.FromSlash(testPath + "/dao/internal/table_user.go"),
+			filepath.FromSlash(testPath + "/dao/table_user.go"),
+			filepath.FromSlash(testPath + "/model/do/table_user.go"),
+			filepath.FromSlash(testPath + "/model/entity/table_user.go"),
+		}
+		for i, _ := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}
+
+func execSqlFile(db gdb.DB, filePath string, args ...any) error {
+	sqlContent := fmt.Sprintf(
+		gfile.GetContents(filePath),
+		args...,
+	)
+	array := gstr.SplitAndTrim(sqlContent, ";")
+	for _, v := range array {
+		if _, err := db.Exec(ctx, v); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func Test_Gen_Dao_Issue2572(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err          error
+			db           = testDB
+			table1       = "user1"
+			table2       = "user2"
+			issueDirPath = gtest.DataPath(`issue`, `2572`)
+		)
+		t.AssertNil(execSqlFile(db, gtest.DataPath(`issue`, `2572`, `sql1.sql`)))
+		t.AssertNil(execSqlFile(db, gtest.DataPath(`issue`, `2572`, `sql2.sql`)))
+		defer dropTableWithDb(db, table1)
+		defer dropTableWithDb(db, table2)
+
+		var (
+			path  = gfile.Temp(guid.S())
+			group = "test"
+			in    = gendao.CGenDaoInput{
+				Path:               path,
+				Link:               link,
+				Tables:             "",
+				TablesEx:           "",
+				Group:              group,
+				Prefix:             "",
+				RemovePrefix:       "",
+				JsonCase:           "SnakeScreaming",
+				ImportPrefix:       "",
+				DaoPath:            "",
+				DoPath:             "",
+				EntityPath:         "",
+				TplDaoIndexPath:    "",
+				TplDaoInternalPath: "",
+				TplDaoDoPath:       "",
+				TplDaoEntityPath:   "",
+				StdTime:            false,
+				WithTime:           false,
+				GJsonSupport:       false,
+				OverwriteDao:       false,
+				DescriptionTag:     false,
+				NoJsonTag:          false,
+				NoModelComment:     false,
+				Clear:              false,
+				TypeMapping:        nil,
+			}
+		)
+		err = gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Copy(issueDirPath, path)
+		t.AssertNil(err)
+
+		defer gfile.Remove(path)
+
+		pwd := gfile.Pwd()
+		err = gfile.Chdir(path)
+		t.AssertNil(err)
+
+		defer gfile.Chdir(pwd)
+
+		_, err = gendao.CGenDao{}.Dao(ctx, in)
+		t.AssertNil(err)
+
+		generatedFiles, err := gfile.ScanDir(path, "*.go", true)
+		t.AssertNil(err)
+		t.Assert(len(generatedFiles), 8)
+		for i, generatedFile := range generatedFiles {
+			generatedFiles[i] = gstr.TrimLeftStr(generatedFile, path)
+		}
+		t.Assert(gstr.InArray(generatedFiles, "/dao/internal/user_1.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/dao/internal/user_2.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/dao/user_1.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/dao/user_2.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/model/do/user_1.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/model/do/user_2.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/model/entity/user_1.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/model/entity/user_2.go"), true)
+	})
+}
+
+func Test_Gen_Dao_Issue2616(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err          error
+			db           = testDB
+			table1       = "user1"
+			table2       = "user2"
+			issueDirPath = gtest.DataPath(`issue`, `2616`)
+		)
+		t.AssertNil(execSqlFile(db, gtest.DataPath(`issue`, `2616`, `sql1.sql`)))
+		t.AssertNil(execSqlFile(db, gtest.DataPath(`issue`, `2616`, `sql2.sql`)))
+		defer dropTableWithDb(db, table1)
+		defer dropTableWithDb(db, table2)
+
+		var (
+			path  = gfile.Temp(guid.S())
+			group = "test"
+			in    = gendao.CGenDaoInput{
+				Path:               path,
+				Link:               link,
+				Tables:             "",
+				TablesEx:           "",
+				Group:              group,
+				Prefix:             "",
+				RemovePrefix:       "",
+				JsonCase:           "SnakeScreaming",
+				ImportPrefix:       "",
+				DaoPath:            "",
+				DoPath:             "",
+				EntityPath:         "",
+				TplDaoIndexPath:    "",
+				TplDaoInternalPath: "",
+				TplDaoDoPath:       "",
+				TplDaoEntityPath:   "",
+				StdTime:            false,
+				WithTime:           false,
+				GJsonSupport:       false,
+				OverwriteDao:       false,
+				DescriptionTag:     false,
+				NoJsonTag:          false,
+				NoModelComment:     false,
+				Clear:              false,
+				TypeMapping:        nil,
+			}
+		)
+		err = gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Copy(issueDirPath, path)
+		t.AssertNil(err)
+
+		defer gfile.Remove(path)
+
+		pwd := gfile.Pwd()
+		err = gfile.Chdir(path)
+		t.AssertNil(err)
+
+		defer gfile.Chdir(pwd)
+
+		_, err = gendao.CGenDao{}.Dao(ctx, in)
+		t.AssertNil(err)
+
+		generatedFiles, err := gfile.ScanDir(path, "*.go", true)
+		t.AssertNil(err)
+		t.Assert(len(generatedFiles), 8)
+		for i, generatedFile := range generatedFiles {
+			generatedFiles[i] = gstr.TrimLeftStr(generatedFile, path)
+		}
+		t.Assert(gstr.InArray(generatedFiles, "/dao/internal/user_1.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/dao/internal/user_2.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/dao/user_1.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/dao/user_2.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/model/do/user_1.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/model/do/user_2.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/model/entity/user_1.go"), true)
+		t.Assert(gstr.InArray(generatedFiles, "/model/entity/user_2.go"), true)
+
+		// Key string to check if overwrite the dao files.
+		// dao user1 is not be overwritten as configured in config.yaml.
+		// dao user2 is to  be overwritten as configured in config.yaml.
+		var (
+			keyStr          = `// I am not overwritten.`
+			daoUser1Content = gfile.GetContents(path + "/dao/user_1.go")
+			daoUser2Content = gfile.GetContents(path + "/dao/user_2.go")
+		)
+		t.Assert(gstr.Contains(daoUser1Content, keyStr), true)
+		t.Assert(gstr.Contains(daoUser2Content, keyStr), false)
+	})
+}
+
+// https://github.com/gogf/gf/issues/2746
+func Test_Gen_Dao_Issue2746(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err        error
+			mdb        gdb.DB
+			link2746   = "mariadb:root:12345678@tcp(127.0.0.1:3307)/test?loc=Local&parseTime=true"
+			table      = "issue2746"
+			sqlContent = fmt.Sprintf(
+				gtest.DataContent(`issue`, `2746`, `sql.sql`),
+				table,
+			)
+		)
+		mdb, err = gdb.New(gdb.ConfigNode{
+			Link: link2746,
+		})
+		t.AssertNil(err)
+
+		array := gstr.SplitAndTrim(sqlContent, ";")
+		for _, v := range array {
+			if _, err = mdb.Exec(ctx, v); err != nil {
+				t.AssertNil(err)
+			}
+		}
+		defer dropTableWithDb(mdb, table)
+
+		var (
+			path  = gfile.Temp(guid.S())
+			group = "test"
+			in    = gendao.CGenDaoInput{
+				Path:               path,
+				Link:               link2746,
+				Tables:             "",
+				TablesEx:           "",
+				Group:              group,
+				Prefix:             "",
+				RemovePrefix:       "",
+				JsonCase:           "SnakeScreaming",
+				ImportPrefix:       "",
+				DaoPath:            "",
+				DoPath:             "",
+				EntityPath:         "",
+				TplDaoIndexPath:    "",
+				TplDaoInternalPath: "",
+				TplDaoDoPath:       "",
+				TplDaoEntityPath:   "",
+				StdTime:            false,
+				WithTime:           false,
+				GJsonSupport:       true,
+				OverwriteDao:       false,
+				DescriptionTag:     false,
+				NoJsonTag:          false,
+				NoModelComment:     false,
+				Clear:              false,
+				TypeMapping:        nil,
+			}
+		)
+		err = gutil.FillStructWithDefault(&in)
+		t.AssertNil(err)
+
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+
+		_, err = gendao.CGenDao{}.Dao(ctx, in)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		var (
+			file          = filepath.FromSlash(path + "/model/entity/issue_2746.go")
+			expectContent = gtest.DataContent(`issue`, `2746`, `issue_2746.go`)
+		)
+		t.Assert(expectContent, gfile.GetContents(file))
+	})
+}
--- a/cmd/gf/internal/cmd/cmd_z_unit_gen_pbentity_test.go
+++ b/cmd/gf/internal/cmd/cmd_z_unit_gen_pbentity_test.go
@ -0,0 +1,70 @@
+// 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 (
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/gogf/gf/v2/os/gcmd"
+	"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_Gen_Pbentity_NameCase(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err        error
+			db         = testDB
+			table      = "table_user"
+			sqlContent = fmt.Sprintf(
+				gtest.DataContent(`genpbentity`, `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())
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		root, err := gcmd.NewFromObject(GF)
+		t.AssertNil(err)
+		err = root.AddObject(
+			Gen,
+		)
+		t.AssertNil(err)
+		os.Args = []string{"gf", "gen", "pbentity", "-l", link, "-p", path, "-package=unittest", "-nameCase=SnakeScreaming"}
+
+		err = root.RunWithError(ctx)
+		t.AssertNil(err)
+
+		files := []string{
+			filepath.FromSlash(path + "/table_user.proto"),
+		}
+
+		testPath := gtest.DataPath("genpbentity", "generated_user")
+		expectFiles := []string{
+			filepath.FromSlash(testPath + "/table_user.proto"),
+		}
+		// check files content
+		for i := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}
--- a/cmd/gf/internal/cmd/cmd_z_unit_gen_service_test.go
+++ b/cmd/gf/internal/cmd/cmd_z_unit_gen_service_test.go
@ -0,0 +1,73 @@
+// 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/cmd/gf/v2/internal/cmd/genservice"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/guid"
+	"github.com/gogf/gf/v2/util/gutil"
+)
+
+func Test_Gen_Service_Default(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			path      = gfile.Temp(guid.S())
+			dstFolder = path + filepath.FromSlash("/service")
+			apiFolder = gtest.DataPath("genservice", "logic")
+			in        = genservice.CGenServiceInput{
+				SrcFolder:       apiFolder,
+				DstFolder:       dstFolder,
+				DstFileNameCase: "Snake",
+				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)
+
+		_, err = genservice.CGenService{}.Service(ctx, in)
+		if err != nil {
+			panic(err)
+		}
+
+		// logic file
+		var (
+			genApi       = apiFolder + filepath.FromSlash("/logic.go")
+			genApiExpect = apiFolder + filepath.FromSlash("/logic_expect.go")
+		)
+		defer gfile.Remove(genApi)
+		t.Assert(gfile.GetContents(genApi), gfile.GetContents(genApiExpect))
+
+		// files
+		files, err := gfile.ScanDir(dstFolder, "*.go", true)
+		t.AssertNil(err)
+		t.Assert(files, []string{
+			dstFolder + filepath.FromSlash("/article.go"),
+		})
+
+		// contents
+		testPath := gtest.DataPath("genservice", "service")
+		expectFiles := []string{
+			testPath + filepath.FromSlash("/article.go"),
+		}
+		for i := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}
--- a/cmd/gf/internal/cmd/genctrl/genctrl.go
+++ b/cmd/gf/internal/cmd/genctrl/genctrl.go
@ -34,10 +34,11 @@ gf gen ctrl
 	CGenCtrlBriefSdkStdVersion = `use standard version prefix for generated sdk request path`
 	CGenCtrlBriefSdkNoV1       = `do not add version suffix for interface module name if version is v1`
 	CGenCtrlBriefClear         = `auto delete generated and unimplemented controller go files if api definitions are missing`
+	CGenCtrlControllerMerge    = `generate all controller files into one go file by name of api definition source go file`
 )

 const (
-	PatternApiDefinition  = `type\s+(\w+)Req\s+struct\s+{([\s\S]+?)}`
+	PatternApiDefinition  = `type[\s\(]+(\w+)Req\s+struct\s+{([\s\S]+?)}`
 	PatternCtrlDefinition = `func\s+\(.+?\)\s+\w+\(.+?\*(\w+)\.(\w+)Req\)\s+\(.+?\*(\w+)\.(\w+)Res,\s+\w+\s+error\)\s+{`
 )

@ -58,6 +59,7 @@ func init() {
 		`CGenCtrlBriefSdkStdVersion`: CGenCtrlBriefSdkStdVersion,
 		`CGenCtrlBriefSdkNoV1`:       CGenCtrlBriefSdkNoV1,
 		`CGenCtrlBriefClear`:         CGenCtrlBriefClear,
+		`CGenCtrlControllerMerge`:    CGenCtrlControllerMerge,
 	})
 }

@ -72,6 +74,7 @@ type (
 		SdkStdVersion bool   `short:"v" name:"sdkStdVersion" brief:"{CGenCtrlBriefSdkStdVersion}" orphan:"true"`
 		SdkNoV1       bool   `short:"n" name:"sdkNoV1"       brief:"{CGenCtrlBriefSdkNoV1}" orphan:"true"`
 		Clear         bool   `short:"c" name:"clear"         brief:"{CGenCtrlBriefClear}" orphan:"true"`
+		Merge         bool   `short:"m" name:"merge"         brief:"{CGenCtrlControllerMerge}" orphan:"true"`
 	}
 	CGenCtrlOutput struct{}
 )
@ -79,7 +82,7 @@ type (
 func (c CGenCtrl) Ctrl(ctx context.Context, in CGenCtrlInput) (out *CGenCtrlOutput, err error) {
 	if in.WatchFile != "" {
 		err = c.generateByWatchFile(
-			in.WatchFile, in.SdkPath, in.SdkStdVersion, in.SdkNoV1, in.Clear,
+			in.WatchFile, in.SdkPath, in.SdkStdVersion, in.SdkNoV1, in.Clear, in.Merge,
 		)
 		mlog.Print(`done!`)
 		return
@ -104,7 +107,7 @@ func (c CGenCtrl) Ctrl(ctx context.Context, in CGenCtrlInput) (out *CGenCtrlOutp
 		)
 		err = c.generateByModule(
 			apiModuleFolderPath, dstModuleFolderPath, in.SdkPath,
-			in.SdkStdVersion, in.SdkNoV1, in.Clear,
+			in.SdkStdVersion, in.SdkNoV1, in.Clear, in.Merge,
 		)
 		if err != nil {
 			return nil, err
@ -115,7 +118,7 @@ func (c CGenCtrl) Ctrl(ctx context.Context, in CGenCtrlInput) (out *CGenCtrlOutp
 	return
 }

-func (c CGenCtrl) generateByWatchFile(watchFile, sdkPath string, sdkStdVersion, sdkNoV1, clear bool) (err error) {
+func (c CGenCtrl) generateByWatchFile(watchFile, sdkPath string, sdkStdVersion, sdkNoV1, clear, merge bool) (err error) {
 	// File lock to avoid multiple processes.
 	var (
 		flockFilePath = gfile.Temp("gf.cli.gen.service.lock")
@ -154,14 +157,14 @@ func (c CGenCtrl) generateByWatchFile(watchFile, sdkPath string, sdkStdVersion,
 		dstModuleFolderPath = gfile.Join(projectRootPath, "internal", "controller", module)
 	)
 	return c.generateByModule(
-		apiModuleFolderPath, dstModuleFolderPath, sdkPath, sdkStdVersion, sdkNoV1, clear,
+		apiModuleFolderPath, dstModuleFolderPath, sdkPath, sdkStdVersion, sdkNoV1, clear, merge,
 	)
 }

 // parseApiModule parses certain api and generate associated go files by certain module, not all api modules.
 func (c CGenCtrl) generateByModule(
 	apiModuleFolderPath, dstModuleFolderPath, sdkPath string,
-	sdkStdVersion, sdkNoV1, clear bool,
+	sdkStdVersion, sdkNoV1, clear, merge bool,
 ) (err error) {
 	// parse src and dst folder go files.
 	apiItemsInSrc, err := c.getApiItemsInSrc(apiModuleFolderPath)
@ -194,7 +197,7 @@ func (c CGenCtrl) generateByModule(
 		toBeImplementedApiItems = append(toBeImplementedApiItems, item)
 	}
 	if len(toBeImplementedApiItems) > 0 {
-		err = newControllerGenerator().Generate(dstModuleFolderPath, toBeImplementedApiItems)
+		err = newControllerGenerator().Generate(dstModuleFolderPath, toBeImplementedApiItems, merge)
 		if err != nil {
 			return
 		}
--- a/cmd/gf/internal/cmd/genctrl/genctrl_api_item.go
+++ b/cmd/gf/internal/cmd/genctrl/genctrl_api_item.go
@ -10,6 +10,7 @@ import "github.com/gogf/gf/v2/text/gstr"

 type apiItem struct {
 	Import     string `eg:"demo.com/api/user/v1"`
+	FileName   string `eg:"user"`
 	Module     string `eg:"user"`
 	Version    string `eg:"v1"`
 	MethodName string `eg:"GetList"`
--- a/cmd/gf/internal/cmd/genctrl/genctrl_calculate.go
+++ b/cmd/gf/internal/cmd/genctrl/genctrl_calculate.go
@ -53,6 +53,7 @@ func (c CGenCtrl) getApiItemsInSrc(apiModuleFolderPath string) (items []apiItem,
 				}
 				item := apiItem{
 					Import:     gstr.Trim(importPath, `"`),
+					FileName:   gfile.Name(apiFileFolderPath),
 					Module:     gfile.Basename(apiModuleFolderPath),
 					Version:    gfile.Basename(apiVersionFolderPath),
 					MethodName: methodName,
--- a/cmd/gf/internal/cmd/genctrl/genctrl_generate_ctrl.go
+++ b/cmd/gf/internal/cmd/genctrl/genctrl_generate_ctrl.go
@ -8,6 +8,7 @@ package genctrl

 import (
 	"fmt"
+	"path/filepath"

 	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
@ -23,7 +24,7 @@ func newControllerGenerator() *controllerGenerator {
 	return &controllerGenerator{}
 }

-func (c *controllerGenerator) Generate(dstModuleFolderPath string, apiModuleApiItems []apiItem) (err error) {
+func (c *controllerGenerator) Generate(dstModuleFolderPath string, apiModuleApiItems []apiItem, merge bool) (err error) {
 	var (
 		doneApiItemSet = gset.NewStrSet()
 	)
@ -42,7 +43,7 @@ func (c *controllerGenerator) Generate(dstModuleFolderPath string, apiModuleApiI
 			return
 		}
 		for _, subItem := range subItems {
-			if err = c.doGenerateCtrlItem(dstModuleFolderPath, subItem); err != nil {
+			if err = c.doGenerateCtrlItem(dstModuleFolderPath, subItem, merge); err != nil {
 				return
 			}
 			doneApiItemSet.Add(subItem.String())
@ -64,8 +65,8 @@ func (c *controllerGenerator) doGenerateCtrlNewByModuleAndVersion(
 	dstModuleFolderPath, module, version, importPath string,
 ) (err error) {
 	var (
-		moduleFilePath        = gfile.Join(dstModuleFolderPath, module+".go")
-		moduleFilePathNew     = gfile.Join(dstModuleFolderPath, module+"_new.go")
+		moduleFilePath        = filepath.FromSlash(gfile.Join(dstModuleFolderPath, module+".go"))
+		moduleFilePathNew     = filepath.FromSlash(gfile.Join(dstModuleFolderPath, module+"_new.go"))
 		ctrlName              = fmt.Sprintf(`Controller%s`, gstr.UcFirst(version))
 		interfaceName         = fmt.Sprintf(`%s.I%s%s`, module, gstr.CaseCamel(module), gstr.UcFirst(version))
 		newFuncName           = fmt.Sprintf(`New%s`, gstr.UcFirst(version))
@ -107,7 +108,7 @@ func (c *controllerGenerator) doGenerateCtrlNewByModuleAndVersion(
 			"{NewFuncName}":   newFuncName,
 			"{InterfaceName}": interfaceName,
 		})
-		err = gfile.PutContentsAppend(moduleFilePathNew, gstr.TrimLeft(content))
+		err = gfile.PutContentsAppend(moduleFilePathNew, content)
 		if err != nil {
 			return err
 		}
@ -115,23 +116,48 @@ func (c *controllerGenerator) doGenerateCtrlNewByModuleAndVersion(
 	return
 }

-func (c *controllerGenerator) doGenerateCtrlItem(dstModuleFolderPath string, item apiItem) (err error) {
+func (c *controllerGenerator) doGenerateCtrlItem(dstModuleFolderPath string, item apiItem, merge bool) (err error) {
 	var (
 		methodNameSnake = gstr.CaseSnake(item.MethodName)
 		ctrlName        = fmt.Sprintf(`Controller%s`, gstr.UcFirst(item.Version))
-		methodFilePath  = gfile.Join(dstModuleFolderPath, fmt.Sprintf(
+		methodFilePath  = filepath.FromSlash(gfile.Join(dstModuleFolderPath, fmt.Sprintf(
 			`%s_%s_%s.go`, item.Module, item.Version, methodNameSnake,
-		))
+		)))
 	)
-	content := gstr.ReplaceByMap(consts.TemplateGenCtrlControllerMethodFunc, g.MapStrStr{
-		"{Module}":     item.Module,
-		"{ImportPath}": item.Import,
-		"{CtrlName}":   ctrlName,
-		"{Version}":    item.Version,
-		"{MethodName}": item.MethodName,
-	})
-	if err = gfile.PutContents(methodFilePath, gstr.TrimLeft(content)); err != nil {
-		return err
+	var content string
+
+	if merge {
+		methodFilePath = gfile.Join(dstModuleFolderPath, fmt.Sprintf(
+			`%s_%s_%s.go`, item.Module, item.Version, item.FileName,
+		))
+
+	}
+
+	if gfile.Exists(methodFilePath) {
+		content = gstr.ReplaceByMap(consts.TemplateGenCtrlControllerMethodFuncMerge, g.MapStrStr{
+			"{Module}":     item.Module,
+			"{CtrlName}":   ctrlName,
+			"{Version}":    item.Version,
+			"{MethodName}": 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 {
+			return err
+		}
+	} else {
+		content = gstr.ReplaceByMap(consts.TemplateGenCtrlControllerMethodFunc, g.MapStrStr{
+			"{Module}":     item.Module,
+			"{ImportPath}": item.Import,
+			"{CtrlName}":   ctrlName,
+			"{Version}":    item.Version,
+			"{MethodName}": item.MethodName,
+		})
+		if err = gfile.PutContents(methodFilePath, gstr.TrimLeft(content)); err != nil {
+			return err
+		}
 	}
 	mlog.Printf(`generated: %s`, methodFilePath)
 	return
--- a/cmd/gf/internal/cmd/genctrl/genctrl_generate_interface.go
+++ b/cmd/gf/internal/cmd/genctrl/genctrl_generate_interface.go
@ -8,6 +8,7 @@ package genctrl

 import (
 	"fmt"
+	"path/filepath"

 	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
@ -39,18 +40,17 @@ func (c *apiInterfaceGenerator) Generate(apiModuleFolderPath string, apiModuleAp

 func (c *apiInterfaceGenerator) doGenerate(apiModuleFolderPath string, module string, items []apiItem) (err error) {
 	var (
-		moduleFilePath = gfile.Join(apiModuleFolderPath, fmt.Sprintf(`%s.go`, module))
+		moduleFilePath = filepath.FromSlash(gfile.Join(apiModuleFolderPath, fmt.Sprintf(`%s.go`, module)))
 		importPathMap  = gmap.NewListMap()
 		importPaths    []string
 	)
 	// if there's already exist file that with the same but not auto generated go file,
 	// it uses another file name.
 	if !utils.IsFileDoNotEdit(moduleFilePath) {
-		moduleFilePath = gfile.Join(apiModuleFolderPath, fmt.Sprintf(`%s.if.go`, module))
+		moduleFilePath = filepath.FromSlash(gfile.Join(apiModuleFolderPath, fmt.Sprintf(`%s.if.go`, module)))
 	}
 	// all import paths.
-	importPathMap.Set("\t"+`"context"`, 1)
-	importPathMap.Set("\t"+``, 1)
+	importPathMap.Set("\t"+`"context"`+"\n", 1)
 	for _, item := range items {
 		importPathMap.Set(fmt.Sprintf("\t"+`"%s"`, item.Import), 1)
 	}
@ -91,7 +91,7 @@ func (c *apiInterfaceGenerator) doGenerate(apiModuleFolderPath string, module st
 		interfaceDefinition += "\n\n"
 	}
 	interfaceContent = gstr.TrimLeft(gstr.ReplaceByMap(interfaceContent, g.MapStrStr{
-		"{Interfaces}": interfaceDefinition,
+		"{Interfaces}": gstr.TrimRightStr(interfaceDefinition, "\n", 2),
 	}))
 	err = gfile.PutContents(moduleFilePath, interfaceContent)
 	mlog.Printf(`generated: %s`, moduleFilePath)
--- a/cmd/gf/internal/cmd/genctrl/genctrl_generate_sdk.go
+++ b/cmd/gf/internal/cmd/genctrl/genctrl_generate_sdk.go
@ -8,6 +8,7 @@ package genctrl

 import (
 	"fmt"
+	"path/filepath"

 	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
@ -54,7 +55,7 @@ func (c *apiSdkGenerator) Generate(apiModuleApiItems []apiItem, sdkFolderPath st
 func (c *apiSdkGenerator) doGenerateSdkPkgFile(sdkFolderPath string) (err error) {
 	var (
 		pkgName     = gfile.Basename(sdkFolderPath)
-		pkgFilePath = gfile.Join(sdkFolderPath, fmt.Sprintf(`%s.go`, pkgName))
+		pkgFilePath = filepath.FromSlash(gfile.Join(sdkFolderPath, fmt.Sprintf(`%s.go`, pkgName)))
 		fileContent string
 	)
 	if gfile.Exists(pkgFilePath) {
@ -79,7 +80,7 @@ func (c *apiSdkGenerator) doGenerateSdkIClient(
 		funcName                = gstr.CaseCamel(module) + gstr.UcFirst(version)
 		interfaceName           = fmt.Sprintf(`I%s`, funcName)
 		moduleImportPath        = gstr.Replace(fmt.Sprintf(`"%s"`, gfile.Dir(versionImportPath)), "\\", "/", -1)
-		iClientFilePath         = gfile.Join(sdkFolderPath, fmt.Sprintf(`%s.iclient.go`, pkgName))
+		iClientFilePath         = filepath.FromSlash(gfile.Join(sdkFolderPath, fmt.Sprintf(`%s.iclient.go`, pkgName)))
 		interfaceFuncDefinition = fmt.Sprintf(
 			`%s() %s.%s`,
 			gstr.CaseCamel(module)+gstr.UcFirst(version), module, interfaceName,
@ -145,9 +146,9 @@ func (c *apiSdkGenerator) doGenerateSdkImplementer(
 		moduleImportPath    = gstr.Replace(gfile.Dir(versionImportPath), "\\", "/", -1)
 		versionPrefix       = ""
 		implementerName     = moduleNameCamel + gstr.UcFirst(version)
-		implementerFilePath = gfile.Join(sdkFolderPath, fmt.Sprintf(
+		implementerFilePath = filepath.FromSlash(gfile.Join(sdkFolderPath, fmt.Sprintf(
 			`%s_%s_%s.go`, pkgName, moduleNameSnake, version,
-		))
+		)))
 	)
 	if sdkNoV1 && version == "v1" {
 		implementerName = moduleNameCamel
--- a/cmd/gf/internal/cmd/gendao/gendao.go
+++ b/cmd/gf/internal/cmd/gendao/gendao.go
@ -9,9 +9,10 @@ package gendao
 import (
 	"context"
 	"fmt"
-	"golang.org/x/mod/modfile"
 	"strings"

+	"golang.org/x/mod/modfile"
+
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/database/gdb"
@ -58,28 +59,29 @@ CONFIGURATION SUPPORT
 			numeric:
 			  type: string
 `
-	CGenDaoBriefPath            = `directory path for generated files`
-	CGenDaoBriefLink            = `database configuration, the same as the ORM configuration of GoFrame`
-	CGenDaoBriefTables          = `generate models only for given tables, multiple table names separated with ','`
-	CGenDaoBriefTablesEx        = `generate models excluding given tables, multiple table names separated with ','`
-	CGenDaoBriefPrefix          = `add prefix for all table of specified link/database tables`
-	CGenDaoBriefRemovePrefix    = `remove specified prefix of the table, multiple prefix separated with ','`
-	CGenDaoBriefStdTime         = `use time.Time from stdlib instead of gtime.Time for generated time/date fields of tables`
-	CGenDaoBriefWithTime        = `add created time for auto produced go files`
-	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`
-	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`
-	CGenDaoBriefModelFile       = `custom file name for storing generated model content`
-	CGenDaoBriefModelFileForDao = `custom file name generating model for DAO operations like Where/Data. It's empty in default`
-	CGenDaoBriefDescriptionTag  = `add comment to description tag for each field`
-	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`
-	CGenDaoBriefTypeMapping     = `custom local type mapping for generated struct attributes relevant to fields of table`
-	CGenDaoBriefGroup           = `
+	CGenDaoBriefPath              = `directory path for generated files`
+	CGenDaoBriefLink              = `database configuration, the same as the ORM configuration of GoFrame`
+	CGenDaoBriefTables            = `generate models only for given tables, multiple table names separated with ','`
+	CGenDaoBriefTablesEx          = `generate models excluding given tables, multiple table names separated with ','`
+	CGenDaoBriefPrefix            = `add prefix for all table of specified link/database tables`
+	CGenDaoBriefRemovePrefix      = `remove specified prefix of the table, multiple prefix separated with ','`
+	CGenDaoBriefRemoveFieldPrefix = `remove specified prefix of the field, multiple prefix separated with ','`
+	CGenDaoBriefStdTime           = `use time.Time from stdlib instead of gtime.Time for generated time/date fields of tables`
+	CGenDaoBriefWithTime          = `add created time for auto produced go files`
+	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`
+	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`
+	CGenDaoBriefModelFile         = `custom file name for storing generated model content`
+	CGenDaoBriefModelFileForDao   = `custom file name generating model for DAO operations like Where/Data. It's empty in default`
+	CGenDaoBriefDescriptionTag    = `add comment to description tag for each field`
+	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`
+	CGenDaoBriefTypeMapping       = `custom local type mapping for generated struct attributes relevant to fields of table`
+	CGenDaoBriefGroup             = `
 specifying the configuration group name of database for generated ORM instance,
 it's not necessary and the default value is "default"
 `
@ -115,7 +117,7 @@ generated json tag case for model struct, cases are as follows:

 var (
 	createdAt          = gtime.Now()
-	defaultTypeMapping = map[string]TypeMapping{
+	defaultTypeMapping = map[DBFieldTypeName]CustomAttributeType{
 		"decimal": {
 			Type: "float64",
 		},
@ -144,6 +146,7 @@ func init() {
 		`CGenDaoBriefTablesEx`:           CGenDaoBriefTablesEx,
 		`CGenDaoBriefPrefix`:             CGenDaoBriefPrefix,
 		`CGenDaoBriefRemovePrefix`:       CGenDaoBriefRemovePrefix,
+		`CGenDaoBriefRemoveFieldPrefix`:  CGenDaoBriefRemoveFieldPrefix,
 		`CGenDaoBriefStdTime`:            CGenDaoBriefStdTime,
 		`CGenDaoBriefWithTime`:           CGenDaoBriefWithTime,
 		`CGenDaoBriefDaoPath`:            CGenDaoBriefDaoPath,
@ -172,31 +175,34 @@ type (
 	CGenDao      struct{}
 	CGenDaoInput struct {
 		g.Meta             `name:"dao" config:"{CGenDaoConfig}" usage:"{CGenDaoUsage}" brief:"{CGenDaoBrief}" eg:"{CGenDaoEg}" ad:"{CGenDaoAd}"`
-		Path               string                 `name:"path"                short:"p"  brief:"{CGenDaoBriefPath}" d:"internal"`
-		Link               string                 `name:"link"                short:"l"  brief:"{CGenDaoBriefLink}"`
-		Tables             string                 `name:"tables"              short:"t"  brief:"{CGenDaoBriefTables}"`
-		TablesEx           string                 `name:"tablesEx"            short:"x"  brief:"{CGenDaoBriefTablesEx}"`
-		Group              string                 `name:"group"               short:"g"  brief:"{CGenDaoBriefGroup}" d:"default"`
-		Prefix             string                 `name:"prefix"              short:"f"  brief:"{CGenDaoBriefPrefix}"`
-		RemovePrefix       string                 `name:"removePrefix"        short:"r"  brief:"{CGenDaoBriefRemovePrefix}"`
-		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"`
-		DoPath             string                 `name:"doPath"              short:"o"  brief:"{CGenDaoBriefDoPath}" d:"model/do"`
-		EntityPath         string                 `name:"entityPath"          short:"e"  brief:"{CGenDaoBriefEntityPath}" d:"model/entity"`
-		TplDaoIndexPath    string                 `name:"tplDaoIndexPath"     short:"t1" brief:"{CGenDaoBriefTplDaoIndexPath}"`
-		TplDaoInternalPath string                 `name:"tplDaoInternalPath"  short:"t2" brief:"{CGenDaoBriefTplDaoInternalPath}"`
-		TplDaoDoPath       string                 `name:"tplDaoDoPath"        short:"t3" brief:"{CGenDaoBriefTplDaoDoPathPath}"`
-		TplDaoEntityPath   string                 `name:"tplDaoEntityPath"    short:"t4" brief:"{CGenDaoBriefTplDaoEntityPath}"`
-		StdTime            bool                   `name:"stdTime"             short:"s"  brief:"{CGenDaoBriefStdTime}" orphan:"true"`
-		WithTime           bool                   `name:"withTime"            short:"w"  brief:"{CGenDaoBriefWithTime}" orphan:"true"`
-		GJsonSupport       bool                   `name:"gJsonSupport"        short:"n"  brief:"{CGenDaoBriefGJsonSupport}" orphan:"true"`
-		OverwriteDao       bool                   `name:"overwriteDao"        short:"v"  brief:"{CGenDaoBriefOverwriteDao}" orphan:"true"`
-		DescriptionTag     bool                   `name:"descriptionTag"      short:"c"  brief:"{CGenDaoBriefDescriptionTag}" orphan:"true"`
-		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"`
-		TypeMapping        map[string]TypeMapping `name:"typeMapping"         short:"y"  brief:"{CGenDaoBriefTypeMapping}" orphan:"true"`
+		Path               string `name:"path"                short:"p"  brief:"{CGenDaoBriefPath}" d:"internal"`
+		Link               string `name:"link"                short:"l"  brief:"{CGenDaoBriefLink}"`
+		Tables             string `name:"tables"              short:"t"  brief:"{CGenDaoBriefTables}"`
+		TablesEx           string `name:"tablesEx"            short:"x"  brief:"{CGenDaoBriefTablesEx}"`
+		Group              string `name:"group"               short:"g"  brief:"{CGenDaoBriefGroup}" d:"default"`
+		Prefix             string `name:"prefix"              short:"f"  brief:"{CGenDaoBriefPrefix}"`
+		RemovePrefix       string `name:"removePrefix"        short:"r"  brief:"{CGenDaoBriefRemovePrefix}"`
+		RemoveFieldPrefix  string `name:"removeFieldPrefix"   short:"rf" brief:"{CGenDaoBriefRemoveFieldPrefix}"`
+		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"`
+		DoPath             string `name:"doPath"              short:"o"  brief:"{CGenDaoBriefDoPath}" d:"model/do"`
+		EntityPath         string `name:"entityPath"          short:"e"  brief:"{CGenDaoBriefEntityPath}" d:"model/entity"`
+		TplDaoIndexPath    string `name:"tplDaoIndexPath"     short:"t1" brief:"{CGenDaoBriefTplDaoIndexPath}"`
+		TplDaoInternalPath string `name:"tplDaoInternalPath"  short:"t2" brief:"{CGenDaoBriefTplDaoInternalPath}"`
+		TplDaoDoPath       string `name:"tplDaoDoPath"        short:"t3" brief:"{CGenDaoBriefTplDaoDoPathPath}"`
+		TplDaoEntityPath   string `name:"tplDaoEntityPath"    short:"t4" brief:"{CGenDaoBriefTplDaoEntityPath}"`
+		StdTime            bool   `name:"stdTime"             short:"s"  brief:"{CGenDaoBriefStdTime}" orphan:"true"`
+		WithTime           bool   `name:"withTime"            short:"w"  brief:"{CGenDaoBriefWithTime}" orphan:"true"`
+		GJsonSupport       bool   `name:"gJsonSupport"        short:"n"  brief:"{CGenDaoBriefGJsonSupport}" orphan:"true"`
+		OverwriteDao       bool   `name:"overwriteDao"        short:"v"  brief:"{CGenDaoBriefOverwriteDao}" orphan:"true"`
+		DescriptionTag     bool   `name:"descriptionTag"      short:"c"  brief:"{CGenDaoBriefDescriptionTag}" orphan:"true"`
+		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"`
+
+		TypeMapping map[DBFieldTypeName]CustomAttributeType `name:"typeMapping" short:"y" brief:"{CGenDaoBriefTypeMapping}" orphan:"true"`
+		genItems    *CGenDaoInternalGenItems
 	}
 	CGenDaoOutput struct{}

@ -207,13 +213,15 @@ type (
 		NewTableNames []string
 	}

-	TypeMapping struct {
+	DBFieldTypeName     = string
+	CustomAttributeType struct {
 		Type   string `brief:"custom attribute type name"`
 		Import string `brief:"custom import for this type"`
 	}
 )

 func (c CGenDao) Dao(ctx context.Context, in CGenDaoInput) (out *CGenDaoOutput, err error) {
+	in.genItems = newCGenDaoInternalGenItems()
 	if g.Cfg().Available(ctx) {
 		v := g.Cfg().MustGet(ctx, CGenDaoConfig)
 		if v.IsSlice() {
@ -226,6 +234,7 @@ func (c CGenDao) Dao(ctx context.Context, in CGenDaoInput) (out *CGenDaoOutput,
 	} else {
 		doGenDaoForArray(ctx, -1, in)
 	}
+	doClear(in.genItems)
 	mlog.Print("done!")
 	return
 }
@ -306,6 +315,8 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 		newTableNames[i] = newTableName
 	}

+	in.genItems.Scale()
+
 	// Dao: index and internal.
 	generateDao(ctx, CGenDaoInternalInput{
 		CGenDaoInput:  in,
@ -327,6 +338,8 @@ func doGenDaoForArray(ctx context.Context, index int, in CGenDaoInput) {
 		TableNames:    tableNames,
 		NewTableNames: newTableNames,
 	})
+
+	in.genItems.SetClear(in.Clear)
 }

 func getImportPartContent(ctx context.Context, source string, isDo bool, appendImports []string) string {
--- a/cmd/gf/internal/cmd/gendao/gendao_clear.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_clear.go
@ -7,22 +7,40 @@
 package gendao

 import (
-	"context"
-
 	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/text/gstr"

 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )

-func doClear(ctx context.Context, dirPath string, force bool) {
-	files, err := gfile.ScanDirFile(dirPath, "*.go", true)
-	if err != nil {
-		mlog.Fatal(err)
+func doClear(items *CGenDaoInternalGenItems) {
+	var allGeneratedFilePaths = make([]string, 0)
+	for _, item := range items.Items {
+		allGeneratedFilePaths = append(allGeneratedFilePaths, item.GeneratedFilePaths...)
 	}
-	for _, file := range files {
-		if force || utils.IsFileDoNotEdit(file) {
-			if err = gfile.Remove(file); err != nil {
+	for i, v := range allGeneratedFilePaths {
+		allGeneratedFilePaths[i] = gfile.RealPath(v)
+	}
+	for _, item := range items.Items {
+		if !item.Clear {
+			continue
+		}
+		doClearItem(item, allGeneratedFilePaths)
+	}
+}
+
+func doClearItem(item CGenDaoInternalGenItem, allGeneratedFilePaths []string) {
+	var generatedFilePaths = make([]string, 0)
+	for _, dirPath := range item.StorageDirPaths {
+		filePaths, err := gfile.ScanDirFile(dirPath, "*.go", true)
+		if err != nil {
+			mlog.Fatal(err)
+		}
+		generatedFilePaths = append(generatedFilePaths, filePaths...)
+	}
+	for _, filePath := range generatedFilePaths {
+		if !gstr.InArray(allGeneratedFilePaths, filePath) {
+			if err := gfile.Remove(filePath); err != nil {
 				mlog.Print(err)
 			}
 		}
--- a/cmd/gf/internal/cmd/gendao/gendao_dao.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_dao.go
@ -10,6 +10,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"path/filepath"
 	"strings"

 	"github.com/olekukonko/tablewriter"
@ -29,9 +30,7 @@ func generateDao(ctx context.Context, in CGenDaoInternalInput) {
 		dirPathDao         = gfile.Join(in.Path, in.DaoPath)
 		dirPathDaoInternal = gfile.Join(dirPathDao, "internal")
 	)
-	if in.Clear {
-		doClear(ctx, dirPathDao, true)
-	}
+	in.genItems.AppendDirPath(dirPathDao)
 	for i := 0; i < len(in.TableNames); i++ {
 		generateDaoSingle(ctx, generateDaoSingleInput{
 			CGenDaoInternalInput: in,
@ -106,7 +105,9 @@ type generateDaoIndexInput struct {
 }

 func generateDaoIndex(in generateDaoIndexInput) {
-	path := gfile.Join(in.DirPathDao, in.FileName+".go")
+	path := filepath.FromSlash(gfile.Join(in.DirPathDao, in.FileName+".go"))
+	// It should add path to result slice whenever it would generate the path file or not.
+	in.genItems.AppendGeneratedFilePath(path)
 	if in.OverwriteDao || !gfile.Exists(path) {
 		indexContent := gstr.ReplaceByMap(
 			getTemplateFromPathOrDefault(in.TplDaoIndexPath, consts.TemplateGenDaoIndexContent),
@ -136,7 +137,8 @@ type generateDaoInternalInput struct {
 }

 func generateDaoInternal(in generateDaoInternalInput) {
-	path := gfile.Join(in.DirPathDaoInternal, in.FileName+".go")
+	path := filepath.FromSlash(gfile.Join(in.DirPathDaoInternal, in.FileName+".go"))
+	removeFieldPrefixArray := gstr.SplitAndTrim(in.RemoveFieldPrefix, ",")
 	modelContent := gstr.ReplaceByMap(
 		getTemplateFromPathOrDefault(in.TplDaoInternalPath, consts.TemplateGenDaoInternalContent),
 		g.MapStrStr{
@ -145,10 +147,11 @@ func generateDaoInternal(in generateDaoInternalInput) {
 			tplVarGroupName:               in.Group,
 			tplVarTableNameCamelCase:      in.TableNameCamelCase,
 			tplVarTableNameCamelLowerCase: in.TableNameCamelLowerCase,
-			tplVarColumnDefine:            gstr.Trim(generateColumnDefinitionForDao(in.FieldMap)),
-			tplVarColumnNames:             gstr.Trim(generateColumnNamesForDao(in.FieldMap)),
+			tplVarColumnDefine:            gstr.Trim(generateColumnDefinitionForDao(in.FieldMap, removeFieldPrefixArray)),
+			tplVarColumnNames:             gstr.Trim(generateColumnNamesForDao(in.FieldMap, removeFieldPrefixArray)),
 		})
 	modelContent = replaceDefaultVar(in.CGenDaoInternalInput, modelContent)
+	in.genItems.AppendGeneratedFilePath(path)
 	if err := gfile.PutContents(path, strings.TrimSpace(modelContent)); err != nil {
 		mlog.Fatalf("writing content to '%s' failed: %v", path, err)
 	} else {
@ -159,16 +162,23 @@ func generateDaoInternal(in generateDaoInternalInput) {

 // generateColumnNamesForDao generates and returns the column names assignment content of column struct
 // for specified table.
-func generateColumnNamesForDao(fieldMap map[string]*gdb.TableField) string {
+func generateColumnNamesForDao(fieldMap map[string]*gdb.TableField, removeFieldPrefixArray []string) string {
 	var (
 		buffer = bytes.NewBuffer(nil)
 		array  = make([][]string, len(fieldMap))
 		names  = sortFieldKeyForDao(fieldMap)
 	)
+
 	for index, name := range names {
 		field := fieldMap[name]
+
+		newFiledName := field.Name
+		for _, v := range removeFieldPrefixArray {
+			newFiledName = gstr.TrimLeftStr(newFiledName, v, 1)
+		}
+
 		array[index] = []string{
-			"            #" + gstr.CaseCamel(field.Name) + ":",
+			"            #" + gstr.CaseCamel(newFiledName) + ":",
 			fmt.Sprintf(` #"%s",`, field.Name),
 		}
 	}
@ -188,12 +198,13 @@ func generateColumnNamesForDao(fieldMap map[string]*gdb.TableField) string {
 }

 // generateColumnDefinitionForDao generates and returns the column names definition for specified table.
-func generateColumnDefinitionForDao(fieldMap map[string]*gdb.TableField) string {
+func generateColumnDefinitionForDao(fieldMap map[string]*gdb.TableField, removeFieldPrefixArray []string) string {
 	var (
 		buffer = bytes.NewBuffer(nil)
 		array  = make([][]string, len(fieldMap))
 		names  = sortFieldKeyForDao(fieldMap)
 	)
+
 	for index, name := range names {
 		var (
 			field   = fieldMap[name]
@ -202,8 +213,12 @@ func generateColumnDefinitionForDao(fieldMap map[string]*gdb.TableField) string
 				"\r", " ",
 			}))
 		)
+		newFiledName := field.Name
+		for _, v := range removeFieldPrefixArray {
+			newFiledName = gstr.TrimLeftStr(newFiledName, v, 1)
+		}
 		array[index] = []string{
-			"    #" + gstr.CaseCamel(field.Name),
+			"    #" + gstr.CaseCamel(newFiledName),
 			" # " + "string",
 			" #" + fmt.Sprintf(`// %s`, comment),
 		}
--- a/cmd/gf/internal/cmd/gendao/gendao_do.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_do.go
@ -9,6 +9,7 @@ package gendao
 import (
 	"context"
 	"fmt"
+	"path/filepath"
 	"strings"

 	"github.com/gogf/gf/v2/frame/g"
@ -22,10 +23,8 @@ import (
 )

 func generateDo(ctx context.Context, in CGenDaoInternalInput) {
-	var dirPathDo = gfile.Join(in.Path, in.DoPath)
-	if in.Clear {
-		doClear(ctx, dirPathDo, false)
-	}
+	var dirPathDo = filepath.FromSlash(gfile.Join(in.Path, in.DoPath))
+	in.genItems.AppendDirPath(dirPathDo)
 	in.NoJsonTag = true
 	in.DescriptionTag = false
 	in.NoModelComment = false
@ -65,6 +64,7 @@ func generateDo(ctx context.Context, in CGenDaoInternalInput) {
 			gstr.CaseCamel(newTableName),
 			structDefinition,
 		)
+		in.genItems.AppendGeneratedFilePath(doFilePath)
 		err = gfile.PutContents(doFilePath, strings.TrimSpace(modelContent))
 		if err != nil {
 			mlog.Fatalf(`writing content to "%s" failed: %v`, doFilePath, err)
--- a/cmd/gf/internal/cmd/gendao/gendao_entity.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_entity.go
@ -8,6 +8,7 @@ package gendao

 import (
 	"context"
+	"path/filepath"
 	"strings"

 	"github.com/gogf/gf/v2/frame/g"
@ -21,9 +22,7 @@ import (

 func generateEntity(ctx context.Context, in CGenDaoInternalInput) {
 	var dirPathEntity = gfile.Join(in.Path, in.EntityPath)
-	if in.Clear {
-		doClear(ctx, dirPathEntity, false)
-	}
+	in.genItems.AppendDirPath(dirPathEntity)
 	// Model content.
 	for i, tableName := range in.TableNames {
 		fieldMap, err := in.DB.TableFields(ctx, tableName)
@ -33,7 +32,7 @@ func generateEntity(ctx context.Context, in CGenDaoInternalInput) {

 		var (
 			newTableName                    = in.NewTableNames[i]
-			entityFilePath                  = gfile.Join(dirPathEntity, gstr.CaseSnake(newTableName)+".go")
+			entityFilePath                  = filepath.FromSlash(gfile.Join(dirPathEntity, gstr.CaseSnake(newTableName)+".go"))
 			structDefinition, appendImports = generateStructDefinition(ctx, generateStructDefinitionInput{
 				CGenDaoInternalInput: in,
 				TableName:            tableName,
@ -50,7 +49,7 @@ func generateEntity(ctx context.Context, in CGenDaoInternalInput) {
 				appendImports,
 			)
 		)
-
+		in.genItems.AppendGeneratedFilePath(entityFilePath)
 		err = gfile.PutContents(entityFilePath, strings.TrimSpace(entityContent))
 		if err != nil {
 			mlog.Fatalf("writing content to '%s' failed: %v", entityFilePath, err)
--- a/cmd/gf/internal/cmd/gendao/gendao_gen_item.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_gen_item.go
@ -0,0 +1,53 @@
+// 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
+
+type (
+	CGenDaoInternalGenItems struct {
+		index int
+		Items []CGenDaoInternalGenItem
+	}
+	CGenDaoInternalGenItem struct {
+		Clear              bool
+		StorageDirPaths    []string
+		GeneratedFilePaths []string
+	}
+)
+
+func newCGenDaoInternalGenItems() *CGenDaoInternalGenItems {
+	return &CGenDaoInternalGenItems{
+		index: -1,
+		Items: make([]CGenDaoInternalGenItem, 0),
+	}
+}
+
+func (i *CGenDaoInternalGenItems) Scale() {
+	i.Items = append(i.Items, CGenDaoInternalGenItem{
+		StorageDirPaths:    make([]string, 0),
+		GeneratedFilePaths: make([]string, 0),
+		Clear:              false,
+	})
+	i.index++
+}
+
+func (i *CGenDaoInternalGenItems) SetClear(clear bool) {
+	i.Items[i.index].Clear = clear
+}
+
+func (i CGenDaoInternalGenItems) AppendDirPath(storageDirPath string) {
+	i.Items[i.index].StorageDirPaths = append(
+		i.Items[i.index].StorageDirPaths,
+		storageDirPath,
+	)
+}
+
+func (i CGenDaoInternalGenItems) AppendGeneratedFilePath(generatedFilePath string) {
+	i.Items[i.index].GeneratedFilePaths = append(
+		i.Items[i.index].GeneratedFilePaths,
+		generatedFilePath,
+	)
+}
--- a/cmd/gf/internal/cmd/gendao/gendao_structure.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_structure.go
@ -10,9 +10,10 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/olekukonko/tablewriter"
 	"strings"

+	"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"
@ -70,7 +71,7 @@ func generateStructFieldDefinition(
 		err              error
 		localTypeName    gdb.LocalType
 		localTypeNameStr string
-		jsonTag          = getJsonTagFromCase(field.Name, in.JsonCase)
+		jsonTag          = gstr.CaseConvert(field.Name, gstr.CaseTypeMatch(in.JsonCase))
 	)

 	if in.TypeMapping != nil && len(in.TypeMapping) > 0 {
@ -96,7 +97,7 @@ func generateStructFieldDefinition(
 		if err != nil {
 			panic(err)
 		}
-
+		localTypeNameStr = string(localTypeName)
 		switch localTypeName {
 		case gdb.LocalTypeDate, gdb.LocalTypeDatetime:
 			if in.StdTime {
@ -125,8 +126,13 @@ func generateStructFieldDefinition(
 		tagKey         = "`"
 		descriptionTag = gstr.Replace(formatComment(field.Comment), `"`, `\"`)
 	)
+	removeFieldPrefixArray := gstr.SplitAndTrim(in.RemoveFieldPrefix, ",")
+	newFiledName := field.Name
+	for _, v := range removeFieldPrefixArray {
+		newFiledName = gstr.TrimLeftStr(newFiledName, v, 1)
+	}
 	attrLines = []string{
-		"    #" + gstr.CaseCamel(field.Name),
+		"    #" + gstr.CaseCamel(newFiledName),
 		" #" + localTypeNameStr,
 	}
 	attrLines = append(attrLines, " #"+fmt.Sprintf(tagKey+`json:"%s"`, jsonTag))
@ -158,30 +164,3 @@ func formatComment(comment string) string {
 	comment = gstr.Trim(comment)
 	return comment
 }
-
-// getJsonTagFromCase call gstr.Case* function to convert the s to specified case.
-func getJsonTagFromCase(str, caseStr string) string {
-	switch gstr.ToLower(caseStr) {
-	case gstr.ToLower("Camel"):
-		return gstr.CaseCamel(str)
-
-	case gstr.ToLower("CamelLower"):
-		return gstr.CaseCamelLower(str)
-
-	case gstr.ToLower("Kebab"):
-		return gstr.CaseKebab(str)
-
-	case gstr.ToLower("KebabScreaming"):
-		return gstr.CaseKebabScreaming(str)
-
-	case gstr.ToLower("Snake"):
-		return gstr.CaseSnake(str)
-
-	case gstr.ToLower("SnakeFirstUpper"):
-		return gstr.CaseSnakeFirstUpper(str)
-
-	case gstr.ToLower("SnakeScreaming"):
-		return gstr.CaseSnakeScreaming(str)
-	}
-	return str
-}
--- a/cmd/gf/internal/cmd/genenums/genenums_parser.go
+++ b/cmd/gf/internal/cmd/genenums/genenums_parser.go
@ -19,9 +19,10 @@ import (
 const pkgLoadMode = 0xffffff

 type EnumsParser struct {
-	enums     []EnumItem
-	parsedPkg map[string]struct{}
-	prefixes  []string
+	enums            []EnumItem
+	parsedPkg        map[string]struct{}
+	prefixes         []string
+	standardPackages map[string]struct{}
 }

 type EnumItem struct {
@ -31,23 +32,12 @@ type EnumItem struct {
 	Type  string        // Pkg.ID + TypeName
 }

-var standardPackages = make(map[string]struct{})
-
-func init() {
-	stdPackages, err := packages.Load(nil, "std")
-	if err != nil {
-		panic(err)
-	}
-	for _, p := range stdPackages {
-		standardPackages[p.ID] = struct{}{}
-	}
-}
-
 func NewEnumsParser(prefixes []string) *EnumsParser {
 	return &EnumsParser{
-		enums:     make([]EnumItem, 0),
-		parsedPkg: make(map[string]struct{}),
-		prefixes:  prefixes,
+		enums:            make([]EnumItem, 0),
+		parsedPkg:        make(map[string]struct{}),
+		prefixes:         prefixes,
+		standardPackages: getStandardPackages(),
 	}
 }

@ -59,7 +49,7 @@ func (p *EnumsParser) ParsePackages(pkgs []*packages.Package) {

 func (p *EnumsParser) ParsePackage(pkg *packages.Package) {
 	// Ignore std packages.
-	if _, ok := standardPackages[pkg.ID]; ok {
+	if _, ok := p.standardPackages[pkg.ID]; ok {
 		return
 	}
 	// Ignore pared packages.
@ -144,3 +134,15 @@ func (p *EnumsParser) Export() string {
 	}
 	return gjson.MustEncodeString(typeEnumMap)
 }
+
+func getStandardPackages() map[string]struct{} {
+	standardPackages := make(map[string]struct{})
+	stdPackages, err := packages.Load(nil, "std")
+	if err != nil {
+		panic(err)
+	}
+	for _, p := range stdPackages {
+		standardPackages[p.ID] = struct{}{}
+	}
+	return standardPackages
+}
--- a/cmd/gf/internal/cmd/genpbentity/genpbentity.go
+++ b/cmd/gf/internal/cmd/genpbentity/genpbentity.go
@ -10,6 +10,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"path/filepath"
 	"strings"

 	"github.com/olekukonko/tablewriter"
@ -30,16 +31,17 @@ import (
 type (
 	CGenPbEntity      struct{}
 	CGenPbEntityInput struct {
-		g.Meta       `name:"pbentity" config:"{CGenPbEntityConfig}" brief:"{CGenPbEntityBrief}" eg:"{CGenPbEntityEg}" ad:"{CGenPbEntityAd}"`
-		Path         string `name:"path"         short:"p" brief:"{CGenPbEntityBriefPath}" d:"manifest/protobuf/pbentity"`
-		Package      string `name:"package"      short:"k" brief:"{CGenPbEntityBriefPackage}"`
-		Link         string `name:"link"         short:"l" brief:"{CGenPbEntityBriefLink}"`
-		Tables       string `name:"tables"       short:"t" brief:"{CGenPbEntityBriefTables}"`
-		Prefix       string `name:"prefix"       short:"f" brief:"{CGenPbEntityBriefPrefix}"`
-		RemovePrefix string `name:"removePrefix" short:"r" brief:"{CGenPbEntityBriefRemovePrefix}"`
-		NameCase     string `name:"nameCase"     short:"n" brief:"{CGenPbEntityBriefNameCase}" d:"Camel"`
-		JsonCase     string `name:"jsonCase"     short:"j" brief:"{CGenPbEntityBriefJsonCase}" d:"CamelLower"`
-		Option       string `name:"option"       short:"o" brief:"{CGenPbEntityBriefOption}"`
+		g.Meta            `name:"pbentity" config:"{CGenPbEntityConfig}" brief:"{CGenPbEntityBrief}" eg:"{CGenPbEntityEg}" ad:"{CGenPbEntityAd}"`
+		Path              string `name:"path"              short:"p"  brief:"{CGenPbEntityBriefPath}" d:"manifest/protobuf/pbentity"`
+		Package           string `name:"package"           short:"k"  brief:"{CGenPbEntityBriefPackage}"`
+		Link              string `name:"link"              short:"l"  brief:"{CGenPbEntityBriefLink}"`
+		Tables            string `name:"tables"            short:"t"  brief:"{CGenPbEntityBriefTables}"`
+		Prefix            string `name:"prefix"            short:"f"  brief:"{CGenPbEntityBriefPrefix}"`
+		RemovePrefix      string `name:"removePrefix"      short:"r"  brief:"{CGenPbEntityBriefRemovePrefix}"`
+		RemoveFieldPrefix string `name:"removeFieldPrefix" short:"rf" brief:"{CGenPbEntityBriefRemoveFieldPrefix}"`
+		NameCase          string `name:"nameCase"          short:"n"  brief:"{CGenPbEntityBriefNameCase}" d:"Camel"`
+		JsonCase          string `name:"jsonCase"          short:"j"  brief:"{CGenPbEntityBriefJsonCase}" d:"none"`
+		Option            string `name:"option"            short:"o"  brief:"{CGenPbEntityBriefOption}"`
 	}
 	CGenPbEntityOutput struct{}

@ -86,14 +88,15 @@ CONFIGURATION SUPPORT
 			  option java_package  = "protobuf/demos";
 			  option php_namespace = "protobuf/demos";
 `
-	CGenPbEntityBriefPath         = `directory path for generated files storing`
-	CGenPbEntityBriefPackage      = `package path for all entity proto files`
-	CGenPbEntityBriefLink         = `database configuration, the same as the ORM configuration of GoFrame`
-	CGenPbEntityBriefTables       = `generate models only for given tables, multiple table names separated with ','`
-	CGenPbEntityBriefPrefix       = `add specified prefix for all entity names and entity proto files`
-	CGenPbEntityBriefRemovePrefix = `remove specified prefix of the table, multiple prefix separated with ','`
-	CGenPbEntityBriefOption       = `extra protobuf options`
-	CGenPbEntityBriefGroup        = `
+	CGenPbEntityBriefPath              = `directory path for generated files storing`
+	CGenPbEntityBriefPackage           = `package path for all entity proto files`
+	CGenPbEntityBriefLink              = `database configuration, the same as the ORM configuration of GoFrame`
+	CGenPbEntityBriefTables            = `generate models only for given tables, multiple table names separated with ','`
+	CGenPbEntityBriefPrefix            = `add specified prefix for all entity names and entity proto files`
+	CGenPbEntityBriefRemovePrefix      = `remove specified prefix of the table, multiple prefix separated with ','`
+	CGenPbEntityBriefRemoveFieldPrefix = `remove specified prefix of the field, multiple prefix separated with ','`
+	CGenPbEntityBriefOption            = `extra protobuf options`
+	CGenPbEntityBriefGroup             = `
 specifying the configuration group name of database for generated ORM instance,
 it's not necessary and the default value is "default"
 `
@ -119,20 +122,21 @@ set it to "none" to ignore json tag generating.

 func init() {
 	gtag.Sets(g.MapStrStr{
-		`CGenPbEntityConfig`:            CGenPbEntityConfig,
-		`CGenPbEntityBrief`:             CGenPbEntityBrief,
-		`CGenPbEntityEg`:                CGenPbEntityEg,
-		`CGenPbEntityAd`:                CGenPbEntityAd,
-		`CGenPbEntityBriefPath`:         CGenPbEntityBriefPath,
-		`CGenPbEntityBriefPackage`:      CGenPbEntityBriefPackage,
-		`CGenPbEntityBriefLink`:         CGenPbEntityBriefLink,
-		`CGenPbEntityBriefTables`:       CGenPbEntityBriefTables,
-		`CGenPbEntityBriefPrefix`:       CGenPbEntityBriefPrefix,
-		`CGenPbEntityBriefRemovePrefix`: CGenPbEntityBriefRemovePrefix,
-		`CGenPbEntityBriefGroup`:        CGenPbEntityBriefGroup,
-		`CGenPbEntityBriefNameCase`:     CGenPbEntityBriefNameCase,
-		`CGenPbEntityBriefJsonCase`:     CGenPbEntityBriefJsonCase,
-		`CGenPbEntityBriefOption`:       CGenPbEntityBriefOption,
+		`CGenPbEntityConfig`:                 CGenPbEntityConfig,
+		`CGenPbEntityBrief`:                  CGenPbEntityBrief,
+		`CGenPbEntityEg`:                     CGenPbEntityEg,
+		`CGenPbEntityAd`:                     CGenPbEntityAd,
+		`CGenPbEntityBriefPath`:              CGenPbEntityBriefPath,
+		`CGenPbEntityBriefPackage`:           CGenPbEntityBriefPackage,
+		`CGenPbEntityBriefLink`:              CGenPbEntityBriefLink,
+		`CGenPbEntityBriefTables`:            CGenPbEntityBriefTables,
+		`CGenPbEntityBriefPrefix`:            CGenPbEntityBriefPrefix,
+		`CGenPbEntityBriefRemovePrefix`:      CGenPbEntityBriefRemovePrefix,
+		`CGenPbEntityBriefRemoveFieldPrefix`: CGenPbEntityBriefRemoveFieldPrefix,
+		`CGenPbEntityBriefGroup`:             CGenPbEntityBriefGroup,
+		`CGenPbEntityBriefNameCase`:          CGenPbEntityBriefNameCase,
+		`CGenPbEntityBriefJsonCase`:          CGenPbEntityBriefJsonCase,
+		`CGenPbEntityBriefOption`:            CGenPbEntityBriefOption,
 	})
 }

@ -197,7 +201,7 @@ func doGenPbEntityForArray(ctx context.Context, index int, in CGenPbEntityInput)
 		if len(match) == 3 {
 			gdb.AddConfigNode(tempGroup, gdb.ConfigNode{
 				Type: gstr.Trim(match[1]),
-				Link: gstr.Trim(match[2]),
+				Link: in.Link,
 			})
 			db, _ = gdb.Instance(tempGroup)
 		}
@ -246,7 +250,7 @@ func generatePbEntityContentFile(ctx context.Context, in CGenPbEntityInternalInp
 		tableNameSnakeCase  = gstr.CaseSnake(newTableName)
 		entityMessageDefine = generateEntityMessageDefinition(tableNameCamelCase, fieldMap, in)
 		fileName            = gstr.Trim(tableNameSnakeCase, "-_.")
-		path                = gfile.Join(in.Path, fileName+".proto")
+		path                = filepath.FromSlash(gfile.Join(in.Path, fileName+".proto"))
 	)
 	if gstr.Contains(entityMessageDefine, "google.protobuf.Timestamp") {
 		imports = `import "google/protobuf/timestamp.proto";`
@ -338,6 +342,7 @@ func generateMessageFieldForPbEntity(index int, field *gdb.TableField, in CGenPb
 	comment = gstr.Replace(comment, `\n`, " ")
 	comment, _ = gregex.ReplaceString(`\s{2,}`, ` `, comment)
 	if jsonTagName := formatCase(field.Name, in.JsonCase); jsonTagName != "" {
+		jsonTagStr = fmt.Sprintf(`[json_name = "%s"]`, jsonTagName)
 		// beautiful indent.
 		if index < 10 {
 			// 3 spaces
@ -350,9 +355,16 @@ func generateMessageFieldForPbEntity(index int, field *gdb.TableField, in CGenPb
 			jsonTagStr = " " + jsonTagStr
 		}
 	}
+
+	removeFieldPrefixArray := gstr.SplitAndTrim(in.RemoveFieldPrefix, ",")
+	newFiledName := field.Name
+	for _, v := range removeFieldPrefixArray {
+		newFiledName = gstr.TrimLeftStr(newFiledName, v, 1)
+	}
+
 	return []string{
 		"    #" + localTypeNameStr,
-		" #" + formatCase(field.Name, in.NameCase),
+		" #" + formatCase(newFiledName, in.NameCase),
 		" #= " + gconv.String(index) + jsonTagStr + ";",
 		" #" + fmt.Sprintf(`// %s`, comment),
 	}
@ -367,32 +379,10 @@ func getTplPbEntityContent(tplEntityPath string) string {

 // formatCase call gstr.Case* function to convert the s to specified case.
 func formatCase(str, caseStr string) string {
-	switch gstr.ToLower(caseStr) {
-	case gstr.ToLower("Camel"):
-		return gstr.CaseCamel(str)
-
-	case gstr.ToLower("CamelLower"):
-		return gstr.CaseCamelLower(str)
-
-	case gstr.ToLower("Kebab"):
-		return gstr.CaseKebab(str)
-
-	case gstr.ToLower("KebabScreaming"):
-		return gstr.CaseKebabScreaming(str)
-
-	case gstr.ToLower("Snake"):
-		return gstr.CaseSnake(str)
-
-	case gstr.ToLower("SnakeFirstUpper"):
-		return gstr.CaseSnakeFirstUpper(str)
-
-	case gstr.ToLower("SnakeScreaming"):
-		return gstr.CaseSnakeScreaming(str)
-
-	case "none":
+	if caseStr == "none" {
 		return ""
 	}
-	return str
+	return gstr.CaseConvert(str, gstr.CaseTypeMatch(caseStr))
 }

 func sortFieldKeyForPbEntity(fieldMap map[string]*gdb.TableField) []string {
--- a/cmd/gf/internal/cmd/genservice/genservice.go
+++ b/cmd/gf/internal/cmd/genservice/genservice.go
@ -9,6 +9,7 @@ package genservice
 import (
 	"context"
 	"fmt"
+	"path/filepath"

 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/container/gmap"
@ -93,10 +94,10 @@ const (
 )

 func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGenServiceOutput, err error) {
-	in.SrcFolder = gstr.TrimRight(in.SrcFolder, `\/`)
-	in.SrcFolder = gstr.Replace(in.SrcFolder, "\\", "/")
-	in.WatchFile = gstr.TrimRight(in.WatchFile, `\/`)
-	in.WatchFile = gstr.Replace(in.WatchFile, "\\", "/")
+	in.SrcFolder = filepath.ToSlash(in.SrcFolder)
+	in.SrcFolder = gstr.TrimRight(in.SrcFolder, `/`)
+	in.WatchFile = filepath.ToSlash(in.WatchFile)
+	in.WatchFile = gstr.TrimRight(in.WatchFile, `/`)

 	// Watch file handling.
 	if in.WatchFile != "" {
@ -173,7 +174,7 @@ func (c CGenService) Service(ctx context.Context, in CGenServiceInput) (out *CGe
 		// Parse single logic package folder.
 		var (
 			// StructName => FunctionDefinitions
-			srcPkgInterfaceMap   = make(map[string]*garray.StrArray)
+			srcPkgInterfaceMap   = gmap.NewListMap()
 			srcImportedPackages  = garray.NewSortedStrArray().SetUnique(true)
 			importAliasToPathMap = gmap.NewStrStrMap() // for conflict imports check. alias => import path(with `"`)
 			importPathToAliasMap = gmap.NewStrStrMap() // for conflict imports check. import path(with `"`) => alias
--- a/cmd/gf/internal/cmd/genservice/genservice_calculate.go
+++ b/cmd/gf/internal/cmd/genservice/genservice_calculate.go
@ -12,6 +12,7 @@ import (
 	"go/token"

 	"github.com/gogf/gf/v2/container/garray"
+	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 )
@ -99,10 +100,9 @@ func (c CGenService) calculateCodeCommented(in CGenServiceInput, fileContent str
 }

 func (c CGenService) calculateInterfaceFunctions(
-	in CGenServiceInput, fileContent string, srcPkgInterfaceMap map[string]*garray.StrArray,
+	in CGenServiceInput, fileContent string, srcPkgInterfaceMap *gmap.ListMap,
 ) (err error) {
 	var (
-		ok                       bool
 		matches                  [][]string
 		srcPkgInterfaceFuncArray *garray.StrArray
 	)
@ -142,9 +142,11 @@ func (c CGenService) calculateInterfaceFunctions(
 			continue
 		}
 		structName = gstr.CaseCamel(structMatch[1])
-		if srcPkgInterfaceFuncArray, ok = srcPkgInterfaceMap[structName]; !ok {
-			srcPkgInterfaceMap[structName] = garray.NewStrArray()
-			srcPkgInterfaceFuncArray = srcPkgInterfaceMap[structName]
+		if !srcPkgInterfaceMap.Contains(structName) {
+			srcPkgInterfaceFuncArray = garray.NewStrArray()
+			srcPkgInterfaceMap.Set(structName, srcPkgInterfaceFuncArray)
+		} else {
+			srcPkgInterfaceFuncArray = srcPkgInterfaceMap.Get(structName).(*garray.StrArray)
 		}
 		srcPkgInterfaceFuncArray.Append(functionHead)
 	}
@ -165,8 +167,8 @@ func (c CGenService) calculateInterfaceFunctions(
 			continue
 		}
 		structName = gstr.CaseCamel(structMatch[1])
-		if srcPkgInterfaceFuncArray, ok = srcPkgInterfaceMap[structName]; !ok {
-			srcPkgInterfaceMap[structName] = garray.NewStrArray()
+		if !srcPkgInterfaceMap.Contains(structName) {
+			srcPkgInterfaceMap.Set(structName, garray.NewStrArray())
 		}
 	}
 	return nil
--- a/cmd/gf/internal/cmd/genservice/genservice_generate.go
+++ b/cmd/gf/internal/cmd/genservice/genservice_generate.go
@ -10,6 +10,7 @@ import (
 	"fmt"

 	"github.com/gogf/gf/v2/container/garray"
+	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
@ -23,7 +24,7 @@ import (
 type generateServiceFilesInput struct {
 	CGenServiceInput
 	DstFilePath         string // Absolute file path for generated service go file.
-	SrcStructFunctions  map[string]*garray.StrArray
+	SrcStructFunctions  *gmap.ListMap
 	SrcImportedPackages []string
 	SrcPackageName      string
 	DstPackageName      string
@ -46,7 +47,8 @@ func (c CGenService) generateServiceFile(in generateServiceFilesInput) (ok bool,
 	// Type definitions.
 	generatedContent += "type("
 	generatedContent += "\n"
-	for structName, funcArray := range in.SrcStructFunctions {
+	in.SrcStructFunctions.Iterator(func(key, value interface{}) bool {
+		structName, funcArray := key.(string), value.(*garray.StrArray)
 		allFuncArray.Append(funcArray.Slice()...)
 		// Add comments to a method.
 		for index, funcName := range funcArray.Slice() {
@ -60,7 +62,8 @@ func (c CGenService) generateServiceFile(in generateServiceFilesInput) (ok bool,
 			"{FuncDefinition}": funcArray.Join("\n\t"),
 		}))
 		generatedContent += "\n"
-	}
+		return true
+	})
 	generatedContent += ")"
 	generatedContent += "\n"

@ -70,17 +73,19 @@ func (c CGenService) generateServiceFile(in generateServiceFilesInput) (ok bool,
 		generatingInterfaceCheck string
 	)
 	// Variable definitions.
-	for structName := range in.SrcStructFunctions {
+	in.SrcStructFunctions.Iterator(func(key, value interface{}) bool {
+		structName := key.(string)
 		generatingInterfaceCheck = fmt.Sprintf(`[^\w\d]+%s.I%s[^\w\d]`, in.DstPackageName, structName)
 		if gregex.IsMatchString(generatingInterfaceCheck, generatedContent) {
-			continue
+			return true
 		}
 		variableContent += gstr.Trim(gstr.ReplaceByMap(consts.TemplateGenServiceContentVariable, g.MapStrStr{
 			"{StructName}":    structName,
 			"{InterfaceName}": "I" + structName,
 		}))
 		variableContent += "\n"
-	}
+		return true
+	})
 	if variableContent != "" {
 		generatedContent += "var("
 		generatedContent += "\n"
@ -89,17 +94,19 @@ func (c CGenService) generateServiceFile(in generateServiceFilesInput) (ok bool,
 		generatedContent += "\n"
 	}
 	// Variable register function definitions.
-	for structName := range in.SrcStructFunctions {
+	in.SrcStructFunctions.Iterator(func(key, value interface{}) bool {
+		structName := key.(string)
 		generatingInterfaceCheck = fmt.Sprintf(`[^\w\d]+%s.I%s[^\w\d]`, in.DstPackageName, structName)
 		if gregex.IsMatchString(generatingInterfaceCheck, generatedContent) {
-			continue
+			return true
 		}
 		generatedContent += gstr.Trim(gstr.ReplaceByMap(consts.TemplateGenServiceContentRegister, g.MapStrStr{
 			"{StructName}":    structName,
 			"{InterfaceName}": "I" + structName,
 		}))
 		generatedContent += "\n\n"
-	}
+		return true
+	})

 	// Replace empty braces that have new line.
 	generatedContent, _ = gregex.ReplaceString(`{[\s\t]+}`, `{}`, generatedContent)
@ -194,28 +201,9 @@ func (c CGenService) generateInitializationFile(in CGenServiceInput, importSrcPa
 }

 // getDstFileNameCase call gstr.Case* function to convert the s to specified case.
-func (c CGenService) getDstFileNameCase(str, caseStr string) string {
-	switch gstr.ToLower(caseStr) {
-	case gstr.ToLower("Lower"):
-		return gstr.ToLower(str)
-
-	case gstr.ToLower("Camel"):
-		return gstr.CaseCamel(str)
-
-	case gstr.ToLower("CamelLower"):
-		return gstr.CaseCamelLower(str)
-
-	case gstr.ToLower("Kebab"):
-		return gstr.CaseKebab(str)
-
-	case gstr.ToLower("KebabScreaming"):
-		return gstr.CaseKebabScreaming(str)
-
-	case gstr.ToLower("SnakeFirstUpper"):
-		return gstr.CaseSnakeFirstUpper(str)
-
-	case gstr.ToLower("SnakeScreaming"):
-		return gstr.CaseSnakeScreaming(str)
+func (c CGenService) getDstFileNameCase(str, caseStr string) (newStr string) {
+	if newStr := gstr.CaseConvert(str, gstr.CaseTypeMatch(caseStr)); newStr != str {
+		return newStr
 	}
 	return gstr.CaseSnake(str)
 }
--- a/cmd/gf/internal/cmd/testdata/build/multiple/multiple.go
+++ b/cmd/gf/internal/cmd/testdata/build/multiple/multiple.go
@ -0,0 +1,5 @@
+package main
+
+func main() {
+
+}
--- a/cmd/gf/internal/cmd/testdata/build/single/main.go
+++ b/cmd/gf/internal/cmd/testdata/build/single/main.go
@ -0,0 +1,5 @@
+package main
+
+func main() {
+
+}
--- a/cmd/gf/internal/cmd/testdata/build/varmap/go.mod
+++ b/cmd/gf/internal/cmd/testdata/build/varmap/go.mod
@ -0,0 +1,12 @@
+module github.com/gogf/gf/cmd/gf/cmd/gf/testdata/vardump/v2
+
+go 1.18
+
+require github.com/gogf/gf/v2 v2.6.1
+
+require (
+	go.opentelemetry.io/otel v1.14.0 // indirect
+	go.opentelemetry.io/otel/trace v1.14.0 // indirect
+)
+
+replace github.com/gogf/gf/v2 => ../../../../../../../
--- a/cmd/gf/internal/cmd/testdata/build/varmap/go.sum
+++ b/cmd/gf/internal/cmd/testdata/build/varmap/go.sum
@ -0,0 +1,27 @@
+github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
+github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/grokify/html-strip-tags-go v0.0.1 h1:0fThFwLbW7P/kOiTBs03FsJSV9RM2M/Q/MOnCQxKMo0=
+github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
+go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
+go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY=
+go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
+go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
--- a/cmd/gf/internal/cmd/testdata/build/varmap/main.go
+++ b/cmd/gf/internal/cmd/testdata/build/varmap/main.go
@ -0,0 +1,13 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogf/gf/v2/os/gbuild"
+)
+
+func main() {
+	for k, v := range gbuild.Data() {
+		fmt.Printf("%s: %v\n", k, v)
+	}
+}
--- a/cmd/gf/internal/cmd/testdata/fix/fix25_content.go
+++ b/cmd/gf/internal/cmd/testdata/fix/fix25_content.go
@ -27,4 +27,4 @@ func Test_Router_Hook_Multi(t *testing.T) {
 			r.Response.Write("2")
 		},
 	})
-}
+}
--- a/cmd/gf/internal/cmd/testdata/genctrl/api/article/article_expect.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/api/article/article_expect.go
@ -0,0 +1,24 @@
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genctrl/api/article/v1"
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genctrl/api/article/v2"
+)
+
+type IArticleV1 interface {
+	Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error)
+	Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error)
+	GetList(ctx context.Context, req *v1.GetListReq) (res *v1.GetListRes, err error)
+	GetOne(ctx context.Context, req *v1.GetOneReq) (res *v1.GetOneRes, err error)
+}
+
+type IArticleV2 interface {
+	Create(ctx context.Context, req *v2.CreateReq) (res *v2.CreateRes, err error)
+	Update(ctx context.Context, req *v2.UpdateReq) (res *v2.UpdateRes, err error)
+}
--- a/cmd/gf/internal/cmd/testdata/genctrl/api/article/v1/edit.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/api/article/v1/edit.go
@ -0,0 +1,27 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package v1
+
+import "github.com/gogf/gf/v2/frame/g"
+
+type (
+	CreateReq struct {
+		g.Meta `path:"/article/create" method:"post" tags:"ArticleService"`
+		Title  string `v:"required"`
+	}
+
+	CreateRes struct{}
+)
+
+type (
+	UpdateReq struct {
+		g.Meta `path:"/article/update" method:"post" tags:"ArticleService"`
+		Title  string `v:"required"`
+	}
+
+	UpdateRes struct{}
+)
--- a/cmd/gf/internal/cmd/testdata/genctrl/api/article/v1/get.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/api/article/v1/get.go
@ -0,0 +1,25 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package v1
+
+import "github.com/gogf/gf/v2/frame/g"
+
+type GetListReq struct {
+	g.Meta `path:"/article/list" method:"get" tags:"ArticleService"`
+}
+
+type GetListRes struct {
+	list []struct{}
+}
+
+type GetOneReq struct {
+	g.Meta `path:"/article/one" method:"get" tags:"ArticleService"`
+}
+
+type GetOneRes struct {
+	one struct{}
+}
--- a/cmd/gf/internal/cmd/testdata/genctrl/api/article/v2/edit.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/api/article/v2/edit.go
@ -0,0 +1,23 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package v2
+
+import "github.com/gogf/gf/v2/frame/g"
+
+type CreateReq struct {
+	g.Meta `path:"/article/create" method:"post" tags:"ArticleService"`
+	Title  string `v:"required"`
+}
+
+type CreateRes struct{}
+
+type UpdateReq struct {
+	g.Meta `path:"/article/update" method:"post" tags:"ArticleService"`
+	Title  string `v:"required"`
+}
+
+type UpdateRes struct{}
--- a/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article.go
@ -0,0 +1,5 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package article
--- a/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_new.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_new.go
@ -0,0 +1,21 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package article
+
+import (
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genctrl/api/article"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() article.IArticleV1 {
+	return &ControllerV1{}
+}
+
+type ControllerV2 struct{}
+
+func NewV2() article.IArticleV2 {
+	return &ControllerV2{}
+}
--- a/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v1_create.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v1_create.go
@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genctrl/api/article/v1"
+)
+
+func (c *ControllerV1) Create(ctx context.Context, req *v1.CreateReq) (res *v1.CreateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}
--- a/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v1_get_list.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v1_get_list.go
@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genctrl/api/article/v1"
+)
+
+func (c *ControllerV1) GetList(ctx context.Context, req *v1.GetListReq) (res *v1.GetListRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}
--- a/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v1_get_one.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v1_get_one.go
@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genctrl/api/article/v1"
+)
+
+func (c *ControllerV1) GetOne(ctx context.Context, req *v1.GetOneReq) (res *v1.GetOneRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}
--- a/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v1_update.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v1_update.go
@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genctrl/api/article/v1"
+)
+
+func (c *ControllerV1) Update(ctx context.Context, req *v1.UpdateReq) (res *v1.UpdateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}
--- a/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v2_create.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v2_create.go
@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genctrl/api/article/v2"
+)
+
+func (c *ControllerV2) Create(ctx context.Context, req *v2.CreateReq) (res *v2.CreateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}
--- a/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v2_update.go
+++ b/cmd/gf/internal/cmd/testdata/genctrl/controller/article/article_v2_update.go
@ -0,0 +1,14 @@
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genctrl/api/article/v2"
+)
+
+func (c *ControllerV2) Update(ctx context.Context, req *v2.UpdateReq) (res *v2.UpdateRes, err error) {
+	return nil, gerror.NewCode(gcode.CodeNotImplemented)
+}
--- a/cmd/gf/internal/cmd/testdata/gendao/generated_user/dao/internal/table_user.go
+++ b/cmd/gf/internal/cmd/testdata/gendao/generated_user/dao/internal/table_user.go
@ -0,0 +1,85 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+package internal
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// TableUserDao is the data access object for table table_user.
+type TableUserDao struct {
+	table   string           // table is the underlying table name of the DAO.
+	group   string           // group is the database configuration group name of current DAO.
+	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
+}
+
+// TableUserColumns defines and stores column names for table table_user.
+type TableUserColumns struct {
+	Id       string // User ID
+	Passport string // User Passport
+	Password string // User Password
+	Nickname string // User Nickname
+	Score    string // Total score amount.
+	CreateAt string // Created Time
+	UpdateAt string // Updated Time
+}
+
+// tableUserColumns holds the columns for table table_user.
+var tableUserColumns = TableUserColumns{
+	Id:       "id",
+	Passport: "passport",
+	Password: "password",
+	Nickname: "nickname",
+	Score:    "score",
+	CreateAt: "create_at",
+	UpdateAt: "update_at",
+}
+
+// NewTableUserDao creates and returns a new DAO object for table data access.
+func NewTableUserDao() *TableUserDao {
+	return &TableUserDao{
+		group:   "test",
+		table:   "table_user",
+		columns: tableUserColumns,
+	}
+}
+
+// DB retrieves and returns the underlying raw database management object of current DAO.
+func (dao *TableUserDao) DB() gdb.DB {
+	return g.DB(dao.group)
+}
+
+// Table returns the table name of current dao.
+func (dao *TableUserDao) Table() string {
+	return dao.table
+}
+
+// Columns returns all column names of current dao.
+func (dao *TableUserDao) Columns() TableUserColumns {
+	return dao.columns
+}
+
+// Group returns the configuration group name of database of current dao.
+func (dao *TableUserDao) Group() string {
+	return dao.group
+}
+
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+func (dao *TableUserDao) Ctx(ctx context.Context) *gdb.Model {
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+}
+
+// Transaction wraps the transaction logic using function f.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It commits the transaction and returns nil if function f returns nil.
+//
+// Note that, you should not Commit or Rollback the transaction in function f
+// as it is automatically handled by this function.
+func (dao *TableUserDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
+	return dao.Ctx(ctx).Transaction(ctx, f)
+}
--- a/cmd/gf/internal/cmd/testdata/gendao/generated_user/dao/table_user.go
+++ b/cmd/gf/internal/cmd/testdata/gendao/generated_user/dao/table_user.go
@ -0,0 +1,27 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package dao
+
+import (
+	"for-gendao-test/pkg/dao/internal"
+)
+
+// internalTableUserDao is internal type for wrapping internal DAO implements.
+type internalTableUserDao = *internal.TableUserDao
+
+// tableUserDao is the data access object for table table_user.
+// You can define custom methods on it to extend its functionality as you wish.
+type tableUserDao struct {
+	internalTableUserDao
+}
+
+var (
+	// TableUser is globally public accessible object for table table_user operations.
+	TableUser = tableUserDao{
+		internal.NewTableUserDao(),
+	}
+)
+
+// Fill with you ideas below.
--- a/cmd/gf/internal/cmd/testdata/gendao/generated_user/model/do/table_user.go
+++ b/cmd/gf/internal/cmd/testdata/gendao/generated_user/model/do/table_user.go
@ -0,0 +1,22 @@
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
+package do
+
+import (
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
+)
+
+// TableUser is the golang structure of table table_user for DAO operations like Where/Data.
+type TableUser struct {
+	g.Meta   `orm:"table:table_user, do:true"`
+	Id       interface{} // User ID
+	Passport interface{} // User Passport
+	Password interface{} // User Password
+	Nickname interface{} // User Nickname
+	Score    interface{} // Total score amount.
+	CreateAt *gtime.Time // Created Time
+	UpdateAt *gtime.Time // Updated Time
+}
--- a/cmd/gf/internal/cmd/testdata/gendao/generated_user/model/entity/table_user.go
+++ b/cmd/gf/internal/cmd/testdata/gendao/generated_user/model/entity/table_user.go
@ -0,0 +1,20 @@
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
+package entity
+
+import (
+	"github.com/gogf/gf/v2/os/gtime"
+)
+
+// TableUser is the golang structure for table table_user.
+type TableUser struct {
+	Id       uint        `json:"ID"        ` // User ID
+	Passport string      `json:"PASSPORT"  ` // User Passport
+	Password string      `json:"PASSWORD"  ` // User Password
+	Nickname string      `json:"NICKNAME"  ` // User Nickname
+	Score    float64     `json:"SCORE"     ` // Total score amount.
+	CreateAt *gtime.Time `json:"CREATE_AT" ` // Created Time
+	UpdateAt *gtime.Time `json:"UPDATE_AT" ` // Updated Time
+}
--- a/cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/dao/internal/table_user.go
+++ b/cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/dao/internal/table_user.go
@ -0,0 +1,85 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+package internal
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// TableUserDao is the data access object for table table_user.
+type TableUserDao struct {
+	table   string           // table is the underlying table name of the DAO.
+	group   string           // group is the database configuration group name of current DAO.
+	columns TableUserColumns // columns contains all the column names of Table for convenient usage.
+}
+
+// TableUserColumns defines and stores column names for table table_user.
+type TableUserColumns struct {
+	Id       string // User ID
+	Passport string // User Passport
+	Password string // User Password
+	Nickname string // User Nickname
+	Score    string // Total score amount.
+	CreateAt string // Created Time
+	UpdateAt string // Updated Time
+}
+
+// tableUserColumns holds the columns for table table_user.
+var tableUserColumns = TableUserColumns{
+	Id:       "id",
+	Passport: "passport",
+	Password: "password",
+	Nickname: "nickname",
+	Score:    "score",
+	CreateAt: "create_at",
+	UpdateAt: "update_at",
+}
+
+// NewTableUserDao creates and returns a new DAO object for table data access.
+func NewTableUserDao() *TableUserDao {
+	return &TableUserDao{
+		group:   "test",
+		table:   "table_user",
+		columns: tableUserColumns,
+	}
+}
+
+// DB retrieves and returns the underlying raw database management object of current DAO.
+func (dao *TableUserDao) DB() gdb.DB {
+	return g.DB(dao.group)
+}
+
+// Table returns the table name of current dao.
+func (dao *TableUserDao) Table() string {
+	return dao.table
+}
+
+// Columns returns all column names of current dao.
+func (dao *TableUserDao) Columns() TableUserColumns {
+	return dao.columns
+}
+
+// Group returns the configuration group name of database of current dao.
+func (dao *TableUserDao) Group() string {
+	return dao.group
+}
+
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+func (dao *TableUserDao) Ctx(ctx context.Context) *gdb.Model {
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+}
+
+// Transaction wraps the transaction logic using function f.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It commits the transaction and returns nil if function f returns nil.
+//
+// Note that, you should not Commit or Rollback the transaction in function f
+// as it is automatically handled by this function.
+func (dao *TableUserDao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
+	return dao.Ctx(ctx).Transaction(ctx, f)
+}
--- a/cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/dao/table_user.go
+++ b/cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/dao/table_user.go
@ -0,0 +1,27 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package dao
+
+import (
+	"for-gendao-test/pkg/dao/internal"
+)
+
+// internalTableUserDao is internal type for wrapping internal DAO implements.
+type internalTableUserDao = *internal.TableUserDao
+
+// tableUserDao is the data access object for table table_user.
+// You can define custom methods on it to extend its functionality as you wish.
+type tableUserDao struct {
+	internalTableUserDao
+}
+
+var (
+	// TableUser is globally public accessible object for table table_user operations.
+	TableUser = tableUserDao{
+		internal.NewTableUserDao(),
+	}
+)
+
+// Fill with you ideas below.
--- a/cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/model/do/table_user.go
+++ b/cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/model/do/table_user.go
@ -0,0 +1,22 @@
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
+package do
+
+import (
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gtime"
+)
+
+// TableUser is the golang structure of table table_user for DAO operations like Where/Data.
+type TableUser struct {
+	g.Meta   `orm:"table:table_user, do:true"`
+	Id       interface{} // User ID
+	Passport interface{} // User Passport
+	Password interface{} // User Password
+	Nickname interface{} // User Nickname
+	Score    interface{} // Total score amount.
+	CreateAt *gtime.Time // Created Time
+	UpdateAt *gtime.Time // Updated Time
+}
--- a/cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/model/entity/table_user.go
+++ b/cmd/gf/internal/cmd/testdata/gendao/generated_user_type_mapping/model/entity/table_user.go
@ -0,0 +1,21 @@
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
+package entity
+
+import (
+	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/shopspring/decimal"
+)
+
+// TableUser is the golang structure for table table_user.
+type TableUser struct {
+	Id       int64           `json:"id"       ` // User ID
+	Passport string          `json:"passport" ` // User Passport
+	Password string          `json:"password" ` // User Password
+	Nickname string          `json:"nickname" ` // User Nickname
+	Score    decimal.Decimal `json:"score"    ` // Total score amount.
+	CreateAt *gtime.Time     `json:"createAt" ` // Created Time
+	UpdateAt *gtime.Time     `json:"updateAt" ` // Updated Time
+}
--- a/cmd/gf/internal/cmd/testdata/gendao/go.mod.txt
+++ b/cmd/gf/internal/cmd/testdata/gendao/go.mod.txt
@ -0,0 +1,32 @@
+module for-gendao-test/pkg
+
+go 1.18
+
+require (
+	github.com/gogf/gf/v2 v2.5.3
+	github.com/shopspring/decimal v1.3.1
+)
+
+require (
+	github.com/BurntSushi/toml v1.2.0 // indirect
+	github.com/clbanning/mxj/v2 v2.7.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/grokify/html-strip-tags-go v0.0.1 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
+	go.opentelemetry.io/otel v1.14.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.14.0 // indirect
+	go.opentelemetry.io/otel/trace v1.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
--- a/cmd/gf/internal/cmd/testdata/gendao/user.tpl.sql
+++ b/cmd/gf/internal/cmd/testdata/gendao/user.tpl.sql
@ -0,0 +1,10 @@
+CREATE TABLE `%s` (
+    `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
+    `passport` varchar(45) NOT NULL COMMENT 'User Passport',
+    `password` varchar(45) NOT NULL COMMENT 'User Password',
+    `nickname` varchar(45) NOT NULL COMMENT 'User Nickname',
+    `score` decimal(10,2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
+    `create_at` datetime DEFAULT NULL COMMENT 'Created Time',
+    `update_at` datetime DEFAULT NULL COMMENT 'Updated Time',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--- a/cmd/gf/internal/cmd/testdata/genpbentity/generated_user/table_user.proto
+++ b/cmd/gf/internal/cmd/testdata/genpbentity/generated_user/table_user.proto
@ -0,0 +1,21 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+syntax = "proto3";
+
+package unittest;
+
+option go_package = "unittest";
+
+import "google/protobuf/timestamp.proto";
+
+message TableUser {
+    uint32                    ID        = 1; // User ID              
+    string                    PASSPORT  = 2; // User Passport        
+    string                    PASSWORD  = 3; // User Password        
+    string                    NICKNAME  = 4; // User Nickname        
+    string                    SCORE     = 5; // Total score amount.  
+    google.protobuf.Timestamp CREATE_AT = 6; // Created Time         
+    google.protobuf.Timestamp UPDATE_AT = 7; // Updated Time         
+}
--- a/cmd/gf/internal/cmd/testdata/genpbentity/user.tpl.sql
+++ b/cmd/gf/internal/cmd/testdata/genpbentity/user.tpl.sql
@ -0,0 +1,10 @@
+CREATE TABLE `%s` (
+    `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
+    `passport` varchar(45) NOT NULL COMMENT 'User Passport',
+    `password` varchar(45) NOT NULL COMMENT 'User Password',
+    `nickname` varchar(45) NOT NULL COMMENT 'User Nickname',
+    `score` decimal(10,2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
+    `create_at` datetime DEFAULT NULL COMMENT 'Created Time',
+    `update_at` datetime DEFAULT NULL COMMENT 'Updated Time',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--- a/cmd/gf/internal/cmd/testdata/genservice/logic/article/article.go
+++ b/cmd/gf/internal/cmd/testdata/genservice/logic/article/article.go
@ -0,0 +1,34 @@
+// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package article
+
+import (
+	"context"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/service"
+)
+
+type sArticle struct {
+}
+
+func init() {
+	service.RegisterArticle(&sArticle{})
+}
+
+// Get article details
+func (s *sArticle) Get(ctx context.Context, id uint) (info struct{}, err error) {
+	return struct{}{}, err
+}
+
+// Create
+/**
+ * create an article.
+ * @author oldme
+ */
+func (s *sArticle) Create(ctx context.Context, info struct{}) (id uint, err error) {
+	return id, err
+}
--- a/cmd/gf/internal/cmd/testdata/genservice/logic/logic_expect.go
+++ b/cmd/gf/internal/cmd/testdata/genservice/logic/logic_expect.go
@ -0,0 +1,9 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+package logic
+
+import (
+	_ "github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/logic/article"
+)
--- a/cmd/gf/internal/cmd/testdata/genservice/service/article.go
+++ b/cmd/gf/internal/cmd/testdata/genservice/service/article.go
@ -0,0 +1,38 @@
+// ================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// You can delete these comments if you wish manually maintain this interface file.
+// ================================================================================
+
+package service
+
+import (
+	"context"
+)
+
+type (
+	IArticle interface {
+		// Get article details
+		Get(ctx context.Context, id uint) (info struct{}, err error)
+		// Create
+		/**
+		 * create an article.
+		 * @author oldme
+		 */
+		Create(ctx context.Context, info struct{}) (id uint, err error)
+	}
+)
+
+var (
+	localArticle IArticle
+)
+
+func Article() IArticle {
+	if localArticle == nil {
+		panic("implement not found for interface IArticle, forgot register?")
+	}
+	return localArticle
+}
+
+func RegisterArticle(i IArticle) {
+	localArticle = i
+}
--- a/cmd/gf/internal/cmd/testdata/issue/2572/config.yaml
+++ b/cmd/gf/internal/cmd/testdata/issue/2572/config.yaml
@ -0,0 +1,20 @@
+gfcli:
+  gen:
+    dao:
+      - link: "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
+        tables: "user1"
+        descriptionTag: true
+        noModelComment: true
+        group: "sys"
+        clear: true
+        overwriteDao: true
+      - link: "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
+        tables: "user2"
+        descriptionTag: true
+        noModelComment: true
+        group: "book"
+        clear: true
+        overwriteDao: true
+
+
+
--- a/cmd/gf/internal/cmd/testdata/issue/2572/dao/internal/user_3.go
+++ b/cmd/gf/internal/cmd/testdata/issue/2572/dao/internal/user_3.go
@ -0,0 +1,85 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+package internal
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// User3Dao is the data access object for table user3.
+type User3Dao struct {
+	table   string       // table is the underlying table name of the DAO.
+	group   string       // group is the database configuration group name of current DAO.
+	columns User3Columns // columns contains all the column names of Table for convenient usage.
+}
+
+// User3Columns defines and stores column names for table user3.
+type User3Columns struct {
+	Id       string // User ID
+	Passport string // User Passport
+	Password string // User Password
+	Nickname string // User Nickname
+	Score    string // Total score amount.
+	CreateAt string // Created Time
+	UpdateAt string // Updated Time
+}
+
+// user3Columns holds the columns for table user3.
+var user3Columns = User3Columns{
+	Id:       "id",
+	Passport: "passport",
+	Password: "password",
+	Nickname: "nickname",
+	Score:    "score",
+	CreateAt: "create_at",
+	UpdateAt: "update_at",
+}
+
+// NewUser3Dao creates and returns a new DAO object for table data access.
+func NewUser3Dao() *User3Dao {
+	return &User3Dao{
+		group:   "sys",
+		table:   "user3",
+		columns: user3Columns,
+	}
+}
+
+// DB retrieves and returns the underlying raw database management object of current DAO.
+func (dao *User3Dao) DB() gdb.DB {
+	return g.DB(dao.group)
+}
+
+// Table returns the table name of current dao.
+func (dao *User3Dao) Table() string {
+	return dao.table
+}
+
+// Columns returns all column names of current dao.
+func (dao *User3Dao) Columns() User3Columns {
+	return dao.columns
+}
+
+// Group returns the configuration group name of database of current dao.
+func (dao *User3Dao) Group() string {
+	return dao.group
+}
+
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+func (dao *User3Dao) Ctx(ctx context.Context) *gdb.Model {
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+}
+
+// Transaction wraps the transaction logic using function f.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It commits the transaction and returns nil if function f returns nil.
+//
+// Note that, you should not Commit or Rollback the transaction in function f
+// as it is automatically handled by this function.
+func (dao *User3Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
+	return dao.Ctx(ctx).Transaction(ctx, f)
+}
--- a/cmd/gf/internal/cmd/testdata/issue/2572/dao/internal/user_4.go
+++ b/cmd/gf/internal/cmd/testdata/issue/2572/dao/internal/user_4.go
@ -0,0 +1,85 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+package internal
+
+import (
+	"context"
+
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+// User4Dao is the data access object for table user4.
+type User4Dao struct {
+	table   string       // table is the underlying table name of the DAO.
+	group   string       // group is the database configuration group name of current DAO.
+	columns User4Columns // columns contains all the column names of Table for convenient usage.
+}
+
+// User4Columns defines and stores column names for table user4.
+type User4Columns struct {
+	Id       string // User ID
+	Passport string // User Passport
+	Password string // User Password
+	Nickname string // User Nickname
+	Score    string // Total score amount.
+	CreateAt string // Created Time
+	UpdateAt string // Updated Time
+}
+
+// user4Columns holds the columns for table user4.
+var user4Columns = User4Columns{
+	Id:       "id",
+	Passport: "passport",
+	Password: "password",
+	Nickname: "nickname",
+	Score:    "score",
+	CreateAt: "create_at",
+	UpdateAt: "update_at",
+}
+
+// NewUser4Dao creates and returns a new DAO object for table data access.
+func NewUser4Dao() *User4Dao {
+	return &User4Dao{
+		group:   "book",
+		table:   "user4",
+		columns: user4Columns,
+	}
+}
+
+// DB retrieves and returns the underlying raw database management object of current DAO.
+func (dao *User4Dao) DB() gdb.DB {
+	return g.DB(dao.group)
+}
+
+// Table returns the table name of current dao.
+func (dao *User4Dao) Table() string {
+	return dao.table
+}
+
+// Columns returns all column names of current dao.
+func (dao *User4Dao) Columns() User4Columns {
+	return dao.columns
+}
+
+// Group returns the configuration group name of database of current dao.
+func (dao *User4Dao) Group() string {
+	return dao.group
+}
+
+// Ctx creates and returns the Model for current DAO, It automatically sets the context for current operation.
+func (dao *User4Dao) Ctx(ctx context.Context) *gdb.Model {
+	return dao.DB().Model(dao.table).Safe().Ctx(ctx)
+}
+
+// Transaction wraps the transaction logic using function f.
+// It rollbacks the transaction and returns the error from function f if it returns non-nil error.
+// It commits the transaction and returns nil if function f returns nil.
+//
+// Note that, you should not Commit or Rollback the transaction in function f
+// as it is automatically handled by this function.
+func (dao *User4Dao) Transaction(ctx context.Context, f func(ctx context.Context, tx gdb.TX) error) (err error) {
+	return dao.Ctx(ctx).Transaction(ctx, f)
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Guo	607f079b23	fix: cache value assertion panic if the cache adapter is not in-memory for soft time feature of `package gdb`; improve converting performance for `gconv.Scan` (#3351 )	2024-03-07 11:36:42 +08:00
oldme	cab6b89446	enhance: update contrib/drivers/README.MD (#3355 )	2024-03-07 11:34:49 +08:00
John Guo	6ed3038312	feat: version v2.6.4 (#3352 )	2024-03-07 10:12:58 +08:00
laushunyu	9b48da459e	enhance: add sentinel auth config for redis (#3348 )	2024-03-06 19:27:52 +08:00
oldme	fbd266fad0	enhance: add `Save` operation support for SQLite #2764 (#3315 )	2024-03-06 19:22:58 +08:00
oldme	240dadff92	fix: `WherePri` function wrong in pgsql #3330 (#3339 )	2024-03-06 19:19:07 +08:00
oldme	290f4a3e65	fix: recognize `json_valid` constraint as json field type for database mariadb #2746 (#3309 )	2024-03-06 19:07:31 +08:00
oldme	97fcd9d726	enhance: improve `FormatUpsert` implements for pgsql (#3349 )	2024-03-06 19:05:13 +08:00
施国鹏	df15d70466	enhance: change tracing span name from request uri to router uri for http request (#3338 )	2024-03-05 21:11:27 +08:00
John Guo	680ae8616b	fix: generated dao go files forcely cleared by command `gf gen dao` if clear set true (#3337 )	2024-03-05 20:49:19 +08:00
houseme	4feb8219fa	feat: upgrade set-go version and add go 1.22 version (#3316 )	2024-03-04 20:18:31 +08:00
oldme	509cc47d3f	enhance: add `Save` operation support for pgsql #3053 (#3324 )	2024-03-04 20:17:43 +08:00
Agzer0	849b104c31	enhance: gproc.signal enhance #3325 (#3326 )	2024-03-04 20:10:05 +08:00
施国鹏	ce3ef13e6a	fix: otel tracing content contains invalid UTF-8 (#3340 )	2024-02-29 20:22:42 +08:00
rio	c8a73f8c25	nacos-sdk-go upgrade to v2 (#3334 )	2024-02-28 21:52:32 +08:00
weiwei	b71ee13ccd	fix error code comment on i18n defaultLanguage value (#3335 )	2024-02-28 21:51:43 +08:00
海亮	a347cdc30e	fix github pages ci (#3331 )	2024-02-28 19:20:37 +08:00
Tallone	39a88ef650	fix typo (#3332 )	2024-02-27 21:09:43 +08:00
oldme	8b156e25c4	enhance mysql_z_unit_model_test (#3329 )	2024-02-27 21:07:31 +08:00
海亮	eb0c4b3824	fix #3226 (#3322 )	2024-02-27 20:37:49 +08:00
海亮	56ef0c0735	fix issue command `gf run -w` takes no effect (#3321 )	2024-02-27 20:33:57 +08:00
oldme	a1a9465e52	add ExampleCache_Clear (#3310 )	2024-02-27 19:42:58 +08:00
John Guo	d64a31fd1a	new version v2.6.3 (#3308 )	2024-02-07 17:11:36 +08:00
John Guo	6cdf044320	fix issue #2616 (#3307 )	2024-02-07 16:47:41 +08:00
John Guo	5307f0742e	add `#` for cron pattern that can ignore seconds, which makes the cron pattern running in minimum minute like linux crontab pattern (#3306 )	2024-02-07 15:38:24 +08:00
oldme	51326f3d02	fix #3245 (#3298 )	2024-02-06 11:47:25 +08:00
oldme	e1fa99013a	use iota to unify the enums definition (#3305 )	2024-02-06 11:44:29 +08:00
John Guo	72014689e4	fix issue #2643 (#3304 )	2024-02-06 10:21:44 +08:00
John Guo	2acdf4bb47	add field type detection for soft time field like `created_at/updated_at/deleted_at` to support unix timestamp or bool deleting table field (#3293 )	2024-02-06 10:21:23 +08:00
John Guo	85c5b7f19e	fix issue #2594 (#3303 )	2024-02-05 20:40:03 +08:00
John Guo	42ec1a0076	fix issue #2572 (#3301 )	2024-02-05 19:20:05 +08:00
海亮	553cc45e54	fix empty pwd path read from `gfile.Pwd()` which could cause internal error logging for `gview.New` (#3302 )	2024-02-05 16:49:44 +08:00
John Guo	7415ec32c8	fix issue #2503 (#3299 )	2024-02-05 10:30:03 +08:00
John Guo	14568562e3	fix issue #2552 (#3300 )	2024-02-05 10:29:43 +08:00
John Guo	cc79d23334	fix issue #2457 (#3297 )	2024-02-02 10:57:24 +08:00
John Guo	ef2b47d180	fix issue #3292 (#3294 )	2024-02-01 16:02:36 +08:00
jswxstw	adc056f547	feat: support running commands via non-command line arguments (#3290 )	2024-01-30 20:14:13 +08:00
John Guo	8266a16b4e	fix issue #3286 (#3289 )	2024-01-30 20:03:58 +08:00
conwaypan	c4a51f4c2f	bugfix:fix gconv map deep option not effective (#3287 )	2024-01-29 19:52:04 +08:00
海亮	4ddc9c3909	add offline document link in readme.md (#3284 )	2024-01-25 20:47:21 +08:00
oldme	0a2f8abb40	Update annotation for redis.toml (#3282 )	2024-01-24 20:37:41 +08:00
John Guo	81de5d3f25	fix workflow script for cli building and release (#3279 )	2024-01-24 20:36:50 +08:00
John Guo	e6d61e6e14	fix error in `gerror.HasCode` (#3277 )	2024-01-24 20:36:32 +08:00
John Guo	4fb739615b	version v2.6.2 (#3276 )	2024-01-22 21:53:10 +08:00
John Guo	ba39323d30	improve converter feature for package gconv (#3211 )	2024-01-22 21:52:54 +08:00
John Guo	383937fe69	add example for ctx keys feature of package `glog` (#3273 )	2024-01-22 21:07:40 +08:00
Bob	f919f90bf5	rename gitee issue template (#3274 ) rename gitee ISSUE_TEMPLATE.MD to ISSUE_TEMPLATE	2024-01-22 21:07:04 +08:00
John Guo	b4f6f06ab5	no printing internal middleware for `ghttp.Server` (#3271 )	2024-01-22 21:05:40 +08:00
John Guo	73fbca40ca	add internal error logging and update comments for `gclient.RequestVar` (#3270 )	2024-01-18 10:21:38 +08:00
houseme	e8d3fcac6b	feat: upgrade gitee sync Hub Mirror Action (#3272 )	2024-01-18 10:21:14 +08:00
John Guo	f87182d5b8	fix workflow for gitee sync (#3269 )	2024-01-17 20:27:41 +08:00
John Guo	951f8921cd	fix #3237 (#3267 )	2024-01-17 15:35:48 +08:00
oldme	d26b7c5437	fix some wrong comment (#3265 )	2024-01-16 14:08:07 +08:00
John Guo	9407fda197	add example for exporting prometheus metrics using `ghttp.Server` (#3266 )	2024-01-16 14:07:49 +08:00
loveyfore	905913f7be	Fix gf gen service bug. Fix the issue of significant differences in the generated code every … (#3260 )	2024-01-15 20:35:14 +08:00
John Guo	4b8eaac73f	fix issue #3232 (#3247 )	2024-01-15 20:33:30 +08:00
oldme	ca242ff401	fix #3251 (#3254 )	2024-01-11 22:15:22 +08:00
oldme	42e3c5f39a	fix #3253 (#3255 )	2024-01-11 22:14:22 +08:00
John Guo	4f4d2c2f8e	add `MiddlewareNeverDoneCtx` for package `ghttp` (#3250 )	2024-01-06 13:03:49 +08:00
Gin	5a01798481	fix: memory leak when gcache.NewAdapterMemory with lru (#3241 )	2024-01-03 20:03:19 +08:00
海亮	8af1eb693e	Update README.MD (#3243 )	2024-01-03 19:49:06 +08:00
oldme	335ccb32af	Update Github issue template (#3234 )	2024-01-02 20:42:14 +08:00
海亮	e1f2666499	add example for serve file (#3193 )	2024-01-02 20:19:40 +08:00
John Guo	22fcfdf755	add configuration support for logger of `grpcx.Server` (#3223 )	2024-01-02 20:19:05 +08:00
John Guo	1e21b61a19	fix typo flie -> file (#3228 )	2024-01-02 20:17:54 +08:00
John Guo	6abd8bd864	comments update for package gstr (#3233 )	2024-01-02 20:16:51 +08:00
cy	4876ae0e2b	fix:gz files are compressed repeatedly every time tick (#3236 )	2024-01-02 20:10:57 +08:00
海亮	63bdf41d40	fix #3191 (#3194 )	2023-12-28 20:18:29 +08:00
海亮	984cca8b82	feat: update dependent redoc js for swagger ui (#3217 )	2023-12-28 20:13:21 +08:00
oldme	9f7ce42c74	enhance #3221 (#3224 )	2023-12-28 20:07:07 +08:00
zhangyuyu	16a43bcb6c	Add comment for Format method so that you can know Layout method. (#3230 )	2023-12-26 16:19:59 +08:00
John Guo	85d95e3e27	version v2.6.1 (#3222 )	2023-12-21 21:12:51 +08:00
海亮	4cce8557e6	fix: #2924 (#3177 )	2023-12-21 10:16:14 +08:00
zhonghuaxunGM	d60d7674d7	fix issues for package contrib/drivers/dm (#3157 )	2023-12-20 20:33:58 +08:00
海亮	7f9467d1f8	fix: #2938 (#3178 )	2023-12-20 20:25:23 +08:00
glennliao	d08e3ef838	fix: #2689 change sessionId in cookie (#3203 )	2023-12-20 20:21:15 +08:00
John Guo	645c5ff5b5	fix issue #3218 #3204 (#3220 )	2023-12-19 21:58:12 +08:00
John Guo	7975e391f0	Version/v2.6.0 (#3213 )	2023-12-18 20:59:09 +08:00
zhangyuyu	565790036e	improve gen dao to support removeFieldPrefix (#3208 )	2023-12-18 20:26:43 +08:00
John Guo	44819b135e	fix issue #3204 (#3212 )	2023-12-18 20:19:18 +08:00
海亮	bb19877430	fix: #3197 (#3206 )	2023-12-18 19:11:39 +08:00
海亮	fc02e06423	doc: update readme img (#3207 )	2023-12-15 15:56:08 +08:00
海亮	dd8a5dcf32	fix: #3179 (#3195 )	2023-12-14 21:51:28 +08:00
zhangyuyu	33584506ab	fix issue: request body was closed while retrying in callRequest method (#3199 )	2023-12-14 14:18:31 +08:00
John Guo	ee2cf92479	Version/v2.6.0 beta (#3183 )	2023-12-04 19:34:48 +08:00
海亮	0b6dd6fb13	improve initialization performance and logging content for cmd gf (#3174 )	2023-11-30 18:59:49 +08:00
海亮	993467bb3c	test: add date-format test for RFC3339 (#3181 )	2023-11-29 19:12:21 +08:00
海亮	c7c9f0011a	fix: #2967 (#3175 )	2023-11-29 19:05:21 +08:00
John Guo	9aa872e705	improve map converting feature using `MapOption` for package `gconv` (#3170 )	2023-11-23 18:59:04 +08:00
John Guo	ea5d52cb2f	fix issue #3147 (#3161 )	2023-11-22 21:05:39 +08:00
海亮	b1754f8254	script updates for version upgrading (#3169 )	2023-11-22 20:49:07 +08:00
John Guo	83f08b3135	fix issue in Join stements with prefix specified for package gdb (#3151 )	2023-11-20 20:47:26 +08:00
Hunk Zhu	d3d1f94e40	Upgrade nacos sdk to latest version (#3166 )	2023-11-20 20:47:00 +08:00
John Guo	fc8572e8dd	version v2.5.7 (#3162 )	2023-11-20 10:01:54 +08:00
wlqe	85acd3d31d	Fix the bug that ScanAndCount and AllAndCount report errors in sqlserver (#3155 )	2023-11-16 20:15:48 +08:00
海亮	9694a68211	Optimize the information display of gf -v (#3145 )	2023-11-16 20:10:45 +08:00
oldme	0be8b29e42	improve gen service code (#3140 )	2023-11-14 20:53:41 +08:00
海亮	5580ac9475	fix issue in cross-building failed in windows (#3152 )	2023-11-14 20:10:49 +08:00
zhangyuyu	84ed66018e	fix issue: Windows Platform did not handle process signal (#3154 )	2023-11-14 20:00:26 +08:00
海亮	4d7f9552fe	fix: gdb unsupport aliyun hologres link (#3150 )	2023-11-13 22:05:53 +08:00
oldme	d4b14fd717	add gen service unit testing (#3142 )	2023-11-09 20:04:05 +08:00
li-caspar	0bd15bdab5	fix: "gf gen dao" utils.GetModPath Return empty string in windows (#3141 )	2023-11-09 20:02:47 +08:00
Hunk Zhu	0b407c5e6d	fix "gf gen pb" api and ctrl not working well. (#3076 )	2023-11-08 21:26:51 +08:00
海亮	5f5b82188c	example: log rotate (#3137 )	2023-11-08 21:23:39 +08:00
John Guo	a17849bc39	improve struct converting in parameter name case sensitive scenario for package `gconv` (#3122 )	2023-11-08 21:17:55 +08:00
houseme	f3e3a5af5a	feat: improve code for shutdown of otel (#3136 )	2023-11-08 21:16:23 +08:00
oldme	dc71c0d28f	enhance #3129 (#3134 )	2023-11-06 19:27:26 +08:00
海亮	eb99f5ebfe	rename function name `PKCS5UnPadding` to `PKCS7UnPadding` (#3124 )	2023-11-06 19:20:07 +08:00
oldme	007fe0ea1a	enhance #3063 (#3115 )	2023-11-06 09:59:45 +08:00
zhonghuaxunGM	50b04c658c	improve implements and fix issues for package `contrib/drivers/dm` (#3128 )	2023-11-06 09:52:36 +08:00
John Guo	cbea89e6f7	fix duplicated route dump for package ghttp (#3116 )	2023-11-02 09:48:39 +08:00
海亮	e2e12fadb0	add function `CaseConvert` for package gstr (#3098 )	2023-11-01 19:52:07 +08:00
oldme	47eaa513c0	add unit testing cases for command `gen ctrl` (#3090 )	2023-11-01 19:23:03 +08:00
John Guo	3bbc0fdd21	add Output configuration support for command `gf build` in cross-buildling binary scenario (#3120 )	2023-11-01 19:18:44 +08:00
oldme	9393072745	improve TemplateGenCtrlController is comments and formats (#3065 )	2023-10-31 20:21:18 +08:00
John Guo	e42aa64d75	improve impelements for logging file rotation in windows (#3080 )	2023-10-31 20:19:01 +08:00
wond4	b6935a7285	fix(goai): example value needs to be converted just like default value (#3085 )	2023-10-31 20:18:39 +08:00
houseme	b0367e4a62	fix: gRPC-Go HTTP/2 Rapid Reset vulnerability (#3095 )	2023-10-31 20:17:39 +08:00
Hunk Zhu	0b71bc43a8	fix issue #3099 (#3107 )	2023-10-31 20:02:20 +08:00
Gin	afeca8cf9d	fix: nacos mod (#3103 )	2023-10-31 10:04:51 +08:00
sam	33c396fb74	fix cmd `gen pbentity` for generating go orm files for database postgres (#3105 )	2023-10-31 10:04:07 +08:00
Hunk Zhu	4903ef7887	fix issue #3100 (#3106 )	2023-10-30 20:27:48 +08:00
Xiaodong Liu	ab5ab4c675	Add the Protocol attribute to the Redis configuration (#3109 )	2023-10-30 20:11:23 +08:00
John Guo	3ea61d084e	fix issue #3086 (#3089 )	2023-10-26 10:04:21 +08:00
海亮	2433b2ce99	ignore cmd/gf/go.work.sum from version controll (#3087 )	2023-10-25 21:17:21 +08:00
海亮	927758a2a9	fix separator issue in windows os for command `gf gen` (#3088 )	2023-10-25 21:16:05 +08:00
houseme	cb0d018fa4	feat: upgrade version and improve consul action (#3078 )	2023-10-24 20:36:01 +08:00
海亮	49f69f6ade	Update README.MD (#3082 )	2023-10-24 20:33:10 +08:00
John Guo	bcb479aabb	fix issue #3077 (#3081 )	2023-10-24 10:02:04 +08:00
Hunk	db59f4232f	add README and example cases for nacos registry (#3075 )	2023-10-23 20:04:39 +08:00
海亮	aa625d24bc	add example for http rate llimit (#3072 )	2023-10-23 20:02:37 +08:00
John Guo	36cfbaaa22	README.MD updates for cli installation (#3071 )	2023-10-23 20:00:10 +08:00
John Guo	f8462b5218	split ci workflow into two workflows for short (#3069 )	2023-10-23 19:28:26 +08:00
John Guo	b2bd12a371	version v2.5.5 (#3068 )	2023-10-20 10:21:04 +08:00
John Guo	acf2307eb9	fix issue #2963 (#3062 )	2023-10-19 19:58:19 +08:00
ltp217	93964ee231	delete repeat code in ut for package ghttp (#3058 )	2023-10-18 20:04:07 +08:00
PickMeUp	943939ba2b	improve cache duration from second to millisecond for redis adapter of package gcache (#3052 )	2023-10-18 20:02:23 +08:00
海亮	f1b5a223bf	add go workspace for cmd/gf, to enable go install for cmd/gf (#3040 )	2023-10-18 20:01:16 +08:00
John Guo	bb9cd37fab	add `SetNoUrlEncode/NoUrlEncode` functions for `gclient.Client` (#3041 )	2023-10-17 21:19:59 +08:00
John Guo	972f8c3aff	improve comments for package gconv (#3057 )	2023-10-17 21:09:46 +08:00
ltp217	34e522306d	resolve response is gzip in internalMiddlewareServerTracing (#3055 )	2023-10-17 20:35:56 +08:00
John Guo	7c92c2f7e8	improve comments and variable names for `gcfg.AdapterFile` of package `gcfg` (#3046 )	2023-10-17 20:12:07 +08:00
zhangshican	5204bdb60d	add option `merge` controlling generating controller files into one single file for command `gf gen ctrl` (#3045 )	2023-10-17 20:11:23 +08:00
glossy	6ab8d065d1	fix:incorrect parameter passing causes captured errors to be lost (#3048 )	2023-10-16 21:20:21 +08:00
海亮	d4e686226b	improve version checks for ci script (#3047 )	2023-10-16 21:18:23 +08:00
海亮	19d7714503	fix security issue for `golang.org/x` packages (#3042 )	2023-10-16 20:45:43 +08:00
John Guo	f464f30e6f	improve comment of router feature for ghttp.Server (#3014 )	2023-10-16 20:41:10 +08:00
XG	0e7d7d1eee	feat: add `-w/--watchPaths` for subcommand `gf run` (#3009 )	2023-10-12 21:07:51 +08:00
Hunk	6af66a0201	add service registry implements using `nacos` (#2995 )	2023-10-12 21:06:37 +08:00
Jack Ling	81f3ad043d	ci: Update action script to remove inactive labels (#3013 )	2023-10-11 21:39:20 +08:00
海亮	ca7450f595	enable go cache for ci, coverage of ut testing is only available after merge of pr (#3011 )	2023-10-11 21:38:43 +08:00
kele1997	65192a7f92	fix issue gconv struct slice/map of json.RawMessage (#3006 ) (#3008 )	2023-10-11 21:35:27 +08:00
John Guo	8c309ac9fe	fix issue #2907 (#3005 )	2023-10-11 21:34:17 +08:00
John Guo	7f1ce2aff3	fix issue #2904 (#3004 )	2023-10-11 21:33:51 +08:00
oldme	10b67fc7b0	fix issues #2980 (#2994 )	2023-10-11 21:28:53 +08:00
海亮	3cd005911d	fix issue reading resource from manage in function New of package gres (#2961 )	2023-10-10 20:02:52 +08:00
海亮	d10d96800f	temporaryly close the testing of package `kubecm` to avoid disk unavailable issue (#3007 )	2023-10-10 14:09:58 +08:00
houseme	35e5f1f204	feat: Migrate the service call tracing to use `otlphttp` or `otlpgrpc` for reporting (#3001 )	2023-10-09 20:09:20 +08:00
John Guo	1efdb72990	add direct service address support for grpc client (#2991 )	2023-10-09 20:03:45 +08:00
John Guo	8d925d4741	fix issue #2890 (#3002 )	2023-10-09 20:00:08 +08:00
John Guo	d6362cad16	add `List2/List3/ListAndTrim2/ListAndTrim3` functions for package `gstr` (#2986 )	2023-10-09 19:58:14 +08:00
aries	00e83fed3f	add function `Partition` for Model of package gdb (#2989 )	2023-10-08 09:49:21 +08:00
huhu	02f1cc7b40	allowing use printToStdout, printToFile and printToWriter at the same time for Logger of package glog (#2990 )	2023-10-07 20:46:24 +08:00
monchickey	32a60c2e96	Add consul config adapter usage example. (#2988 )	2023-10-07 20:19:47 +08:00
John Guo	30040332a7	improve address configuration for grpc server (#2982 )	2023-09-27 14:40:32 +08:00
houseme	569cbb09bf	fix: improve specification version (#2987 )	2023-09-26 22:03:18 +08:00
海亮	130191f4ed	add `in:header` tag cache for http request to enhance performance (#2923 )	2023-09-25 21:34:58 +08:00
monchickey	e6732039c6	add consul config adapter (#2964 )	2023-09-25 21:02:55 +08:00
John Guo	df92c483d0	fix isue #2976 , to be compatible with bad response type definition for strict route function (#2977 )	2023-09-25 20:40:32 +08:00
the harder the luckier	7c9eefef3d	feat: Preserve original file permissions & Default copy permissions c… (#2969 )	2023-09-19 20:20:13 +08:00
海亮	42de1c1dbe	improve example cases for package gi18n (#2970 )	2023-09-19 20:18:43 +08:00
laushunyu	395df940d7	fix(gutil): panic when field is []byte(BINARY in mysql) (#2957 )	2023-09-18 20:16:59 +08:00
the harder the luckier	ef1e18df19	fix: gutil.IsMap judgment logic error (#2953 )	2023-09-13 19:30:02 +08:00
光芒伞	e684eae878	Make GTime support multiple formats (#2933 )	2023-09-13 19:29:25 +08:00
John Guo	5219c5c37e	add ut cases for command `gen dao` (#2958 )	2023-09-12 22:00:35 +08:00
海亮	5059abd88e	upgrade dependence `github.com/apolloconfig/agollo/v4` version from `v4.1.1` to `v4.3.1` for package `contrib/config/apollo` (#2949 )	2023-09-12 21:20:53 +08:00
houseme	e2ed058e3b	feat: upgrade action/checkout to v4 (#2948 )	2023-09-12 21:20:10 +08:00
houseme	ccc959a2d3	feat: jaeger package will be removed in v2.6.0. (#2946 )	2023-09-12 21:17:47 +08:00
John Guo	a5a7d23792	improve `g.Go` (#2956 )	2023-09-12 20:00:01 +08:00