From eb8e590fd683801452efbc2535cec2f1f9db99ca Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Fri, 21 May 2021 15:19:04 +0800 Subject: [PATCH] Simplified program entry --- .../account/AuthServer.Host/Program.cs | 10 ++++---- .../Program.cs | 16 ++++-------- .../LINGYUN.Abp.ApiGateway.Host/Program.cs | 6 ++--- .../LINGYUN.ApiGateway.Host/Program.cs | 6 ++--- .../Program.cs | 16 ++++-------- .../Program.cs | 24 ++++++++---------- .../Startup.cs | 2 +- .../Program.cs | 25 ++++++++----------- .../Startup.cs | 2 +- .../Program.cs | 22 +++++++--------- .../LINGYUN.Platform.HttpApi.Host/Program.cs | 22 +++++++--------- 11 files changed, 59 insertions(+), 92 deletions(-) diff --git a/aspnet-core/services/account/AuthServer.Host/Program.cs b/aspnet-core/services/account/AuthServer.Host/Program.cs index 75d3e5008..a9f8c8050 100644 --- a/aspnet-core/services/account/AuthServer.Host/Program.cs +++ b/aspnet-core/services/account/AuthServer.Host/Program.cs @@ -11,7 +11,7 @@ namespace AuthServer.Host { try { - Log.Information("Starting web host."); + Log.Information("Starting AuthServer.Host."); CreateHostBuilder(args).Build().Run(); return 0; } @@ -28,14 +28,14 @@ namespace AuthServer.Host internal static IHostBuilder CreateHostBuilder(string[] args) => Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) - .UseSerilog((ctx, cfg) => - { - cfg = cfg.ReadFrom.Configuration(ctx.Configuration); - }) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) .UseAutofac(); } } diff --git a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Program.cs b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Program.cs index fb7bfb6ad..a0ed03463 100644 --- a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Program.cs +++ b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Program.cs @@ -11,18 +11,9 @@ namespace LINGYUN.Abp.BackendAdmin { public static int Main(string[] args) { - var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; - var configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true) - .AddEnvironmentVariables() - .Build(); - Log.Logger = new LoggerConfiguration() - .ReadFrom.Configuration(configuration) - .CreateLogger(); try { - Log.Information("Starting web host."); + Log.Information("Starting BackendAdmin.Host."); CreateHostBuilder(args).Build().Run(); return 0; } @@ -43,7 +34,10 @@ namespace LINGYUN.Abp.BackendAdmin { webBuilder.UseStartup(); }) - .UseSerilog() + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) .UseAutofac(); } } diff --git a/aspnet-core/services/apigateway/LINGYUN.Abp.ApiGateway.Host/Program.cs b/aspnet-core/services/apigateway/LINGYUN.Abp.ApiGateway.Host/Program.cs index 47f651df7..df0503529 100644 --- a/aspnet-core/services/apigateway/LINGYUN.Abp.ApiGateway.Host/Program.cs +++ b/aspnet-core/services/apigateway/LINGYUN.Abp.ApiGateway.Host/Program.cs @@ -14,7 +14,7 @@ namespace LINGYUN.Abp.ApiGateway try { var hostBuilder = CreateHostBuilder(args).Build(); - Log.Information("Starting web host."); + Log.Information("Starting ApiGateway.Host."); hostBuilder.Run(); return 0; @@ -34,9 +34,7 @@ namespace LINGYUN.Abp.ApiGateway Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => { - webBuilder - .UseKestrel() - .UseStartup(); + webBuilder.UseStartup(); }) .UseSerilog((context, provider, config) => { diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs index 52812b9e4..da603508b 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs @@ -14,7 +14,7 @@ namespace LINGYUN.ApiGateway try { var hostBuilder = CreateHostBuilder(args).Build(); - Log.Information("Starting web host."); + Log.Information("Starting ApiGateway.Host."); hostBuilder.Run(); return 0; @@ -34,9 +34,7 @@ namespace LINGYUN.ApiGateway Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => { - webBuilder - .UseKestrel() - .UseStartup(); + webBuilder.UseStartup(); }) .UseSerilog((context, provider, config) => { diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs index cdca27a21..e6fcb12a8 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs @@ -11,18 +11,9 @@ namespace LINGYUN.ApiGateway { public static int Main(string[] args) { - var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; - var configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true) - .AddEnvironmentVariables() - .Build(); - Log.Logger = new LoggerConfiguration() - .ReadFrom.Configuration(configuration) - .CreateLogger(); try { - Log.Information("Starting web host."); + Log.Information("Starting ApiGatewayAdmin.Host."); CreateHostBuilder(args).Build().Run(); return 0; } @@ -43,7 +34,10 @@ namespace LINGYUN.ApiGateway { webBuilder.UseStartup(); }) - .UseSerilog() + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) .UseAutofac(); } } diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs index 454c84767..5dbf15e02 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs @@ -5,25 +5,18 @@ using Serilog; using System; using System.IO; -namespace LINGYUN.Abp.IdentityServer4.HttpApi.Host +namespace LINGYUN.Abp.IdentityServer4 { public class Program { public static int Main(string[] args) { - var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; - var configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true) - .AddEnvironmentVariables() - .Build(); - Log.Logger = new LoggerConfiguration() - .ReadFrom.Configuration(configuration) - .CreateLogger(); try { - Log.Information("Starting web host."); - CreateHostBuilder(args).Build().Run(); + var hostBuilder = CreateHostBuilder(args).Build(); + Log.Information("Starting IdentityServer4Admin.Host."); + hostBuilder.Run(); + return 0; } catch (Exception ex) @@ -38,12 +31,15 @@ namespace LINGYUN.Abp.IdentityServer4.HttpApi.Host } internal static IHostBuilder CreateHostBuilder(string[] args) => - Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .UseSerilog() + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) .UseAutofac(); } } \ No newline at end of file diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs index bd45bfb5c..116954420 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; -namespace LINGYUN.Abp.IdentityServer4.HttpApi.Host +namespace LINGYUN.Abp.IdentityServer4 { public class Startup { diff --git a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Program.cs b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Program.cs index df992d5da..9a95d0628 100644 --- a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Program.cs @@ -5,26 +5,18 @@ using Serilog; using System; using System.IO; -namespace LINGYUN.Abp.LocalizationManagement.HttpApi.Host +namespace LINGYUN.Abp.LocalizationManagement { public class Program { public static int Main(string[] args) { - var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; - var configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile($"appsettings.json", optional: false, reloadOnChange: true) - .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true) - .AddEnvironmentVariables() - .Build(); - Log.Logger = new LoggerConfiguration() - .ReadFrom.Configuration(configuration) - .CreateLogger(); try { - Log.Information("Starting web host."); - CreateHostBuilder(args).Build().Run(); + var hostBuilder = CreateHostBuilder(args).Build(); + Log.Information("Starting LocalizationManagement.Host."); + hostBuilder.Run(); + return 0; } catch (Exception ex) @@ -39,12 +31,15 @@ namespace LINGYUN.Abp.LocalizationManagement.HttpApi.Host } internal static IHostBuilder CreateHostBuilder(string[] args) => - Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .UseSerilog() + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) .UseAutofac(); } } diff --git a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Startup.cs b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Startup.cs index 2e6df555c..5976dbf86 100644 --- a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Startup.cs +++ b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Startup.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace LINGYUN.Abp.LocalizationManagement.HttpApi.Host +namespace LINGYUN.Abp.LocalizationManagement { public class Startup { diff --git a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/Program.cs b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/Program.cs index 210cb65f8..5f3e70484 100644 --- a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/Program.cs +++ b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/Program.cs @@ -11,19 +11,12 @@ namespace LINGYUN.Abp.MessageService { public static int Main(string[] args) { - var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; - var configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true) - .AddEnvironmentVariables() - .Build(); - Log.Logger = new LoggerConfiguration() - .ReadFrom.Configuration(configuration) - .CreateLogger(); try { - Log.Information("Starting web host."); - CreateHostBuilder(args).Build().Run(); + var hostBuilder = CreateHostBuilder(args).Build(); + Log.Information("Starting MessageService.Host."); + hostBuilder.Run(); + return 0; } catch (Exception ex) @@ -38,12 +31,15 @@ namespace LINGYUN.Abp.MessageService } internal static IHostBuilder CreateHostBuilder(string[] args) => - Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .UseSerilog() + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) .UseAutofac(); } } diff --git a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs index b6cf26bae..2788465a8 100644 --- a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs +++ b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs @@ -11,19 +11,12 @@ namespace LINGYUN.Platform { public static int Main(string[] args) { - var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"; - var configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true) - .AddEnvironmentVariables() - .Build(); - Log.Logger = new LoggerConfiguration() - .ReadFrom.Configuration(configuration) - .CreateLogger(); try { - Log.Information("Starting web host."); - CreateHostBuilder(args).Build().Run(); + var hostBuilder = CreateHostBuilder(args).Build(); + Log.Information("Starting Platform.Host."); + hostBuilder.Run(); + return 0; } catch (Exception ex) @@ -38,12 +31,15 @@ namespace LINGYUN.Platform } internal static IHostBuilder CreateHostBuilder(string[] args) => - Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + Host.CreateDefaultBuilder(args) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) - .UseSerilog() + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) .UseAutofac(); } }