Browse Source

Fix module deps.

pull/29/head
Halil İbrahim Kalkan 6 years ago
parent
commit
6bca7d45bf
  1. 12
      src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj
  2. 19
      src/EventHub.BackgroundServices/EventHubBackgroundServicesModule.cs
  3. 21
      src/EventHub.BackgroundServices/appsettings.json
  4. 26
      src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
  5. 11
      src/EventHub.IdentityServer/EventHubIdentityServerModule.cs
  6. 16
      src/EventHub.Web/EventHubWebModule.cs

12
src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj

@ -6,11 +6,17 @@
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace> <RootNamespace>EventHub</RootNamespace>
<UserSecretsId>EventHub-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\EventHub.Domain\EventHub.Domain.csproj" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" />
<PackageReference Include="Volo.Abp.BackgroundWorkers" Version="4.2.1" /> <PackageReference Include="Volo.Abp.BackgroundWorkers" Version="4.2.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.2.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -19,6 +25,7 @@
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" /> <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" /> <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -28,7 +35,4 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EventHub.Domain\EventHub.Domain.csproj" />
</ItemGroup>
</Project> </Project>

19
src/EventHub.BackgroundServices/EventHubBackgroundServicesModule.cs

@ -1,16 +1,23 @@
using EventHub.Events; using EventHub.Events;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using StackExchange.Redis;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Autofac; using Volo.Abp.Autofac;
using Volo.Abp.BackgroundWorkers; using Volo.Abp.BackgroundWorkers;
using Volo.Abp.Caching;
using Volo.Abp.Caching.StackExchangeRedis;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
namespace EventHub namespace EventHub
{ {
[DependsOn( [DependsOn(
typeof(AbpAutofacModule) typeof(AbpAutofacModule),
typeof(AbpBackgroundWorkersModule),
typeof(EventHubDomainModule),
typeof(AbpCachingStackExchangeRedisModule)
)] )]
public class EventHubBackgroundServicesModule : AbpModule public class EventHubBackgroundServicesModule : AbpModule
{ {
@ -20,6 +27,16 @@ namespace EventHub
var hostEnvironment = context.Services.GetSingletonInstance<IHostEnvironment>(); var hostEnvironment = context.Services.GetSingletonInstance<IHostEnvironment>();
context.Services.AddHostedService<EventHubBackgroundServicesHostedService>(); context.Services.AddHostedService<EventHubBackgroundServicesHostedService>();
Configure<AbpDistributedCacheOptions>(options =>
{
options.KeyPrefix = "EventHub:";
});
var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
context.Services
.AddDataProtection()
.PersistKeysToStackExchangeRedis(redis, "EventHub-Protection-Keys");
} }
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)

21
src/EventHub.BackgroundServices/appsettings.json

@ -1,3 +1,22 @@
{ {
"ConnectionStrings": {
"Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=EventHub;Trusted_Connection=True"
},
"Redis": {
"Configuration": "127.0.0.1"
},
"StringEncryption": {
"DefaultPassPhrase": "TxVIZFPxK33czbbv"
},
"Settings": {
"Abp.Mailing.Smtp.Host": "127.0.0.1",
"Abp.Mailing.Smtp.Port": "25",
"Abp.Mailing.Smtp.UserName": "",
"Abp.Mailing.Smtp.Password": "",
"Abp.Mailing.Smtp.Domain": "",
"Abp.Mailing.Smtp.EnableSsl": "false",
"Abp.Mailing.Smtp.UseDefaultCredentials": "true",
"Abp.Mailing.DefaultFromAddress": "noreply@abp.io",
"Abp.Mailing.DefaultFromDisplayName": "ABP application"
}
} }

26
src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs

@ -19,6 +19,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.AspNetCore.Serilog;
using Volo.Abp.Autofac; using Volo.Abp.Autofac;
using Volo.Abp.BackgroundJobs;
using Volo.Abp.Caching; using Volo.Abp.Caching;
using Volo.Abp.Caching.StackExchangeRedis; using Volo.Abp.Caching.StackExchangeRedis;
using Volo.Abp.Localization; using Volo.Abp.Localization;
@ -52,9 +53,18 @@ namespace EventHub
ConfigureLocalization(); ConfigureLocalization();
ConfigureCache(configuration); ConfigureCache(configuration);
ConfigureVirtualFileSystem(context); ConfigureVirtualFileSystem(context);
ConfigureRedis(context, configuration, hostingEnvironment); ConfigureRedis(context, configuration);
ConfigureCors(context, configuration); ConfigureCors(context, configuration);
ConfigureSwaggerServices(context, configuration); ConfigureSwaggerServices(context, configuration);
ConfigureBackgroundJobs();
}
private void ConfigureBackgroundJobs()
{
Configure<AbpBackgroundJobOptions>(options =>
{
options.IsJobExecutionEnabled = false;
});
} }
private void ConfigureCache(IConfiguration configuration) private void ConfigureCache(IConfiguration configuration)
@ -142,16 +152,12 @@ namespace EventHub
private void ConfigureRedis( private void ConfigureRedis(
ServiceConfigurationContext context, ServiceConfigurationContext context,
IConfiguration configuration, IConfiguration configuration)
IWebHostEnvironment hostingEnvironment)
{ {
if (!hostingEnvironment.IsDevelopment()) var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
{ context.Services
var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); .AddDataProtection()
context.Services .PersistKeysToStackExchangeRedis(redis, "EventHub-Protection-Keys");
.AddDataProtection()
.PersistKeysToStackExchangeRedis(redis, "EventHub-Protection-Keys");
}
} }
private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration)

11
src/EventHub.IdentityServer/EventHubIdentityServerModule.cs

@ -113,13 +113,10 @@ namespace EventHub
options.KeyPrefix = "EventHub:"; options.KeyPrefix = "EventHub:";
}); });
if (!hostingEnvironment.IsDevelopment()) var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
{ context.Services
var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); .AddDataProtection()
context.Services .PersistKeysToStackExchangeRedis(redis, "EventHub-Protection-Keys");
.AddDataProtection()
.PersistKeysToStackExchangeRedis(redis, "EventHub-Protection-Keys");
}
context.Services.AddCors(options => context.Services.AddCors(options =>
{ {

16
src/EventHub.Web/EventHubWebModule.cs

@ -69,7 +69,7 @@ namespace EventHub.Web
ConfigureBundles(); ConfigureBundles();
ConfigureCache(configuration); ConfigureCache(configuration);
ConfigureRedis(context, configuration, hostingEnvironment); ConfigureRedis(context, configuration);
ConfigureUrls(configuration); ConfigureUrls(configuration);
ConfigureAuthentication(context, configuration); ConfigureAuthentication(context, configuration);
ConfigureAutoMapper(); ConfigureAutoMapper();
@ -186,16 +186,12 @@ namespace EventHub.Web
private void ConfigureRedis( private void ConfigureRedis(
ServiceConfigurationContext context, ServiceConfigurationContext context,
IConfiguration configuration, IConfiguration configuration)
IWebHostEnvironment hostingEnvironment)
{ {
if (!hostingEnvironment.IsDevelopment()) var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
{ context.Services
var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]); .AddDataProtection()
context.Services .PersistKeysToStackExchangeRedis(redis, "EventHub-Protection-Keys");
.AddDataProtection()
.PersistKeysToStackExchangeRedis(redis, "EventHub-Protection-Keys");
}
} }
public override void OnApplicationInitialization(ApplicationInitializationContext context) public override void OnApplicationInitialization(ApplicationInitializationContext context)

Loading…
Cancel
Save