diff --git a/WebApiService/Win_in.Sfs.Scp.WebApi.sln b/WebApiService/Win_in.Sfs.Scp.WebApi.sln index f207bc5..14a2a0f 100644 --- a/WebApiService/Win_in.Sfs.Scp.WebApi.sln +++ b/WebApiService/Win_in.Sfs.Scp.WebApi.sln @@ -39,12 +39,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win_in.Sfs.Scp.v1.Domain", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win_in.Sfs.Scp.v1.EntityFrameworkCore", "src\Win_in.Sfs.Scp.v1.EntityFrameworkCore\Win_in.Sfs.Scp.v1.EntityFrameworkCore.csproj", "{77D1D3F8-A04C-4688-AC67-C8372BD268A2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win_in.Sfs.Scp.v1.Event", "src\Win_in.Sfs.Scp.v1.Event\Win_in.Sfs.Scp.v1.Event.csproj", "{45EED43B-B235-4C24-9176-3B7992DA4D6E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win_in.Sfs.Scp.WebApi.Event", "src\Win_in.Sfs.Scp.v1.Event\Win_in.Sfs.Scp.WebApi.Event.csproj", "{45EED43B-B235-4C24-9176-3B7992DA4D6E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Win_in.Sfs.Scp.WebApi.Xml.Host", "src\Win_in.Sfs.Scp.WebApi.Xml.Host\Win_in.Sfs.Scp.WebApi.Xml.Host.csproj", "{98CDED94-F046-4010-88F4-700B7481169E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosts", "hosts", "{44A92E7C-E2FC-4F37-AF3D-6B7213EF54FE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scp", "scp", "{925EA68F-25D1-444F-A79B-EB9BF754EC3C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webApi", "webApi", "{A79A01B2-9532-4C6B-880F-193251F3B9F3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -128,24 +132,26 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {1A94A50E-06DC-43C1-80B5-B662820EC3EB} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {A79A01B2-9532-4C6B-880F-193251F3B9F3} + {1A94A50E-06DC-43C1-80B5-B662820EC3EB} = {A79A01B2-9532-4C6B-880F-193251F3B9F3} + {C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {A79A01B2-9532-4C6B-880F-193251F3B9F3} {50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} - {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {42F719ED-8413-4895-B5B4-5AB56079BC66} = {A79A01B2-9532-4C6B-880F-193251F3B9F3} + {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {A79A01B2-9532-4C6B-880F-193251F3B9F3} + {4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {A79A01B2-9532-4C6B-880F-193251F3B9F3} + {3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {A79A01B2-9532-4C6B-880F-193251F3B9F3} {1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {91853F21-9CD9-4132-BC29-A7D5D84FFFE7} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {E512F4D9-9375-480F-A2F6-A46509F9D824} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {EF480016-9127-4916-8735-D2466BDBC582} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} - {AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {A79A01B2-9532-4C6B-880F-193251F3B9F3} {748584B1-BA69-4F6A-81AA-F4BDE6BCE29D} = {44A92E7C-E2FC-4F37-AF3D-6B7213EF54FE} - {3EE98133-3E7A-4B14-A515-12CB039A9EED} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {77D1D3F8-A04C-4688-AC67-C8372BD268A2} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {45EED43B-B235-4C24-9176-3B7992DA4D6E} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {3EE98133-3E7A-4B14-A515-12CB039A9EED} = {925EA68F-25D1-444F-A79B-EB9BF754EC3C} + {77D1D3F8-A04C-4688-AC67-C8372BD268A2} = {925EA68F-25D1-444F-A79B-EB9BF754EC3C} + {45EED43B-B235-4C24-9176-3B7992DA4D6E} = {A79A01B2-9532-4C6B-880F-193251F3B9F3} {98CDED94-F046-4010-88F4-700B7481169E} = {44A92E7C-E2FC-4F37-AF3D-6B7213EF54FE} + {925EA68F-25D1-444F-A79B-EB9BF754EC3C} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {A79A01B2-9532-4C6B-880F-193251F3B9F3} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/WebApiEntityFrameworkCoreModule.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/WebApiEntityFrameworkCoreModule.cs index 7dd6cbc..7d4262a 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/WebApiEntityFrameworkCoreModule.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/WebApiEntityFrameworkCoreModule.cs @@ -12,7 +12,6 @@ using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.EntityFrameworkCore; -using Win_in.Sfs.Scp.v1.Event; using Win_in.Sfs.Scp.WebApi.EntityFrameworkCore; // using Win_in.Sfs.Scp.v1.Event; @@ -31,7 +30,7 @@ namespace Win_in.Sfs.Scp.WebApi typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule) )] - [DependsOn(typeof(V1ScpEventModule))] + [DependsOn(typeof(WebApiEventModule))] public class WebApiEntityFrameworkCoreModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore.csproj b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore.csproj index 78858c4..fecc969 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore.csproj +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore.csproj @@ -8,7 +8,7 @@ - + diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/PartEventHandler.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/PartEventHandler.cs index 7cbf3fd..a1d1cb0 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/PartEventHandler.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/PartEventHandler.cs @@ -3,11 +3,10 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events; using Volo.Abp.EventBus; -using Win_in.Sfs.Scp.v1.Domain; -using Win_in.Sfs.Scp.WebApi; using Volo.Abp.ObjectMapping; +using Win_in.Sfs.Scp.v1.Domain; -namespace Win_in.Sfs.Scp.v1.Event +namespace Win_in.Sfs.Scp.WebApi { public class PartEventHandler : ILocalEventHandler>, diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/PurchaseOrderEventHandler.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/PurchaseOrderEventHandler.cs index d68ce87..c2ea19b 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/PurchaseOrderEventHandler.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/PurchaseOrderEventHandler.cs @@ -2,11 +2,9 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events; -using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.EventBus; -using Win_in.Sfs.Scp.WebApi; -namespace Win_in.Sfs.Scp.v1.Event +namespace Win_in.Sfs.Scp.WebApi { public class PurchaseOrderEventHandler:ILocalEventHandler>,ITransientDependency { diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/ReceiptEventHandler.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/ReceiptEventHandler.cs index cb8d3bc..2958a42 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/ReceiptEventHandler.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/ReceiptEventHandler.cs @@ -2,11 +2,9 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events; -using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.EventBus; -using Win_in.Sfs.Scp.WebApi; -namespace Win_in.Sfs.Scp.v1.Event +namespace Win_in.Sfs.Scp.WebApi { public class ReceiptEventHandler:ILocalEventHandler>, ITransientDependency { diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/SupplierEventHandler.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/SupplierEventHandler.cs index 289c0cb..7fb677c 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/SupplierEventHandler.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/SupplierEventHandler.cs @@ -2,11 +2,9 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events; -using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.EventBus; -using Win_in.Sfs.Scp.WebApi; -namespace Win_in.Sfs.Scp.v1.Event +namespace Win_in.Sfs.Scp.WebApi { public class SupplierEventHandler:ILocalEventHandler>, ITransientDependency { diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/UnplannedReceiptEventHandler.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/UnplannedReceiptEventHandler.cs index 261ab45..915f87b 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/UnplannedReceiptEventHandler.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/UnplannedReceiptEventHandler.cs @@ -2,11 +2,9 @@ using System.Threading.Tasks; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events; -using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.EventBus; -using Win_in.Sfs.Scp.WebApi; -namespace Win_in.Sfs.Scp.v1.Event +namespace Win_in.Sfs.Scp.WebApi { public class UnplannedReceiptEventHandler:ILocalEventHandler>, ITransientDependency { diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/WebApiApplicationAutoMapperProfile.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/WebApiApplicationAutoMapperProfile.cs index 667b10b..9de44db 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/WebApiApplicationAutoMapperProfile.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/WebApiApplicationAutoMapperProfile.cs @@ -1,9 +1,7 @@ using AutoMapper; -using Volo.Abp.AutoMapper; using Win_in.Sfs.Scp.v1.Domain; -using Win_in.Sfs.Scp.WebApi; -namespace Win_in.Sfs.Scp.v1.Event +namespace Win_in.Sfs.Scp.WebApi { public class EventAutoMapperProfile : Profile { diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/V1ScpEventModule.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/WebApiEventModule.cs similarity index 73% rename from WebApiService/src/Win_in.Sfs.Scp.v1.Event/V1ScpEventModule.cs rename to WebApiService/src/Win_in.Sfs.Scp.v1.Event/WebApiEventModule.cs index 8c25fbe..1f21dee 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/V1ScpEventModule.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/WebApiEventModule.cs @@ -1,12 +1,10 @@ using Volo.Abp.Autofac; using Volo.Abp.AutoMapper; -using Volo.Abp.Domain.Entities.Events.Distributed; using Volo.Abp.Modularity; using Win_in.Sfs.Scp.v1.Domain; using Win_in.Sfs.Scp.v1.EntityFrameworkCore; -using Win_in.Sfs.Scp.WebApi; -namespace Win_in.Sfs.Scp.v1.Event +namespace Win_in.Sfs.Scp.WebApi { [DependsOn( typeof(AbpAutofacModule), @@ -15,13 +13,13 @@ namespace Win_in.Sfs.Scp.v1.Event typeof(WebApiDomainModule), typeof(V1ScpEntityFrameworkCoreModule) )] - public class V1ScpEventModule : AbpModule + public class WebApiEventModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { Configure(options => { - options.AddMaps(); + options.AddMaps(); }); diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/Win_in.Sfs.Scp.v1.Event.csproj b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/Win_in.Sfs.Scp.WebApi.Event.csproj similarity index 91% rename from WebApiService/src/Win_in.Sfs.Scp.v1.Event/Win_in.Sfs.Scp.v1.Event.csproj rename to WebApiService/src/Win_in.Sfs.Scp.v1.Event/Win_in.Sfs.Scp.WebApi.Event.csproj index 31e41f0..5211d00 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Event/Win_in.Sfs.Scp.v1.Event.csproj +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Event/Win_in.Sfs.Scp.WebApi.Event.csproj @@ -2,6 +2,7 @@ net5.0 + Win_in.Sfs.Scp.WebApi