From 11b44280e370a8d658aadbd7b8775453d2ff9717 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Wed, 3 Nov 2021 22:23:19 +0800 Subject: [PATCH] enhance: reference agile_config. --- .../AuthServer.Host/AuthServer.Host.csproj | 1 + .../account/AuthServer.Host/Program.cs | 91 +++++++++-------- .../appsettings.Development.json | 8 ++ ...NGYUN.Abp.BackendAdmin.HttpApi.Host.csproj | 1 + .../Program.cs | 94 ++++++++++-------- .../appsettings.Development.json | 8 ++ .../LINGYUN.ApiGateway.Host.csproj | 1 + .../LINGYUN.ApiGateway.Host/Program.cs | 98 ++++++++++--------- .../appsettings.Development.json | 8 ++ .../LINGYUN.ApiGateway.HttpApi.Host.csproj | 1 + .../Program.cs | 94 ++++++++++-------- .../appsettings.Development.json | 8 ++ ...UN.Abp.IdentityServer4.HttpApi.Host.csproj | 1 + .../Program.cs | 96 +++++++++--------- .../appsettings.Development.json | 8 ++ ...LocalizationManagement.HttpApi.Host.csproj | 1 + .../Program.cs | 98 ++++++++++--------- .../appsettings.Development.json | 8 ++ ...YUN.Abp.MessageService.HttpApi.Host.csproj | 1 + .../Program.cs | 98 ++++++++++--------- .../appsettings.Development.json | 8 ++ .../LINGYUN.Platform.HttpApi.Host.csproj | 1 + .../LINGYUN.Platform.HttpApi.Host/Program.cs | 8 ++ .../appsettings.Development.json | 8 ++ docker-compose.agile.config.yml | 18 ++++ docker-compose.configuration.yml | 2 +- 26 files changed, 462 insertions(+), 307 deletions(-) create mode 100644 docker-compose.agile.config.yml diff --git a/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj b/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj index 80c63836f..9653ce4ca 100644 --- a/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj +++ b/aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj @@ -22,6 +22,7 @@ + diff --git a/aspnet-core/services/account/AuthServer.Host/Program.cs b/aspnet-core/services/account/AuthServer.Host/Program.cs index a9f8c8050..8a6404e3d 100644 --- a/aspnet-core/services/account/AuthServer.Host/Program.cs +++ b/aspnet-core/services/account/AuthServer.Host/Program.cs @@ -1,41 +1,50 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; -using Serilog; -using System; - -namespace AuthServer.Host -{ - public class Program - { - public static int Main(string[] args) - { - try - { - Log.Information("Starting AuthServer.Host."); - CreateHostBuilder(args).Build().Run(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseSerilog((context, provider, config) => - { - config.ReadFrom.Configuration(context.Configuration); - }) - .UseAutofac(); - } -} +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Serilog; +using System; + +namespace AuthServer.Host +{ + public class Program + { + public static int Main(string[] args) + { + try + { + Log.Information("Starting AuthServer.Host."); + CreateHostBuilder(args).Build().Run(); + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } + } + + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .ConfigureAppConfiguration((context, config) => + { + var configuration = config.Build(); + if (configuration.GetSection("AgileConfig").Exists()) + { + config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); + } + }) + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) + .UseAutofac(); + } +} diff --git a/aspnet-core/services/account/AuthServer.Host/appsettings.Development.json b/aspnet-core/services/account/AuthServer.Host/appsettings.Development.json index a6ebd0761..78bc23ecd 100644 --- a/aspnet-core/services/account/AuthServer.Host/appsettings.Development.json +++ b/aspnet-core/services/account/AuthServer.Host/appsettings.Development.json @@ -1,4 +1,12 @@ { + "AgileConfig": { + "env": "DEV", + "appId": "LINGYUN.Abp.AuthServer", + "secret": "1q2w3E*", + "nodes": "http://localhost:5000", + "name": "AuthServer", + "tag": "AuthServer" + }, "App": { "TrackingEntitiesChanged": true, "SelfUrl": "http://localhost:44385/", diff --git a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj index e37574641..5197047f3 100644 --- a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj +++ b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj @@ -23,6 +23,7 @@ + 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 a0ed03463..a090df75c 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 @@ -1,43 +1,51 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Serilog; -using System; -using System.IO; - -namespace LINGYUN.Abp.BackendAdmin -{ - public class Program - { - public static int Main(string[] args) - { - try - { - Log.Information("Starting BackendAdmin.Host."); - CreateHostBuilder(args).Build().Run(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseSerilog((context, provider, config) => - { - config.ReadFrom.Configuration(context.Configuration); - }) - .UseAutofac(); - } -} +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Serilog; +using System; +using System.IO; + +namespace LINGYUN.Abp.BackendAdmin +{ + public class Program + { + public static int Main(string[] args) + { + try + { + Log.Information("Starting BackendAdmin.Host."); + CreateHostBuilder(args).Build().Run(); + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } + } + + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .ConfigureAppConfiguration((context, config) => + { + var configuration = config.Build(); + if (configuration.GetSection("AgileConfig").Exists()) + { + config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); + } + }) + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) + .UseAutofac(); + } +} diff --git a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json index 9913543e1..ab65c3c1f 100644 --- a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json @@ -1,4 +1,12 @@ { + "AgileConfig": { + "env": "DEV", + "appId": "LINGYUN.Abp.Backend.Admin", + "secret": "1q2w3E*", + "nodes": "http://localhost:5000", + "name": "BackendAdmin", + "tag": "BackendAdmin" + }, "App": { "TrackingEntitiesChanged": true, "Forwarded": { diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj index 099eaf982..15a41e670 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj @@ -11,6 +11,7 @@ + diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs index da603508b..743580495 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs @@ -1,45 +1,53 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Serilog; -using System; -using System.IO; - -namespace LINGYUN.ApiGateway -{ - public class Program - { - public static int Main(string[] args) - { - try - { - var hostBuilder = CreateHostBuilder(args).Build(); - Log.Information("Starting ApiGateway.Host."); - hostBuilder.Run(); - - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseSerilog((context, provider, config) => - { - config.ReadFrom.Configuration(context.Configuration); - }) - .UseAutofac(); - } -} +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Serilog; +using System; +using System.IO; + +namespace LINGYUN.ApiGateway +{ + public class Program + { + public static int Main(string[] args) + { + try + { + var hostBuilder = CreateHostBuilder(args).Build(); + Log.Information("Starting ApiGateway.Host."); + hostBuilder.Run(); + + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } + } + + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .ConfigureAppConfiguration((context, config) => + { + var configuration = config.Build(); + if (configuration.GetSection("AgileConfig").Exists()) + { + config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); + } + }) + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) + .UseAutofac(); + } +} diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json index 2adaa12db..8d11db68e 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json @@ -1,4 +1,12 @@ { + "AgileConfig": { + "env": "DEV", + "appId": "LINGYUN.Abp.ApiGateway", + "secret": "1q2w3E*", + "nodes": "http://localhost:5000", + "name": "ApiGateway", + "tag": "ApiGateway" + }, "EnabledDynamicOcelot": true, "ApiGateway": { "AppId": "TEST-APP" //这里是用于Ocelot主机去API服务器获取参数的标识,指定需要获取什么类型的网关配置 diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj index 6c98121ec..edc01395f 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj @@ -11,6 +11,7 @@ + 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 e6fcb12a8..c8344df0f 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs @@ -1,43 +1,51 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Serilog; -using System; -using System.IO; - -namespace LINGYUN.ApiGateway -{ - public class Program - { - public static int Main(string[] args) - { - try - { - Log.Information("Starting ApiGatewayAdmin.Host."); - CreateHostBuilder(args).Build().Run(); - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseSerilog((context, provider, config) => - { - config.ReadFrom.Configuration(context.Configuration); - }) - .UseAutofac(); - } -} +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Serilog; +using System; +using System.IO; + +namespace LINGYUN.ApiGateway +{ + public class Program + { + public static int Main(string[] args) + { + try + { + Log.Information("Starting ApiGatewayAdmin.Host."); + CreateHostBuilder(args).Build().Run(); + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } + } + + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .ConfigureAppConfiguration((context, config) => + { + var configuration = config.Build(); + if (configuration.GetSection("AgileConfig").Exists()) + { + config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); + } + }) + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) + .UseAutofac(); + } +} diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json index 571019d66..1985f2619 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json @@ -1,4 +1,12 @@ { + "AgileConfig": { + "env": "DEV", + "appId": "LINGYUN.Abp.ApiGateway.Admin", + "secret": "1q2w3E*", + "nodes": "http://localhost:5000", + "name": "ApiGateway.Admin", + "tag": "ApiGateway.Admin" + }, "App": { "TrackingEntitiesChanged": true, "SelfUrl": "http://localhost:30001/" diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj index 3726cc7ad..8729739e1 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj @@ -21,6 +21,7 @@ + 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 5dbf15e02..c9b505ed7 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 @@ -1,45 +1,53 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Serilog; -using System; -using System.IO; - -namespace LINGYUN.Abp.IdentityServer4 -{ - public class Program - { - public static int Main(string[] args) - { - try - { - var hostBuilder = CreateHostBuilder(args).Build(); - Log.Information("Starting IdentityServer4Admin.Host."); - hostBuilder.Run(); - - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseSerilog((context, provider, config) => - { - config.ReadFrom.Configuration(context.Configuration); - }) - .UseAutofac(); - } +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Serilog; +using System; +using System.IO; + +namespace LINGYUN.Abp.IdentityServer4 +{ + public class Program + { + public static int Main(string[] args) + { + try + { + var hostBuilder = CreateHostBuilder(args).Build(); + Log.Information("Starting IdentityServer4Admin.Host."); + hostBuilder.Run(); + + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } + } + + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .ConfigureAppConfiguration((context, config) => + { + var configuration = config.Build(); + if (configuration.GetSection("AgileConfig").Exists()) + { + config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); + } + }) + .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/appsettings.Development.json b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json index 0f6c962ae..8333d7154 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json @@ -1,4 +1,12 @@ { + "AgileConfig": { + "env": "DEV", + "appId": "LINGYUN.Abp.IdentityServer.Admin", + "secret": "1q2w3E*", + "nodes": "http://localhost:5000", + "name": "IdentityServer.Admin", + "tag": "IdentityServer.Admin" + }, "App": { "TrackingEntitiesChanged": true }, diff --git a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj index 965e7cf94..6bdff94f9 100644 --- a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj @@ -6,6 +6,7 @@ + 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 9a95d0628..ad6bbc884 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 @@ -1,45 +1,53 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Serilog; -using System; -using System.IO; - -namespace LINGYUN.Abp.LocalizationManagement -{ - public class Program - { - public static int Main(string[] args) - { - try - { - var hostBuilder = CreateHostBuilder(args).Build(); - Log.Information("Starting LocalizationManagement.Host."); - hostBuilder.Run(); - - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseSerilog((context, provider, config) => - { - config.ReadFrom.Configuration(context.Configuration); - }) - .UseAutofac(); - } -} +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Serilog; +using System; +using System.IO; + +namespace LINGYUN.Abp.LocalizationManagement +{ + public class Program + { + public static int Main(string[] args) + { + try + { + var hostBuilder = CreateHostBuilder(args).Build(); + Log.Information("Starting LocalizationManagement.Host."); + hostBuilder.Run(); + + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } + } + + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .ConfigureAppConfiguration((context, config) => + { + var configuration = config.Build(); + if (configuration.GetSection("AgileConfig").Exists()) + { + config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); + } + }) + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) + .UseAutofac(); + } +} diff --git a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/appsettings.Development.json index ccc18f747..5cf6b2c22 100644 --- a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/appsettings.Development.json @@ -1,4 +1,12 @@ { + "AgileConfig": { + "env": "DEV", + "appId": "LINGYUN.Abp.Localization", + "secret": "1q2w3E*", + "nodes": "http://localhost:5000", + "name": "Localization", + "tag": "Localization" + }, "App": { "TrackingEntitiesChanged": true }, diff --git a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj index bd4c0ea93..45c9c8c0f 100644 --- a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj +++ b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj @@ -16,6 +16,7 @@ + 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 5f3e70484..671df4fa6 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 @@ -1,45 +1,53 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Serilog; -using System; -using System.IO; - -namespace LINGYUN.Abp.MessageService -{ - public class Program - { - public static int Main(string[] args) - { - try - { - var hostBuilder = CreateHostBuilder(args).Build(); - Log.Information("Starting MessageService.Host."); - hostBuilder.Run(); - - return 0; - } - catch (Exception ex) - { - Log.Fatal(ex, "Host terminated unexpectedly!"); - return 1; - } - finally - { - Log.CloseAndFlush(); - } - } - - internal static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseSerilog((context, provider, config) => - { - config.ReadFrom.Configuration(context.Configuration); - }) - .UseAutofac(); - } -} +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Serilog; +using System; +using System.IO; + +namespace LINGYUN.Abp.MessageService +{ + public class Program + { + public static int Main(string[] args) + { + try + { + var hostBuilder = CreateHostBuilder(args).Build(); + Log.Information("Starting MessageService.Host."); + hostBuilder.Run(); + + return 0; + } + catch (Exception ex) + { + Log.Fatal(ex, "Host terminated unexpectedly!"); + return 1; + } + finally + { + Log.CloseAndFlush(); + } + } + + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .ConfigureAppConfiguration((context, config) => + { + var configuration = config.Build(); + if (configuration.GetSection("AgileConfig").Exists()) + { + config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); + } + }) + .UseSerilog((context, provider, config) => + { + config.ReadFrom.Configuration(context.Configuration); + }) + .UseAutofac(); + } +} diff --git a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json index 5e43474e0..7cd75b432 100644 --- a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json @@ -1,4 +1,12 @@ { + "AgileConfig": { + "env": "DEV", + "appId": "LINGYUN.Abp.Message", + "secret": "1q2w3E*", + "nodes": "http://localhost:5000", + "name": "Message", + "tag": "Message" + }, "App": { "CorsOrigins": "http://localhost:9527,http://localhost:30000,http://localhost:3100", "Forwarded": { diff --git a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj index 290e2effb..bfe9b2290 100644 --- a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj +++ b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj @@ -20,6 +20,7 @@ + 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 baa19b48b..72d9cf26e 100644 --- a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs +++ b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs @@ -36,6 +36,14 @@ namespace LINGYUN.Platform { webBuilder.UseStartup(); }) + .ConfigureAppConfiguration((context, config) => + { + var configuration = config.Build(); + if (configuration.GetSection("AgileConfig").Exists()) + { + config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); + } + }) .UseSerilog((context, provider, config) => { config.ReadFrom.Configuration(context.Configuration); diff --git a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json index 1874f7e19..927667d68 100644 --- a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json @@ -1,4 +1,12 @@ { + "AgileConfig": { + "env": "DEV", + "appId": "LINGYUN.Abp.Platform", + "secret": "1q2w3E*", + "nodes": "http://localhost:5000", + "name": "Platform", + "tag": "Platform" + }, "App": { "Forwarded": { "ForwardedHeaders": 5, diff --git a/docker-compose.agile.config.yml b/docker-compose.agile.config.yml new file mode 100644 index 000000000..a2d8abd16 --- /dev/null +++ b/docker-compose.agile.config.yml @@ -0,0 +1,18 @@ +version: '3.4' + +services: + agile-config: + image: kklldog/agile_config:latest + environment: + - adminConsole=true + - db:provider=mysql + - db:conn=Server=localhost;Database=agile;User Id=root;Password=123456;Character Set=utf8mb4 + ports: + - "5000:5000" + volumes: + - /etc/localtime:/etc/localtime + restart: always + + identity-server-sts: + depends_on: + - agile-config diff --git a/docker-compose.configuration.yml b/docker-compose.configuration.yml index e45722030..29e24a3d0 100644 --- a/docker-compose.configuration.yml +++ b/docker-compose.configuration.yml @@ -121,7 +121,7 @@ services: - Redis__InstanceName=LINGYUN.Abp.Application - AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__ApiName=lingyun-abp-application - + messages-service: environment: - App__CorsOrigins=http://127.0.0.1:40000,http://127.0.0.1:30000