general-startup: fix
This commit is contained in:
parent
2f5491f1ba
commit
71d90ebfa2
@ -2,30 +2,21 @@
|
||||
using ASC.Api.Core.Middleware;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.HttpOverrides;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.Mvc.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc.Formatters;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using ASC.Common.DependencyInjection;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using ASC.Api.Core.Auth;
|
||||
|
||||
namespace ASC.Api.Core
|
||||
{
|
||||
public class Startup
|
||||
public static class GeneralStartup
|
||||
{
|
||||
public static void ConfigureServices(IServiceCollection services, bool confirmAddScheme)
|
||||
{
|
||||
public IConfiguration Configuration { get; }
|
||||
public IHostEnvironment HostEnvironment { get; }
|
||||
|
||||
public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment)
|
||||
{
|
||||
Configuration = configuration;
|
||||
HostEnvironment = hostEnvironment;
|
||||
}
|
||||
public void ConfigureServices(IServiceCollection services)
|
||||
{
|
||||
services.AddHttpContextAccessor();
|
||||
|
||||
services.AddControllers()
|
||||
@ -52,9 +43,20 @@ namespace ASC.Api.Core
|
||||
config.OutputFormatters.RemoveType<XmlSerializerOutputFormatter>();
|
||||
config.OutputFormatters.Add(new XmlOutputFormatter());
|
||||
});
|
||||
services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
|
||||
|
||||
if (confirmAddScheme)
|
||||
{
|
||||
services.AddAuthentication("cookie")
|
||||
.AddScheme<AuthenticationSchemeOptions, CookieAuthHandler>("cookie", a => { })
|
||||
.AddScheme<AuthenticationSchemeOptions, ConfirmAuthHandler>("confirm", a => { });
|
||||
}
|
||||
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
|
||||
else
|
||||
{
|
||||
services.AddAuthentication("cookie")
|
||||
.AddScheme<AuthenticationSchemeOptions, CookieAuthHandler>("cookie", a => { });
|
||||
}
|
||||
}
|
||||
public static void Configure(IApplicationBuilder app)
|
||||
{
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions
|
||||
{
|
@ -1,19 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
using ASC.Api.Core;
|
||||
using ASC.Api.Core.Auth;
|
||||
using ASC.Common;
|
||||
using ASC.Common.DependencyInjection;
|
||||
using ASC.Common.Logging;
|
||||
using ASC.Common.Threading.Progress;
|
||||
using ASC.Data.Backup.Controllers;
|
||||
using ASC.Data.Backup.Service;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace ASC.Data.Backup
|
||||
@ -53,28 +43,6 @@ namespace ASC.Data.Backup
|
||||
.AddJsonFile($"kafka.{env}.json", true)
|
||||
.AddEnvironmentVariables();
|
||||
})
|
||||
.ConfigureServices((hostContext, services) =>
|
||||
{
|
||||
var diHelper = new DIHelper(services);
|
||||
|
||||
diHelper.AddBackupServiceLauncher()
|
||||
.AddBackupController();
|
||||
diHelper.AddNLogManager("ASC.Data.Backup");
|
||||
services.AddHostedService<BackupServiceLauncher>();
|
||||
diHelper.Configure<ProgressQueue<BaseBackupProgressItem>>(r =>
|
||||
{
|
||||
r.workerCount = 1;
|
||||
r.waitInterval = (int)TimeSpan.FromMinutes(5).TotalMilliseconds;
|
||||
r.removeAfterCompleted = true;
|
||||
r.stopAfterFinsih = false;
|
||||
r.errorCount = 0;
|
||||
});
|
||||
|
||||
services.AddAuthentication("cookie")
|
||||
.AddScheme<AuthenticationSchemeOptions, CookieAuthHandler>("cookie", a => { });
|
||||
|
||||
services.AddAutofac(hostContext.Configuration, hostContext.HostingEnvironment.ContentRootPath, false);
|
||||
})
|
||||
.UseConsoleLifetime()
|
||||
.Build();
|
||||
|
||||
|
55
common/services/ASC.Data.Backup/Startup.cs
Normal file
55
common/services/ASC.Data.Backup/Startup.cs
Normal file
@ -0,0 +1,55 @@
|
||||
using System;
|
||||
|
||||
using ASC.Api.Core;
|
||||
using ASC.Common;
|
||||
using ASC.Common.Logging;
|
||||
using ASC.Common.Threading.Progress;
|
||||
using ASC.Data.Backup.Controllers;
|
||||
using ASC.Data.Backup.Service;
|
||||
using ASC.Common.DependencyInjection;
|
||||
using Autofac.Extensions.DependencyInjection;
|
||||
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace ASC.Data.Backup
|
||||
{
|
||||
public class Startup
|
||||
{
|
||||
public IConfiguration Configuration { get; }
|
||||
public IHostEnvironment HostEnvironment { get; }
|
||||
|
||||
public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment)
|
||||
{
|
||||
Configuration = configuration;
|
||||
HostEnvironment = hostEnvironment;
|
||||
}
|
||||
public void ConfigureServices(IServiceCollection services) {
|
||||
var diHelper = new DIHelper(services);
|
||||
|
||||
diHelper.AddBackupServiceLauncher()
|
||||
.AddBackupController();
|
||||
diHelper.AddNLogManager("ASC.Data.Backup");
|
||||
services.AddHostedService<BackupServiceLauncher>();
|
||||
diHelper.Configure<ProgressQueue<BaseBackupProgressItem>>(r =>
|
||||
{
|
||||
r.workerCount = 1;
|
||||
r.waitInterval = (int)TimeSpan.FromMinutes(5).TotalMilliseconds;
|
||||
r.removeAfterCompleted = true;
|
||||
r.stopAfterFinsih = false;
|
||||
r.errorCount = 0;
|
||||
});
|
||||
|
||||
|
||||
GeneralStartup.ConfigureServices(services, false);
|
||||
services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
|
||||
|
||||
}
|
||||
public void Configure(IApplicationBuilder app)
|
||||
{
|
||||
GeneralStartup.Configure(app);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,20 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using ASC.Api.Core;
|
||||
using ASC.Api.Core.Auth;
|
||||
using ASC.Api.Core.Middleware;
|
||||
using ASC.Common;
|
||||
using ASC.Common.Logging;
|
||||
using ASC.Common.Threading.Progress;
|
||||
using ASC.Common.Threading.Workers;
|
||||
using ASC.Data.Reassigns;
|
||||
using ASC.Employee.Core.Controllers;
|
||||
using ASC.Web.Core.Users;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace ASC.People
|
||||
@ -54,56 +42,6 @@ namespace ASC.People
|
||||
.AddJsonFile($"kafka.{hostingContext.HostingEnvironment.EnvironmentName}.json", true)
|
||||
.AddEnvironmentVariables()
|
||||
.AddCommandLine(args);
|
||||
}).ConfigureServices((hostContext, services)=>
|
||||
{
|
||||
|
||||
services.AddAuthentication("cookie")
|
||||
.AddScheme<AuthenticationSchemeOptions, CookieAuthHandler>("cookie", a => { })
|
||||
.AddScheme<AuthenticationSchemeOptions, ConfirmAuthHandler>("confirm", a => { });
|
||||
|
||||
var diHelper = new DIHelper(services);
|
||||
|
||||
diHelper
|
||||
.AddConfirmAuthHandler()
|
||||
.AddCookieAuthHandler()
|
||||
.AddCultureMiddleware()
|
||||
.AddIpSecurityFilter()
|
||||
.AddPaymentFilter()
|
||||
.AddProductSecurityFilter()
|
||||
.AddTenantStatusFilter();
|
||||
|
||||
diHelper.Configure<WorkerQueue<ResizeWorkerItem>>(r =>
|
||||
{
|
||||
r.workerCount = 2;
|
||||
r.waitInterval = (int)TimeSpan.FromSeconds(30).TotalMilliseconds;
|
||||
r.errorCount = 1;
|
||||
r.stopAfterFinsih = true;
|
||||
});
|
||||
|
||||
diHelper.Configure<ProgressQueue<ReassignProgressItem>>(r =>
|
||||
{
|
||||
r.workerCount = 1;
|
||||
r.waitInterval = (int)TimeSpan.FromMinutes(5).TotalMilliseconds;
|
||||
r.removeAfterCompleted = true;
|
||||
r.stopAfterFinsih = false;
|
||||
r.errorCount = 0;
|
||||
});
|
||||
|
||||
diHelper.Configure<ProgressQueue<RemoveProgressItem>>(r =>
|
||||
{
|
||||
r.workerCount = 1;
|
||||
r.waitInterval = (int)TimeSpan.FromMinutes(5).TotalMilliseconds;
|
||||
r.removeAfterCompleted = true;
|
||||
r.stopAfterFinsih = false;
|
||||
r.errorCount = 0;
|
||||
});
|
||||
|
||||
diHelper.AddNLogManager("ASC.Api", "ASC.Web");
|
||||
|
||||
diHelper
|
||||
.AddPeopleController()
|
||||
.AddGroupController();
|
||||
})
|
||||
;
|
||||
}
|
||||
}
|
123
products/ASC.People/Server/Startup.cs
Normal file
123
products/ASC.People/Server/Startup.cs
Normal file
@ -0,0 +1,123 @@
|
||||
|
||||
using System;
|
||||
|
||||
using ASC.Api.Core;
|
||||
using ASC.Api.Core.Auth;
|
||||
using ASC.Api.Core.Core;
|
||||
using ASC.Api.Core.Middleware;
|
||||
using ASC.Common;
|
||||
using ASC.Common.DependencyInjection;
|
||||
using ASC.Common.Logging;
|
||||
using ASC.Common.Threading.Progress;
|
||||
using ASC.Common.Threading.Workers;
|
||||
using ASC.Data.Reassigns;
|
||||
using ASC.Employee.Core.Controllers;
|
||||
using ASC.Web.Core.Users;
|
||||
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.HttpOverrides;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace ASC.People
|
||||
{
|
||||
public class Startup
|
||||
{
|
||||
public IConfiguration Configuration { get; }
|
||||
public IHostEnvironment HostEnvironment { get; }
|
||||
|
||||
public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment)
|
||||
{
|
||||
Configuration = configuration;
|
||||
HostEnvironment = hostEnvironment;
|
||||
}
|
||||
|
||||
public void ConfigureServices(IServiceCollection services)
|
||||
{
|
||||
services.AddHttpContextAccessor();
|
||||
|
||||
|
||||
var diHelper = new DIHelper(services);
|
||||
|
||||
diHelper
|
||||
.AddConfirmAuthHandler()
|
||||
.AddCookieAuthHandler()
|
||||
.AddCultureMiddleware()
|
||||
.AddIpSecurityFilter()
|
||||
.AddPaymentFilter()
|
||||
.AddProductSecurityFilter()
|
||||
.AddTenantStatusFilter();
|
||||
|
||||
diHelper.Configure<WorkerQueue<ResizeWorkerItem>>(r =>
|
||||
{
|
||||
r.workerCount = 2;
|
||||
r.waitInterval = (int)TimeSpan.FromSeconds(30).TotalMilliseconds;
|
||||
r.errorCount = 1;
|
||||
r.stopAfterFinsih = true;
|
||||
});
|
||||
|
||||
diHelper.Configure<ProgressQueue<ReassignProgressItem>>(r =>
|
||||
{
|
||||
r.workerCount = 1;
|
||||
r.waitInterval = (int)TimeSpan.FromMinutes(5).TotalMilliseconds;
|
||||
r.removeAfterCompleted = true;
|
||||
r.stopAfterFinsih = false;
|
||||
r.errorCount = 0;
|
||||
});
|
||||
|
||||
diHelper.Configure<ProgressQueue<RemoveProgressItem>>(r =>
|
||||
{
|
||||
r.workerCount = 1;
|
||||
r.waitInterval = (int)TimeSpan.FromMinutes(5).TotalMilliseconds;
|
||||
r.removeAfterCompleted = true;
|
||||
r.stopAfterFinsih = false;
|
||||
r.errorCount = 0;
|
||||
});
|
||||
|
||||
diHelper.AddNLogManager("ASC.Api", "ASC.Web");
|
||||
|
||||
diHelper
|
||||
.AddPeopleController()
|
||||
.AddGroupController();
|
||||
GeneralStartup.ConfigureServices(services, true);
|
||||
services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
|
||||
}
|
||||
|
||||
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
|
||||
{
|
||||
if (env.IsDevelopment())
|
||||
{
|
||||
app.UseDeveloperExceptionPage();
|
||||
}
|
||||
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions
|
||||
{
|
||||
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
|
||||
});
|
||||
|
||||
app.UseCors(builder =>
|
||||
builder
|
||||
.AllowAnyOrigin()
|
||||
.AllowAnyHeader()
|
||||
.AllowAnyMethod());
|
||||
|
||||
app.UseRouting();
|
||||
|
||||
app.UseAuthentication();
|
||||
|
||||
app.UseAuthorization();
|
||||
|
||||
app.UseCultureMiddleware();
|
||||
|
||||
app.UseDisposeMiddleware();
|
||||
|
||||
app.UseEndpoints(endpoints =>
|
||||
{
|
||||
endpoints.MapControllers();
|
||||
endpoints.MapCustom();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
@ -1,16 +1,8 @@
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using ASC.Api.Core;
|
||||
using ASC.Api.Core.Auth;
|
||||
using ASC.Api.Core.Middleware;
|
||||
using ASC.Api.Settings;
|
||||
using ASC.Common;
|
||||
using ASC.Common.Logging;
|
||||
using ASC.Web.Api.Controllers;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
|
||||
@ -51,30 +43,6 @@ namespace ASC.Web.Api
|
||||
.AddJsonFile($"kafka.{hostingContext.HostingEnvironment.EnvironmentName}.json", true)
|
||||
.AddEnvironmentVariables()
|
||||
.AddCommandLine(args);
|
||||
}).ConfigureServices((hostContext, services) => {
|
||||
|
||||
services.AddAuthentication("cookie")
|
||||
.AddScheme<AuthenticationSchemeOptions, CookieAuthHandler>("cookie", a => { })
|
||||
.AddScheme<AuthenticationSchemeOptions, ConfirmAuthHandler>("confirm", a => { });
|
||||
var diHelper = new DIHelper(services);
|
||||
|
||||
diHelper
|
||||
.AddConfirmAuthHandler()
|
||||
.AddCookieAuthHandler()
|
||||
.AddCultureMiddleware()
|
||||
.AddIpSecurityFilter()
|
||||
.AddPaymentFilter()
|
||||
.AddProductSecurityFilter()
|
||||
.AddTenantStatusFilter();
|
||||
|
||||
diHelper.AddNLogManager("ASC.Api", "ASC.Web");
|
||||
|
||||
diHelper
|
||||
.AddAuthenticationController()
|
||||
.AddModulesController()
|
||||
.AddPortalController()
|
||||
.AddSettingsController()
|
||||
.AddSmtpSettingsController();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
60
web/ASC.Web.Api/Startup.cs
Normal file
60
web/ASC.Web.Api/Startup.cs
Normal file
@ -0,0 +1,60 @@
|
||||
|
||||
using ASC.Api.Core;
|
||||
using ASC.Api.Core.Auth;
|
||||
using ASC.Api.Core.Middleware;
|
||||
using ASC.Api.Settings;
|
||||
using ASC.Common;
|
||||
using ASC.Common.Logging;
|
||||
using ASC.Common.DependencyInjection;
|
||||
using ASC.Web.Api.Controllers;
|
||||
|
||||
using Autofac.Extensions.DependencyInjection;
|
||||
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace ASC.Web.Api
|
||||
{
|
||||
public class Startup
|
||||
{
|
||||
public IConfiguration Configuration { get; }
|
||||
public IHostEnvironment HostEnvironment { get; }
|
||||
|
||||
public Startup(IConfiguration configuration, IHostEnvironment hostEnvironment)
|
||||
{
|
||||
Configuration = configuration;
|
||||
HostEnvironment = hostEnvironment;
|
||||
}
|
||||
public void ConfigureServices(IServiceCollection services)
|
||||
{
|
||||
var diHelper = new DIHelper(services);
|
||||
|
||||
diHelper
|
||||
.AddConfirmAuthHandler()
|
||||
.AddCookieAuthHandler()
|
||||
.AddCultureMiddleware()
|
||||
.AddIpSecurityFilter()
|
||||
.AddPaymentFilter()
|
||||
.AddProductSecurityFilter()
|
||||
.AddTenantStatusFilter();
|
||||
|
||||
diHelper.AddNLogManager("ASC.Api", "ASC.Web");
|
||||
|
||||
diHelper
|
||||
.AddAuthenticationController()
|
||||
.AddModulesController()
|
||||
.AddPortalController()
|
||||
.AddSettingsController()
|
||||
.AddSmtpSettingsController();
|
||||
GeneralStartup.ConfigureServices(services, true);
|
||||
services.AddAutofac(Configuration, HostEnvironment.ContentRootPath);
|
||||
|
||||
}
|
||||
public void Configure(IApplicationBuilder app)
|
||||
{
|
||||
GeneralStartup.Configure(app);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user