diff --git a/Yi.Abp.Net8/Yi.Abp.sln b/Yi.Abp.Net8/Yi.Abp.sln index 196f77b5..03343e50 100644 --- a/Yi.Abp.Net8/Yi.Abp.sln +++ b/Yi.Abp.Net8/Yi.Abp.sln @@ -105,15 +105,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.TenantManageme EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.TenantManagement.Application.Contracts", "module\tenant-management\Yi.Framework.TenantManagement.Application.Contracts\Yi.Framework.TenantManagement.Application.Contracts.csproj", "{FA735055-CBDD-4EFD-B84B-85810DA1425E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "code-gun", "code-gun", "{4FFE7212-21F2-476D-B628-3C65E6C5075E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "code-gen", "code-gen", "{4FFE7212-21F2-476D-B628-3C65E6C5075E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.CodeGun.Application", "module\code-gun\Yi.Framework.CodeGun.Application\Yi.Framework.CodeGun.Application.csproj", "{97EC40D7-DBFA-467A-98CB-221AF27B14F2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Application", "module\code-gen\Yi.Framework.Codegen.Application\Yi.Framework.CodeGen.Application.csproj", "{97EC40D7-DBFA-467A-98CB-221AF27B14F2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.CodeGun.Application.Contracts", "module\code-gun\Yi.Framework.CodeGun.Application.Contracts\Yi.Framework.CodeGun.Application.Contracts.csproj", "{882BC563-2F75-4B95-AC96-F4BF23F5E69D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Application.Contracts", "module\code-gen\Yi.Framework.Codegen.Application.Contracts\Yi.Framework.CodeGen.Application.Contracts.csproj", "{882BC563-2F75-4B95-AC96-F4BF23F5E69D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.CodeGun.Domain", "module\code-gun\Yi.Framework.CodeGun.Domain\Yi.Framework.CodeGun.Domain.csproj", "{85CB8517-2B80-42D8-B954-081079AC9BA0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Domain", "module\code-gen\Yi.Framework.Codegen.Domain\Yi.Framework.CodeGen.Domain.csproj", "{85CB8517-2B80-42D8-B954-081079AC9BA0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.CodeGun.Domain.Shared", "module\code-gun\Yi.Framework.CodeGun.Domain.Shared\Yi.Framework.CodeGun.Domain.Shared.csproj", "{EEFF0F05-2709-4151-A8CE-667935CEAE0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yi.Framework.CodeGen.Domain.Shared", "module\code-gen\Yi.Framework.Codegen.Domain.Shared\Yi.Framework.CodeGen.Domain.Shared.csproj", "{EEFF0F05-2709-4151-A8CE-667935CEAE0B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.SqlSugarCore/YiFrameworkAuditLoggingSqlSugarCoreModule.cs b/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.SqlSugarCore/YiFrameworkAuditLoggingSqlSugarCoreModule.cs index 37d61ee1..5195edb6 100644 --- a/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.SqlSugarCore/YiFrameworkAuditLoggingSqlSugarCoreModule.cs +++ b/Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.SqlSugarCore/YiFrameworkAuditLoggingSqlSugarCoreModule.cs @@ -5,18 +5,18 @@ using Yi.Framework.AuditLogging.Domain.Repositories; using Yi.Framework.AuditLogging.SqlSugarCore.Repositories; using Yi.Framework.SqlSugarCore; -namespace Yi.AuditLogging.SqlSugarCore +namespace Yi.Framework.AuditLogging.SqlSugarCore { [DependsOn( typeof(YiFrameworkAuditLoggingDomainModule), - + typeof(YiFrameworkSqlSugarCoreModule))] public class YiFrameworkAuditLoggingSqlSugarCoreModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) - { + { context.Services.AddTransient(); - + } } } diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Field/FieldDto.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Field/FieldDto.cs similarity index 89% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Field/FieldDto.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Field/FieldDto.cs index 35ab76b9..0ca35e1a 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Field/FieldDto.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Field/FieldDto.cs @@ -1,7 +1,7 @@ using Volo.Abp.Application.Dtos; -using Yi.Framework.CodeGun.Domain.Shared.Enums; +using Yi.Framework.CodeGen.Domain.Shared.Enums; -namespace Yi.Framework.CodeGun.Application.Contracts.Dtos.Field +namespace Yi.Framework.CodeGen.Application.Contracts.Dtos.Field { public class FieldDto : EntityDto { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Field/FieldGetListInput.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Field/FieldGetListInput.cs similarity index 81% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Field/FieldGetListInput.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Field/FieldGetListInput.cs index 028213c6..16bdbac0 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Field/FieldGetListInput.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Field/FieldGetListInput.cs @@ -1,6 +1,6 @@ using Volo.Abp.Application.Dtos; -namespace Yi.Framework.CodeGun.Application.Contracts.Dtos.Field +namespace Yi.Framework.CodeGen.Application.Contracts.Dtos.Field { public class FieldGetListInput : PagedAndSortedResultRequestDto { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Table/TableDto.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Table/TableDto.cs similarity index 79% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Table/TableDto.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Table/TableDto.cs index 45421430..673d0aad 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Table/TableDto.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Table/TableDto.cs @@ -1,7 +1,7 @@ using Volo.Abp.Application.Dtos; -using Yi.Framework.CodeGun.Application.Contracts.Dtos.Field; +using Yi.Framework.CodeGen.Application.Contracts.Dtos.Field; -namespace Yi.Framework.CodeGun.Application.Contracts.Dtos.Table +namespace Yi.Framework.CodeGen.Application.Contracts.Dtos.Table { public class TableDto : EntityDto { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Table/TableGetListInput.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Table/TableGetListInput.cs similarity index 65% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Table/TableGetListInput.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Table/TableGetListInput.cs index 42fdc266..aa213339 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Table/TableGetListInput.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Table/TableGetListInput.cs @@ -1,6 +1,6 @@ using Volo.Abp.Application.Dtos; -namespace Yi.Framework.CodeGun.Application.Contracts.Dtos.Table +namespace Yi.Framework.CodeGen.Application.Contracts.Dtos.Table { public class TableGetListInput : PagedAndSortedResultRequestDto { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Template/TemplateDto.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Template/TemplateDto.cs similarity index 90% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Template/TemplateDto.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Template/TemplateDto.cs index 74007317..fed21cbe 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Template/TemplateDto.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Template/TemplateDto.cs @@ -1,6 +1,6 @@ using Volo.Abp.Application.Dtos; -namespace Yi.Framework.CodeGun.Application.Contracts.Dtos.Template +namespace Yi.Framework.CodeGen.Application.Contracts.Dtos.Template { public class TemplateDto : EntityDto { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Template/TemplateGetListInput.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Template/TemplateGetListInput.cs similarity index 79% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Template/TemplateGetListInput.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Template/TemplateGetListInput.cs index 324dcaad..d8fc5e9f 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Dtos/Template/TemplateGetListInput.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Dtos/Template/TemplateGetListInput.cs @@ -1,6 +1,6 @@ using Volo.Abp.Application.Dtos; -namespace Yi.Framework.CodeGun.Application.Contracts.Dtos.Template +namespace Yi.Framework.CodeGen.Application.Contracts.Dtos.Template { public class TemplateGetListInput : PagedAndSortedResultRequestDto { diff --git a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ICodeGenService.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ICodeGenService.cs new file mode 100644 index 00000000..1b76b825 --- /dev/null +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ICodeGenService.cs @@ -0,0 +1,8 @@ +using Volo.Abp.Application.Services; + +namespace Yi.Framework.CodeGen.Application.Contracts.IServices +{ + public interface ICodeGenService : IApplicationService + { + } +} diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/IFieldService.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/IFieldService.cs similarity index 54% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/IFieldService.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/IFieldService.cs index c4fe6e9d..0095944d 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/IFieldService.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/IFieldService.cs @@ -1,7 +1,7 @@ -using Yi.Framework.CodeGun.Application.Contracts.Dtos.Field; +using Yi.Framework.CodeGen.Application.Contracts.Dtos.Field; using Yi.Framework.Ddd.Application.Contracts; -namespace Yi.Framework.CodeGun.Application.Contracts.IServices +namespace Yi.Framework.CodeGen.Application.Contracts.IServices { public interface IFieldService : IYiCrudAppService { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ITableService.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ITableService.cs similarity index 54% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ITableService.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ITableService.cs index 82302c4f..8b1ebd3f 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ITableService.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ITableService.cs @@ -1,7 +1,7 @@ -using Yi.Framework.CodeGun.Application.Contracts.Dtos.Table; +using Yi.Framework.CodeGen.Application.Contracts.Dtos.Table; using Yi.Framework.Ddd.Application.Contracts; -namespace Yi.Framework.CodeGun.Application.Contracts.IServices +namespace Yi.Framework.CodeGen.Application.Contracts.IServices { public interface ITableService : IYiCrudAppService { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ITemplateService.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ITemplateService.cs similarity index 56% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ITemplateService.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ITemplateService.cs index bc461f1c..de5e99cd 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ITemplateService.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ITemplateService.cs @@ -1,7 +1,7 @@ -using Yi.Framework.CodeGun.Application.Contracts.Dtos.Template; +using Yi.Framework.CodeGen.Application.Contracts.Dtos.Template; using Yi.Framework.Ddd.Application.Contracts; -namespace Yi.Framework.CodeGun.Application.Contracts.IServices +namespace Yi.Framework.CodeGen.Application.Contracts.IServices { public interface ITemplateService : IYiCrudAppService { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Yi.Framework.CodeGun.Application.Contracts.csproj b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Yi.Framework.CodeGen.Application.Contracts.csproj similarity index 78% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Yi.Framework.CodeGun.Application.Contracts.csproj rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Yi.Framework.CodeGen.Application.Contracts.csproj index 3c963e90..18088e9e 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/Yi.Framework.CodeGun.Application.Contracts.csproj +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/Yi.Framework.CodeGen.Application.Contracts.csproj @@ -8,7 +8,7 @@ - + diff --git a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/YiFrameworkCodeGenApplicationContractsModule.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/YiFrameworkCodeGenApplicationContractsModule.cs new file mode 100644 index 00000000..30727036 --- /dev/null +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/YiFrameworkCodeGenApplicationContractsModule.cs @@ -0,0 +1,12 @@ +using Yi.Framework.CodeGen.Domain.Shared; +using Yi.Framework.Ddd.Application.Contracts; + +namespace Yi.Framework.CodeGen.Application.Contracts +{ + [DependsOn(typeof(YiFrameworkCodeGenDomainSharedModule), + typeof(YiFrameworkDddApplicationContractsModule))] + public class YiFrameworkCodeGenApplicationContractsModule : AbpModule + { + + } +} diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/CodeGunService.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/CodeGenService.cs similarity index 86% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/CodeGunService.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/CodeGenService.cs index e126e49d..cf9091aa 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/CodeGunService.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/CodeGenService.cs @@ -3,22 +3,22 @@ using System.Runtime.InteropServices; using Microsoft.AspNetCore.Mvc; using Volo.Abp.Application.Services; using Volo.Abp.Uow; -using Yi.Framework.CodeGun.Application.Contracts.IServices; -using Yi.Framework.CodeGun.Domain.Entities; -using Yi.Framework.CodeGun.Domain.Managers; +using Yi.Framework.CodeGen.Application.Contracts.IServices; +using Yi.Framework.CodeGen.Domain.Entities; +using Yi.Framework.CodeGen.Domain.Managers; using Yi.Framework.SqlSugarCore.Abstractions; -namespace Yi.Framework.CodeGun.Application.Services +namespace Yi.Framework.CodeGen.Application.Services { /// - /// CodeGun + /// CodeGen /// - public class CodeGunService : ApplicationService, ICodeGunService + public class CodeGenService : ApplicationService, ICodeGenService { private ISqlSugarRepository _tableRepository; private CodeFileManager _codeFileManager; private WebTemplateManager _webTemplateManager; - public CodeGunService(ISqlSugarRepository tableRepository, CodeFileManager codeFileManager, WebTemplateManager webTemplateManager) + public CodeGenService(ISqlSugarRepository tableRepository, CodeFileManager codeFileManager, WebTemplateManager webTemplateManager) { _tableRepository = tableRepository; _codeFileManager = codeFileManager; @@ -80,8 +80,8 @@ namespace Yi.Framework.CodeGun.Application.Services /// 打开目录 /// /// - [HttpPost("code-gun/dir/{**path}")] - public async Task PostDir([FromRoute]string path) + [HttpPost("code-gen/dir/{**path}")] + public async Task PostDir([FromRoute] string path) { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/FieldService.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/FieldService.cs similarity index 86% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/FieldService.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/FieldService.cs index 1af58e90..b936b36f 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/FieldService.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/FieldService.cs @@ -6,14 +6,14 @@ using Newtonsoft.Json.Linq; using SqlSugar; using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Repositories; -using Yi.Framework.CodeGun.Application.Contracts.Dtos.Field; -using Yi.Framework.CodeGun.Application.Contracts.IServices; -using Yi.Framework.CodeGun.Domain.Entities; -using Yi.Framework.CodeGun.Domain.Shared.Enums; +using Yi.Framework.CodeGen.Application.Contracts.Dtos.Field; +using Yi.Framework.CodeGen.Application.Contracts.IServices; +using Yi.Framework.CodeGen.Domain.Entities; +using Yi.Framework.CodeGen.Domain.Shared.Enums; using Yi.Framework.Ddd.Application; using Yi.Framework.SqlSugarCore.Abstractions; -namespace Yi.Framework.CodeGun.Application.Services +namespace Yi.Framework.CodeGen.Application.Services { /// /// 字段管理 diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/TableService.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TableService.cs similarity index 70% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/TableService.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TableService.cs index f2129fe4..5286d04e 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/TableService.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TableService.cs @@ -1,11 +1,11 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Repositories; -using Yi.Framework.CodeGun.Application.Contracts.Dtos.Table; -using Yi.Framework.CodeGun.Application.Contracts.IServices; -using Yi.Framework.CodeGun.Domain.Entities; +using Yi.Framework.CodeGen.Application.Contracts.Dtos.Table; +using Yi.Framework.CodeGen.Application.Contracts.IServices; +using Yi.Framework.CodeGen.Domain.Entities; using Yi.Framework.Ddd.Application; -namespace Yi.Framework.CodeGun.Application.Services +namespace Yi.Framework.CodeGen.Application.Services { public class TableService : YiCrudAppService, ITableService { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/TemplateService.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TemplateService.cs similarity index 81% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/TemplateService.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TemplateService.cs index caf361d0..5bffd43c 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Services/TemplateService.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Services/TemplateService.cs @@ -1,16 +1,16 @@ using Microsoft.AspNetCore.Mvc; using SqlSugar; using Volo.Abp.Application.Dtos; -using Yi.Framework.CodeGun.Application.Contracts.Dtos.Template; -using Yi.Framework.CodeGun.Application.Contracts.IServices; -using Yi.Framework.CodeGun.Domain.Entities; +using Yi.Framework.CodeGen.Application.Contracts.Dtos.Template; +using Yi.Framework.CodeGen.Application.Contracts.IServices; +using Yi.Framework.CodeGen.Domain.Entities; using Yi.Framework.Ddd.Application; using Yi.Framework.SqlSugarCore.Abstractions; -namespace Yi.Framework.CodeGun.Application.Services; +namespace Yi.Framework.CodeGen.Application.Services; public class TemplateService : YiCrudAppService, ITemplateService - { +{ private ISqlSugarRepository _repository; public TemplateService(ISqlSugarRepository repository) : base(repository) { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Yi.Framework.CodeGun.Application.csproj b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Yi.Framework.CodeGen.Application.csproj similarity index 63% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Yi.Framework.CodeGun.Application.csproj rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Yi.Framework.CodeGen.Application.csproj index d82944fd..152fd158 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/Yi.Framework.CodeGun.Application.csproj +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/Yi.Framework.CodeGen.Application.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/YiFrameworkCodeGenApplicationModule.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/YiFrameworkCodeGenApplicationModule.cs new file mode 100644 index 00000000..0df0ea36 --- /dev/null +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/YiFrameworkCodeGenApplicationModule.cs @@ -0,0 +1,14 @@ +using Yi.Framework.CodeGen.Application.Contracts; +using Yi.Framework.CodeGen.Domain; +using Yi.Framework.Ddd.Application; + +namespace Yi.Framework.CodeGen.Application +{ + [DependsOn(typeof(YiFrameworkCodeGenApplicationContractsModule), + typeof(YiFrameworkCodeGenDomainModule), + typeof(YiFrameworkDddApplicationModule))] + public class YiFrameworkCodeGenApplicationModule : AbpModule + { + + } +} diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain.Shared/Enums/FieldTypeEnum.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/Enums/FieldTypeEnum.cs similarity index 92% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain.Shared/Enums/FieldTypeEnum.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/Enums/FieldTypeEnum.cs index e4a4657d..4713f2a9 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain.Shared/Enums/FieldTypeEnum.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/Enums/FieldTypeEnum.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.CodeGun.Domain.Shared.Enums +namespace Yi.Framework.CodeGen.Domain.Shared.Enums { public enum FieldTypeEnum { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain.Shared/Yi.Framework.CodeGun.Domain.Shared.csproj b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/Yi.Framework.CodeGen.Domain.Shared.csproj similarity index 100% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain.Shared/Yi.Framework.CodeGun.Domain.Shared.csproj rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/Yi.Framework.CodeGen.Domain.Shared.csproj diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain.Shared/YiFrameworkCodeGunDomainSharedModule.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/YiFrameworkCodeGenDomainSharedModule.cs similarity index 52% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain.Shared/YiFrameworkCodeGunDomainSharedModule.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/YiFrameworkCodeGenDomainSharedModule.cs index 54bceede..8bd1cc2b 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain.Shared/YiFrameworkCodeGunDomainSharedModule.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain.Shared/YiFrameworkCodeGenDomainSharedModule.cs @@ -1,10 +1,10 @@ using Volo.Abp.Domain; using Volo.Abp.Modularity; -namespace Yi.Framework.CodeGun.Domain.Shared +namespace Yi.Framework.CodeGen.Domain.Shared { [DependsOn(typeof(AbpDddDomainSharedModule))] - public class YiFrameworkCodeGunDomainSharedModule:AbpModule + public class YiFrameworkCodeGenDomainSharedModule : AbpModule { } diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Entities/FieldEntity.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/FieldEntity.cs similarity index 91% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Entities/FieldEntity.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/FieldEntity.cs index c01e7537..23fa0a0f 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Entities/FieldEntity.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/FieldEntity.cs @@ -1,8 +1,8 @@ using SqlSugar; using Volo.Abp.Domain.Entities; -using Yi.Framework.CodeGun.Domain.Shared.Enums; +using Yi.Framework.CodeGen.Domain.Shared.Enums; -namespace Yi.Framework.CodeGun.Domain.Entities +namespace Yi.Framework.CodeGen.Domain.Entities { [SugarTable("YiField")] public class FieldEntity : Entity diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Entities/TableAggregateRoot.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TableAggregateRoot.cs similarity index 93% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Entities/TableAggregateRoot.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TableAggregateRoot.cs index 3ccbe957..bee9af39 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Entities/TableAggregateRoot.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TableAggregateRoot.cs @@ -1,7 +1,7 @@ using SqlSugar; using Volo.Abp.Domain.Entities; -namespace Yi.Framework.CodeGun.Domain.Entities +namespace Yi.Framework.CodeGen.Domain.Entities { [SugarTable("YiTable")] public class TableAggregateRoot : AggregateRoot diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Entities/TemplateEntity.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TemplateEntity.cs similarity index 94% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Entities/TemplateEntity.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TemplateEntity.cs index 08a25088..6a2282a0 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Entities/TemplateEntity.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Entities/TemplateEntity.cs @@ -1,7 +1,7 @@ using SqlSugar; using Volo.Abp.Domain.Entities; -namespace Yi.Framework.CodeGun.Domain.Entities +namespace Yi.Framework.CodeGen.Domain.Entities { [SugarTable("YiTemplate")] public class TemplateEntity : Entity diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/FieldTemplateHandler.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/FieldTemplateHandler.cs similarity index 95% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/FieldTemplateHandler.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/FieldTemplateHandler.cs index 69d8160d..895ae1a2 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/FieldTemplateHandler.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/FieldTemplateHandler.cs @@ -1,9 +1,9 @@ using System.ComponentModel.DataAnnotations; using System.Reflection; using System.Text; -using Yi.Framework.CodeGun.Domain.Shared.Enums; +using Yi.Framework.CodeGen.Domain.Shared.Enums; -namespace Yi.Framework.CodeGun.Domain.Handlers +namespace Yi.Framework.CodeGen.Domain.Handlers { public class FieldTemplateHandler : TemplateHandlerBase, ITemplateHandler { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/HandledTemplate.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/HandledTemplate.cs similarity index 84% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/HandledTemplate.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/HandledTemplate.cs index bcea3ee7..61025012 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/HandledTemplate.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/HandledTemplate.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Yi.Framework.CodeGun.Domain.Handlers +namespace Yi.Framework.CodeGen.Domain.Handlers { public class HandledTemplate { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/ITemplateHandler.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/ITemplateHandler.cs similarity index 51% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/ITemplateHandler.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/ITemplateHandler.cs index 1127981f..5d65d566 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/ITemplateHandler.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/ITemplateHandler.cs @@ -1,9 +1,9 @@ using Volo.Abp.DependencyInjection; -using Yi.Framework.CodeGun.Domain.Entities; +using Yi.Framework.CodeGen.Domain.Entities; -namespace Yi.Framework.CodeGun.Domain.Handlers +namespace Yi.Framework.CodeGen.Domain.Handlers { - public interface ITemplateHandler: ISingletonDependency + public interface ITemplateHandler : ISingletonDependency { void SetTable(TableAggregateRoot table); HandledTemplate Invoker(string str, string path); diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/ModelTemplateHandler.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/ModelTemplateHandler.cs similarity index 92% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/ModelTemplateHandler.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/ModelTemplateHandler.cs index dfff3394..100f8bbb 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/ModelTemplateHandler.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/ModelTemplateHandler.cs @@ -1,4 +1,4 @@ -namespace Yi.Framework.CodeGun.Domain.Handlers +namespace Yi.Framework.CodeGen.Domain.Handlers { public class ModelTemplateHandler : TemplateHandlerBase, ITemplateHandler { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/NameSpaceTemplateHandler.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/NameSpaceTemplateHandler.cs similarity index 87% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/NameSpaceTemplateHandler.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/NameSpaceTemplateHandler.cs index 06ffd2f7..42729941 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/NameSpaceTemplateHandler.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/NameSpaceTemplateHandler.cs @@ -1,4 +1,4 @@ -namespace Yi.Framework.CodeGun.Domain.Handlers +namespace Yi.Framework.CodeGen.Domain.Handlers { public class NameSpaceTemplateHandler : TemplateHandlerBase, ITemplateHandler { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/TemplateHandlerBase.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/TemplateHandlerBase.cs similarity index 69% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/TemplateHandlerBase.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/TemplateHandlerBase.cs index 73668cdf..96162955 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Handlers/TemplateHandlerBase.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Handlers/TemplateHandlerBase.cs @@ -1,6 +1,6 @@ -using Yi.Framework.CodeGun.Domain.Entities; +using Yi.Framework.CodeGen.Domain.Entities; -namespace Yi.Framework.CodeGun.Domain.Handlers +namespace Yi.Framework.CodeGen.Domain.Handlers { public class TemplateHandlerBase { diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Managers/CodeFileManager.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/CodeFileManager.cs similarity index 93% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Managers/CodeFileManager.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/CodeFileManager.cs index 7966528f..c323a541 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Managers/CodeFileManager.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/CodeFileManager.cs @@ -1,9 +1,9 @@ using Volo.Abp.Domain.Services; -using Yi.Framework.CodeGun.Domain.Entities; -using Yi.Framework.CodeGun.Domain.Handlers; +using Yi.Framework.CodeGen.Domain.Entities; +using Yi.Framework.CodeGen.Domain.Handlers; using Yi.Framework.SqlSugarCore.Abstractions; -namespace Yi.Framework.CodeGun.Domain.Managers +namespace Yi.Framework.CodeGen.Domain.Managers { /// /// 代码文件领域服务,与代码文件生成相关,web to code diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Managers/DataBaseManger.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/DataBaseManger.cs similarity index 83% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Managers/DataBaseManger.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/DataBaseManger.cs index c8a231c2..0120b541 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Managers/DataBaseManger.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/DataBaseManger.cs @@ -1,6 +1,6 @@ using Volo.Abp.Domain.Services; -namespace Yi.Framework.CodeGun.Domain.Managers +namespace Yi.Framework.CodeGen.Domain.Managers { /// /// 数据库领域服务,与数据库相关,同步到数据库,web to db ,code to db diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Managers/WebTemplateManager.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/WebTemplateManager.cs similarity index 95% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Managers/WebTemplateManager.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/WebTemplateManager.cs index 20249b1a..0209499d 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Managers/WebTemplateManager.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Managers/WebTemplateManager.cs @@ -2,11 +2,11 @@ using System.Reflection; using SqlSugar; using Volo.Abp.Domain.Services; -using Yi.Framework.CodeGun.Domain.Entities; -using Yi.Framework.CodeGun.Domain.Shared.Enums; +using Yi.Framework.CodeGen.Domain.Entities; +using Yi.Framework.CodeGen.Domain.Shared.Enums; using Yi.Framework.SqlSugarCore.Abstractions; -namespace Yi.Framework.CodeGun.Domain.Managers +namespace Yi.Framework.CodeGen.Domain.Managers { /// /// 与webfrist相关,同步到web,code to web @@ -18,7 +18,7 @@ namespace Yi.Framework.CodeGun.Domain.Managers public WebTemplateManager(ISqlSugarRepository repository, IModuleContainer moduleContainer) { _repository = repository; - _moduleContainer= moduleContainer; + _moduleContainer = moduleContainer; } /// /// 通过当前的实体代码获取表存储 diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Yi.Framework.CodeGun.Domain.csproj b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Yi.Framework.CodeGen.Domain.csproj similarity index 81% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Yi.Framework.CodeGun.Domain.csproj rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Yi.Framework.CodeGen.Domain.csproj index f4ed654f..0c6fcd5b 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/Yi.Framework.CodeGun.Domain.csproj +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/Yi.Framework.CodeGen.Domain.csproj @@ -17,6 +17,6 @@ - + diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/YiFrameworkCodeGunDomainModule.cs b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/YiFrameworkCodeGenDomainModule.cs similarity index 51% rename from Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/YiFrameworkCodeGunDomainModule.cs rename to Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/YiFrameworkCodeGenDomainModule.cs index af09e906..ac6f7780 100644 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Domain/YiFrameworkCodeGunDomainModule.cs +++ b/Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Domain/YiFrameworkCodeGenDomainModule.cs @@ -1,14 +1,14 @@ using Volo.Abp.Domain; using Volo.Abp.Modularity; -using Yi.Framework.CodeGun.Domain.Shared; +using Yi.Framework.CodeGen.Domain.Shared; using Yi.Framework.SqlSugarCore.Abstractions; -namespace Yi.Framework.CodeGun.Domain +namespace Yi.Framework.CodeGen.Domain { - [DependsOn(typeof(YiFrameworkCodeGunDomainSharedModule), + [DependsOn(typeof(YiFrameworkCodeGenDomainSharedModule), typeof(AbpDddDomainModule), typeof(YiFrameworkSqlSugarCoreAbstractionsModule))] - public class YiFrameworkCodeGunDomainModule : AbpModule + public class YiFrameworkCodeGenDomainModule : AbpModule { } diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ICodeGunService.cs b/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ICodeGunService.cs deleted file mode 100644 index 5897a422..00000000 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ICodeGunService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Volo.Abp.Application.Services; - -namespace Yi.Framework.CodeGun.Application.Contracts.IServices -{ - public interface ICodeGunService : IApplicationService - { - } -} diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/YiFrameworkCodeGunApplicationContractsModule.cs b/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/YiFrameworkCodeGunApplicationContractsModule.cs deleted file mode 100644 index 4f308531..00000000 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/YiFrameworkCodeGunApplicationContractsModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Yi.Framework.CodeGun.Domain.Shared; -using Yi.Framework.Ddd.Application.Contracts; - -namespace Yi.Framework.CodeGun.Application.Contracts -{ - [DependsOn(typeof(YiFrameworkCodeGunDomainSharedModule), - typeof(YiFrameworkDddApplicationContractsModule))] - public class YiFrameworkCodeGunApplicationContractsModule:AbpModule - { - - } -} diff --git a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/YiFrameworkCodeGunApplicationModule.cs b/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/YiFrameworkCodeGunApplicationModule.cs deleted file mode 100644 index 83163c3d..00000000 --- a/Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/YiFrameworkCodeGunApplicationModule.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Yi.Framework.CodeGun.Application.Contracts; -using Yi.Framework.CodeGun.Domain; -using Yi.Framework.Ddd.Application; - -namespace Yi.Framework.CodeGun.Application -{ - [DependsOn(typeof(YiFrameworkCodeGunApplicationContractsModule), - typeof(YiFrameworkCodeGunDomainModule), - typeof(YiFrameworkDddApplicationModule))] - public class YiFrameworkCodeGunApplicationModule : AbpModule - { - - } -} diff --git a/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/YiMultiTenantConnectionStringResolver.cs b/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/YiMultiTenantConnectionStringResolver.cs index 30b21076..503c3966 100644 --- a/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/YiMultiTenantConnectionStringResolver.cs +++ b/Yi.Abp.Net8/module/tenant-management/Yi.Framework.TenantManagement.Domain/YiMultiTenantConnectionStringResolver.cs @@ -5,8 +5,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; +using Volo.Abp.MultiTenancy; -namespace Volo.Abp.MultiTenancy; +namespace Yi.Framework.TenantManagement.Domain; [Dependency(ReplaceServices = true)] public class YiMultiTenantConnectionStringResolver : DefaultConnectionStringResolver diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj b/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj index 122bbf9a..5c9dd523 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/Yi.Abp.Application.csproj @@ -8,7 +8,7 @@ - + diff --git a/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs index 7dc62e4c..7f6ae7b6 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Application/YiAbpApplicationModule.cs @@ -1,8 +1,7 @@ -using Volo.Abp.Modularity; -using Yi.Abp.Application.Contracts; +using Yi.Abp.Application.Contracts; using Yi.Abp.Domain; using Yi.Framework.Bbs.Application; -using Yi.Framework.CodeGun.Application; +using Yi.Framework.CodeGen.Application; using Yi.Framework.Ddd.Application; using Yi.Framework.Rbac.Application; using Yi.Framework.TenantManagement.Application; @@ -17,7 +16,7 @@ namespace Yi.Abp.Application typeof(YiFrameworkRbacApplicationModule), typeof(YiFrameworkBbsApplicationModule), typeof(YiFrameworkTenantManagementApplicationModule), - typeof(YiFrameworkCodeGunApplicationModule), + typeof(YiFrameworkCodeGenApplicationModule), typeof(YiFrameworkDddApplicationModule) )] diff --git a/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiAbpSqlSugarCoreModule.cs b/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiAbpSqlSugarCoreModule.cs index cc27417b..004f7512 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiAbpSqlSugarCoreModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.SqlSugarCore/YiAbpSqlSugarCoreModule.cs @@ -2,7 +2,7 @@ using Volo.Abp.Modularity; using Yi.Abp.Domain; using Yi.Abp.SqlSugarCore; -using Yi.AuditLogging.SqlSugarCore; +using Yi.Framework.AuditLogging.SqlSugarCore; using Yi.Framework.Bbs.SqlSugarCore; using Yi.Framework.Mapster; using Yi.Framework.Rbac.SqlSugarCore; diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs index dc670dbf..65b0d18c 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Cors; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; using Newtonsoft.Json.Converters; -using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.AspNetCore.Mvc; @@ -13,7 +12,6 @@ using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Auditing; using Volo.Abp.Autofac; using Volo.Abp.Caching; -using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; using Volo.Abp.Swashbuckle; using Yi.Abp.Application; @@ -25,7 +23,7 @@ using Yi.Framework.AspNetCore.Authentication.OAuth.QQ; using Yi.Framework.AspNetCore.Microsoft.AspNetCore.Builder; using Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection; using Yi.Framework.Bbs.Application; -using Yi.Framework.CodeGun.Application; +using Yi.Framework.CodeGen.Application; using Yi.Framework.Rbac.Application; using Yi.Framework.Rbac.Domain.Authorization; using Yi.Framework.Rbac.Domain.Shared.Consts; @@ -75,7 +73,7 @@ namespace Yi.Abp.Web options.ConventionalControllers.Create(typeof(YiFrameworkRbacApplicationModule).Assembly, options => options.RemoteServiceName = "rbac"); options.ConventionalControllers.Create(typeof(YiFrameworkBbsApplicationModule).Assembly, options => options.RemoteServiceName = "bbs"); options.ConventionalControllers.Create(typeof(YiFrameworkTenantManagementApplicationModule).Assembly, options => options.RemoteServiceName = "tenant-management"); - options.ConventionalControllers.Create(typeof(YiFrameworkCodeGunApplicationModule).Assembly, options => options.RemoteServiceName = "code-gun"); + options.ConventionalControllers.Create(typeof(YiFrameworkCodeGenApplicationModule).Assembly, options => options.RemoteServiceName = "code-gun"); }); //设置api格式 diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db b/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db new file mode 100644 index 00000000..bb954120 Binary files /dev/null and b/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db differ diff --git a/Yi.RuoYi.Vue3/src/api/code/codeGunApi.js b/Yi.RuoYi.Vue3/src/api/code/codeGenApi.js similarity index 72% rename from Yi.RuoYi.Vue3/src/api/code/codeGunApi.js rename to Yi.RuoYi.Vue3/src/api/code/codeGenApi.js index 4eb673c9..d08ccd2d 100644 --- a/Yi.RuoYi.Vue3/src/api/code/codeGunApi.js +++ b/Yi.RuoYi.Vue3/src/api/code/codeGenApi.js @@ -2,14 +2,14 @@ import request from '@/utils/request' // code to web export function codeToWeb() { return request({ - url: 'code-gun/code-build-web', + url: 'code-gen/code-build-web', method: 'post' }) } // code to web export function webToCode(ids) { return request({ - url: 'code-gun/web-build-code', + url: 'code-gen/web-build-code', method: 'post', data:ids }) @@ -18,7 +18,7 @@ export function webToCode(ids) { // open zhe path export function openPath(path) { return request({ - url: `code-gun/dir/${encodeURIComponent(path)}`, + url: `code-gen/dir/${encodeURIComponent(path)}`, method: 'post' }) } diff --git a/Yi.RuoYi.Vue3/src/views/code/table/index.vue b/Yi.RuoYi.Vue3/src/views/code/table/index.vue index eee081f4..8afbd4d9 100644 --- a/Yi.RuoYi.Vue3/src/views/code/table/index.vue +++ b/Yi.RuoYi.Vue3/src/views/code/table/index.vue @@ -61,7 +61,7 @@ plain icon="Plus" @click="handleAdd" - v-hasPermi="['codeGun:table:add']" + v-hasPermi="['codeGen:table:add']" >新增 @@ -72,7 +72,7 @@ icon="Edit" :disabled="single" @click="handleUpdate" - v-hasPermi="['codeGun:table:edit']" + v-hasPermi="['codeGen:table:edit']" >修改 @@ -83,7 +83,7 @@ icon="Delete" :disabled="multiple" @click="handleDelete" - v-hasPermi="['codeGun:table:remove']" + v-hasPermi="['codeGen:table:remove']" >删除 @@ -93,7 +93,7 @@ plain icon="Download" @click="handleExport" - v-hasPermi="['codeGun:table:export']" + v-hasPermi="['codeGen:table:export']" >导出 @@ -104,7 +104,7 @@ plain icon="Switch" @click="handleExport" - v-hasPermi="['codeGun:table:export']" + v-hasPermi="['codeGen:table:export']" >同步数据库WebToDb --> @@ -115,7 +115,7 @@ icon="Switch" @click="handleWebToCode" :disabled="ids.length==0" - v-hasPermi="['codeGun:table:export']" + v-hasPermi="['codeGen:table:export']" >代码生成WebToCode @@ -126,7 +126,7 @@ plain icon="Switch" @click="handleCodeToWeb" - v-hasPermi="['codeGun:table:export']" + v-hasPermi="['codeGen:table:export']" >实体同步CodeToWeb @@ -243,7 +243,7 @@ import { addData, updateData, } from "@/api/code/tableApi"; -import { codeToWeb,webToCode } from "@/api/code/codeGunApi"; +import { codeToWeb,webToCode } from "@/api/code/codeGenApi"; const { proxy } = getCurrentInstance(); const { sys_normal_disable } = proxy.useDict("sys_normal_disable"); diff --git a/Yi.RuoYi.Vue3/src/views/code/template/index.vue b/Yi.RuoYi.Vue3/src/views/code/template/index.vue index 5ac3fbf8..b3728409 100644 --- a/Yi.RuoYi.Vue3/src/views/code/template/index.vue +++ b/Yi.RuoYi.Vue3/src/views/code/template/index.vue @@ -46,7 +46,7 @@ plain icon="Plus" @click="handleAdd" - v-hasPermi="['codeGun:template:add']" + v-hasPermi="['codeGen:template:add']" >新增 @@ -57,7 +57,7 @@ icon="Edit" :disabled="single" @click="handleUpdate" - v-hasPermi="['codeGun:template:edit']" + v-hasPermi="['codeGen:template:edit']" >修改 @@ -68,7 +68,7 @@ icon="Delete" :disabled="multiple" @click="handleDelete" - v-hasPermi="['codeGun:template:remove']" + v-hasPermi="['codeGen:template:remove']" >删除 @@ -78,7 +78,7 @@ plain icon="Download" @click="handleExport" - v-hasPermi="['codeGun:template:export']" + v-hasPermi="['codeGen:template:export']" >导出 @@ -145,14 +145,14 @@ type="text" icon="Edit" @click="handleUpdate(scope.row)" - v-hasPermi="['codeGun:template:edit']" + v-hasPermi="['codeGen:template:edit']" >修改 删除 @@ -232,7 +232,7 @@ import { addData, updateData, } from "@/api/code/templateApi"; -import {openPath} from "@/api/code/codeGunApi"; +import {openPath} from "@/api/code/codeGenApi"; import { ref } from "@vue/reactivity"; import ReplaceText from './components/ReplaceText' import TempalteTip from './components/TempalteTip.vue' diff --git a/Yi.RuoYi.Vue3/src/views/system/tenant/index.vue b/Yi.RuoYi.Vue3/src/views/system/tenant/index.vue index 462f3f22..2af57d72 100644 --- a/Yi.RuoYi.Vue3/src/views/system/tenant/index.vue +++ b/Yi.RuoYi.Vue3/src/views/system/tenant/index.vue @@ -6,7 +6,7 @@ 该文件为通用Crud模板文件,按照规范只需要 替换以下变量即可, 租户 : 实体中文名称 system:tenant :crud权限编码 -system/tenant : api文件路径,例如:codeGun/tableApi +system/tenant : api文件路径,例如:codeGen/tableApi -->