Browse Source

Fix configuration usage.

pull/1944/head
Halil İbrahim Kalkan 7 years ago
parent
commit
f2138e5868
  1. 4
      modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/DemoAppHangfireModule.cs
  2. 10
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
  3. 6
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs
  4. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
  5. 8
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs
  6. 12
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
  7. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
  8. 2
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs
  9. 2
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs
  10. 10
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs

4
modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/DemoAppHangfireModule.cs

@ -4,7 +4,6 @@ using Volo.Abp.Autofac;
using Volo.Abp.BackgroundJobs.DemoApp.Shared;
using Volo.Abp.Modularity;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Volo.Abp.BackgroundJobs.Hangfire;
namespace Volo.Abp.BackgroundJobs.DemoApp.HangFire
@ -18,8 +17,7 @@ namespace Volo.Abp.BackgroundJobs.DemoApp.HangFire
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
var configuration = ConfigurationHelper.BuildConfiguration();
context.Services.SetConfiguration(configuration);
var configuration = context.Services.GetConfiguration();
context.Services.PreConfigure<IGlobalConfiguration>(hangfireConfiguration =>
{

10
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs

@ -52,9 +52,9 @@ namespace MyCompanyName.MyProjectName
ConfigureSwaggerServices(context);
}
private void ConfigureCache(IConfigurationRoot configuration)
private void ConfigureCache(IConfiguration configuration)
{
Configure<AbpCacheOptions>(options =>
Configure<AbpDistributedCacheOptions>(options =>
{
options.KeyPrefix = "MyProjectName:";
});
@ -84,7 +84,7 @@ namespace MyCompanyName.MyProjectName
});
}
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
{
context.Services.AddAuthentication("Bearer")
.AddIdentityServerAuthentication(options =>
@ -119,7 +119,7 @@ namespace MyCompanyName.MyProjectName
private void ConfigureRedis(
ServiceConfigurationContext context,
IConfigurationRoot configuration,
IConfiguration configuration,
IWebHostEnvironment hostingEnvironment)
{
context.Services.AddStackExchangeRedisCache(options =>
@ -136,7 +136,7 @@ namespace MyCompanyName.MyProjectName
}
}
private void ConfigureCors(ServiceConfigurationContext context, IConfigurationRoot configuration)
private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration)
{
context.Services.AddCors(options =>
{

6
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs

@ -54,7 +54,7 @@ namespace MyCompanyName.MyProjectName
ConfigureSwaggerServices(context);
}
private void ConfigureUrls(IConfigurationRoot configuration)
private void ConfigureUrls(IConfiguration configuration)
{
Configure<AppUrlOptions>(options =>
{
@ -86,7 +86,7 @@ namespace MyCompanyName.MyProjectName
});
}
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
{
context.Services.AddAuthentication()
.AddIdentityServerAuthentication(options =>
@ -123,7 +123,7 @@ namespace MyCompanyName.MyProjectName
});
}
private void ConfigureCors(ServiceConfigurationContext context, IConfigurationRoot configuration)
private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration)
{
context.Services.AddCors(options =>
{

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs

@ -94,7 +94,7 @@ namespace MyCompanyName.MyProjectName
options.IsJobExecutionEnabled = false;
});
Configure<AbpCacheOptions>(options =>
Configure<AbpDistributedCacheOptions>(options =>
{
options.KeyPrefix = "MyProjectName:";
});

8
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs

@ -13,11 +13,11 @@ namespace MyCompanyName.MyProjectName.Web.Menus
{
public class MyProjectNameMenuContributor : IMenuContributor
{
private readonly IConfigurationRoot _configurationRoot;
private readonly IConfiguration _configuration;
public MyProjectNameMenuContributor(IConfigurationRoot configurationRoot)
public MyProjectNameMenuContributor(IConfiguration configuration)
{
_configurationRoot = configurationRoot;
_configuration = configuration;
}
public async Task ConfigureMenuAsync(MenuConfigurationContext context)
@ -52,7 +52,7 @@ namespace MyCompanyName.MyProjectName.Web.Menus
var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<MyProjectNameResource>>();
var accountStringLocalizer = context.ServiceProvider.GetRequiredService<IStringLocalizer<AccountResource>>();
var identityServerUrl = _configurationRoot["AuthServer:Authority"] ?? "";
var identityServerUrl = _configuration["AuthServer:Authority"] ?? "";
context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountStringLocalizer["ManageYourProfile"], $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage", icon: "fa fa-cog", order: 1000, null, "_blank"));
context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000));

12
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs

@ -81,15 +81,15 @@ namespace MyCompanyName.MyProjectName.Web
ConfigureSwaggerServices(context.Services);
}
private void ConfigureCache(IConfigurationRoot configuration)
private void ConfigureCache(IConfiguration configuration)
{
Configure<AbpCacheOptions>(options =>
Configure<AbpDistributedCacheOptions>(options =>
{
options.KeyPrefix = "MyProjectName:";
});
}
private void ConfigureUrls(IConfigurationRoot configuration)
private void ConfigureUrls(IConfiguration configuration)
{
Configure<AppUrlOptions>(options =>
{
@ -105,7 +105,7 @@ namespace MyCompanyName.MyProjectName.Web
});
}
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
{
context.Services.AddAuthentication(options =>
{
@ -167,7 +167,7 @@ namespace MyCompanyName.MyProjectName.Web
}
}
private void ConfigureNavigationServices(IConfigurationRoot configuration)
private void ConfigureNavigationServices(IConfiguration configuration)
{
Configure<AbpNavigationOptions>(options =>
{
@ -189,7 +189,7 @@ namespace MyCompanyName.MyProjectName.Web
private void ConfigureRedis(
ServiceConfigurationContext context,
IConfigurationRoot configuration,
IConfiguration configuration,
IWebHostEnvironment hostingEnvironment)
{
context.Services.AddStackExchangeRedisCache(options =>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs

@ -81,7 +81,7 @@ namespace MyCompanyName.MyProjectName.Web
ConfigureSwaggerServices(context.Services);
}
private void ConfigureUrls(IConfigurationRoot configuration)
private void ConfigureUrls(IConfiguration configuration)
{
Configure<AppUrlOptions>(options =>
{
@ -89,7 +89,7 @@ namespace MyCompanyName.MyProjectName.Web
});
}
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
{
context.Services.AddAuthentication()
.AddIdentityServerAuthentication(options =>

2
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs

@ -88,7 +88,7 @@ namespace MyCompanyName.MyProjectName
options.ApiName = "MyProjectName";
});
Configure<AbpCacheOptions>(options =>
Configure<AbpDistributedCacheOptions>(options =>
{
options.KeyPrefix = "MyProjectName:";
});

2
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs

@ -108,7 +108,7 @@ namespace MyCompanyName.MyProjectName
options.ApiName = configuration["AuthServer:ApiName"];
});
Configure<AbpCacheOptions>(options =>
Configure<AbpDistributedCacheOptions>(options =>
{
options.KeyPrefix = "MyProjectName:";
});

10
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs

@ -85,15 +85,15 @@ namespace MyCompanyName.MyProjectName
ConfigureRedis(context, configuration, hostingEnvironment);
}
private void ConfigureCache(IConfigurationRoot configuration)
private void ConfigureCache(IConfiguration configuration)
{
Configure<AbpCacheOptions>(options =>
Configure<AbpDistributedCacheOptions>(options =>
{
options.KeyPrefix = "MyProjectName:";
});
}
private void ConfigureUrls(IConfigurationRoot configuration)
private void ConfigureUrls(IConfiguration configuration)
{
Configure<AppUrlOptions>(options =>
{
@ -109,7 +109,7 @@ namespace MyCompanyName.MyProjectName
});
}
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration)
private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
{
context.Services.AddAuthentication(options =>
{
@ -186,7 +186,7 @@ namespace MyCompanyName.MyProjectName
private void ConfigureRedis(
ServiceConfigurationContext context,
IConfigurationRoot configuration,
IConfiguration configuration,
IWebHostEnvironment hostingEnvironment)
{
context.Services.AddStackExchangeRedisCache(options =>

Loading…
Cancel
Save