Version/v2.6.0 (#3213)

.github/workflows/golangci-lint.yml

@@ -36,7 +36,7 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go-version: [ '1.18','1.19','1.20','1.21' ]
+        go-version: [ '1.18','1.19','1.20','1.21.4' ]
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:

README.MD

@@ -9,6 +9,15 @@
 [![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)
 [![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)](https://github.com/gogf/gf/releases)
+[![GitHub pull requests](https://img.shields.io/github/issues-pr/gogf/gf)](https://github.com/gogf/gf/pulls)
+[![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed/gogf/gf)](https://github.com/gogf/gf/pulls?q=is%3Apr+is%3Aclosed)
+[![GitHub issues](https://img.shields.io/github/issues/gogf/gf)](https://github.com/gogf/gf/issues)
+[![GitHub closed issues](https://img.shields.io/github/issues-closed/gogf/gf)](https://github.com/gogf/gf/issues?q=is%3Aissue+is%3Aclosed)
+![Stars](https://img.shields.io/github/stars/gogf/gf)
+![Forks](https://img.shields.io/github/forks/gogf/gf)
+
 </div>
 
 `GoFrame` is a modular, powerful, high-performance and enterprise-class application development framework of Golang.

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.6.0-beta
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.6.0-beta
-	github.com/gogf/gf/v2 v2.6.0-beta
-	github.com/minio/selfupdate v0.6.0
+	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.6.0
+	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.6.0
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.0
+	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.6.0
+	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.6.0
+	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.6.0
+	github.com/gogf/gf/v2 v2.6.0
+	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

cmd/gf/go.sum

@@ -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=
@@ -73,8 +75,6 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 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,7 +126,6 @@ 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.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=

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"

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

@@ -59,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"
 `
@@ -145,6 +146,7 @@ func init() {
 		`CGenDaoBriefTablesEx`:           CGenDaoBriefTablesEx,
 		`CGenDaoBriefPrefix`:             CGenDaoBriefPrefix,
 		`CGenDaoBriefRemovePrefix`:       CGenDaoBriefRemovePrefix,
+		`CGenDaoBriefRemoveFieldPrefix`:  CGenDaoBriefRemoveFieldPrefix,
 		`CGenDaoBriefStdTime`:            CGenDaoBriefStdTime,
 		`CGenDaoBriefWithTime`:           CGenDaoBriefWithTime,
 		`CGenDaoBriefDaoPath`:            CGenDaoBriefDaoPath,
@@ -180,6 +182,7 @@ type (
 		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"`

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

@@ -138,6 +138,7 @@ type generateDaoInternalInput struct {
 
 func generateDaoInternal(in generateDaoInternalInput) {
 	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{
@@ -146,8 +147,8 @@ 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)
 	if err := gfile.PutContents(path, strings.TrimSpace(modelContent)); err != nil {
@@ -160,16 +161,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),
 		}
 	}
@@ -189,12 +197,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]
@@ -203,8 +212,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),
 		}

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

@@ -126,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))

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

@@ -31,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:"CamelLower"`
+		Option            string `name:"option"            short:"o"  brief:"{CGenPbEntityBriefOption}"`
 	}
 	CGenPbEntityOutput struct{}
 
@@ -87,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"
 `
@@ -120,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,
 	})
 }
 
@@ -351,9 +354,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),
 	}

contrib/config/apollo/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/apolloconfig/agollo/v4 v4.3.1
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 )
 
 require (

contrib/config/consul/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/consul/v2
 go 1.19
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/hashicorp/consul/api v1.24.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 )

contrib/config/kubecm/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2
 go 1.19
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	k8s.io/api v0.27.4
 	k8s.io/apimachinery v0.27.4
 	k8s.io/client-go v0.27.4

contrib/config/nacos/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/nacos-group/nacos-sdk-go v1.1.4
 )
 

contrib/config/polaris/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/polarismesh/polaris-go v1.5.5
 )
 

contrib/drivers/clickhouse/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.0.15
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/google/uuid v1.3.0
 	github.com/shopspring/decimal v1.3.1
 )

contrib/drivers/dm/go.mod

@@ -6,7 +6,7 @@ replace github.com/gogf/gf/v2 => ../../../
 
 require (
 	gitee.com/chunanyong/dm v1.8.12
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 )
 
 require (

contrib/drivers/mssql/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/denisenkom/go-mssqldb v0.12.3
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 )
 
 require (

contrib/drivers/mysql/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/go-sql-driver/mysql v1.7.1
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 )
 
 require (

contrib/drivers/mysql/mysql_issue_test.go

@@ -881,3 +881,28 @@ func Test_Issue3086(t *testing.T) {
 		t.Assert(n, 2)
 	})
 }
+
+// https://github.com/gogf/gf/issues/3204
+func Test_Issue3204(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+	db.SetDebug(true)
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			g.Meta     `orm:"do:true"`
+			Id         interface{} `orm:"id,omitempty"`
+			Passport   interface{} `orm:"passport,omitempty"`
+			Password   interface{} `orm:"password,omitempty"`
+			Nickname   interface{} `orm:"nickname,omitempty"`
+			CreateTime interface{} `orm:"create_time,omitempty"`
+		}
+		where := User{
+			Id:       2,
+			Passport: "",
+		}
+		all, err := db.Model(table).Where(where).All()
+		t.AssertNil(err)
+		t.Assert(len(all), 1)
+		t.Assert(all[0]["id"], 2)
+	})
+}

