Merge remote-tracking branch 'Origin/feat/v3' into feat/v3

Author: CyJaySong

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

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

.github/workflows/scripts/before_script.sh

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

.github/workflows/scripts/replace_examples_gomod.sh

@@ -57,7 +57,7 @@ for file in `find ${workdir} -name go.mod`; do
             [ -z "$dep" ] && continue
 
             # Calculate the relative path for the replacement
-            if [[ "$dep" == "github.com/gogf/gf/v2" ]]; then
+            if [[ "$dep" == "github.com/gogf/gf/v3" ]]; then
                 replacement="$relativePath"
             else
                 # Extract the path after v2 and remove trailing version

.golangci.yml

@@ -116,7 +116,7 @@ linters-settings:
     # A comma-separated list of prefixes, which, if set, checks import paths
     # with the given prefixes are grouped after 3rd-party packages.
     # Default: ""
-    local-prefixes: github.com/gogf/gf/v2
+    local-prefixes: github.com/gogf/gf/v3
   gci:
     # Section configuration to compare against.
     # Section names are case-insensitive and may contain parameters in ().

.make_version.sh

@@ -57,13 +57,13 @@ for file in `find ${workdir} -name go.mod`; do
     cd $goModPath
     if [ $goModPath = "./cmd/gf" ]; then
         mv go.work go.work.version.bak
-        go mod edit -replace github.com/gogf/gf/v2=../../
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/clickhouse/v2=../../contrib/drivers/clickhouse
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/mssql/v2=../../contrib/drivers/mssql
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/mysql/v2=../../contrib/drivers/mysql
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/oracle/v2=../../contrib/drivers/oracle
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/pgsql/v2=../../contrib/drivers/pgsql
-        go mod edit -replace github.com/gogf/gf/contrib/drivers/sqlite/v2=../../contrib/drivers/sqlite
+        go mod edit -replace github.com/gogf/gf/v3=../../
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/clickhouse/v3=../../contrib/drivers/clickhouse
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/mssql/v3=../../contrib/drivers/mssql
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/mysql/v3=../../contrib/drivers/mysql
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/oracle/v3=../../contrib/drivers/oracle
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/pgsql/v3=../../contrib/drivers/pgsql
+        go mod edit -replace github.com/gogf/gf/contrib/drivers/sqlite/v3=../../contrib/drivers/sqlite
     fi
     go mod tidy
     # Remove toolchain line if exists
@@ -77,13 +77,13 @@ for file in `find ${workdir} -name go.mod`; do
     # Remove toolchain line if exists
     sed -i '' '/^toolchain/d' go.mod
     if [ $goModPath = "./cmd/gf" ]; then
-        go mod edit -dropreplace github.com/gogf/gf/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/clickhouse/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/mssql/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/mysql/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/oracle/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/pgsql/v2
-        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/sqlite/v2
+        go mod edit -dropreplace github.com/gogf/gf/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/clickhouse/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/mssql/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/mysql/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/oracle/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/pgsql/v3
+        go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/sqlite/v3
         mv go.work.version.bak go.work
     fi
     cd -

README.MD

@@ -2,9 +2,9 @@
 <div align=center>
 <img src="https://goframe.org/img/logo_full.png" width="300" alt="goframe gf logo"/>
 
