From 9251662e5517a8c5ea4b5f8faad2306cd206da9b Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Thu, 4 Nov 2021 09:34:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcap=20mysql=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=A2=84=E6=9C=9F=E7=9A=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthIdentityServerModule.Configure.cs | 5 +- .../BackendAdminHostModule.Configure.cs | 5 +- .../ApiGatewayHttpApiHostModule.Configure.cs | 5 +- ...yServerAdminHttpApiHostModule.Configure.cs | 5 +- ...onManagementHttpApiHostModule.Configure.cs | 5 +- ...ssageServiceHttpApiHostModule.Configure.cs | 5 +- .../AppPlatformHttpApiHostModule.Configure.cs | 5 +- docker-compose.agile.config.yml | 84 +++++++++++++++++++ 8 files changed, 112 insertions(+), 7 deletions(-) diff --git a/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.Configure.cs b/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.Configure.cs index 72f503d1c..c7644b482 100644 --- a/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.Configure.cs +++ b/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.Configure.cs @@ -40,7 +40,10 @@ namespace AuthServer.Host PreConfigure(options => { options - .UseMySql(configuration.GetConnectionString("Default")) + .UseMySql(mySqlOptions => + { + configuration.GetSection("CAP:MySql").Bind(mySqlOptions); + }) .UseRabbitMQ(rabbitMQOptions => { configuration.GetSection("CAP:RabbitMQ").Bind(rabbitMQOptions); diff --git a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.Configure.cs b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.Configure.cs index ae1e725a8..cc61405e6 100644 --- a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.Configure.cs +++ b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.Configure.cs @@ -39,7 +39,10 @@ namespace LINGYUN.Abp.BackendAdmin PreConfigure(options => { options - .UseMySql(configuration.GetConnectionString("Default")) + .UseMySql(mySqlOptions => + { + configuration.GetSection("CAP:MySql").Bind(mySqlOptions); + }) .UseRabbitMQ(rabbitMQOptions => { configuration.GetSection("CAP:RabbitMQ").Bind(rabbitMQOptions); diff --git a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.Configure.cs b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.Configure.cs index a658583ec..ebff0f297 100644 --- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.Configure.cs @@ -33,7 +33,10 @@ namespace LINGYUN.ApiGateway PreConfigure(options => { options - .UseMySql(configuration.GetConnectionString("Default")) + .UseMySql(mySqlOptions => + { + configuration.GetSection("CAP:MySql").Bind(mySqlOptions); + }) .UseRabbitMQ(rabbitMQOptions => { configuration.GetSection("CAP:RabbitMQ").Bind(rabbitMQOptions); diff --git a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.Configure.cs b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.Configure.cs index ed4bb735d..5128989f0 100644 --- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.Configure.cs @@ -43,7 +43,10 @@ namespace LINGYUN.Abp.IdentityServer4 PreConfigure(options => { options - .UseMySql(configuration.GetConnectionString("Default")) + .UseMySql(mySqlOptions => + { + configuration.GetSection("CAP:MySql").Bind(mySqlOptions); + }) .UseRabbitMQ(rabbitMQOptions => { configuration.GetSection("CAP:RabbitMQ").Bind(rabbitMQOptions); diff --git a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/AbpLocalizationManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/AbpLocalizationManagementHttpApiHostModule.Configure.cs index 75072fbe9..ac34901dd 100644 --- a/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/AbpLocalizationManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/AbpLocalizationManagementHttpApiHostModule.Configure.cs @@ -36,7 +36,10 @@ namespace LINGYUN.Abp.LocalizationManagement PreConfigure(options => { options - .UseMySql(configuration.GetConnectionString("Default")) + .UseMySql(mySqlOptions => + { + configuration.GetSection("CAP:MySql").Bind(mySqlOptions); + }) .UseRabbitMQ(rabbitMQOptions => { configuration.GetSection("CAP:RabbitMQ").Bind(rabbitMQOptions); diff --git a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.Configure.cs b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.Configure.cs index 2485298f1..677e2bfba 100644 --- a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.Configure.cs @@ -39,7 +39,10 @@ namespace LINGYUN.Abp.MessageService PreConfigure(options => { options - .UseMySql(configuration.GetConnectionString("Default")) + .UseMySql(mySqlOptions => + { + configuration.GetSection("CAP:MySql").Bind(mySqlOptions); + }) .UseRabbitMQ(rabbitMQOptions => { configuration.GetSection("CAP:RabbitMQ").Bind(rabbitMQOptions); diff --git a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.Configure.cs b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.Configure.cs index 8765c0cbc..fafc94467 100644 --- a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.Configure.cs @@ -39,7 +39,10 @@ namespace LINGYUN.Platform PreConfigure(options => { options - .UseMySql(configuration.GetConnectionString("Default")) + .UseMySql(mySqlOptions => + { + configuration.GetSection("CAP:MySql").Bind(mySqlOptions); + }) .UseRabbitMQ(rabbitMQOptions => { configuration.GetSection("CAP:RabbitMQ").Bind(rabbitMQOptions); diff --git a/docker-compose.agile.config.yml b/docker-compose.agile.config.yml index a2d8abd16..da3827a9f 100644 --- a/docker-compose.agile.config.yml +++ b/docker-compose.agile.config.yml @@ -14,5 +14,89 @@ services: restart: always identity-server-sts: + environment: + - AgileConfig__env=PROD + - AgileConfig__appId=LINGYUN.Abp.AuthServer + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__name=AuthServer + - AgileConfig__tag=AuthServer + depends_on: + - agile-config + + identity-server-admin: + environment: + - AgileConfig__env=PROD + - AgileConfig__appId=LINGYUN.Abp.IdentityServer.Admin + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__name=IdentityServer.Admin + - AgileConfig__tag=IdentityServer.Admin + depends_on: + - agile-config + + admin-service: + environment: + - AgileConfig__env=PROD + - AgileConfig__appId=LINGYUN.Abp.Backend.Admin + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__name=Backend.Admin + - AgileConfig__tag=Backend.Admin + depends_on: + - agile-config + + localization-service: + environment: + - AgileConfig__env=PROD + - AgileConfig__appId=LINGYUN.Abp.Localization + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__name=Localization + - AgileConfig__tag=Localization + depends_on: + - agile-config + + platform-service: + environment: + - AgileConfig__env=PROD + - AgileConfig__appId=LINGYUN.Abp.Platform + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__name=Platform + - AgileConfig__tag=Platform + depends_on: + - agile-config + + messages-service: + environment: + - AgileConfig__env=PROD + - AgileConfig__appId=LINGYUN.Abp.Messages + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__name=Messages + - AgileConfig__tag=Messages + depends_on: + - agile-config + + apigateway-admin-service: + environment: + - AgileConfig__env=PROD + - AgileConfig__appId=LINGYUN.Abp.Apigateway.Admin + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__name=Apigateway.Admin + - AgileConfig__tag=Apigateway.Admin + depends_on: + - agile-config + + apigateway-host-service: + environment: + - AgileConfig__env=PROD + - AgileConfig__appId=LINGYUN.Abp.Apigateway + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__name=Apigateway + - AgileConfig__tag=Apigateway depends_on: - agile-config