contrib/drivers/oracle/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/sijms/go-ora/v2 v2.7.10
 )
 

contrib/drivers/pgsql/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/lib/pq v1.10.9
 )
 

contrib/drivers/sqlite/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/glebarez/go-sqlite v1.21.2
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 )
 
 require (

contrib/drivers/sqlitecgo/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/sqlitecgo/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/mattn/go-sqlite3 v1.14.17
 )
 

contrib/nosql/redis/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/nosql/redis/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/redis/go-redis/v9 v9.2.1
 	go.opentelemetry.io/otel v1.14.0
 	go.opentelemetry.io/otel/trace v1.14.0

contrib/registry/etcd/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/etcd/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	go.etcd.io/etcd/client/v3 v3.5.7
 )
 

contrib/registry/file/go.mod

@@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/registry/file/v2
 
 go 1.18
 
-require github.com/gogf/gf/v2 v2.6.0-beta
+require github.com/gogf/gf/v2 v2.6.0
 
 require (
 	github.com/BurntSushi/toml v1.2.0 // indirect

contrib/registry/nacos/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/nacos/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/joy999/nacos-sdk-go v0.0.0-20231120071639-10a34b3e7288
 )
 

contrib/registry/polaris/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/polaris/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/polarismesh/polaris-go v1.5.5
 )
 

contrib/registry/zookeeper/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/go-zookeeper/zk v1.0.3
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	golang.org/x/sync v0.4.0
 )
 

contrib/rpc/grpcx/go.mod

@@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/rpc/grpcx/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/contrib/registry/file/v2 v2.6.0-beta
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/contrib/registry/file/v2 v2.6.0
+	github.com/gogf/gf/v2 v2.6.0
 	go.opentelemetry.io/otel v1.14.0
 	go.opentelemetry.io/otel/trace v1.14.0
 	google.golang.org/grpc v1.57.2

contrib/sdk/httpclient/go.mod

@@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/sdk/httpclient/v2
 
 go 1.18
 
