cmd/gf: use automatic generating package names for go files of dao/do/entity instead of constant package names (#3639)

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

@@ -118,6 +118,7 @@ generated json tag case for model struct, cases are as follows:
 	tplVarGroupName               = `{TplGroupName}`
 	tplVarDatetimeStr             = `{TplDatetimeStr}`
 	tplVarCreatedAtDatetimeStr    = `{TplCreatedAtDatetimeStr}`
+	tplVarPackageName             = `{TplPackageName}`
 )
 
 var (

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

@@ -116,6 +116,7 @@ func generateDaoIndex(in generateDaoIndexInput) {
 				tplVarTableName:               in.TableName,
 				tplVarTableNameCamelCase:      in.TableNameCamelCase,
 				tplVarTableNameCamelLowerCase: in.TableNameCamelLowerCase,
+				tplVarPackageName:             filepath.Base(in.DaoPath),
 			})
 		indexContent = replaceDefaultVar(in.CGenDaoInternalInput, indexContent)
 		if err := gfile.PutContents(path, strings.TrimSpace(indexContent)); err != nil {

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

@@ -85,6 +85,7 @@ func generateDoContent(
 			tplVarPackageImports:     getImportPartContent(ctx, structDefine, true, nil),
 			tplVarTableNameCamelCase: tableNameCamelCase,
 			tplVarStructDefine:       structDefine,
+			tplVarPackageName:        filepath.Base(in.DoPath),
 		},
 	)
 	doContent = replaceDefaultVar(in, doContent)

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

@@ -70,6 +70,7 @@ func generateEntityContent(
 			tplVarPackageImports:     getImportPartContent(ctx, structDefine, false, appendImports),
 			tplVarTableNameCamelCase: tableNameCamelCase,
 			tplVarStructDefine:       structDefine,
+			tplVarPackageName:        filepath.Base(in.EntityPath),
 		},
 	)
 	entityContent = replaceDefaultVar(in, entityContent)

cmd/gf/internal/consts/consts_gen_dao_template_dao.go

@@ -11,7 +11,7 @@ const TemplateGenDaoIndexContent = `
 // This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
-package dao
+package {TplPackageName}
 
 import (
 	"{TplImportPrefix}/internal"

cmd/gf/internal/consts/consts_gen_dao_template_do.go

@@ -11,7 +11,7 @@ const TemplateGenDaoDoContent = `
 // Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. {TplCreatedAtDatetimeStr}
 // =================================================================================
 
-package do
+package {TplPackageName}
 
 {TplPackageImports}
 

cmd/gf/internal/consts/consts_gen_dao_template_entity.go

@@ -11,7 +11,7 @@ const TemplateGenDaoEntityContent = `
 // Code generated and maintained by GoFrame CLI tool. DO NOT EDIT. {TplCreatedAtDatetimeStr}
 // =================================================================================
 
-package entity
+package {TplPackageName}
 
 {TplPackageImports}