diff --git a/cmd/gf/internal/cmd/gendao/gendao.go b/cmd/gf/internal/cmd/gendao/gendao.go index 2b7ae3d61..7a048016e 100644 --- a/cmd/gf/internal/cmd/gendao/gendao.go +++ b/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 ( diff --git a/cmd/gf/internal/cmd/gendao/gendao_dao.go b/cmd/gf/internal/cmd/gendao/gendao_dao.go index 848528617..3d3b8a4d6 100644 --- a/cmd/gf/internal/cmd/gendao/gendao_dao.go +++ b/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 { diff --git a/cmd/gf/internal/cmd/gendao/gendao_do.go b/cmd/gf/internal/cmd/gendao/gendao_do.go index afe61ec57..16a4c15eb 100644 --- a/cmd/gf/internal/cmd/gendao/gendao_do.go +++ b/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) diff --git a/cmd/gf/internal/cmd/gendao/gendao_entity.go b/cmd/gf/internal/cmd/gendao/gendao_entity.go index 2717df201..7a36bf428 100644 --- a/cmd/gf/internal/cmd/gendao/gendao_entity.go +++ b/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) diff --git a/cmd/gf/internal/consts/consts_gen_dao_template_dao.go b/cmd/gf/internal/consts/consts_gen_dao_template_dao.go index bcf23736a..5af47e493 100644 --- a/cmd/gf/internal/consts/consts_gen_dao_template_dao.go +++ b/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" diff --git a/cmd/gf/internal/consts/consts_gen_dao_template_do.go b/cmd/gf/internal/consts/consts_gen_dao_template_do.go index 11914b010..320aaa9e2 100644 --- a/cmd/gf/internal/consts/consts_gen_dao_template_do.go +++ b/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} diff --git a/cmd/gf/internal/consts/consts_gen_dao_template_entity.go b/cmd/gf/internal/consts/consts_gen_dao_template_entity.go index 44af06aa3..67a868ec7 100644 --- a/cmd/gf/internal/consts/consts_gen_dao_template_entity.go +++ b/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}