-[![Go Reference](https://pkg.go.dev/badge/github.com/gogf/gf/v2.svg)](https://pkg.go.dev/github.com/gogf/gf/v2)
+[![Go Reference](https://pkg.go.dev/badge/github.com/gogf/gf/v3.svg)](https://pkg.go.dev/github.com/gogf/gf/v3)
 [![GoFrame CI](https://github.com/gogf/gf/actions/workflows/ci-main.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/ci-main.yml)
-[![Go Report Card](https://goreportcard.com/badge/github.com/gogf/gf/v2)](https://goreportcard.com/report/github.com/gogf/gf/v2)
+[![Go Report Card](https://goreportcard.com/badge/github.com/gogf/gf/v3)](https://goreportcard.com/report/github.com/gogf/gf/v3)
 [![Code Coverage](https://codecov.io/gh/gogf/gf/branch/master/graph/badge.svg)](https://codecov.io/gh/gogf/gf)
 [![Production Ready](https://img.shields.io/badge/production-ready-blue.svg?style=flat)](https://github.com/gogf/gf)
 [![License](https://img.shields.io/github/license/gogf/gf.svg?style=flat)](https://github.com/gogf/gf)
@@ -28,7 +28,7 @@ A powerful framework for faster, easier, and more efficient project development.
 - GoFrame Official Site(en): [https://goframe.org/en](https://goframe.org/en)
 - GoFrame Mirror Site(中文): [https://goframe.org.cn](https://goframe.org.cn)
 - GoFrame Mirror Site(github pages): [https://pages.goframe.org](https://pages.goframe.org)
-- GoDoc API: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2)
+- GoDoc API: [https://pkg.go.dev/github.com/gogf/gf/v3](https://pkg.go.dev/github.com/gogf/gf/v3)
 
 
 # Contributors

cmd/gf/README.MD

@@ -37,8 +37,8 @@ You can also install `gf` tool using pre-built binaries: <https://github.com/gog
 ## 2) Manually Install
 
 ```shell
-go install github.com/gogf/gf/cmd/gf/v2@latest # latest version
-go install github.com/gogf/gf/cmd/gf/v2@v2.5.5 # certain version(should be >= v2.5.5)
+go install github.com/gogf/gf/cmd/gf/v3@latest # latest version
+go install github.com/gogf/gf/cmd/gf/v3@v2.5.5 # certain version(should be >= v2.5.5)
 ```
 
 ## 2. Commands

cmd/gf/gfcmd/gfcmd.go

@@ -11,19 +11,19 @@ import (
 	"context"
 	"runtime"
 
-	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
+	_ "github.com/gogf/gf/cmd/gf/v3/internal/packed"
 
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcfg"
-	"github.com/gogf/gf/v2/os/gcmd"
-	"github.com/gogf/gf/v2/os/gfile"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gcfg"
+	"github.com/gogf/gf/v3/os/gcmd"
+	"github.com/gogf/gf/v3/os/gfile"
+	"github.com/gogf/gf/v3/text/gstr"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v3/internal/cmd"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v3/internal/utility/mlog"
 )
 
 const cliFolderName = `hack`

cmd/gf/go.mod

@@ -1,15 +1,15 @@
-module github.com/gogf/gf/cmd/gf/v2
+module github.com/gogf/gf/cmd/gf/v3
 
 go 1.22
 
 require (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.0
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.0
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.0
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.0
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.0
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.0
-	github.com/gogf/gf/v2 v2.9.0
+	github.com/gogf/gf/contrib/drivers/clickhouse/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/mssql/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/mysql/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/oracle/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/pgsql/v3 v3.0.0-alpha
+	github.com/gogf/gf/contrib/drivers/sqlite/v3 v3.0.0-alpha
+	github.com/gogf/gf/v3 v3.0.0-alpha
 	github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/schollz/progressbar/v3 v3.15.0

cmd/gf/go.work

@@ -10,11 +10,11 @@ use (
 // =====================================================================================================
 
 replace (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 => ../../contrib/drivers/clickhouse
-	github.com/gogf/gf/contrib/drivers/mssql/v2 => ../../contrib/drivers/mssql
-	github.com/gogf/gf/contrib/drivers/mysql/v2 => ../../contrib/drivers/mysql
-	github.com/gogf/gf/contrib/drivers/oracle/v2 => ../../contrib/drivers/oracle
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 => ../../contrib/drivers/pgsql
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 => ../../contrib/drivers/sqlite
-	github.com/gogf/gf/v2 => ../../
+	github.com/gogf/gf/contrib/drivers/clickhouse/v3 => ../../contrib/drivers/clickhouse
+	github.com/gogf/gf/contrib/drivers/mssql/v3 => ../../contrib/drivers/mssql
+	github.com/gogf/gf/contrib/drivers/mysql/v3 => ../../contrib/drivers/mysql
+	github.com/gogf/gf/contrib/drivers/oracle/v3 => ../../contrib/drivers/oracle
+	github.com/gogf/gf/contrib/drivers/pgsql/v3 => ../../contrib/drivers/pgsql
+	github.com/gogf/gf/contrib/drivers/sqlite/v3 => ../../contrib/drivers/sqlite
+	github.com/gogf/gf/v3 => ../../
 )