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 #359 from colinin/4.4 

enhance: reference agile_config.
pull/364/head
yx lin 4 years ago
committed by GitHub
parent
1130af28ee 11b44280e3
commit
4fbc35c654
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 462 additions and 307 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. 1
      aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj
  2. 9
      aspnet-core/services/account/AuthServer.Host/Program.cs
  3. 8
      aspnet-core/services/account/AuthServer.Host/appsettings.Development.json
  4. 1
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj
  5. 8
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Program.cs
  6. 8
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json
  7. 1
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj
  8. 8
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs
  9. 8
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json
  10. 1
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj
  11. 8
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs
  12. 8
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json
  13. 1
      aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj
  14. 8
      aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs
  15. 8
      aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json
  16. 1
      aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj
  17. 8
      aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Program.cs
  18. 8
      aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/appsettings.Development.json
  19. 1
      aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj
  20. 8
      aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/Program.cs
  21. 8
      aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json
  22. 1
      aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj
  23. 8
      aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs
  24. 8
      aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json
  25. 18
      docker-compose.agile.config.yml

1
aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj
View File

@ -22,6 +22,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AgileConfig.Client" Version="1.2.1.3" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.2" />

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

@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Serilog;
using System;
@ -32,6 +33,14 @@ namespace AuthServer.Host
{
webBuilder.UseStartup<Startup>();
})
.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);

8
aspnet-core/services/account/AuthServer.Host/appsettings.Development.json
View File

@ -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/",

1
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj
View File

@ -23,6 +23,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AgileConfig.Client" Version="1.2.1.3" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.2" />

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

@ -34,6 +34,14 @@ namespace LINGYUN.Abp.BackendAdmin
{
webBuilder.UseStartup<Startup>();
})
.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);

8
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.Development.json
View File

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

1
aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj
View File

@ -11,6 +11,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AgileConfig.Client" Version="1.2.1.3" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.Sqlite" Version="5.1.2" />

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

@ -36,6 +36,14 @@ namespace LINGYUN.ApiGateway
{
webBuilder.UseStartup<Startup>();
})
.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);

8
aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/appsettings.Development.json
View File

@ -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服务器获取参数的标识,指定需要获取什么类型的网关配置

1
aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj
View File

@ -11,6 +11,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AgileConfig.Client" Version="1.2.1.3" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.2" />

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

@ -34,6 +34,14 @@ namespace LINGYUN.ApiGateway
{
webBuilder.UseStartup<Startup>();
})
.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);

8
aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.Development.json
View File

@ -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/"

1
aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj
View File

@ -21,6 +21,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AgileConfig.Client" Version="1.2.1.3" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.2" />

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

@ -36,6 +36,14 @@ namespace LINGYUN.Abp.IdentityServer4
{
webBuilder.UseStartup<Startup>();
})
.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);

8
aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.Development.json
View File

@ -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
},

1
aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj
View File

@ -6,6 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AgileConfig.Client" Version="1.2.1.3" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.2" />

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

@ -36,6 +36,14 @@ namespace LINGYUN.Abp.LocalizationManagement
{
webBuilder.UseStartup<Startup>();
})
.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);

8
aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/appsettings.Development.json
View File

@ -1,4 +1,12 @@
{
"AgileConfig": {
"env": "DEV",
"appId": "LINGYUN.Abp.Localization",
"secret": "1q2w3E*",
"nodes": "http://localhost:5000",
"name": "Localization",
"tag": "Localization"
},
"App": {
"TrackingEntitiesChanged": true
},

1
aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj
View File

@ -16,6 +16,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AgileConfig.Client" Version="1.2.1.3" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.2" />

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

@ -36,6 +36,14 @@ namespace LINGYUN.Abp.MessageService
{
webBuilder.UseStartup<Startup>();
})
.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);

8
aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.Development.json
View File

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

1
aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj
View File

@ -20,6 +20,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AgileConfig.Client" Version="1.2.1.3" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="5.1.2" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.1.2" />

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

@ -36,6 +36,14 @@ namespace LINGYUN.Platform
{
webBuilder.UseStartup<Startup>();
})
.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);

8
aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/appsettings.Development.json
View File

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

18
docker-compose.agile.config.yml
View File

@ -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
Write Preview
Loading…
Cancel
Save