From d062d68229b7ea8d2dee0a7c765d584394bfd694 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 25 Jan 2022 22:29:52 +0300 Subject: [PATCH 1/4] updated applications --- .../src/EShopOnAbp.AuthServer/Program.cs | 65 +++++++++-------- .../src/EShopOnAbp.AuthServer/Startup.cs | 19 ----- .../src/EShopOnAbp.PublicWeb/Program.cs | 69 +++++++++---------- .../src/EShopOnAbp.PublicWeb/Startup.cs | 25 ------- 4 files changed, 63 insertions(+), 115 deletions(-) delete mode 100644 apps/auth-server/src/EShopOnAbp.AuthServer/Startup.cs delete mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Startup.cs diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs b/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs index b236243d..efe95993 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs @@ -1,46 +1,45 @@ using System; using System.Threading.Tasks; using EShopOnAbp.Shared.Hosting.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Serilog; -namespace EShopOnAbp.AuthServer +namespace EShopOnAbp.AuthServer; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static async Task Main(string[] args) - { - var assemblyName = typeof(Program).Assembly.GetName().Name; - - SerilogConfigurationHelper.Configure(assemblyName); + var assemblyName = typeof(Program).Assembly.GetName().Name; - try - { - Log.Information($"Starting {assemblyName}."); - await CreateHostBuilder(args).Build().RunAsync(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } + SerilogConfigurationHelper.Configure(assemblyName); - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureAppConfiguration(build => - { - build.AddJsonFile("appsettings.secrets.json", optional: true); - }) - .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) + try + { + Log.Information($"Starting {assemblyName}."); + var builder = WebApplication.CreateBuilder(args); + builder.Host + .AddAppSettingsSecretsJson() .UseAutofac() .UseSerilog(); + + await builder.AddApplicationAsync(); + var app = builder.Build(); + await app.InitializeApplicationAsync(); + await app.RunAsync(); + + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } } -} +} \ No newline at end of file diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/Startup.cs b/apps/auth-server/src/EShopOnAbp.AuthServer/Startup.cs deleted file mode 100644 index f20bcf34..00000000 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/Startup.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; - -namespace EShopOnAbp.AuthServer -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - app.InitializeApplication(); - } - } -} \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Program.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Program.cs index 213a1f8d..305cbc91 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Program.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Program.cs @@ -1,52 +1,45 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using EShopOnAbp.Shared.Hosting.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; using Serilog; -namespace EShopOnAbp.PublicWeb +namespace EShopOnAbp.PublicWeb; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static async Task Main(string[] args) - { - var assemblyName = typeof(Program).Assembly.GetName().Name; - - SerilogConfigurationHelper.Configure(assemblyName); + var assemblyName = typeof(Program).Assembly.GetName().Name; - try - { - Log.Information($"Starting {assemblyName}."); - await CreateHostBuilder(args).Build().RunAsync(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } + SerilogConfigurationHelper.Configure(assemblyName); - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureAppConfiguration(build => - { - build.AddJsonFile("appsettings.secrets.json", optional: true); - }) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) + try + { + Log.Information($"Starting {assemblyName}."); + var builder = WebApplication.CreateBuilder(args); + builder.Host + .AddAppSettingsSecretsJson() .UseAutofac() .UseSerilog(); + + await builder.AddApplicationAsync(); + var app = builder.Build(); + await app.InitializeApplicationAsync(); + await app.RunAsync(); + + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } } } \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Startup.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Startup.cs deleted file mode 100644 index 2322543f..00000000 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Startup.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -namespace EShopOnAbp.PublicWeb -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - app.InitializeApplication(); - } - } -} \ No newline at end of file From df349c0bad0f3821dce3b41014e99746dd7e042a Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 25 Jan 2022 23:19:42 +0300 Subject: [PATCH 2/4] added ApplicationBuilderHelper --- .../src/EShopOnAbp.AuthServer/Program.cs | 11 +-------- .../src/EShopOnAbp.PublicWeb/Program.cs | 13 ++-------- .../ApplicationBuilderHelper.cs | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 shared/EShopOnAbp.Shared.Hosting.AspNetCore/ApplicationBuilderHelper.cs diff --git a/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs b/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs index efe95993..94508848 100644 --- a/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs +++ b/apps/auth-server/src/EShopOnAbp.AuthServer/Program.cs @@ -2,8 +2,6 @@ using System; using System.Threading.Tasks; using EShopOnAbp.Shared.Hosting.AspNetCore; using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Serilog; namespace EShopOnAbp.AuthServer; @@ -19,14 +17,7 @@ public class Program try { Log.Information($"Starting {assemblyName}."); - var builder = WebApplication.CreateBuilder(args); - builder.Host - .AddAppSettingsSecretsJson() - .UseAutofac() - .UseSerilog(); - - await builder.AddApplicationAsync(); - var app = builder.Build(); + var app = await ApplicationBuilderHelper.BuildApplicationAsync(args); await app.InitializeApplicationAsync(); await app.RunAsync(); diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Program.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Program.cs index 305cbc91..02db8160 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Program.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Program.cs @@ -2,8 +2,6 @@ using System; using System.Threading.Tasks; using EShopOnAbp.Shared.Hosting.AspNetCore; using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Serilog; namespace EShopOnAbp.PublicWeb; @@ -19,17 +17,10 @@ public class Program try { Log.Information($"Starting {assemblyName}."); - var builder = WebApplication.CreateBuilder(args); - builder.Host - .AddAppSettingsSecretsJson() - .UseAutofac() - .UseSerilog(); - - await builder.AddApplicationAsync(); - var app = builder.Build(); + var app = await ApplicationBuilderHelper.BuildApplicationAsync(args); await app.InitializeApplicationAsync(); await app.RunAsync(); - + return 0; } catch (Exception ex) diff --git a/shared/EShopOnAbp.Shared.Hosting.AspNetCore/ApplicationBuilderHelper.cs b/shared/EShopOnAbp.Shared.Hosting.AspNetCore/ApplicationBuilderHelper.cs new file mode 100644 index 00000000..90faea26 --- /dev/null +++ b/shared/EShopOnAbp.Shared.Hosting.AspNetCore/ApplicationBuilderHelper.cs @@ -0,0 +1,24 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Serilog; +using Volo.Abp.Modularity; + +namespace EShopOnAbp.Shared.Hosting.AspNetCore; + +public static class ApplicationBuilderHelper +{ + public static async Task BuildApplicationAsync(string[] args) + where TStartupModule : IAbpModule + { + var builder = WebApplication.CreateBuilder(args); + builder.Host + .AddAppSettingsSecretsJson() + .UseAutofac() + .UseSerilog(); + + await builder.AddApplicationAsync(); + return builder.Build(); + } +} \ No newline at end of file From 6410405baa155e511777e94e1516ef10209a0a18 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 25 Jan 2022 23:21:35 +0300 Subject: [PATCH 3/4] updated gateways --- .../EShopOnAbp.WebPublicGateway/Program.cs | 60 ++++++++----------- .../EShopOnAbp.WebPublicGateway/Startup.cs | 18 ------ .../web/src/EShopOnAbp.WebGateway/Program.cs | 60 ++++++++----------- .../web/src/EShopOnAbp.WebGateway/Startup.cs | 19 ------ 4 files changed, 50 insertions(+), 107 deletions(-) delete mode 100644 gateways/web-public/src/EShopOnAbp.WebPublicGateway/Startup.cs delete mode 100644 gateways/web/src/EShopOnAbp.WebGateway/Startup.cs diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs index 7e4b70f7..b7e61272 100644 --- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs +++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Program.cs @@ -1,46 +1,36 @@ using EShopOnAbp.Shared.Hosting.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; using Serilog; using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; -namespace EShopOnAbp.WebPublicGateway +namespace EShopOnAbp.WebPublicGateway; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static async Task Main(string[] args) - { - var assemblyName = typeof(Program).Assembly.GetName().Name; + var assemblyName = typeof(Program).Assembly.GetName().Name; - SerilogConfigurationHelper.Configure(assemblyName); + SerilogConfigurationHelper.Configure(assemblyName); - try - { - Log.Information($"Starting {assemblyName}."); - await CreateHostBuilder(args).Build().RunAsync(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } + try + { + Log.Information($"Starting {assemblyName}."); + var app = await ApplicationBuilderHelper.BuildApplicationAsync(args); + await app.InitializeApplicationAsync(); + await app.RunAsync(); - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureAppConfiguration(build => - { - build.AddJsonFile("appsettings.secrets.json", optional: true, reloadOnChange:true); - }) - .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .UseAutofac() - .UseSerilog(); + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } } -} +} \ No newline at end of file diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Startup.cs b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Startup.cs deleted file mode 100644 index 4dab1503..00000000 --- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/Startup.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; - -namespace EShopOnAbp.WebPublicGateway -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app) - { - app.InitializeApplication(); - } - } -} diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Program.cs b/gateways/web/src/EShopOnAbp.WebGateway/Program.cs index a6b3277c..03378683 100644 --- a/gateways/web/src/EShopOnAbp.WebGateway/Program.cs +++ b/gateways/web/src/EShopOnAbp.WebGateway/Program.cs @@ -1,46 +1,36 @@ using EShopOnAbp.Shared.Hosting.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; using Serilog; using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; -namespace EShopOnAbp.WebGateway +namespace EShopOnAbp.WebGateway; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static async Task Main(string[] args) - { - var assemblyName = typeof(Program).Assembly.GetName().Name; + var assemblyName = typeof(Program).Assembly.GetName().Name; - SerilogConfigurationHelper.Configure(assemblyName); + SerilogConfigurationHelper.Configure(assemblyName); - try - { - Log.Information($"Starting {assemblyName}."); - await CreateHostBuilder(args).Build().RunAsync(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } + try + { + Log.Information($"Starting {assemblyName}."); + var app = await ApplicationBuilderHelper.BuildApplicationAsync(args); + await app.InitializeApplicationAsync(); + await app.RunAsync(); - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureAppConfiguration(build => - { - build.AddJsonFile("appsettings.secrets.json", optional: true); - }) - .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .UseAutofac() - .UseSerilog(); + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } } -} +} \ No newline at end of file diff --git a/gateways/web/src/EShopOnAbp.WebGateway/Startup.cs b/gateways/web/src/EShopOnAbp.WebGateway/Startup.cs deleted file mode 100644 index 3f299188..00000000 --- a/gateways/web/src/EShopOnAbp.WebGateway/Startup.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; - -namespace EShopOnAbp.WebGateway -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - app.InitializeApplication(); - } - } -} From e087b5984968f831d42e05ceaad3484151fd1527 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 25 Jan 2022 23:32:30 +0300 Subject: [PATCH 4/4] updated services --- .../Program.cs | 61 +++++++-------- .../Startup.cs | 18 ----- .../Program.cs | 75 +++++++------------ .../Startup.cs | 20 ----- .../Program.cs | 75 +++++++------------ .../Startup.cs | 20 ----- .../Program.cs | 61 +++++++-------- .../Startup.cs | 18 ----- .../Program.cs | 75 +++++++------------ .../Startup.cs | 20 ----- .../Program.cs | 75 +++++++------------ .../Startup.cs | 21 ------ 12 files changed, 164 insertions(+), 375 deletions(-) delete mode 100644 services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Startup.cs delete mode 100644 services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Startup.cs delete mode 100644 services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Startup.cs delete mode 100644 services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Startup.cs delete mode 100644 services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Startup.cs delete mode 100644 services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Startup.cs diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Program.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Program.cs index 69f9c74d..bf5d0004 100644 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Program.cs +++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Program.cs @@ -1,46 +1,37 @@ using EShopOnAbp.Shared.Hosting.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; using Serilog; using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; -namespace EShopOnAbp.AdministrationService +namespace EShopOnAbp.AdministrationService; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static async Task Main(string[] args) - { - var assemblyName = typeof(Program).Assembly.GetName().Name; + var assemblyName = typeof(Program).Assembly.GetName().Name; - SerilogConfigurationHelper.Configure(assemblyName); + SerilogConfigurationHelper.Configure(assemblyName); - try - { - Log.Information($"Starting {assemblyName}."); - await CreateHostBuilder(args).Build().RunAsync(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } + try + { + Log.Information($"Starting {assemblyName}."); + var app = await ApplicationBuilderHelper + .BuildApplicationAsync(args); + await app.InitializeApplicationAsync(); + await app.RunAsync(); - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureAppConfiguration(build => - { - build.AddJsonFile("appsettings.secrets.json", optional: true); - }) - .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .UseAutofac() - .UseSerilog(); + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } } -} +} \ No newline at end of file diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Startup.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Startup.cs deleted file mode 100644 index c416abff..00000000 --- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Host/Startup.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; - -namespace EShopOnAbp.AdministrationService -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app) - { - app.InitializeApplication(); - } - } -} diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Program.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Program.cs index 88d563e6..2b661d9c 100644 --- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Program.cs +++ b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Program.cs @@ -1,56 +1,37 @@ using System; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; +using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.AspNetCore; +using Microsoft.AspNetCore.Builder; using Serilog; -using Serilog.Events; -namespace EShopOnAbp.BasketService +namespace EShopOnAbp.BasketService; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static int Main(string[] args) + var assemblyName = typeof(Program).Assembly.GetName().Name; + + SerilogConfigurationHelper.Configure(assemblyName); + + try { - Log.Logger = new LoggerConfiguration() -#if DEBUG - .MinimumLevel.Debug() -#else - .MinimumLevel.Information() -#endif - .MinimumLevel.Override("Microsoft", LogEventLevel.Information) - .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning) - .Enrich.FromLogContext() - .WriteTo.Async(c => c.File("Logs/logs.txt")) -#if DEBUG - .WriteTo.Async(c => c.Console()) -#endif - .CreateLogger(); + Log.Information($"Starting {assemblyName}."); + var app = await ApplicationBuilderHelper + .BuildApplicationAsync(args); + await app.InitializeApplicationAsync(); + await app.RunAsync(); - try - { - Log.Information("Starting EShopOnAbp.BasketService.HttpApi.Host."); - CreateHostBuilder(args).Build().Run(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .AddAppSettingsSecretsJson() - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseAutofac() - .UseSerilog(); } -} +} \ No newline at end of file diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Startup.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Startup.cs deleted file mode 100644 index c14b14fd..00000000 --- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Host/Startup.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace EShopOnAbp.BasketService -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) - { - app.InitializeApplication(); - } - } -} diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Program.cs b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Program.cs index 5d9c744e..74728f1c 100644 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Program.cs +++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Program.cs @@ -1,56 +1,37 @@ using System; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; +using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.AspNetCore; +using Microsoft.AspNetCore.Builder; using Serilog; -using Serilog.Events; -namespace EShopOnAbp.CatalogService +namespace EShopOnAbp.CatalogService; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static int Main(string[] args) + var assemblyName = typeof(Program).Assembly.GetName().Name; + + SerilogConfigurationHelper.Configure(assemblyName); + + try { - Log.Logger = new LoggerConfiguration() -#if DEBUG - .MinimumLevel.Debug() -#else - .MinimumLevel.Information() -#endif - .MinimumLevel.Override("Microsoft", LogEventLevel.Information) - .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning) - .Enrich.FromLogContext() - .WriteTo.Async(c => c.File("Logs/logs.txt")) -#if DEBUG - .WriteTo.Async(c => c.Console()) -#endif - .CreateLogger(); + Log.Information($"Starting {assemblyName}."); + var app = await ApplicationBuilderHelper + .BuildApplicationAsync(args); + await app.InitializeApplicationAsync(); + await app.RunAsync(); - try - { - Log.Information("Starting EShopOnAbp.CatalogService.HttpApi.Host."); - CreateHostBuilder(args).Build().Run(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .AddAppSettingsSecretsJson() - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseAutofac() - .UseSerilog(); } -} +} \ No newline at end of file diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Startup.cs b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Startup.cs deleted file mode 100644 index ae24adfe..00000000 --- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/Startup.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace EShopOnAbp.CatalogService -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) - { - app.InitializeApplication(); - } - } -} diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Program.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Program.cs index 5f5c9a52..576a28ee 100644 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Program.cs +++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Program.cs @@ -1,46 +1,37 @@ using EShopOnAbp.Shared.Hosting.AspNetCore; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; using Serilog; using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; -namespace EShopOnAbp.IdentityService +namespace EShopOnAbp.IdentityService; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static async Task Main(string[] args) - { - var assemblyName = typeof(Program).Assembly.GetName().Name; + var assemblyName = typeof(Program).Assembly.GetName().Name; - SerilogConfigurationHelper.Configure(assemblyName); + SerilogConfigurationHelper.Configure(assemblyName); - try - { - Log.Information($"Starting {assemblyName}."); - await CreateHostBuilder(args).Build().RunAsync(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } + try + { + Log.Information($"Starting {assemblyName}."); + var app = await ApplicationBuilderHelper + .BuildApplicationAsync(args); + await app.InitializeApplicationAsync(); + await app.RunAsync(); - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureAppConfiguration(build => - { - build.AddJsonFile("appsettings.secrets.json", optional: true); - }) - .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .UseAutofac() - .UseSerilog(); + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } } -} +} \ No newline at end of file diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Startup.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Startup.cs deleted file mode 100644 index 04b114fe..00000000 --- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/Startup.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; - -namespace EShopOnAbp.IdentityService -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app) - { - app.InitializeApplication(); - } - } -} diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Program.cs b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Program.cs index f5575609..6b783b3b 100644 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Program.cs +++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Program.cs @@ -1,56 +1,37 @@ using System; -using System.IO; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; +using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.AspNetCore; +using Microsoft.AspNetCore.Builder; using Serilog; -using Serilog.Events; -namespace EShopOnAbp.OrderingService +namespace EShopOnAbp.OrderingService; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static int Main(string[] args) + var assemblyName = typeof(Program).Assembly.GetName().Name; + + SerilogConfigurationHelper.Configure(assemblyName); + + try { - Log.Logger = new LoggerConfiguration() -#if DEBUG - .MinimumLevel.Debug() -#else - .MinimumLevel.Information() -#endif - .MinimumLevel.Override("Microsoft", LogEventLevel.Information) - .Enrich.FromLogContext() - .WriteTo.Async(c => c.File("Logs/logs.txt")) -#if DEBUG - .WriteTo.Async(c => c.Console()) -#endif - .CreateLogger(); + Log.Information($"Starting {assemblyName}."); + var app = await ApplicationBuilderHelper + .BuildApplicationAsync(args); + await app.InitializeApplicationAsync(); + await app.RunAsync(); - try - { - Log.Information("Starting web host."); - CreateHostBuilder(args).Build().Run(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .AddAppSettingsSecretsJson() - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseAutofac() - .UseSerilog(); } -} +} \ No newline at end of file diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Startup.cs b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Startup.cs deleted file mode 100644 index e962f8b7..00000000 --- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/Startup.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace EShopOnAbp.OrderingService -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) - { - app.InitializeApplication(); - } - } -} diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Program.cs b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Program.cs index 326df981..3a9ce66b 100644 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Program.cs +++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Program.cs @@ -1,56 +1,37 @@ using System; -using System.IO; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; +using System.Threading.Tasks; +using EShopOnAbp.Shared.Hosting.AspNetCore; +using Microsoft.AspNetCore.Builder; using Serilog; -using Serilog.Events; -namespace EShopOnAbp.PaymentService +namespace EShopOnAbp.PaymentService; + +public class Program { - public class Program + public static async Task Main(string[] args) { - public static int Main(string[] args) + var assemblyName = typeof(Program).Assembly.GetName().Name; + + SerilogConfigurationHelper.Configure(assemblyName); + + try { - Log.Logger = new LoggerConfiguration() -#if DEBUG - .MinimumLevel.Debug() -#else - .MinimumLevel.Information() -#endif - .MinimumLevel.Override("Microsoft", LogEventLevel.Information) - .Enrich.FromLogContext() - .WriteTo.Async(c => c.File("Logs/logs.txt")) -#if DEBUG - .WriteTo.Async(c => c.Console()) -#endif - .CreateLogger(); + Log.Information($"Starting {assemblyName}."); + var app = await ApplicationBuilderHelper + .BuildApplicationAsync(args); + await app.InitializeApplicationAsync(); + await app.RunAsync(); - try - { - Log.Information("Starting web host."); - CreateHostBuilder(args).Build().Run(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, $"{assemblyName} terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .AddAppSettingsSecretsJson() - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseAutofac() - .UseSerilog(); } -} +} \ No newline at end of file diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Startup.cs b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Startup.cs deleted file mode 100644 index 57212ab9..00000000 --- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Startup.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace EShopOnAbp.PaymentService -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - services.AddApplication(); - } - - public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) - { - app.InitializeApplication(); - } - } -}