-require github.com/gogf/gf/v2 v2.6.0-beta
+require github.com/gogf/gf/v2 v2.6.0
 
 require (
 	github.com/BurntSushi/toml v1.2.0 // indirect

contrib/trace/jaeger/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/jaeger/v2
 go 1.18
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	go.opentelemetry.io/otel v1.14.0
 	go.opentelemetry.io/otel/exporters/jaeger v1.14.0
 	go.opentelemetry.io/otel/sdk v1.14.0

contrib/trace/otlpgrpc/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlpgrpc/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	go.opentelemetry.io/otel v1.19.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0

contrib/trace/otlphttp/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlphttp/v2
 go 1.20
 
 require (
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/v2 v2.6.0
 	go.opentelemetry.io/otel v1.19.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0

database/gdb/gdb_core_structure.go

@@ -60,7 +60,7 @@ func (c *Core) GetFieldType(ctx context.Context, fieldName, table, schema string
 func (c *Core) ConvertDataForRecord(ctx context.Context, value interface{}, table string) (map[string]interface{}, error) {
 	var (
 		err  error
-		data = DataToMapDeep(value)
+		data = MapOrStructToMapDeep(value, false)
 	)
 	for fieldName, fieldValue := range data {
 		data[fieldName], err = c.db.ConvertValueForField(

database/gdb/gdb_func.go

@@ -213,11 +213,19 @@ func anyValueToMapBeforeToRecord(value interface{}) map[string]interface{} {
 	return gconv.Map(value, gconv.MapOption{Tags: structTagPriority})
 }
 
-// DataToMapDeep converts `value` to map type recursively(if attribute struct is embedded).
+// DaToMapDeep is deprecated, use MapOrStructToMapDeep instead.
+func DaToMapDeep(value interface{}) map[string]interface{} {
+	return MapOrStructToMapDeep(value, false)
+}
+
+// MapOrStructToMapDeep converts `value` to map type recursively(if attribute struct is embedded).
 // The parameter `value` should be type of *map/map/*struct/struct.
 // It supports embedded struct definition for struct.
-func DataToMapDeep(value interface{}) map[string]interface{} {
-	m := gconv.Map(value, gconv.MapOption{Tags: structTagPriority})
+func MapOrStructToMapDeep(value interface{}, omitempty bool) map[string]interface{} {
+	m := gconv.Map(value, gconv.MapOption{
+		Tags:      structTagPriority,
+		OmitEmpty: omitempty,
+	})
 	for k, v := range m {
 		switch v.(type) {
 		case time.Time, *time.Time, gtime.Time, *gtime.Time, gjson.Json, *gjson.Json:
@@ -413,7 +421,7 @@ func formatWhereHolder(ctx context.Context, db DB, in formatWhereHolderInput) (n
 		newArgs = formatWhereInterfaces(db, gconv.Interfaces(in.Where), buffer, newArgs)
 
 	case reflect.Map:
-		for key, value := range DataToMapDeep(in.Where) {
+		for key, value := range MapOrStructToMapDeep(in.Where, true) {
 			if in.OmitNil && empty.IsNil(value) {
 				continue
 			}
@@ -468,7 +476,7 @@ func formatWhereHolder(ctx context.Context, db DB, in formatWhereHolderInput) (n
 		var (
 			reflectType = reflectInfo.OriginValue.Type()
 			structField reflect.StructField
-			data        = DataToMapDeep(in.Where)
+			data        = MapOrStructToMapDeep(in.Where, true)
 		)
 		// If `Prefix` is given, it checks and retrieves the table name.
 		if in.Prefix != "" {

database/gdb/gdb_model_insert.go

@@ -268,7 +268,7 @@ func (m *Model) doInsertWithOption(ctx context.Context, insertOption InsertOptio
 
 	default:
 		// It uses gconv.Map here to simply fo the type converting from interface{} to map[string]interface{},
-		// as there's another DataToMapDeep in next logic to do the deep converting.
+		// as there's another MapOrStructToMapDeep in next logic to do the deep converting.
 		reflectInfo := reflection.OriginValueAndKind(newData)
 		switch reflectInfo.OriginKind {
 		// If it's slice type, it then converts it to List type.

example/go.mod

@@ -3,21 +3,21 @@ module github.com/gogf/gf/example
 go 1.20
 
 require (
-	github.com/gogf/gf/contrib/config/apollo/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/config/consul/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/config/kubecm/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/config/nacos/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/config/polaris/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/nosql/redis/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/registry/etcd/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/registry/file/v2 v2.6.0-beta
+	github.com/gogf/gf/contrib/config/apollo/v2 v2.6.0
+	github.com/gogf/gf/contrib/config/consul/v2 v2.6.0
+	github.com/gogf/gf/contrib/config/kubecm/v2 v2.6.0
+	github.com/gogf/gf/contrib/config/nacos/v2 v2.6.0
+	github.com/gogf/gf/contrib/config/polaris/v2 v2.6.0
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.0
+	github.com/gogf/gf/contrib/nosql/redis/v2 v2.6.0
+	github.com/gogf/gf/contrib/registry/etcd/v2 v2.6.0
+	github.com/gogf/gf/contrib/registry/file/v2 v2.6.0
 	github.com/gogf/gf/contrib/registry/nacos/v2 v2.5.6
-	github.com/gogf/gf/contrib/registry/polaris/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.6.0-beta
-	github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.6.0-beta
-	github.com/gogf/gf/v2 v2.6.0-beta
+	github.com/gogf/gf/contrib/registry/polaris/v2 v2.6.0
+	github.com/gogf/gf/contrib/rpc/grpcx/v2 v2.6.0
+	github.com/gogf/gf/contrib/trace/otlpgrpc/v2 v2.6.0
+	github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.6.0
+	github.com/gogf/gf/v2 v2.6.0
 	github.com/hashicorp/consul/api v1.24.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/nacos-group/nacos-sdk-go v1.1.4

net/gclient/gclient_request.go

@@ -338,8 +338,8 @@ func (c *Client) callRequest(req *http.Request) (resp *Response, err error) {
 	// raw HTTP request-response procedure.
 	reqBodyContent, _ := io.ReadAll(req.Body)
 	resp.requestBody = reqBodyContent
-	req.Body = utils.NewReadCloser(reqBodyContent, false)
 	for {
+		req.Body = utils.NewReadCloser(reqBodyContent, false)
 		if resp.Response, err = c.Do(req); err != nil {
 			err = gerror.Wrapf(err, `request failed`)
 			// The response might not be nil when err != nil.

net/ghttp/ghttp_server_admin_process.go

@@ -117,7 +117,7 @@ func forkReloadProcess(ctx context.Context, newExeFilePath ...string) error {
 	var (
 		path = os.Args[0]
 	)
-	if len(newExeFilePath) > 0 {
+	if len(newExeFilePath) > 0 && newExeFilePath[0] != "" {
 		path = newExeFilePath[0]
 	}
 	var (
@@ -156,12 +156,12 @@ func forkReloadProcess(ctx context.Context, newExeFilePath ...string) error {
 }
 
 // forkRestartProcess creates a new server process.
-func forkRestartProcess(ctx context.Context, newExeFilePath string) error {
+func forkRestartProcess(ctx context.Context, newExeFilePath ...string) error {
 	var (
 		path = os.Args[0]
 	)
-	if newExeFilePath != "" {
-		path = newExeFilePath
+	if len(newExeFilePath) > 0 && newExeFilePath[0] != "" {
+		path = newExeFilePath[0]
 	}
 	if err := os.Unsetenv(adminActionReloadEnvKey); err != nil {
 		intlog.Errorf(ctx, `%+v`, err)

version.go

@@ -2,5 +2,5 @@ package gf
 
 const (
 	// VERSION is the current GoFrame version.
-	VERSION = "v2.6.0-beta"
+	VERSION = "v2.6.0"
 )