tsai
/
abp-next-admin
mirror of https://github.com/colinin/abp-next-admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #267 from colinin/4.3 

Simplified program entry
pull/274/head
cKey 5 years ago
committed by GitHub
parent
b704a618aa eb8e590fd6
commit
71646cc122
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 59 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      aspnet-core/services/account/AuthServer.Host/Program.cs
  2. 16
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Program.cs
  3. 6
      aspnet-core/services/apigateway/LINGYUN.Abp.ApiGateway.Host/Program.cs
  4. 6
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs
  5. 16
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs
  6. 24
      aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs
  7. 2
      aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs
  8. 25
      aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Program.cs
  9. 2
      aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Startup.cs
  10. 22
      aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/Program.cs
  11. 22
      aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs

10
aspnet-core/services/account/AuthServer.Host/Program.cs
View File

@ -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<Startup>();
})
.UseSerilog((context, provider, config) =>
{
config.ReadFrom.Configuration(context.Configuration);
})
.UseAutofac();
}
}

16
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Program.cs
View File

@ -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<Startup>();
})
.UseSerilog()
.UseSerilog((context, provider, config) =>
{
config.ReadFrom.Configuration(context.Configuration);
})
.UseAutofac();
}
}

6
aspnet-core/services/apigateway/LINGYUN.Abp.ApiGateway.Host/Program.cs
View File

@ -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<Startup>();
webBuilder.UseStartup<Startup>();
})
.UseSerilog((context, provider, config) =>
{

6
aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs
View File

@ -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<Startup>();
webBuilder.UseStartup<Startup>();
})
.UseSerilog((context, provider, config) =>
{

16
aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs
View File

@ -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<Startup>();
})
.UseSerilog()
.UseSerilog((context, provider, config) =>
{
config.ReadFrom.Configuration(context.Configuration);
})
.UseAutofac();
}
}

24
aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs
View File

@ -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<Startup>();
})
.UseSerilog()
.UseSerilog((context, provider, config) =>
{
config.ReadFrom.Configuration(context.Configuration);
})
.UseAutofac();
}
}

2
aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs
View File

@ -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
{

25
aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Program.cs
View File

@ -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<Startup>();
})
.UseSerilog()
.UseSerilog((context, provider, config) =>
{
config.ReadFrom.Configuration(context.Configuration);
})
.UseAutofac();
}
}

2
aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Startup.cs
View File

@ -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
{

22
aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/Program.cs
View File

@ -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<Startup>();
})
.UseSerilog()
.UseSerilog((context, provider, config) =>
{
config.ReadFrom.Configuration(context.Configuration);
})
.UseAutofac();
}
}

22
aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs
View File

@ -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<Startup>();
})
.UseSerilog()
.UseSerilog((context, provider, config) =>
{
config.ReadFrom.Configuration(context.Configuration);
})
.UseAutofac();
}
}

Write Preview
Loading…
Cancel
Save