From 3f1f76b2e8aefdf27230bdc21dccc8c4d16aaade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Fri, 16 Feb 2024 21:06:34 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9codegen=E5=91=BD?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Yi.Abp.Net8/Yi.Abp.sln | 10 +++++----- ...FrameworkAuditLoggingSqlSugarCoreModule.cs | 8 ++++---- .../Dtos/Field/FieldDto.cs | 4 ++-- .../Dtos/Field/FieldGetListInput.cs | 2 +- .../Dtos/Table/TableDto.cs | 4 ++-- .../Dtos/Table/TableGetListInput.cs | 2 +- .../Dtos/Template/TemplateDto.cs | 2 +- .../Dtos/Template/TemplateGetListInput.cs | 2 +- .../IServices/ICodeGenService.cs | 8 ++++++++ .../IServices/IFieldService.cs | 4 ++-- .../IServices/ITableService.cs | 4 ++-- .../IServices/ITemplateService.cs | 4 ++-- ...work.CodeGen.Application.Contracts.csproj} | 2 +- ...meworkCodeGenApplicationContractsModule.cs | 12 ++++++++++++ .../Services/CodeGenService.cs} | 18 +++++++++--------- .../Services/FieldService.cs | 10 +++++----- .../Services/TableService.cs | 8 ++++---- .../Services/TemplateService.cs | 10 +++++----- .../Yi.Framework.CodeGen.Application.csproj} | 4 ++-- .../YiFrameworkCodeGenApplicationModule.cs | 14 ++++++++++++++ .../Enums/FieldTypeEnum.cs | 2 +- ...Yi.Framework.CodeGen.Domain.Shared.csproj} | 0 .../YiFrameworkCodeGenDomainSharedModule.cs} | 4 ++-- .../Entities/FieldEntity.cs | 4 ++-- .../Entities/TableAggregateRoot.cs | 2 +- .../Entities/TemplateEntity.cs | 2 +- .../Handlers/FieldTemplateHandler.cs | 4 ++-- .../Handlers/HandledTemplate.cs | 2 +- .../Handlers/ITemplateHandler.cs | 6 +++--- .../Handlers/ModelTemplateHandler.cs | 2 +- .../Handlers/NameSpaceTemplateHandler.cs | 2 +- .../Handlers/TemplateHandlerBase.cs | 4 ++-- .../Managers/CodeFileManager.cs | 6 +++--- .../Managers/DataBaseManger.cs | 2 +- .../Managers/WebTemplateManager.cs | 8 ++++---- .../Yi.Framework.CodeGen.Domain.csproj} | 2 +- .../YiFrameworkCodeGenDomainModule.cs} | 8 ++++---- .../IServices/ICodeGunService.cs | 8 -------- ...meworkCodeGunApplicationContractsModule.cs | 12 ------------ .../YiFrameworkCodeGunApplicationModule.cs | 14 -------------- .../YiMultiTenantConnectionStringResolver.cs | 3 ++- .../Yi.Abp.Application.csproj | 2 +- .../YiAbpApplicationModule.cs | 7 +++---- .../YiAbpSqlSugarCoreModule.cs | 2 +- Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs | 6 ++---- Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db | Bin 0 -> 499712 bytes .../api/code/{codeGunApi.js => codeGenApi.js} | 6 +++--- Yi.RuoYi.Vue3/src/views/code/table/index.vue | 16 ++++++++-------- .../src/views/code/template/index.vue | 14 +++++++------- .../src/views/system/tenant/index.vue | 2 +- 50 files changed, 141 insertions(+), 143 deletions(-) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts => code-gen/Yi.Framework.CodeGen.Application.Contracts}/Dtos/Field/FieldDto.cs (89%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts => code-gen/Yi.Framework.CodeGen.Application.Contracts}/Dtos/Field/FieldGetListInput.cs (81%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts => code-gen/Yi.Framework.CodeGen.Application.Contracts}/Dtos/Table/TableDto.cs (79%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts => code-gen/Yi.Framework.CodeGen.Application.Contracts}/Dtos/Table/TableGetListInput.cs (65%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts => code-gen/Yi.Framework.CodeGen.Application.Contracts}/Dtos/Template/TemplateDto.cs (90%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts => code-gen/Yi.Framework.CodeGen.Application.Contracts}/Dtos/Template/TemplateGetListInput.cs (79%) create mode 100644 Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/IServices/ICodeGenService.cs rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts => code-gen/Yi.Framework.CodeGen.Application.Contracts}/IServices/IFieldService.cs (54%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts => code-gen/Yi.Framework.CodeGen.Application.Contracts}/IServices/ITableService.cs (54%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts => code-gen/Yi.Framework.CodeGen.Application.Contracts}/IServices/ITemplateService.cs (56%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application.Contracts/Yi.Framework.CodeGun.Application.Contracts.csproj => code-gen/Yi.Framework.CodeGen.Application.Contracts/Yi.Framework.CodeGen.Application.Contracts.csproj} (78%) create mode 100644 Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application.Contracts/YiFrameworkCodeGenApplicationContractsModule.cs rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application/Services/CodeGunService.cs => code-gen/Yi.Framework.CodeGen.Application/Services/CodeGenService.cs} (86%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application => code-gen/Yi.Framework.CodeGen.Application}/Services/FieldService.cs (86%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application => code-gen/Yi.Framework.CodeGen.Application}/Services/TableService.cs (70%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application => code-gen/Yi.Framework.CodeGen.Application}/Services/TemplateService.cs (81%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Application/Yi.Framework.CodeGun.Application.csproj => code-gen/Yi.Framework.CodeGen.Application/Yi.Framework.CodeGen.Application.csproj} (63%) create mode 100644 Yi.Abp.Net8/module/code-gen/Yi.Framework.CodeGen.Application/YiFrameworkCodeGenApplicationModule.cs rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain.Shared => code-gen/Yi.Framework.CodeGen.Domain.Shared}/Enums/FieldTypeEnum.cs (92%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain.Shared/Yi.Framework.CodeGun.Domain.Shared.csproj => code-gen/Yi.Framework.CodeGen.Domain.Shared/Yi.Framework.CodeGen.Domain.Shared.csproj} (100%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain.Shared/YiFrameworkCodeGunDomainSharedModule.cs => code-gen/Yi.Framework.CodeGen.Domain.Shared/YiFrameworkCodeGenDomainSharedModule.cs} (52%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Entities/FieldEntity.cs (91%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Entities/TableAggregateRoot.cs (93%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Entities/TemplateEntity.cs (94%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Handlers/FieldTemplateHandler.cs (95%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Handlers/HandledTemplate.cs (84%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Handlers/ITemplateHandler.cs (51%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Handlers/ModelTemplateHandler.cs (92%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Handlers/NameSpaceTemplateHandler.cs (87%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Handlers/TemplateHandlerBase.cs (69%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Managers/CodeFileManager.cs (93%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Managers/DataBaseManger.cs (83%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain => code-gen/Yi.Framework.CodeGen.Domain}/Managers/WebTemplateManager.cs (95%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain/Yi.Framework.CodeGun.Domain.csproj => code-gen/Yi.Framework.CodeGen.Domain/Yi.Framework.CodeGen.Domain.csproj} (81%) rename Yi.Abp.Net8/module/{code-gun/Yi.Framework.CodeGun.Domain/YiFrameworkCodeGunDomainModule.cs => code-gen/Yi.Framework.CodeGen.Domain/YiFrameworkCodeGenDomainModule.cs} (51%) delete mode 100644 Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/IServices/ICodeGunService.cs delete mode 100644 Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application.Contracts/YiFrameworkCodeGunApplicationContractsModule.cs delete mode 100644 Yi.Abp.Net8/module/code-gun/Yi.Framework.CodeGun.Application/YiFrameworkCodeGunApplicationModule.cs create mode 100644 Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db rename Yi.RuoYi.Vue3/src/api/code/{codeGunApi.js => codeGenApi.js} (72%) 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 0000000000000000000000000000000000000000..bb9541207e8b5050808fe36a6e963f88a7015e6f GIT binary patch literal 499712 zcmeFa3wRvIb)Y+g*I@7(z3354OB_;WNQ5e}-w(;M41$mZ2?Qw+phVdeRNYk#js?ts zGXsf~ZybTt%XVbR@k5d=KV(a>v#}&Qe&}Ue*<|lyH_3N%zkHi$zrFV+@f83n@%Lqu zyYc38_U_(O-7|xp;mn|kRn`LcK;mGg`*hW*zfPSxb*iUv__pzEiD$fgVV;&UYV4v| zJRbW{CKHRrEckan{Hy$!@TQ~k0e;6r@0-1~V%K`+A#}`p0HPoJsX3(p$E~AC8x(Gskbt2LA>|CP#;-Ml(~x`^HBz zJH+7~yZd`~jIkY=#a#BpBF{3OD`mYbFJvYTPGu&h$Hy~=CdUp8Pae(OI(js7HAsug z4rlM@J2H&B*?Bs*CR#l|LFeK8y|mySr-j{$t`9X3Iz&syTMCU7I4x!Kxv8uujnNV> z!MnPWe4%`yaT|pGzEb0~SUQkre$yh0x(#cumN}Boxr>DY&$*`#m+1UL)3#(XL%RmL z(${T?$Fe!bPZm$ifdS3X#Zun?JR^|K$l^71=HtDI^w3cJ5!3Iw{aIHKpoLRYrxtka zr@q?mtUbAbjvXuR=X1Qo!5W-wsSfkO0^@~=#rYkXY_7y-!v^951_CAMB>%!HA)(T` zrXYkw+RM_QSvKI=h2I@3h6ei(v{M zc0Mk&W$_198p*TPwm8lyxbdb2eTc$rR%$#y)@amXh>FRsyVYbTS_1|HugNoo z&O~}}F#gC5zNx^3>Sbqx*REP~2@Y<+V1f(Rr5A|Z%1_m^scCi~wf>L~AJ(1qIGycd`zJ(lI-~~S@8_&;% z-*?nnOZe0VY-TE3g2=cod|m4~&>`sB#*xq@hd>&lO

lhfu0E2(Bq*y4YeYiZ+a$ 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 mM9ZCT`%~0U-Bq(?T^M7D!C>tp5k9pMB2& literal 0 HcmV?d00001 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 -->