From ec440f13b1c96e8925460535713eae787ac558e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Tue, 24 Jan 2023 20:46:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A8=A1=E6=9D=BF=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8A=A8=E6=80=81=E6=94=AF=E6=8C=81=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Abstract/ModelTemplateProvider.cs | 3 ++- .../Abstract/ProgramTemplateProvider.cs | 10 ++++++- .../ConstClasses/TemplateConst.cs | 6 +++-- .../module/Yi.Framework.Template/Program.cs | 19 ++++++------- .../Provider/Server/ConstTemplateProvider.cs | 4 +-- .../Server/CreateInputVoTemplateProvider.cs | 6 ++--- .../Server/GetListInputVoTemplateProvider.cs | 6 ++--- .../GetListOutputDtoTemplateProvider.cs | 6 ++--- .../Server/GetOutputDtoTemplateProvider.cs | 6 ++--- .../Server/IServiceTemplateProvider.cs | 4 +-- .../Server/ProfileTemplateProvider.cs | 4 +-- .../Server/ServiceTemplateProvider.cs | 4 +-- .../Server/UpdateInputVoTemplateProvider.cs | 6 ++--- .../Template/Server/ConstTemplate.txt | 2 +- .../Template/Server/CreateInputVoTemplate.txt | 2 +- .../Server/GetListInputVoTemplate.txt | 2 +- .../Server/GetListOutputDtoTemplate.txt | 2 +- .../Template/Server/GetOutputDtoTemplate.txt | 2 +- .../Template/Server/IServiceTemplate.txt | 4 +-- .../Template/Server/ProfileTemplate.txt | 6 ++--- .../Template/Server/ServiceTemplate.txt | 8 +++--- .../Template/Server/UpdateInputVoTemplate.txt | 2 +- .../Dtos/Student/StudentGetOutputDto.cs | 17 ------------ .../School/Dtos/StudentCreateInputVo.cs | 19 ------------- .../School/Dtos/StudentGetListInputVo.cs | 17 ------------ .../School/Dtos/StudentGetListOutputDto.cs | 17 ------------ .../School/Dtos/StudentUpdateInputVo.cs | 16 ----------- .../School/IStudentService.cs | 18 ------------- .../School/MapperConfig/StudentProfile.cs | 23 ---------------- .../School/StudentService.cs | 17 ------------ .../School/ConstClasses/StudentConst.cs | 16 ----------- .../School/DataSeeds/StudentDataSeed.cs | 27 ------------------- .../School/Entities/StudentEntity.cs | 25 ----------------- 33 files changed, 63 insertions(+), 263 deletions(-) delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/Student/StudentGetOutputDto.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentCreateInputVo.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentGetListInputVo.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentGetListOutputDto.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentUpdateInputVo.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/IStudentService.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/School/MapperConfig/StudentProfile.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/School/StudentService.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/School/ConstClasses/StudentConst.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/School/DataSeeds/StudentDataSeed.cs delete mode 100644 Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/School/Entities/StudentEntity.cs diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs index 7778f0df..2c3672aa 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Xml.Linq; using Yi.Framework.Template.ConstClasses; namespace Yi.Framework.Template.Abstract @@ -10,7 +11,7 @@ namespace Yi.Framework.Template.Abstract public abstract class ModelTemplateProvider : ProgramTemplateProvider { - public ModelTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public ModelTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { AddIgnoreEntityField(/*"Id", */"TenantId", "IsDeleted"); } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ProgramTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ProgramTemplateProvider.cs index 8fda0ffb..f518eebe 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ProgramTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ProgramTemplateProvider.cs @@ -10,15 +10,23 @@ namespace Yi.Framework.Template.Abstract public abstract class ProgramTemplateProvider : AbstractTemplateProvider { - public ProgramTemplateProvider(string modelName, string entityName) + public ProgramTemplateProvider(string modelName, string entityName,string nameSpaces) { ModelName = modelName; EntityName = entityName; + NameSpaces = nameSpaces; + base.AddTemplateDic(TemplateConst.NameSpaces, NameSpaces); base.AddTemplateDic(TemplateConst.EntityName, EntityName); base.AddTemplateDic(TemplateConst.ModelName, ModelName); base.AddTemplateDic(TemplateConst.LowerEntityName, EntityName.Substring(0, 1).ToLower() + EntityName.Substring(1)); base.AddTemplateDic(TemplateConst.LowerModelName, ModelName.ToLower()); } + + + /// + /// 命名空间 + /// + public string NameSpaces { get; set; } /// /// 实体名称 /// diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/ConstClasses/TemplateConst.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/ConstClasses/TemplateConst.cs index d051e35b..54822a33 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/ConstClasses/TemplateConst.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/ConstClasses/TemplateConst.cs @@ -36,7 +36,9 @@ namespace Yi.Framework.Template.ConstClasses //public const string BuildRootPath = "../../../_Code"; - public const string BuildRootPath = "../../../../../project"; - public const string BuildEntityPath = "../../../../../project"; + public const string NameSpaces = "#NameSpaces#"; + + public const string BuildRootPath = "../../../../../project/bbs"; + public const string BuildEntityPath = "../../../../../project/bbs"; } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Program.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Program.cs index d07381fc..53e06cc5 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Program.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Program.cs @@ -8,23 +8,24 @@ TemplateFactory templateFactory = new(); //选择需要生成的模板提供者 string modelName = "School"; +string nameSpaces = "Yi.BBS"; List entityNames = new() { "Student" }; foreach (var entityName in entityNames) { templateFactory.CreateTemplateProviders((option) => { - option.Add(new ServiceTemplateProvider(modelName, entityName)); - option.Add(new IServiceTemplateProvider(modelName, entityName)); + option.Add(new ServiceTemplateProvider(modelName, entityName, nameSpaces)); + option.Add(new IServiceTemplateProvider(modelName, entityName, nameSpaces)); - option.Add(new CreateInputVoTemplateProvider(modelName, entityName)); - option.Add(new UpdateInputVoTemplateProvider(modelName, entityName)); - option.Add(new GetListInputVoTemplateProvider(modelName, entityName)); - option.Add(new GetListOutputDtoTemplateProvider(modelName, entityName)); - option.Add(new GetOutputDtoTemplateProvider(modelName, entityName)); + option.Add(new CreateInputVoTemplateProvider(modelName, entityName, nameSpaces)); + option.Add(new UpdateInputVoTemplateProvider(modelName, entityName, nameSpaces)); + option.Add(new GetListInputVoTemplateProvider(modelName, entityName, nameSpaces)); + option.Add(new GetListOutputDtoTemplateProvider(modelName, entityName, nameSpaces)); + option.Add(new GetOutputDtoTemplateProvider(modelName, entityName, nameSpaces)); - option.Add(new ConstTemplateProvider(modelName, entityName)); - option.Add(new ProfileTemplateProvider(modelName, entityName)); + option.Add(new ConstTemplateProvider(modelName, entityName, nameSpaces)); + option.Add(new ProfileTemplateProvider(modelName, entityName, nameSpaces)); //option.Add(new ApiTemplateProvider(modelName, entityName)); }); //开始构建模板 diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ConstTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ConstTemplateProvider.cs index f992ecf2..d62cc481 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ConstTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ConstTemplateProvider.cs @@ -10,9 +10,9 @@ namespace Yi.Framework.Template.Provider.Server { internal class ConstTemplateProvider : ProgramTemplateProvider { - public ConstTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public ConstTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - BuildPath = $@"{TemplateConst.BuildRootPath}\Yi.Framework.Domain.Shared\{TemplateConst.ModelName}\ConstClasses\{TemplateConst.EntityName}Const.cs"; + BuildPath = $@"{TemplateConst.BuildRootPath}\{nameSpaces}.Domain.Shared\{TemplateConst.ModelName}\ConstClasses\{TemplateConst.EntityName}Const.cs"; TemplatePath = $@"..\..\..\Template\Server\ConstTemplate.txt"; } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/CreateInputVoTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/CreateInputVoTemplateProvider.cs index 26b95c5f..faedd408 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/CreateInputVoTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/CreateInputVoTemplateProvider.cs @@ -10,11 +10,11 @@ namespace Yi.Framework.Template.Provider.Server { public class CreateInputVoTemplateProvider : ModelTemplateProvider { - public CreateInputVoTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public CreateInputVoTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - BuildPath = $@"{TemplateConst.BuildRootPath}\Yi.Framework.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}CreateInputVo.cs"; + BuildPath = $@"{TemplateConst.BuildRootPath}\{nameSpaces}.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}CreateInputVo.cs"; TemplatePath = $@"..\..\..\Template\Server\CreateInputVoTemplate.txt"; - EntityPath = $@"{TemplateConst.BuildEntityPath}\Yi.Framework.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; + EntityPath = $@"{TemplateConst.BuildEntityPath}\{nameSpaces}.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; } } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetListInputVoTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetListInputVoTemplateProvider.cs index d984e14f..f3542b43 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetListInputVoTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetListInputVoTemplateProvider.cs @@ -10,11 +10,11 @@ namespace Yi.Framework.Template.Provider.Server { public class GetListInputVoTemplateProvider : ModelTemplateProvider { - public GetListInputVoTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public GetListInputVoTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - BuildPath = $@"{TemplateConst.BuildRootPath}\Yi.Framework.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}GetListInputVo.cs"; + BuildPath = $@"{TemplateConst.BuildRootPath}\{nameSpaces}.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}GetListInputVo.cs"; TemplatePath = $@"..\..\..\Template\Server\GetListInputVoTemplate.txt"; - EntityPath = $@"{TemplateConst.BuildEntityPath}\Yi.Framework.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; + EntityPath = $@"{TemplateConst.BuildEntityPath}\{nameSpaces}.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; } } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetListOutputDtoTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetListOutputDtoTemplateProvider.cs index 85abe13f..100b3b0f 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetListOutputDtoTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetListOutputDtoTemplateProvider.cs @@ -10,11 +10,11 @@ namespace Yi.Framework.Template.Provider.Server { public class GetListOutputDtoTemplateProvider : ModelTemplateProvider { - public GetListOutputDtoTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public GetListOutputDtoTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - BuildPath = $@"{TemplateConst.BuildRootPath}\Yi.Framework.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}GetListOutputDto.cs"; + BuildPath = $@"{TemplateConst.BuildRootPath}\{nameSpaces}.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}GetListOutputDto.cs"; TemplatePath = $@"..\..\..\Template\Server\GetListOutputDtoTemplate.txt"; - EntityPath = $@"{TemplateConst.BuildEntityPath}\Yi.Framework.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; + EntityPath = $@"{TemplateConst.BuildEntityPath}\{nameSpaces}.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; } } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetOutputDtoTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetOutputDtoTemplateProvider.cs index 132aa350..79ba9a0d 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetOutputDtoTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/GetOutputDtoTemplateProvider.cs @@ -10,11 +10,11 @@ namespace Yi.Framework.Template.Provider.Server { public class GetOutputDtoTemplateProvider : ModelTemplateProvider { - public GetOutputDtoTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public GetOutputDtoTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - BuildPath = $@"{TemplateConst.BuildRootPath}\Yi.Framework.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}\{TemplateConst.EntityName}GetOutputDto.cs"; + BuildPath = $@"{TemplateConst.BuildRootPath}\{nameSpaces}.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}\{TemplateConst.EntityName}GetOutputDto.cs"; TemplatePath = $@"..\..\..\Template\Server\GetOutputDtoTemplate.txt"; - EntityPath = $@"{TemplateConst.BuildEntityPath}\Yi.Framework.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; + EntityPath = $@"{TemplateConst.BuildEntityPath}\{nameSpaces}.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; } } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/IServiceTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/IServiceTemplateProvider.cs index 20dd051a..2228dbc4 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/IServiceTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/IServiceTemplateProvider.cs @@ -10,9 +10,9 @@ namespace Yi.Framework.Template.Provider.Server { public class IServiceTemplateProvider : ProgramTemplateProvider { - public IServiceTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public IServiceTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - BuildPath = $@"{TemplateConst.BuildRootPath}\Yi.Framework.Application.Contracts\{TemplateConst.ModelName}\I{TemplateConst.EntityName}Service.cs"; + BuildPath = $@"{TemplateConst.BuildRootPath}\{nameSpaces}.Application.Contracts\{TemplateConst.ModelName}\I{TemplateConst.EntityName}Service.cs"; TemplatePath = $@"..\..\..\Template\Server\IServiceTemplate.txt"; } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ProfileTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ProfileTemplateProvider.cs index cb4e484f..4c64726a 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ProfileTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ProfileTemplateProvider.cs @@ -10,9 +10,9 @@ namespace Yi.Framework.Template.Provider.Server { public class ProfileTemplateProvider : ProgramTemplateProvider { - public ProfileTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public ProfileTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - BuildPath = $@"{TemplateConst.BuildRootPath}\Yi.Framework.Application\{TemplateConst.ModelName}\MapperConfig\{TemplateConst.EntityName}Profile.cs"; + BuildPath = $@"{TemplateConst.BuildRootPath}\{nameSpaces}.Application\{TemplateConst.ModelName}\MapperConfig\{TemplateConst.EntityName}Profile.cs"; TemplatePath = $@"..\..\..\Template\Server\ProfileTemplate.txt"; } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ServiceTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ServiceTemplateProvider.cs index ddb511ec..6bdcaa61 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ServiceTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/ServiceTemplateProvider.cs @@ -10,9 +10,9 @@ namespace Yi.Framework.Template.Provider.Server { public class ServiceTemplateProvider : ProgramTemplateProvider { - public ServiceTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public ServiceTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - BuildPath = $@"{TemplateConst.BuildRootPath}\Yi.Framework.Application\{TemplateConst.ModelName}\{TemplateConst.EntityName}Service.cs"; + BuildPath = $@"{TemplateConst.BuildRootPath}\{nameSpaces}.Application\{TemplateConst.ModelName}\{TemplateConst.EntityName}Service.cs"; TemplatePath = $@"..\..\..\Template\Server\ServiceTemplate.txt"; } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/UpdateInputVoTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/UpdateInputVoTemplateProvider.cs index 40b9e52f..ed7db631 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/UpdateInputVoTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Provider/Server/UpdateInputVoTemplateProvider.cs @@ -10,11 +10,11 @@ namespace Yi.Framework.Template.Provider.Server { public class UpdateInputVoTemplateProvider : ModelTemplateProvider { - public UpdateInputVoTemplateProvider(string modelName, string entityName) : base(modelName, entityName) + public UpdateInputVoTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - BuildPath = $@"{TemplateConst.BuildRootPath}\Yi.Framework.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}UpdateInputVo.cs"; + BuildPath = $@"{TemplateConst.BuildRootPath}\{nameSpaces}.Application.Contracts\{TemplateConst.ModelName}\Dtos\{TemplateConst.EntityName}UpdateInputVo.cs"; TemplatePath = $@"..\..\..\Template\Server\UpdateInputVoTemplate.txt"; - EntityPath = $@"{TemplateConst.BuildEntityPath}\Yi.Framework.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; + EntityPath = $@"{TemplateConst.BuildEntityPath}\{nameSpaces}.Domain\{TemplateConst.ModelName}\Entities\{TemplateConst.EntityName}Entity.cs"; } } } diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ConstTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ConstTemplate.txt index 0ef4d1da..8a30baa2 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ConstTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ConstTemplate.txt @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.Domain.Shared.#ModelName#.ConstClasses +namespace #NameSpaces#.Domain.Shared.#ModelName#.ConstClasses { /// /// 常量定义 diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/CreateInputVoTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/CreateInputVoTemplate.txt index 7720a174..1b9740eb 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/CreateInputVoTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/CreateInputVoTemplate.txt @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.Application.Contracts.#ModelName#.Dtos +namespace #NameSpaces#.Application.Contracts.#ModelName#.Dtos { /// /// #EntityName#输入创建对象 diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetListInputVoTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetListInputVoTemplate.txt index 3000aefa..0a5224ac 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetListInputVoTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetListInputVoTemplate.txt @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Ddd.Dtos; -namespace Yi.Framework.Application.Contracts.#ModelName#.Dtos +namespace #NameSpaces#.Application.Contracts.#ModelName#.Dtos { public class #EntityName#GetListInputVo : PagedAndSortedResultRequestDto { diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetListOutputDtoTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetListOutputDtoTemplate.txt index 45417297..5c44adec 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetListOutputDtoTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetListOutputDtoTemplate.txt @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Ddd.Dtos; -namespace Yi.Framework.Application.Contracts.#ModelName#.Dtos +namespace #NameSpaces#.Application.Contracts.#ModelName#.Dtos { public class #EntityName#GetListOutputDto : IEntityDto { diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetOutputDtoTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetOutputDtoTemplate.txt index 8ef5237d..05eda43a 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetOutputDtoTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/GetOutputDtoTemplate.txt @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Yi.Framework.Ddd.Dtos; -namespace Yi.Framework.Application.Contracts.#ModelName#.Dtos +namespace #NameSpaces#.Application.Contracts.#ModelName#.Dtos { public class #EntityName#GetOutputDto : IEntityDto { diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/IServiceTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/IServiceTemplate.txt index 67ba872d..8e8b86be 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/IServiceTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/IServiceTemplate.txt @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Application.Contracts.#ModelName#.Dtos; +using #NameSpaces#.Application.Contracts.#ModelName#.Dtos; using Yi.Framework.Ddd.Services.Abstract; -namespace Yi.Framework.Application.Contracts.#ModelName# +namespace #NameSpaces#.Application.Contracts.#ModelName# { /// /// #EntityName# diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ProfileTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ProfileTemplate.txt index 0bf7fda1..95ea4f7d 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ProfileTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ProfileTemplate.txt @@ -4,10 +4,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Yi.Framework.Application.Contracts.#ModelName#.Dtos; -using Yi.Framework.Domain.#ModelName#.Entities; +using #NameSpaces#.Application.Contracts.#ModelName#.Dtos; +using #NameSpaces#.Domain.#ModelName#.Entities; -namespace Yi.Framework.Application.#ModelName#.MapperConfig +namespace #NameSpaces#.Application.#ModelName#.MapperConfig { public class #EntityName#Profile: Profile { diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ServiceTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ServiceTemplate.txt index 1ca19195..e058e170 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ServiceTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/ServiceTemplate.txt @@ -1,10 +1,10 @@ -using Yi.Framework.Application.Contracts.#ModelName#; +using #NameSpaces#.Application.Contracts.#ModelName#; using NET.AutoWebApi.Setting; -using Yi.Framework.Application.Contracts.#ModelName#.Dtos; -using Yi.Framework.Domain.#ModelName#.Entities; +using #NameSpaces#.Application.Contracts.#ModelName#.Dtos; +using #NameSpaces#.Domain.#ModelName#.Entities; using Yi.Framework.Ddd.Services; -namespace Yi.Framework.Application.#ModelName# +namespace #NameSpaces#.Application.#ModelName# { /// /// #EntityName#服务实现 diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/UpdateInputVoTemplate.txt b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/UpdateInputVoTemplate.txt index 31c1aab0..c727b790 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/UpdateInputVoTemplate.txt +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Template/Server/UpdateInputVoTemplate.txt @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.Application.Contracts.#ModelName#.Dtos +namespace #NameSpaces#.Application.Contracts.#ModelName#.Dtos { public class #EntityName#UpdateInputVo { diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/Student/StudentGetOutputDto.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/Student/StudentGetOutputDto.cs deleted file mode 100644 index 4fdf3aa2..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/Student/StudentGetOutputDto.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Ddd.Dtos; - -namespace Yi.BBS.Application.Contracts.School.Dtos -{ - public class StudentGetOutputDto : IEntityDto - { - public long Id { get; set; } - public string Name { get; set; } - public int? Height { get; set; } - public string? Phone { get; set; } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentCreateInputVo.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentCreateInputVo.cs deleted file mode 100644 index 017199c1..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentCreateInputVo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Yi.BBS.Application.Contracts.School.Dtos -{ - /// - /// Student输入创建对象 - /// - public class StudentCreateInputVo - { - public long Id { get; set; } - public string Name { get; set; } - public int? Height { get; set; } - public string? Phone { get; set; } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentGetListInputVo.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentGetListInputVo.cs deleted file mode 100644 index 1e299470..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentGetListInputVo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Ddd.Dtos; - -namespace Yi.BBS.Application.Contracts.School.Dtos -{ - public class StudentGetListInputVo : PagedAndSortedResultRequestDto - { - public long Id { get; set; } - public string Name { get; set; } - public int? Height { get; set; } - public string? Phone { get; set; } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentGetListOutputDto.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentGetListOutputDto.cs deleted file mode 100644 index e2f4f430..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentGetListOutputDto.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Ddd.Dtos; - -namespace Yi.BBS.Application.Contracts.School.Dtos -{ - public class StudentGetListOutputDto : IEntityDto - { - public long Id { get; set; } - public string Name { get; set; } - public int? Height { get; set; } - public string? Phone { get; set; } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentUpdateInputVo.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentUpdateInputVo.cs deleted file mode 100644 index 228df0ee..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/Dtos/StudentUpdateInputVo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Yi.BBS.Application.Contracts.School.Dtos -{ - public class StudentUpdateInputVo - { - public long Id { get; set; } - public string Name { get; set; } - public int? Height { get; set; } - public string? Phone { get; set; } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/IStudentService.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/IStudentService.cs deleted file mode 100644 index 1f66eb21..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application.Contracts/School/IStudentService.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.BBS.Application.Contracts.School.Dtos; -using Yi.Framework.Ddd.Services.Abstract; - -namespace Yi.BBS.Application.Contracts.School -{ - /// - /// Student - /// - public interface IStudentService : ICrudAppService - { - - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/School/MapperConfig/StudentProfile.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/School/MapperConfig/StudentProfile.cs deleted file mode 100644 index ab5e27f5..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/School/MapperConfig/StudentProfile.cs +++ /dev/null @@ -1,23 +0,0 @@ -using AutoMapper; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.BBS.Application.Contracts.School.Dtos; -using Yi.BBS.Domain.School.Entities; - -namespace Yi.BBS.Application.School.MapperConfig -{ - public class StudentProfile: Profile - { - public StudentProfile() - { - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/School/StudentService.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/School/StudentService.cs deleted file mode 100644 index 15e40a07..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Application/School/StudentService.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Yi.BBS.Application.Contracts.School; -using NET.AutoWebApi.Setting; -using Yi.BBS.Application.Contracts.School.Dtos; -using Yi.BBS.Domain.School.Entities; -using Yi.Framework.Ddd.Services; - -namespace Yi.BBS.Application.School -{ - /// - /// Student服务实现 - /// - [AppService] - public class StudentService : CrudAppService, - IStudentService, IAutoApiService - { - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/School/ConstClasses/StudentConst.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/School/ConstClasses/StudentConst.cs deleted file mode 100644 index eab15830..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain.Shared/School/ConstClasses/StudentConst.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Yi.BBS.Domain.Shared.School.ConstClasses -{ - /// - /// 常量定义 - /// - - public class StudentConst - { - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/School/DataSeeds/StudentDataSeed.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/School/DataSeeds/StudentDataSeed.cs deleted file mode 100644 index 7cec847b..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/School/DataSeeds/StudentDataSeed.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Data.DataSeeds; -using Yi.Framework.Ddd.Repositories; -using Yi.BBS.Domain.School.Entities; - -namespace Yi.BBS.Domain.School.DataSeeds -{ - [AppService(typeof(IDataSeed))] - public class StudentDataSeed : AbstractDataSeed - { - public StudentDataSeed(IRepository repository) : base(repository) - { - } - - public override List GetSeedData() - { - return new List() { new StudentEntity { Id = SnowflakeHelper.NextId, Name = "你好", Phone = "123", Height = 188, IsDeleted = false } , - new StudentEntity { Id = SnowflakeHelper.NextId, Name = "你好1", Phone = "123", Height = 188, IsDeleted = false }, - new StudentEntity { Id = SnowflakeHelper.NextId, Name = "你好2", Phone = "123", Height = 188, IsDeleted = false } - }; - } - } -} diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/School/Entities/StudentEntity.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/School/Entities/StudentEntity.cs deleted file mode 100644 index 141c9c5a..00000000 --- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Domain/School/Entities/StudentEntity.cs +++ /dev/null @@ -1,25 +0,0 @@ -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Yi.Framework.Data.Entities; -using Yi.Framework.Ddd.Entities; - -namespace Yi.BBS.Domain.School.Entities -{ - [SugarTable("Student")] - public class StudentEntity : IEntity,ISoftDelete - { - [SugarColumn(IsPrimaryKey = true)] - public long Id { get; set; } - - public string Name { get; set; } - - public int? Height { get; set; } - - public string? Phone { get; set; } - public bool IsDeleted { get; set; } = false; - } -}