From 0126ef46fc868dd6cdbc36e6e60f6c7e59e6b923 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 20 Oct 2021 12:47:03 +0300 Subject: [PATCH] Add Payment module to EventHub project --- .../EventHub.Application.Contracts.csproj | 1 + .../EventHubApplicationContractsModule.cs | 6 ++++-- src/EventHub.Application/EventHub.Application.csproj | 1 + src/EventHub.Application/EventHubApplicationModule.cs | 6 ++++-- src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj | 4 ++++ src/EventHub.Domain.Shared/EventHubDomainSharedModule.cs | 4 +++- src/EventHub.Domain/EventHub.Domain.csproj | 1 + src/EventHub.Domain/EventHubDomainModule.cs | 4 +++- .../EventHubEntityFrameworkCoreModule.cs | 4 +++- .../EventHub.EntityFrameworkCore.csproj | 5 +++++ .../EventHub.HttpApi.Client.csproj | 1 + .../EventHubHttpApiClientModule.cs | 4 +++- src/EventHub.HttpApi.Host/appsettings.json | 8 ++++++++ src/EventHub.HttpApi/EventHub.HttpApi.csproj | 1 + src/EventHub.HttpApi/EventHubHttpApiModule.cs | 3 ++- src/EventHub.Web/EventHub.Web.csproj | 1 + src/EventHub.Web/EventHubWebModule.cs | 4 +++- src/EventHub.Web/appsettings.json | 8 -------- 18 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj b/src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj index a15a062..69cc07f 100644 --- a/src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj +++ b/src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj @@ -9,6 +9,7 @@ + diff --git a/src/EventHub.Application.Contracts/EventHubApplicationContractsModule.cs b/src/EventHub.Application.Contracts/EventHubApplicationContractsModule.cs index e6a02a7..56fc60a 100644 --- a/src/EventHub.Application.Contracts/EventHubApplicationContractsModule.cs +++ b/src/EventHub.Application.Contracts/EventHubApplicationContractsModule.cs @@ -1,11 +1,13 @@ -using Volo.Abp.Application; +using Payment; +using Volo.Abp.Application; using Volo.Abp.Modularity; namespace EventHub { [DependsOn( typeof(EventHubDomainSharedModule), - typeof(AbpDddApplicationContractsModule) + typeof(AbpDddApplicationContractsModule), + typeof(PaymentApplicationContractsModule) )] public class EventHubApplicationContractsModule : AbpModule { diff --git a/src/EventHub.Application/EventHub.Application.csproj b/src/EventHub.Application/EventHub.Application.csproj index 65385e6..62dc5a8 100644 --- a/src/EventHub.Application/EventHub.Application.csproj +++ b/src/EventHub.Application/EventHub.Application.csproj @@ -10,6 +10,7 @@ + diff --git a/src/EventHub.Application/EventHubApplicationModule.cs b/src/EventHub.Application/EventHubApplicationModule.cs index 767fdbb..6ffb16d 100644 --- a/src/EventHub.Application/EventHubApplicationModule.cs +++ b/src/EventHub.Application/EventHubApplicationModule.cs @@ -1,4 +1,5 @@ -using Volo.Abp.Application; +using Payment; +using Volo.Abp.Application; using Volo.Abp.AutoMapper; using Volo.Abp.Modularity; @@ -7,7 +8,8 @@ namespace EventHub [DependsOn( typeof(EventHubDomainModule), typeof(EventHubApplicationContractsModule), - typeof(AbpDddApplicationModule) + typeof(AbpDddApplicationModule), + typeof(PaymentApplicationModule) )] public class EventHubApplicationModule : AbpModule { diff --git a/src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj b/src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj index eed8d21..5da33a0 100644 --- a/src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj +++ b/src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj @@ -8,6 +8,10 @@ true + + + + diff --git a/src/EventHub.Domain.Shared/EventHubDomainSharedModule.cs b/src/EventHub.Domain.Shared/EventHubDomainSharedModule.cs index efa5dc2..f686ff2 100644 --- a/src/EventHub.Domain.Shared/EventHubDomainSharedModule.cs +++ b/src/EventHub.Domain.Shared/EventHubDomainSharedModule.cs @@ -13,6 +13,7 @@ using Volo.Abp.SettingManagement; using Volo.Abp.Validation.Localization; using Volo.Abp.VirtualFileSystem; using Volo.Abp.BlobStoring.Database; +using Payment; namespace EventHub { @@ -23,7 +24,8 @@ namespace EventHub typeof(AbpIdentityServerDomainSharedModule), typeof(AbpPermissionManagementDomainSharedModule), typeof(AbpSettingManagementDomainSharedModule), - typeof(BlobStoringDatabaseDomainSharedModule) + typeof(BlobStoringDatabaseDomainSharedModule), + typeof(PaymentDomainSharedModule) )] public class EventHubDomainSharedModule : AbpModule { diff --git a/src/EventHub.Domain/EventHub.Domain.csproj b/src/EventHub.Domain/EventHub.Domain.csproj index 73ea415..b890675 100644 --- a/src/EventHub.Domain/EventHub.Domain.csproj +++ b/src/EventHub.Domain/EventHub.Domain.csproj @@ -10,6 +10,7 @@ + diff --git a/src/EventHub.Domain/EventHubDomainModule.cs b/src/EventHub.Domain/EventHubDomainModule.cs index 8c17cf5..6e98046 100644 --- a/src/EventHub.Domain/EventHubDomainModule.cs +++ b/src/EventHub.Domain/EventHubDomainModule.cs @@ -11,6 +11,7 @@ using Volo.Abp.PermissionManagement.IdentityServer; using Volo.Abp.SettingManagement; using Volo.Abp.BlobStoring.Database; using Volo.Abp.VirtualFileSystem; +using Payment; namespace EventHub { @@ -24,7 +25,8 @@ namespace EventHub typeof(AbpPermissionManagementDomainIdentityServerModule), typeof(AbpSettingManagementDomainModule), typeof(AbpEmailingModule), - typeof(BlobStoringDatabaseDomainModule) + typeof(BlobStoringDatabaseDomainModule), + typeof(PaymentDomainModule) )] public class EventHubDomainModule : AbpModule { diff --git a/src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs b/src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs index 5ccfe62..cce1631 100644 --- a/src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs +++ b/src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs @@ -10,6 +10,7 @@ using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.BlobStoring.Database.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore.PostgreSql; using System; +using Payment.EntityFrameworkCore; namespace EventHub.EntityFrameworkCore { @@ -22,7 +23,8 @@ namespace EventHub.EntityFrameworkCore typeof(AbpEntityFrameworkCorePostgreSqlModule), typeof(AbpBackgroundJobsEntityFrameworkCoreModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule), - typeof(BlobStoringDatabaseEntityFrameworkCoreModule) + typeof(BlobStoringDatabaseEntityFrameworkCoreModule), + typeof(PaymentEntityFrameworkCoreModule) )] public class EventHubEntityFrameworkCoreModule : AbpModule { diff --git a/src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj b/src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj index 9e8ea50..b8b4b35 100644 --- a/src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj +++ b/src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj @@ -7,6 +7,11 @@ EventHub + + + + + diff --git a/src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj b/src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj index 59df771..7af1285 100644 --- a/src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj +++ b/src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj @@ -9,6 +9,7 @@ + diff --git a/src/EventHub.HttpApi.Client/EventHubHttpApiClientModule.cs b/src/EventHub.HttpApi.Client/EventHubHttpApiClientModule.cs index f799384..5b3604c 100644 --- a/src/EventHub.HttpApi.Client/EventHubHttpApiClientModule.cs +++ b/src/EventHub.HttpApi.Client/EventHubHttpApiClientModule.cs @@ -1,12 +1,14 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Http.Client; using Volo.Abp.Modularity; +using Payment; namespace EventHub { [DependsOn( typeof(EventHubApplicationContractsModule), - typeof(AbpHttpClientModule) + typeof(AbpHttpClientModule), + typeof(PaymentHttpApiClientModule) )] public class EventHubHttpApiClientModule : AbpModule { diff --git a/src/EventHub.HttpApi.Host/appsettings.json b/src/EventHub.HttpApi.Host/appsettings.json index aca9ac1..1a74ce3 100644 --- a/src/EventHub.HttpApi.Host/appsettings.json +++ b/src/EventHub.HttpApi.Host/appsettings.json @@ -10,5 +10,13 @@ "RequireHttpsMetadata": "true", "SwaggerClientId": "EventHub_Swagger", "SwaggerClientSecret": "1q2w3e*" + }, + "Payment": { + "DefaultCurrency": "USD", + "PayPal": { + "ClientId": "{ClientId}", + "Secret": "{Secret}", + "Environment": "Sandbox" + } } } diff --git a/src/EventHub.HttpApi/EventHub.HttpApi.csproj b/src/EventHub.HttpApi/EventHub.HttpApi.csproj index 5b941d6..f38eecb 100644 --- a/src/EventHub.HttpApi/EventHub.HttpApi.csproj +++ b/src/EventHub.HttpApi/EventHub.HttpApi.csproj @@ -9,6 +9,7 @@ + diff --git a/src/EventHub.HttpApi/EventHubHttpApiModule.cs b/src/EventHub.HttpApi/EventHubHttpApiModule.cs index a137f45..287a993 100644 --- a/src/EventHub.HttpApi/EventHubHttpApiModule.cs +++ b/src/EventHub.HttpApi/EventHubHttpApiModule.cs @@ -8,7 +8,8 @@ namespace EventHub { [DependsOn( typeof(EventHubApplicationContractsModule), - typeof(AbpAspNetCoreMvcModule) + typeof(AbpAspNetCoreMvcModule), + typeof(EventHubHttpApiModule) )] public class EventHubHttpApiModule : AbpModule { diff --git a/src/EventHub.Web/EventHub.Web.csproj b/src/EventHub.Web/EventHub.Web.csproj index fa0ee57..d83e1a4 100644 --- a/src/EventHub.Web/EventHub.Web.csproj +++ b/src/EventHub.Web/EventHub.Web.csproj @@ -17,6 +17,7 @@ + diff --git a/src/EventHub.Web/EventHubWebModule.cs b/src/EventHub.Web/EventHubWebModule.cs index 5fae0ba..e8e10d2 100644 --- a/src/EventHub.Web/EventHubWebModule.cs +++ b/src/EventHub.Web/EventHubWebModule.cs @@ -36,6 +36,7 @@ using Volo.Abp.Swashbuckle; using Volo.Abp.UI.Navigation.Urls; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; +using Payment.Web; namespace EventHub.Web { @@ -51,7 +52,8 @@ namespace EventHub.Web typeof(AbpHttpClientIdentityModelWebModule), typeof(AbpAspNetCoreSerilogModule), typeof(AbpSwashbuckleModule), - typeof(AbpAccountApplicationContractsModule) + typeof(AbpAccountApplicationContractsModule), + typeof(PaymentWebModule) )] public class EventHubWebModule : AbpModule { diff --git a/src/EventHub.Web/appsettings.json b/src/EventHub.Web/appsettings.json index ad787a5..2c4a520 100644 --- a/src/EventHub.Web/appsettings.json +++ b/src/EventHub.Web/appsettings.json @@ -7,13 +7,5 @@ "RequireHttpsMetadata": "true", "ClientId": "EventHub_Web", "ClientSecret": "1q2w3e*" - }, - "Payment": { - "DefaultCurrency": "USD", - "PayPal": { - "ClientId": "{ClientId}", - "Secret": "{Secret}", - "Environment": "Sandbox" - } } }