From d78aeb83ae0503bd3679e1f4a8a6f06e195484b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Thu, 31 Aug 2023 18:21:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?Docker=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appsettings.Development.json | 2 +- .../appsettings.Development.json | 2 +- .../appsettings.Development.json | 2 +- .../Dockerfile | 2 +- .../Program.cs | 3 + docker-compose.agile.config.yml | 126 ++++++++-------- docker-compose.configuration.yml | 138 ++++++++++++++---- docker-compose.override.windows.yml | 111 +++++++++----- docker-compose.override.yml | 10 -- docker-compose.yml | 20 +-- .../Multiplexer/AbpResponseMergeAggregator.cs | 22 ++- .../appsettings.Development.json | 5 +- 12 files changed, 285 insertions(+), 158 deletions(-) diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json index 7d35e0310..1f918bdf4 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json @@ -4,7 +4,7 @@ "env": "DEV", "appId": "LINGYUN.Abp.TaskManagement", "secret": "1q2w3E*", - "nodes": "http://127.0.0.1:15000", + "nodes": "http://127.0.0.1:5000", "name": "LINGYUN.Abp.TaskManagement", "tag": "LINGYUN.Abp.TaskManagement" }, diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json index fcc334b6d..6a6ff355e 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json @@ -4,7 +4,7 @@ "env": "DEV", "appId": "LINGYUN.Abp.WebhooksManagement", "secret": "1q2w3E*", - "nodes": "http://127.0.0.1:15000", + "nodes": "http://127.0.0.1:5000", "name": "LINGYUN.Abp.WebhooksManagement", "tag": "LINGYUN.Abp.WebhooksManagement" }, diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json index 9da2e8a6e..57d565fdb 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json @@ -4,7 +4,7 @@ "env": "DEV", "appId": "LINGYUN.Abp.Workflow", "secret": "1q2w3E*", - "nodes": "http://127.0.0.1:15000", + "nodes": "http://127.0.0.1:5000", "name": "LINGYUN.Abp.Workflow", "tag": "LINGYUN.Abp.Workflow" }, diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile index 8edce9f5a..865eea60a 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile @@ -11,4 +11,4 @@ EXPOSE 80/tcp VOLUME [ "./app/Logs" ] VOLUME [ "./app/Modules" ] -ENTRYPOINT ["dotnet", "LY.MicroService.IdentityServer.HttpApi.Host.dll"] +ENTRYPOINT ["dotnet", "LY.MicroService.identityServer.HttpApi.Host.dll"] diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs index d0625474d..2bdabb0f3 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Logging; using Serilog; using System; using System.IO; @@ -20,6 +21,8 @@ public class Program { Console.Title = "IdentityServer.HttpApi.Host"; Log.Information("Starting IdentityServer.HttpApi.Host."); + IdentityModelEventSource.ShowPII = true; + var builder = WebApplication.CreateBuilder(args); builder.Host.AddAppSettingsSecretsJson() diff --git a/docker-compose.agile.config.yml b/docker-compose.agile.config.yml index 9a3526d7d..72864443d 100644 --- a/docker-compose.agile.config.yml +++ b/docker-compose.agile.config.yml @@ -1,102 +1,102 @@ version: '3.4' services: - agile-config: - image: kklldog/agile_config:latest + sts-server: environment: - - adminConsole=true - - db:provider=mysql - - db:conn=Server=127.0.0.1;Database=agile;User Id=root;Password=123456;Character Set=utf8mb4 - ports: - - "5000:5000" - volumes: - - /etc/localtime:/etc/localtime - restart: always - - identity-server-sts: - environment: - - AgileConfig__env=PROD + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.AuthServer - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__nodes=http://docker.gzbit.cn:5000 - AgileConfig__name=AuthServer - AgileConfig__tag=AuthServer - depends_on: - - agile-config - identity-server-admin: + sts-api: environment: - - AgileConfig__env=PROD + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.IdentityServer.Admin - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__nodes=http://docker.gzbit.cn:5000 - AgileConfig__name=IdentityServer.Admin - AgileConfig__tag=IdentityServer.Admin - depends_on: - - agile-config - admin-service: + admin-api: environment: - - AgileConfig__env=PROD + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV - 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 + - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__name=BackendAdmin + - AgileConfig__tag=BackendAdmin - localization-service: + localization-api: environment: - - AgileConfig__env=PROD + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Localization - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__nodes=http://docker.gzbit.cn:5000 - AgileConfig__name=Localization - AgileConfig__tag=Localization - depends_on: - - agile-config - platform-service: + platform-api: environment: - - AgileConfig__env=PROD + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Platform - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://agile-config:5000 + - AgileConfig__nodes=http://docker.gzbit.cn:5000 - AgileConfig__name=Platform - AgileConfig__tag=Platform - depends_on: - - agile-config - messages-service: + messages-api: + environment: + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV + - AgileConfig__appId=LINGYUN.Abp.Message + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__name=Message + - AgileConfig__tag=Message + + task-api: + environment: + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV + - AgileConfig__appId=LINGYUN.Abp.Task + - AgileConfig__secret=1q2w3E* + - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__name=Task + - AgileConfig__tag=Task + + webhook-api: environment: - - AgileConfig__env=PROD - - AgileConfig__appId=LINGYUN.Abp.Messages + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV + - AgileConfig__appId=LINGYUN.Abp.Webhooks - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://agile-config:5000 - - AgileConfig__name=Messages - - AgileConfig__tag=Messages - depends_on: - - agile-config + - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__name=Webhooks + - AgileConfig__tag=Webhooks - apigateway-admin-service: + workflow-api: environment: - - AgileConfig__env=PROD - - AgileConfig__appId=LINGYUN.Abp.Apigateway.Admin + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV + - AgileConfig__appId=LINGYUN.Abp.Workflow - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://agile-config:5000 - - AgileConfig__name=Apigateway.Admin - - AgileConfig__tag=Apigateway.Admin - depends_on: - - agile-config + - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__name=Workflow + - AgileConfig__tag=Workflow - apigateway-host-service: + internal-apigateway: environment: - - AgileConfig__env=PROD - - AgileConfig__appId=LINGYUN.Abp.Apigateway + - AgileConfig__IsEnabled=true + - AgileConfig__env=DEV + - AgileConfig__appId=LINGYUN.Internal.ApiGateway - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://agile-config:5000 - - AgileConfig__name=Apigateway - - AgileConfig__tag=Apigateway - depends_on: - - agile-config + - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__name=ApiGateway + - AgileConfig__tag=ApiGateway diff --git a/docker-compose.configuration.yml b/docker-compose.configuration.yml index 1edc577da..21ba1986c 100644 --- a/docker-compose.configuration.yml +++ b/docker-compose.configuration.yml @@ -1,20 +1,25 @@ version: '3.4' services: - admin-service: + sts-server: environment: + - App__SelfUrl=http://127.0.0.1:44385/ + - App__CorsOrigins=http://127.0.0.1:9527,http://127.0.0.1:9528,http://127.0.0.1:40000,http://127.0.0.1:30000 - App__TrackingEntitiesChanged=true - - ConnectionStrings__Default=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 + - ConnectionStrings__Default=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - ConnectionStrings__AbpIdentity=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - ConnectionStrings__AbpIdentityServer=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - ConnectionStrings__AbpAuditLogging=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 - ConnectionStrings__AbpTenantManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 - ConnectionStrings__AbpSettingManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 - ConnectionStrings__AbpPermissionManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 + - ConnectionStrings__AbpFeatureManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 + - Certificates__CerPath=./idsrv4.pfx + - Certificates__Password=csfvw2-2r0ff41 - Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__InitVector=s83ng0abvd02js84 - Encryption__Salt=sf&5)s3# - - CAP__EventBus__DefaultGroup=BackendAdmin + - CAP__EventBus__DefaultGroup=AuthServer - CAP__EventBus__Version=v1 - CAP__EventBus__FailedRetryInterval=300 - CAP__EventBus__FailedRetryCount=10 @@ -28,8 +33,13 @@ services: - Redis__InstanceName=LINGYUN.Abp.Application - AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__ApiName=lingyun-abp-application + - IdentityServer__Clients__AuthManagement__ClientId=auth-management + - IdentityServer__Clients__AuthManagement__RootUrl=http://127.0.0.1:9527/ + - IdentityServer__Clients__AuthVueAdmin__ClientId=vue-admin-element + - IdentityServer__Clients__AuthApiGateway__ClientId=ApigatewayHostClient + - IdentityServer__Clients__AuthApiGatewayAdmin__ClientId=apigateway-admin-client - identity-server-admin: + sts-api: environment: - App__TrackingEntitiesChanged=true - ConnectionStrings__Default=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 @@ -58,7 +68,35 @@ services: - AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__ApiName=lingyun-abp-application - localization-service: + admin-api: + environment: + - App__TrackingEntitiesChanged=true + - ConnectionStrings__Default=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 + - ConnectionStrings__AbpIdentity=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 + - ConnectionStrings__AbpIdentityServer=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 + - ConnectionStrings__AbpAuditLogging=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 + - ConnectionStrings__AbpTenantManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 + - ConnectionStrings__AbpSettingManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 + - ConnectionStrings__AbpPermissionManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 + - Encryption__PassPhrase=s46c5q55nxpeS8Ra + - Encryption__InitVector=s83ng0abvd02js84 + - Encryption__Salt=sf&5)s3# + - CAP__EventBus__DefaultGroup=BackendAdmin + - CAP__EventBus__Version=v1 + - CAP__EventBus__FailedRetryInterval=300 + - CAP__EventBus__FailedRetryCount=10 + - CAP__RabbitMQ__HostName=127.0.0.1 + - CAP__RabbitMQ__Port=5672 + - CAP__RabbitMQ__UserName=admin + - CAP__RabbitMQ__Password=123456 + - CAP__RabbitMQ__ExchangeName=LINGYUN.Abp.Application + - CAP__RabbitMQ__VirtualHost=/ + - Redis__Configuration=127.0.0.1,defaultDatabase=10 + - Redis__InstanceName=LINGYUN.Abp.Application + - AuthServer__Authority=http://127.0.0.1:44385/ + - AuthServer__ApiName=lingyun-abp-application + + localization-api: environment: - App__TrackingEntitiesChanged=true - ConnectionStrings__Default=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 @@ -85,7 +123,7 @@ services: - AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__ApiName=lingyun-abp-application - platform-service: + platform-api: environment: - App__TrackingEntitiesChanged=true - ConnectionStrings__Default=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 @@ -122,7 +160,7 @@ services: - AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__ApiName=lingyun-abp-application - messages-service: + messages-api: environment: - App__CorsOrigins=http://127.0.0.1:40000,http://127.0.0.1:30000 - App__TrackingEntitiesChanged=true @@ -152,25 +190,76 @@ services: - Hangfire__Dashboard__WhiteList=127.0.0.1 - Notifications__WeChat__WeApp__DefaultWeAppState=formal - identity-server-sts: + task-api: environment: - - App__SelfUrl=http://127.0.0.1:44385/ - - App__CorsOrigins=http://127.0.0.1:9527,http://127.0.0.1:9528,http://127.0.0.1:40000,http://127.0.0.1:30000 - App__TrackingEntitiesChanged=true - - ConnectionStrings__Default=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - - ConnectionStrings__AbpIdentity=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - - ConnectionStrings__AbpIdentityServer=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - - ConnectionStrings__AbpAuditLogging=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 - - ConnectionStrings__AbpTenantManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 - - ConnectionStrings__AbpSettingManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 - - ConnectionStrings__AbpPermissionManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 - - ConnectionStrings__AbpFeatureManagement=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 - - Certificates__CerPath=./idsrv4.pfx - - Certificates__Password=csfvw2-2r0ff41 + - ConnectionStrings__Default=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__TaskManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpFeatureManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpPermissionManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpLocalizationManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpSettingManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpSaas=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, - Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__InitVector=s83ng0abvd02js84 - Encryption__Salt=sf&5)s3# - - CAP__EventBus__DefaultGroup=AuthServer + - CAP__EventBus__DefaultGroup=TaskManagement + - CAP__EventBus__Version=v1 + - CAP__EventBus__FailedRetryInterval=300 + - CAP__EventBus__FailedRetryCount=10 + - CAP__RabbitMQ__HostName=127.0.0.1 + - CAP__RabbitMQ__Port=5672 + - CAP__RabbitMQ__UserName=admin + - CAP__RabbitMQ__Password=123456 + - CAP__RabbitMQ__ExchangeName=LINGYUN.Abp.Application + - CAP__RabbitMQ__VirtualHost=/ + - Redis__Configuration=127.0.0.1,defaultDatabase=10 + - Redis__InstanceName=LINGYUN.Abp.Application + - AuthServer__Authority=http://127.0.0.1:44385/ + - AuthServer__ApiName=lingyun-abp-application + + webhook-api: + - App__TrackingEntitiesChanged=true + - ConnectionStrings__Default=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__WebhooksManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__TaskManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpSaas=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpFeatureManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpPermissionManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpSettingManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - Encryption__PassPhrase=s46c5q55nxpeS8Ra + - Encryption__InitVector=s83ng0abvd02js84 + - Encryption__Salt=sf&5)s3# + - CAP__EventBus__DefaultGroup=WebhooksManagement + - CAP__EventBus__Version=v1 + - CAP__EventBus__FailedRetryInterval=300 + - CAP__EventBus__FailedRetryCount=10 + - CAP__RabbitMQ__HostName=127.0.0.1 + - CAP__RabbitMQ__Port=5672 + - CAP__RabbitMQ__UserName=admin + - CAP__RabbitMQ__Password=123456 + - CAP__RabbitMQ__ExchangeName=LINGYUN.Abp.Application + - CAP__RabbitMQ__VirtualHost=/ + - Redis__Configuration=127.0.0.1,defaultDatabase=10 + - Redis__InstanceName=LINGYUN.Abp.Application + - AuthServer__Authority=http://127.0.0.1:44385/ + - AuthServer__ApiName=lingyun-abp-application + + workflow-api: + - App__TrackingEntitiesChanged=true + - ConnectionStrings__Default=Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456, + - ConnectionStrings__Workflow=Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456, + - ConnectionStrings__WorkflowManagement=Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456, + - ConnectionStrings__AbpWorkflowCore=Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456, + - ConnectionStrings__AbpFeatureManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpPermissionManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpLocalizationManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpSettingManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - ConnectionStrings__AbpSaas=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, + - Encryption__PassPhrase=s46c5q55nxpeS8Ra + - Encryption__InitVector=s83ng0abvd02js84 + - Encryption__Salt=sf&5)s3# + - CAP__EventBus__DefaultGroup=Workflow - CAP__EventBus__Version=v1 - CAP__EventBus__FailedRetryInterval=300 - CAP__EventBus__FailedRetryCount=10 @@ -184,13 +273,8 @@ services: - Redis__InstanceName=LINGYUN.Abp.Application - AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__ApiName=lingyun-abp-application - - IdentityServer__Clients__AuthManagement__ClientId=auth-management - - IdentityServer__Clients__AuthManagement__RootUrl=http://127.0.0.1:9527/ - - IdentityServer__Clients__AuthVueAdmin__ClientId=vue-admin-element - - IdentityServer__Clients__AuthApiGateway__ClientId=ApigatewayHostClient - - IdentityServer__Clients__AuthApiGatewayAdmin__ClientId=apigateway-admin-client - internat-apigateway: + internal-apigateway: environment: - App__TrackingEntitiesChanged=true - Encryption__PassPhrase=s46c5q55nxpeS8Ra diff --git a/docker-compose.override.windows.yml b/docker-compose.override.windows.yml index f5c2e6f28..2c739447e 100644 --- a/docker-compose.override.windows.yml +++ b/docker-compose.override.windows.yml @@ -1,79 +1,114 @@ version: '3.4' services: - identity-server-sts: + sts-server: build: context: ./aspnet-core/services/Publish/identityserver volumes: - - D:\Projects\Development\Abp\Application\logs\ids-sts:/app/Logs - restart: always + - D:\Project\Abp\logs\ids-sts:/app/Logs + - D:\Project\Abp\data\ids-sts\Modules:/app/Modules + networks: + - framework - identity-server-admin: + sts-api: build: context: ./aspnet-core/services/Publish/identityserver4-admin volumes: - - D:\Projects\Development\Abp\Application\logs\ids-admin:/app/Logs + - D:\Project\Abp\logs\ids-admin:/app/Logs + - D:\Project\Abp\data\ids-admin\Modules:/app/Modules depends_on: - - identity-server-sts - restart: always + - sts-server + networks: + - framework - admin-service: + admin-api: build: context: ./aspnet-core/services/Publish/admin volumes: - - D:\Projects\Development\Abp\Application\logs\backend-admin:/app/Logs + - D:\Project\Abp\logs\backend-admin:/app/Logs + - D:\Project\Abp\data\backend-admin\Modules:/app/Modules depends_on: - - identity-server-sts - restart: always + - sts-server + networks: + - framework - localization-service: + localization-api: build: context: ./aspnet-core/services/Publish/localization volumes: - - D:\Projects\Development\Abp\Application\logs\localization:/app/Logs - restart: always + - D:\Project\Abp\logs\localization:/app/Logs + - D:\Project\Abp\data\localization\Modules:/app/Modules + depends_on: + - sts-server + networks: + - framework - platform-service: + platform-api: build: context: ./aspnet-core/services/Publish/platform volumes: - - D:\Projects\Development\Abp\Application\logs\platform:/app/Logs - - D:\Projects\Development\Abp\Application\data\platform:/app/file-blob-storing + - D:\Project\Abp\logs\platform:/app/Logs + - D:\Project\Abp\data\platform\Modules:/app/Modules + - D:\Project\Abp\data\platform:/app/file-blob-storing depends_on: - - identity-server-sts - restart: always + - sts-server + networks: + - framework - messages-service: + messages-api: build: context: ./aspnet-core/services/Publish/messages volumes: - - D:\Projects\Development\Abp\Application\logs\messages:/app/Logs + - D:\Project\Abp\logs\messages:/app/Logs + - D:\Project\Abp\data\messages\Modules:/app/Modules depends_on: - - identity-server-sts - restart: always + - sts-server + networks: + - framework - apigateway-admin-service: + task-api: build: - context: ./aspnet-core/services/Publish/apigateway-admin + context: ./aspnet-core/services/Publish/task-management volumes: - - D:\Projects\Development\Abp\Application\logs\apigateway-admin:/app/Logs + - D:\Project\Abp\logs\task-management:/app/Logs + - D:\Project\Abp\data\task-management\Modules:/app/Modules depends_on: - - identity-server-sts - - admin-service - restart: always + - sts-server + networks: + - framework - apigateway-host-service: + webhook-api: build: - context: ./aspnet-core/services/Publish/apigateway-host + context: ./aspnet-core/services/Publish/webhooks volumes: - - D:\Projects\Development\Abp\Application\logs\apigateway-host:/app/Logs + - D:\Project\Abp\logs\webhooks:/app/Logs + - D:\Project\Abp\data\webhooks\Modules:/app/Modules depends_on: - - identity-server-sts - - apigateway-admin-service - restart: always + - sts-server + networks: + - framework -volumes: - dbdata: + workflow-api: + build: + context: ./aspnet-core/services/Publish/workflow + volumes: + - D:\Project\Abp\logs\workflow:/app/Logs + - D:\Project\Abp\data\workflow\Modules:/app/Modules + depends_on: + - sts-server + networks: + - framework + + internal-apigateway: + build: + context: ./aspnet-core/services/Publish/internal-apigateway + volumes: + - D:\Project\Abp\logs\internal-apigateway:/app/Logs + - D:\Project\Abp\data\internal-apigateway\Modules:/app/Modules + networks: + - framework networks: - linyun-abp: + framework: + name: nt + external: true diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 7f8f4b216..238b97d4c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -7,7 +7,6 @@ services: volumes: - /var/opt/abp/logs/ids-sts:/app/Logs - /var/opt/abp/data/ids-sts/Modules:/app/Modules - restart: always networks: - framework @@ -19,7 +18,6 @@ services: - /var/opt/abp/data/ids-admin/Modules:/app/Modules depends_on: - sts-server - restart: always networks: - framework @@ -31,7 +29,6 @@ services: - /var/opt/abp/data/backend-admin/Modules:/app/Modules depends_on: - sts-server - restart: always networks: - framework @@ -41,7 +38,6 @@ services: volumes: - /var/opt/abp/logs/localization:/app/Logs - /var/opt/abp/data/localization/Modules:/app/Modules - restart: always depends_on: - sts-server networks: @@ -56,7 +52,6 @@ services: - /var/opt/abp/data/platform:/app/file-blob-storing depends_on: - sts-server - restart: always networks: - framework @@ -68,7 +63,6 @@ services: - /var/opt/abp/data/messages/Modules:/app/Modules depends_on: - sts-server - restart: always networks: - framework @@ -80,7 +74,6 @@ services: - /var/opt/abp/data/task-management/Modules:/app/Modules depends_on: - sts-server - restart: always networks: - framework @@ -92,7 +85,6 @@ services: - /var/opt/abp/data/webhooks/Modules:/app/Modules depends_on: - sts-server - restart: always networks: - framework @@ -104,7 +96,6 @@ services: - /var/opt/abp/data/workflow/Modules:/app/Modules depends_on: - sts-server - restart: always networks: - framework @@ -114,7 +105,6 @@ services: volumes: - /var/opt/abp/logs/internal-apigateway:/app/Logs - /var/opt/abp/data/internal-apigateway/Modules:/app/Modules - restart: always networks: - framework diff --git a/docker-compose.yml b/docker-compose.yml index b4b63bbb8..61d265109 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,70 +3,70 @@ version: '3.4' services: admin-api: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30010:80" sts-api: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30015:80" localization-api: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30030:80" platform-api: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30025:80" messages-api: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30020:80" task-api: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30040:80" webhook-api: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30045:80" workflow-api: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30050:80" sts-server: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "44385:80" internal-apigateway: environment: - - ASPNETCORE_ENVIRONMENT=Production + - ASPNETCORE_ENVIRONMENT=Development - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30000:80" diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs index 78534abe9..49e6abaf2 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs @@ -79,14 +79,26 @@ namespace Ocelot.Multiplexer continue; } var content = await response.Content.ReadAsStringAsync(); - var contentObject = JsonConvert.DeserializeObject(content); - if (responseObject == null) + try { - responseObject = JObject.FromObject(contentObject); + var contentObject = JsonConvert.DeserializeObject(content); + if (responseObject == null) + { + responseObject = JObject.FromObject(contentObject); + } + else + { + responseObject.Merge(contentObject, mergeSetting); + } } - else + catch (System.Exception ex) { - responseObject.Merge(contentObject, mergeSetting); + Logger.LogError(content); + return new DownstreamResponse( + null, + HttpStatusCode.InternalServerError, + new List>>(), + content); } } diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json index 53d532aec..9654bc194 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json @@ -49,7 +49,10 @@ }, "AuthServer": { "Authority": "http://127.0.0.1:44385/", - "ApiName": "lingyun-abp-application" + "ApiName": "lingyun-abp-application", + "SwaggerClientId": "ApigatewayHostClient", + "SwaggerClientSecret": "1q2w3e*", + "ApiSocpes": "lingyun-abp-application" }, "Serilog": { "MinimumLevel": { From ce829a756f14e87d093b58a55be14f08715511b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Fri, 1 Sep 2023 19:19:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=BE=93=E5=87=BA=E5=BC=80=E5=85=B3=EF=BC=9A?= =?UTF-8?q?App:ShowPii=20=E4=BF=AE=E6=94=B9docker=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0workflow=E3=80=81r?= =?UTF-8?q?ealtimemessage=E3=80=81task=E9=A1=B9=E7=9B=AE=E7=9A=84=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=20=E7=BB=9F=E4=B8=80internalgetway=E7=9A=84agileconfi?= =?UTF-8?q?g=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BackendAdminHttpApiHostModule.cs | 5 +++ .../appsettings.Development.json | 3 +- ...LocalizationManagementHttpApiHostModule.cs | 6 ++++ .../appsettings.Development.json | 3 +- .../PlatformManagementHttpApiHostModule.cs | 6 ++++ .../appsettings.Development.json | 3 +- .../RealtimeMessageHttpApiHostModule.cs | 6 ++++ .../appsettings.Development.json | 3 +- .../TaskManagementHttpApiHostModule.cs | 6 ++++ .../appsettings.Development.json | 3 ++ .../WebhooksManagementHttpApiHostModule.cs | 6 ++++ .../appsettings.Development.json | 3 ++ .../WorkflowManagementHttpApiHostModule.cs | 6 ++++ .../appsettings.Development.json | 3 +- .../IdentityServerHttpApiHostModule.cs | 6 ++++ .../Program.cs | 1 - .../appsettings.Development.json | 3 +- .../IdentityServerModule.cs | 6 ++++ .../appsettings.Development.json | 3 +- docker-compose.yml | 20 ++++++++++++ .../InternalApiGatewayModule.cs | 5 +++ .../Program.cs | 32 ++++++++++--------- .../appsettings.Development.json | 6 ++-- .../InternalApiGatewayModule.cs | 5 +++ .../appsettings.Development.json | 3 +- 25 files changed, 126 insertions(+), 26 deletions(-) diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs index 69d8376c2..fefe18391 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs @@ -30,8 +30,10 @@ using LINGYUN.Abp.TextTemplating.Scriban; using LY.MicroService.BackendAdmin.EntityFrameworkCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Logging; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy; @@ -105,6 +107,9 @@ public partial class BackendAdminHttpApiHostModule : AbpModule { var configuration = context.Services.GetConfiguration(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + PreConfigureApp(); PreConfigureFeature(); PreConfigureCAP(configuration); diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json index cab22c86b..79972bda4 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json @@ -15,7 +15,8 @@ "127.0.0.1" ] }, - "CorsOrigins": "http://127.0.0.1:3100" + "CorsOrigins": "http://127.0.0.1:3100", + "ShowPii": true }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs index 3af1fe12d..c92230ac7 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs @@ -14,8 +14,10 @@ using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using LY.MicroService.LocalizationManagement.EntityFrameworkCore; using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Logging; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.MultiTenancy; @@ -63,6 +65,10 @@ namespace LY.MicroService.LocalizationManagement { var configuration = context.Services.GetConfiguration(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + + PreConfigureApp(); PreConfigureFeature(); PreConfigureCAP(configuration); diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json index 0043098a8..053a7aef8 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json @@ -9,7 +9,8 @@ "tag": "Localization" }, "App": { - "CorsOrigins": "http://127.0.0.1:3100" + "CorsOrigins": "http://127.0.0.1:3100", + "ShowPii": true }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs index 2761d51c6..f29b567e4 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs @@ -27,9 +27,11 @@ using LY.MicroService.Platform.EntityFrameworkCore; using LY.MicroService.PlatformManagement.BackgroundWorkers; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; +using Microsoft.IdentityModel.Logging; using System.Threading.Tasks; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.JwtBearer; @@ -97,6 +99,10 @@ public partial class PlatformManagementHttpApiHostModule : AbpModule { var configuration = context.Services.GetConfiguration(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + + PreConfigureApp(); PreConfigureFeature(); PreConfigureCAP(configuration); diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json index 1da8844c9..fa87331f1 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json @@ -16,7 +16,8 @@ "127.0.0.1" ] }, - "CorsOrigins": "http://127.0.0.1:3100" + "CorsOrigins": "http://127.0.0.1:3100", + "ShowPii": true }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs index a91d60b04..910193ebd 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs @@ -36,8 +36,10 @@ using LINGYUN.Abp.TextTemplating.Scriban; using LY.MicroService.RealtimeMessage.EntityFrameworkCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Logging; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.MultiTenancy; @@ -109,6 +111,10 @@ public partial class RealtimeMessageHttpApiHostModule : AbpModule { var configuration = context.Services.GetConfiguration(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + + PreConfigureApp(); PreConfigureFeature(); PreConfigureCAP(configuration); diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json index aa44f80fd..58a343941 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json @@ -15,7 +15,8 @@ "KnownProxies": [ "127.0.0.1" ] - } + }, + "ShowPii": true }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs index e7c7cab93..963f213b7 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs @@ -21,8 +21,10 @@ using LINGYUN.Abp.TaskManagement.EntityFrameworkCore; using LY.MicroService.TaskManagement.EntityFrameworkCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Logging; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.MultiTenancy; @@ -84,6 +86,10 @@ public partial class TaskManagementHttpApiHostModule : AbpModule { var configuration = context.Services.GetConfiguration(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + + PreConfigureApp(); PreConfigureFeature(); PreConfigureCAP(configuration); diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json index 1f918bdf4..4b7eab961 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json @@ -8,6 +8,9 @@ "name": "LINGYUN.Abp.TaskManagement", "tag": "LINGYUN.Abp.TaskManagement" }, + "App": { + "ShowPii": true + }, "Auditing": { "AllEntitiesSelector": true }, diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs index 50766b859..817cff719 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs @@ -22,8 +22,10 @@ using LINGYUN.Abp.WebhooksManagement.EntityFrameworkCore; using LY.MicroService.WebhooksManagement.EntityFrameworkCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Logging; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.MultiTenancy; @@ -84,6 +86,10 @@ public partial class WebhooksManagementHttpApiHostModule : AbpModule { var configuration = context.Services.GetConfiguration(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + + PreConfigureApp(); PreConfigureFeature(); PreConfigureCAP(configuration); diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json index 6a6ff355e..fa587f56c 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json @@ -8,6 +8,9 @@ "name": "LINGYUN.Abp.WebhooksManagement", "tag": "LINGYUN.Abp.WebhooksManagement" }, + "App": { + "ShowPii": true + }, "Auditing": { "AllEntitiesSelector": true }, diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs index 6c6ba1edc..ad7d976ee 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs @@ -23,8 +23,10 @@ using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using LINGYUN.Abp.TaskManagement.EntityFrameworkCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Logging; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.MultiTenancy; @@ -89,6 +91,10 @@ public partial class WorkflowManagementHttpApiHostModule : AbpModule { var configuration = context.Services.GetConfiguration(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + + PreConfigureApp(); PreConfigureFeature(); PreConfigureCAP(configuration); diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json index 57d565fdb..3cd50819f 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json @@ -9,7 +9,8 @@ "tag": "LINGYUN.Abp.Workflow" }, "App": { - "CorsOrigins": "http://127.0.0.1:3100" + "CorsOrigins": "http://127.0.0.1:3100", + "ShowPii": true }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs index 03f79789b..eceea70b5 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs @@ -15,8 +15,10 @@ using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using LINGYUN.Abp.Sms.Aliyun; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Logging; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.MultiTenancy; @@ -70,6 +72,10 @@ public partial class IdentityServerHttpApiHostModule : AbpModule { var configuration = context.Services.GetConfiguration(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + + PreConfigureApp(); PreConfigureFeature(); PreConfigureCAP(configuration); diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs index 2bdabb0f3..7d0f79299 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs @@ -21,7 +21,6 @@ public class Program { Console.Title = "IdentityServer.HttpApi.Host"; Log.Information("Starting IdentityServer.HttpApi.Host."); - IdentityModelEventSource.ShowPII = true; var builder = WebApplication.CreateBuilder(args); diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json index 741573141..c8cd05c2f 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json @@ -11,7 +11,8 @@ "App": { "SelfUrl": "http://127.0.0.1:30015/", "StsUrl": "http://127.0.0.1:44385/", - "CorsOrigins": "http://127.0.0.1:3100" + "CorsOrigins": "http://127.0.0.1:3100", + "ShowPii": true }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs index f938071f4..68d89ea55 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs @@ -23,8 +23,10 @@ using LINGYUN.Platform.EntityFrameworkCore; using LY.MicroService.IdentityServer.EntityFrameworkCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.IdentityModel.Logging; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Authentication.JwtBearer; @@ -90,6 +92,10 @@ public partial class IdentityServerModule : AbpModule var configuration = context.Services.GetConfiguration(); var hostingEnvironment = context.Services.GetHostingEnvironment(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + + PreConfigureApp(); PreConfigureFeature(); PreConfigureCAP(configuration); diff --git a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json index fe1de71ae..8b7373b65 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json @@ -11,7 +11,8 @@ "App": { "SelfUrl": "http://127.0.0.1:44385/", "StsUrl": "http://127.0.0.1:44385/", - "CorsOrigins": "http://127.0.0.1:3100" + "CorsOrigins": "http://127.0.0.1:3100", + "ShowPii": true }, "AppSelfUrl": "http://127.0.0.1:44385/", "Auditing": { diff --git a/docker-compose.yml b/docker-compose.yml index 61d265109..924e0976c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,8 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30010:80" + extra_hosts: + - "host.docker.internal:host-gateway" sts-api: environment: @@ -14,6 +16,8 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30015:80" + extra_hosts: + - "host.docker.internal:host-gateway" localization-api: environment: @@ -21,6 +25,8 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30030:80" + extra_hosts: + - "host.docker.internal:host-gateway" platform-api: environment: @@ -28,6 +34,8 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30025:80" + extra_hosts: + - "host.docker.internal:host-gateway" messages-api: environment: @@ -35,6 +43,8 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30020:80" + extra_hosts: + - "host.docker.internal:host-gateway" task-api: environment: @@ -42,6 +52,8 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30040:80" + extra_hosts: + - "host.docker.internal:host-gateway" webhook-api: environment: @@ -49,6 +61,8 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30045:80" + extra_hosts: + - "host.docker.internal:host-gateway" workflow-api: environment: @@ -56,6 +70,8 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30050:80" + extra_hosts: + - "host.docker.internal:host-gateway" sts-server: environment: @@ -63,6 +79,8 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "44385:80" + extra_hosts: + - "host.docker.internal:host-gateway" internal-apigateway: environment: @@ -70,3 +88,5 @@ services: - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30000:80" + extra_hosts: + - "host.docker.internal:host-gateway" diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.cs b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.cs index 31cc54a87..e1be74da5 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.cs +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.cs @@ -1,9 +1,11 @@ using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; +using Microsoft.IdentityModel.Logging; using Ocelot.Configuration.File; using Ocelot.Configuration.Repository; using Ocelot.Middleware; @@ -35,6 +37,9 @@ namespace LINGYUN.MicroService.Internal.ApiGateway var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + ConfigureLocalization(); ConfigureJsonSerializer(); ConfigureVirtualFileSystem(); diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Program.cs b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Program.cs index 2efd8bda1..585be4326 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Program.cs +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Program.cs @@ -22,24 +22,26 @@ public class Program Log.Information("Starting Internal ApiGateway."); var builder = WebApplication.CreateBuilder(args); + builder.Host.AddAppSettingsSecretsJson() - .UseAutofac() - .ConfigureAppConfiguration((context, config) => - { - //// 加入 ocelot配置文件 - //config.AddJsonFile( - //$"ocelot.{context.HostingEnvironment.EnvironmentName ?? "Development"}.json", - //optional: true, - //reloadOnChange: true); + .UseAutofac() + .ConfigureAppConfiguration((context, config) => + { + //// 加入 ocelot配置文件 + //config.AddJsonFile( + //$"ocelot.{context.HostingEnvironment.EnvironmentName ?? "Development"}.json", + //optional: true, + //reloadOnChange: true); - config.AddAutoOcelotConfig("OcelotConfig", builder.Environment); + config.AddAutoOcelotConfig("OcelotConfig", builder.Environment); - var configuration = config.Build(); - if (configuration.GetSection("AgileConfig").Exists()) - { - config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); - } - }) + var configuration = config.Build(); + var agileConfigEnabled = configuration["AgileConfig:IsEnabled"]; + if (agileConfigEnabled.IsNullOrEmpty() || bool.Parse(agileConfigEnabled)) + { + config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration)); + } + }) .UseSerilog((context, provider, config) => { config.ReadFrom.Configuration(context.Configuration); diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json index 9654bc194..0baadf8d5 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json @@ -1,5 +1,6 @@ { "AgileConfig": { + "IsEnabled": false, "env": "DEV", "appId": "LINGYUN.Internal.ApiGateway", "secret": "1q2w3E*", @@ -8,7 +9,8 @@ "tag": "ApiGateway" }, "App": { - "CorsOrigins": "http://127.0.0.1:3100" + "CorsOrigins": "http://127.0.0.1:3100", + "ShowPii": true }, "ApiGateway": { "AppId": "TEST-APP", @@ -48,7 +50,7 @@ "InstanceName": "LINGYUN.Abp.Application" }, "AuthServer": { - "Authority": "http://127.0.0.1:44385/", + "Authority": "http://host.docker.internal:44385/", "ApiName": "lingyun-abp-application", "SwaggerClientId": "ApigatewayHostClient", "SwaggerClientSecret": "1q2w3e*", diff --git a/gateways/web/LY.MicroService.ApiGateway/InternalApiGatewayModule.cs b/gateways/web/LY.MicroService.ApiGateway/InternalApiGatewayModule.cs index 10123cf45..094282f84 100644 --- a/gateways/web/LY.MicroService.ApiGateway/InternalApiGatewayModule.cs +++ b/gateways/web/LY.MicroService.ApiGateway/InternalApiGatewayModule.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Microsoft.IdentityModel.Logging; using Microsoft.OpenApi.Models; using System; using System.Collections.Generic; @@ -34,6 +35,10 @@ public class InternalApiGatewayModule : AbpModule var configuration = context.Services.GetConfiguration(); var hostingEnvironment = context.Services.GetHostingEnvironment(); + var showPii = configuration.GetValue("App:ShowPii"); + IdentityModelEventSource.ShowPII = showPii; + + Configure(options => { options.Aggregator.ConfigurationUrl.ClientName = "_Abp_Application_Configuration"; diff --git a/gateways/web/LY.MicroService.ApiGateway/appsettings.Development.json b/gateways/web/LY.MicroService.ApiGateway/appsettings.Development.json index 114264ea7..71ad36eb7 100644 --- a/gateways/web/LY.MicroService.ApiGateway/appsettings.Development.json +++ b/gateways/web/LY.MicroService.ApiGateway/appsettings.Development.json @@ -8,7 +8,8 @@ "tag": "BackendAdmin" }, "App": { - "CorsOrigins": "http://127.0.0.1:3100" + "CorsOrigins": "http://127.0.0.1:3100", + "ShowPii": true }, "ConnectionStrings": { "Default": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456", From f5756902067cb765737feedf45c040f82ec3603c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Fri, 1 Sep 2023 19:30:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appsettings.Development.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json index 26037e888..fbcca0acc 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json @@ -29,7 +29,8 @@ } } } - } + }, + "ShowPii": true }, "Auditing": { "AllEntitiesSelector": true From f1635e980294da3089ee702f69ca11bd31f5bee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Fri, 1 Sep 2023 19:45:32 +0800 Subject: [PATCH 4/6] =?UTF-8?q?docker=20compose=E6=96=87=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.configuration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.configuration.yml b/docker-compose.configuration.yml index 21ba1986c..dd8085e57 100644 --- a/docker-compose.configuration.yml +++ b/docker-compose.configuration.yml @@ -219,6 +219,7 @@ services: - AuthServer__ApiName=lingyun-abp-application webhook-api: + environment: - App__TrackingEntitiesChanged=true - ConnectionStrings__Default=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, - ConnectionStrings__WebhooksManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456, @@ -246,6 +247,7 @@ services: - AuthServer__ApiName=lingyun-abp-application workflow-api: + environment: - App__TrackingEntitiesChanged=true - ConnectionStrings__Default=Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456, - ConnectionStrings__Workflow=Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456, From 77298072cfea77033f29d198796e214ffaa1742d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Mon, 4 Sep 2023 19:54:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?compose=E6=96=87=E4=BB=B6=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.agile.config.yml | 52 +++++++++++++++++++++++------ docker-compose.override.windows.yml | 47 ++++++++++++++------------ docker-compose.override.yml | 4 +-- docker-compose.yml | 20 +++++------ 4 files changed, 79 insertions(+), 44 deletions(-) diff --git a/docker-compose.agile.config.yml b/docker-compose.agile.config.yml index 72864443d..295226ea3 100644 --- a/docker-compose.agile.config.yml +++ b/docker-compose.agile.config.yml @@ -1,15 +1,29 @@ version: '3.4' services: + agile-config: + image: kklldog/agile_config:latest + environment: + - adminConsole=true + - db:provider=mysql + - db:conn=Server=127.0.0.1;Database=agile;User Id=root;Password=123456;Character Set=utf8mb4 + ports: + - "5000:5000" + volumes: + - /etc/localtime:/etc/localtime + restart: always + sts-server: environment: - AgileConfig__IsEnabled=true - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.AuthServer - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=AuthServer - AgileConfig__tag=AuthServer + depends_on: + - agile-config sts-api: environment: @@ -17,9 +31,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.IdentityServer.Admin - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=IdentityServer.Admin - AgileConfig__tag=IdentityServer.Admin + depends_on: + - agile-config admin-api: environment: @@ -27,9 +43,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Backend.Admin - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=BackendAdmin - AgileConfig__tag=BackendAdmin + depends_on: + - agile-config localization-api: environment: @@ -37,9 +55,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Localization - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Localization - AgileConfig__tag=Localization + depends_on: + - agile-config platform-api: environment: @@ -47,9 +67,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Platform - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Platform - AgileConfig__tag=Platform + depends_on: + - agile-config messages-api: environment: @@ -57,9 +79,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Message - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Message - AgileConfig__tag=Message + depends_on: + - agile-config task-api: environment: @@ -67,9 +91,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Task - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Task - AgileConfig__tag=Task + depends_on: + - agile-config webhook-api: environment: @@ -77,9 +103,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Webhooks - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Webhooks - AgileConfig__tag=Webhooks + depends_on: + - agile-config workflow-api: environment: @@ -87,9 +115,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Workflow - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Workflow - AgileConfig__tag=Workflow + depends_on: + - agile-config internal-apigateway: environment: @@ -97,6 +127,8 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Internal.ApiGateway - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=ApiGateway - AgileConfig__tag=ApiGateway + depends_on: + - agile-config diff --git a/docker-compose.override.windows.yml b/docker-compose.override.windows.yml index 2c739447e..29f7e405e 100644 --- a/docker-compose.override.windows.yml +++ b/docker-compose.override.windows.yml @@ -5,8 +5,8 @@ services: build: context: ./aspnet-core/services/Publish/identityserver volumes: - - D:\Project\Abp\logs\ids-sts:/app/Logs - - D:\Project\Abp\data\ids-sts\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\ids-sts:/app/Logs + - D:\Projects\Development\Abp\Application\data\ids-sts\Modules:/app/Modules networks: - framework @@ -14,8 +14,8 @@ services: build: context: ./aspnet-core/services/Publish/identityserver4-admin volumes: - - D:\Project\Abp\logs\ids-admin:/app/Logs - - D:\Project\Abp\data\ids-admin\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\ids-admin:/app/Logs + - D:\Projects\Development\Abp\Application\data\ids-admin\Modules:/app/Modules depends_on: - sts-server networks: @@ -25,8 +25,8 @@ services: build: context: ./aspnet-core/services/Publish/admin volumes: - - D:\Project\Abp\logs\backend-admin:/app/Logs - - D:\Project\Abp\data\backend-admin\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\backend-admin:/app/Logs + - D:\Projects\Development\Abp\Application\data\backend-admin\Modules:/app/Modules depends_on: - sts-server networks: @@ -36,8 +36,8 @@ services: build: context: ./aspnet-core/services/Publish/localization volumes: - - D:\Project\Abp\logs\localization:/app/Logs - - D:\Project\Abp\data\localization\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\localization:/app/Logs + - D:\Projects\Development\Abp\Application\data\localization\Modules:/app/Modules depends_on: - sts-server networks: @@ -47,9 +47,9 @@ services: build: context: ./aspnet-core/services/Publish/platform volumes: - - D:\Project\Abp\logs\platform:/app/Logs - - D:\Project\Abp\data\platform\Modules:/app/Modules - - D:\Project\Abp\data\platform:/app/file-blob-storing + - D:\Projects\Development\Abp\Application\logs\platform:/app/Logs + - D:\Projects\Development\Abp\Application\data\platform\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\data\platform:/app/file-blob-storing depends_on: - sts-server networks: @@ -59,8 +59,8 @@ services: build: context: ./aspnet-core/services/Publish/messages volumes: - - D:\Project\Abp\logs\messages:/app/Logs - - D:\Project\Abp\data\messages\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\messages:/app/Logs + - D:\Projects\Development\Abp\Application\data\messages\Modules:/app/Modules depends_on: - sts-server networks: @@ -70,8 +70,8 @@ services: build: context: ./aspnet-core/services/Publish/task-management volumes: - - D:\Project\Abp\logs\task-management:/app/Logs - - D:\Project\Abp\data\task-management\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\task-management:/app/Logs + - D:\Projects\Development\Abp\Application\data\task-management\Modules:/app/Modules depends_on: - sts-server networks: @@ -81,8 +81,8 @@ services: build: context: ./aspnet-core/services/Publish/webhooks volumes: - - D:\Project\Abp\logs\webhooks:/app/Logs - - D:\Project\Abp\data\webhooks\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\webhooks:/app/Logs + - D:\Projects\Development\Abp\Application\data\webhooks\Modules:/app/Modules depends_on: - sts-server networks: @@ -92,8 +92,8 @@ services: build: context: ./aspnet-core/services/Publish/workflow volumes: - - D:\Project\Abp\logs\workflow:/app/Logs - - D:\Project\Abp\data\workflow\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\workflow:/app/Logs + - D:\Projects\Development\Abp\Application\data\workflow\Modules:/app/Modules depends_on: - sts-server networks: @@ -103,12 +103,15 @@ services: build: context: ./aspnet-core/services/Publish/internal-apigateway volumes: - - D:\Project\Abp\logs\internal-apigateway:/app/Logs - - D:\Project\Abp\data\internal-apigateway\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\internal-apigateway:/app/Logs + - D:\Projects\Development\Abp\Application\data\internal-apigateway\Modules:/app/Modules networks: - framework + +volumes: + dbdata: networks: framework: - name: nt + name: linyun-abp external: true diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 238b97d4c..6e5cd5588 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -110,5 +110,5 @@ services: networks: framework: - external: - name: ly_app_net + name: linyun-abp + external: true diff --git a/docker-compose.yml b/docker-compose.yml index 924e0976c..e561db2e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.4' services: admin-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30010:80" @@ -12,7 +12,7 @@ services: sts-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30015:80" @@ -21,7 +21,7 @@ services: localization-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30030:80" @@ -30,7 +30,7 @@ services: platform-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30025:80" @@ -39,7 +39,7 @@ services: messages-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30020:80" @@ -48,7 +48,7 @@ services: task-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30040:80" @@ -57,7 +57,7 @@ services: webhook-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30045:80" @@ -66,7 +66,7 @@ services: workflow-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30050:80" @@ -75,7 +75,7 @@ services: sts-server: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "44385:80" @@ -84,7 +84,7 @@ services: internal-apigateway: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30000:80" From afc41d8d29044e96e597f5640dbca3964a727095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Mon, 4 Sep 2023 20:22:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=9B=BA=E5=AE=9Aagileconfig=E7=9A=84?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.agile.config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.agile.config.yml b/docker-compose.agile.config.yml index 295226ea3..d22ed913e 100644 --- a/docker-compose.agile.config.yml +++ b/docker-compose.agile.config.yml @@ -3,15 +3,15 @@ version: '3.4' services: agile-config: image: kklldog/agile_config:latest + container_name: agile-config environment: - adminConsole=true - db:provider=mysql - - db:conn=Server=127.0.0.1;Database=agile;User Id=root;Password=123456;Character Set=utf8mb4 + - db:conn=Server=host.docker.internal;Database=agile;User Id=root;Password=123456;Character Set=utf8mb4 ports: - "5000:5000" volumes: - /etc/localtime:/etc/localtime - restart: always sts-server: environment: