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

Docker配置修改

pull/872/head
李宏 2 years ago
parent
c8ad940869
commit
d78aeb83ae
12 changed files with 285 additions and 158 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json
  2. 2
      aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json
  3. 2
      aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json
  4. 2
      aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile
  5. 3
      aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs
  6. 126
      docker-compose.agile.config.yml
  7. 138
      docker-compose.configuration.yml
  8. 111
      docker-compose.override.windows.yml
  9. 10
      docker-compose.override.yml
  10. 20
      docker-compose.yml
  11. 22
      gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs
  12. 5
      gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json

2
aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json
View File

@ -4,7 +4,7 @@
"env": "DEV", "env": "DEV",
"appId": "LINGYUN.Abp.TaskManagement", "appId": "LINGYUN.Abp.TaskManagement",
"secret": "1q2w3E*", "secret": "1q2w3E*",
"nodes": "http://127.0.0.1:15000", "nodes": "http://127.0.0.1:5000",
"name": "LINGYUN.Abp.TaskManagement", "name": "LINGYUN.Abp.TaskManagement",
"tag": "LINGYUN.Abp.TaskManagement" "tag": "LINGYUN.Abp.TaskManagement"
}, },

2
aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json
View File

@ -4,7 +4,7 @@
"env": "DEV", "env": "DEV",
"appId": "LINGYUN.Abp.WebhooksManagement", "appId": "LINGYUN.Abp.WebhooksManagement",
"secret": "1q2w3E*", "secret": "1q2w3E*",
"nodes": "http://127.0.0.1:15000", "nodes": "http://127.0.0.1:5000",
"name": "LINGYUN.Abp.WebhooksManagement", "name": "LINGYUN.Abp.WebhooksManagement",
"tag": "LINGYUN.Abp.WebhooksManagement" "tag": "LINGYUN.Abp.WebhooksManagement"
}, },

2
aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json
View File

@ -4,7 +4,7 @@
"env": "DEV", "env": "DEV",
"appId": "LINGYUN.Abp.Workflow", "appId": "LINGYUN.Abp.Workflow",
"secret": "1q2w3E*", "secret": "1q2w3E*",
"nodes": "http://127.0.0.1:15000", "nodes": "http://127.0.0.1:5000",
"name": "LINGYUN.Abp.Workflow", "name": "LINGYUN.Abp.Workflow",
"tag": "LINGYUN.Abp.Workflow" "tag": "LINGYUN.Abp.Workflow"
}, },

2
aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile
View File

@ -11,4 +11,4 @@ EXPOSE 80/tcp
VOLUME [ "./app/Logs" ] VOLUME [ "./app/Logs" ]
VOLUME [ "./app/Modules" ] VOLUME [ "./app/Modules" ]
ENTRYPOINT ["dotnet", "LY.MicroService.IdentityServer.HttpApi.Host.dll"] ENTRYPOINT ["dotnet", "LY.MicroService.identityServer.HttpApi.Host.dll"]

3
aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs
View File

@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.IdentityModel.Logging;
using Serilog; using Serilog;
using System; using System;
using System.IO; using System.IO;
@ -20,6 +21,8 @@ public class Program
{ {
Console.Title = "IdentityServer.HttpApi.Host"; Console.Title = "IdentityServer.HttpApi.Host";
Log.Information("Starting IdentityServer.HttpApi.Host."); Log.Information("Starting IdentityServer.HttpApi.Host.");
IdentityModelEventSource.ShowPII = true;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
builder.Host.AddAppSettingsSecretsJson() builder.Host.AddAppSettingsSecretsJson()

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

@ -1,102 +1,102 @@
version: '3.4' version: '3.4'
services: services:
agile-config: sts-server:
image: kklldog/agile_config:latest
environment: environment:
- adminConsole=true - AgileConfig__IsEnabled=true
- db:provider=mysql - AgileConfig__env=DEV
- 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__appId=LINGYUN.Abp.AuthServer - AgileConfig__appId=LINGYUN.Abp.AuthServer
- AgileConfig__secret=1q2w3E* - AgileConfig__secret=1q2w3E*
- AgileConfig__nodes=http://agile-config:5000 - AgileConfig__nodes=http://docker.gzbit.cn:5000
- AgileConfig__name=AuthServer - AgileConfig__name=AuthServer
- AgileConfig__tag=AuthServer - AgileConfig__tag=AuthServer
depends_on:
- agile-config
identity-server-admin: sts-api:
environment: environment:
- AgileConfig__env=PROD - AgileConfig__IsEnabled=true
- AgileConfig__env=DEV
- AgileConfig__appId=LINGYUN.Abp.IdentityServer.Admin - AgileConfig__appId=LINGYUN.Abp.IdentityServer.Admin
- AgileConfig__secret=1q2w3E* - AgileConfig__secret=1q2w3E*
- AgileConfig__nodes=http://agile-config:5000 - AgileConfig__nodes=http://docker.gzbit.cn:5000
- AgileConfig__name=IdentityServer.Admin - AgileConfig__name=IdentityServer.Admin
- AgileConfig__tag=IdentityServer.Admin - AgileConfig__tag=IdentityServer.Admin
depends_on:
- agile-config
admin-service: admin-api:
environment: environment:
- AgileConfig__env=PROD - AgileConfig__IsEnabled=true
- AgileConfig__env=DEV
- AgileConfig__appId=LINGYUN.Abp.Backend.Admin - AgileConfig__appId=LINGYUN.Abp.Backend.Admin
- AgileConfig__secret=1q2w3E* - AgileConfig__secret=1q2w3E*
- AgileConfig__nodes=http://agile-config:5000 - AgileConfig__nodes=http://docker.gzbit.cn:5000
- AgileConfig__name=Backend.Admin - AgileConfig__name=BackendAdmin
- AgileConfig__tag=Backend.Admin - AgileConfig__tag=BackendAdmin
depends_on:
- agile-config
localization-service: localization-api:
environment: environment:
- AgileConfig__env=PROD - AgileConfig__IsEnabled=true
- AgileConfig__env=DEV
- AgileConfig__appId=LINGYUN.Abp.Localization - AgileConfig__appId=LINGYUN.Abp.Localization
- AgileConfig__secret=1q2w3E* - AgileConfig__secret=1q2w3E*
- AgileConfig__nodes=http://agile-config:5000 - AgileConfig__nodes=http://docker.gzbit.cn:5000
- AgileConfig__name=Localization - AgileConfig__name=Localization
- AgileConfig__tag=Localization - AgileConfig__tag=Localization
depends_on:
- agile-config
platform-service: platform-api:
environment: environment:
- AgileConfig__env=PROD - AgileConfig__IsEnabled=true
- AgileConfig__env=DEV
- AgileConfig__appId=LINGYUN.Abp.Platform - AgileConfig__appId=LINGYUN.Abp.Platform
- AgileConfig__secret=1q2w3E* - AgileConfig__secret=1q2w3E*
- AgileConfig__nodes=http://agile-config:5000 - AgileConfig__nodes=http://docker.gzbit.cn:5000
- AgileConfig__name=Platform - AgileConfig__name=Platform
- AgileConfig__tag=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: environment:
- AgileConfig__env=PROD - AgileConfig__IsEnabled=true
- AgileConfig__appId=LINGYUN.Abp.Messages - AgileConfig__env=DEV
- AgileConfig__appId=LINGYUN.Abp.Webhooks
- AgileConfig__secret=1q2w3E* - AgileConfig__secret=1q2w3E*
- AgileConfig__nodes=http://agile-config:5000 - AgileConfig__nodes=http://docker.gzbit.cn:5000
- AgileConfig__name=Messages - AgileConfig__name=Webhooks
- AgileConfig__tag=Messages - AgileConfig__tag=Webhooks
depends_on:
- agile-config
apigateway-admin-service: workflow-api:
environment: environment:
- AgileConfig__env=PROD - AgileConfig__IsEnabled=true
- AgileConfig__appId=LINGYUN.Abp.Apigateway.Admin - AgileConfig__env=DEV
- AgileConfig__appId=LINGYUN.Abp.Workflow
- AgileConfig__secret=1q2w3E* - AgileConfig__secret=1q2w3E*
- AgileConfig__nodes=http://agile-config:5000 - AgileConfig__nodes=http://docker.gzbit.cn:5000
- AgileConfig__name=Apigateway.Admin - AgileConfig__name=Workflow
- AgileConfig__tag=Apigateway.Admin - AgileConfig__tag=Workflow
depends_on:
- agile-config
apigateway-host-service: internal-apigateway:
environment: environment:
- AgileConfig__env=PROD - AgileConfig__IsEnabled=true
- AgileConfig__appId=LINGYUN.Abp.Apigateway - AgileConfig__env=DEV
- AgileConfig__appId=LINGYUN.Internal.ApiGateway
- AgileConfig__secret=1q2w3E* - AgileConfig__secret=1q2w3E*
- AgileConfig__nodes=http://agile-config:5000 - AgileConfig__nodes=http://docker.gzbit.cn:5000
- AgileConfig__name=Apigateway - AgileConfig__name=ApiGateway
- AgileConfig__tag=Apigateway - AgileConfig__tag=ApiGateway
depends_on:
- agile-config

138
docker-compose.configuration.yml
View File

@ -1,20 +1,25 @@
version: '3.4' version: '3.4'
services: services:
admin-service: sts-server:
environment: 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 - 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__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__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__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__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__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__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__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#
- CAP__EventBus__DefaultGroup=BackendAdmin - CAP__EventBus__DefaultGroup=AuthServer
- CAP__EventBus__Version=v1 - CAP__EventBus__Version=v1
- CAP__EventBus__FailedRetryInterval=300 - CAP__EventBus__FailedRetryInterval=300
- CAP__EventBus__FailedRetryCount=10 - CAP__EventBus__FailedRetryCount=10
@ -28,8 +33,13 @@ services:
- Redis__InstanceName=LINGYUN.Abp.Application - Redis__InstanceName=LINGYUN.Abp.Application
- AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__Authority=http://127.0.0.1:44385/
- AuthServer__ApiName=lingyun-abp-application - 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: environment:
- App__TrackingEntitiesChanged=true - App__TrackingEntitiesChanged=true
- ConnectionStrings__Default=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - 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__Authority=http://127.0.0.1:44385/
- AuthServer__ApiName=lingyun-abp-application - 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: environment:
- App__TrackingEntitiesChanged=true - 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=Platform;User Id=root;Password=123456
@ -85,7 +123,7 @@ services:
- AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__Authority=http://127.0.0.1:44385/
- AuthServer__ApiName=lingyun-abp-application - AuthServer__ApiName=lingyun-abp-application
platform-service: platform-api:
environment: environment:
- App__TrackingEntitiesChanged=true - 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=Platform;User Id=root;Password=123456
@ -122,7 +160,7 @@ services:
- AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__Authority=http://127.0.0.1:44385/
- AuthServer__ApiName=lingyun-abp-application - AuthServer__ApiName=lingyun-abp-application
messages-service: messages-api:
environment: environment:
- App__CorsOrigins=http://127.0.0.1:40000,http://127.0.0.1:30000 - App__CorsOrigins=http://127.0.0.1:40000,http://127.0.0.1:30000
- App__TrackingEntitiesChanged=true - App__TrackingEntitiesChanged=true
@ -152,25 +190,76 @@ services:
- Hangfire__Dashboard__WhiteList=127.0.0.1 - Hangfire__Dashboard__WhiteList=127.0.0.1
- Notifications__WeChat__WeApp__DefaultWeAppState=formal - Notifications__WeChat__WeApp__DefaultWeAppState=formal
identity-server-sts: task-api:
environment: 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 - App__TrackingEntitiesChanged=true
- ConnectionStrings__Default=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - ConnectionStrings__Default=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456,
- ConnectionStrings__AbpIdentity=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - ConnectionStrings__TaskManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456,
- ConnectionStrings__AbpIdentityServer=Server=127.0.0.1;Database=IdentityServer;User Id=root;Password=123456 - ConnectionStrings__AbpFeatureManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456,
- ConnectionStrings__AbpAuditLogging=Server=127.0.0.1;Database=Platform;User Id=root;Password=123456 - ConnectionStrings__AbpPermissionManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456,
- ConnectionStrings__AbpTenantManagement=Server=127.0.0.1;Database=Platform;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;User Id=root;Password=123456 - ConnectionStrings__AbpSettingManagement=Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456,
- ConnectionStrings__AbpPermissionManagement=Server=127.0.0.1;Database=Platform;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;User Id=root;Password=123456
- Certificates__CerPath=./idsrv4.pfx
- Certificates__Password=csfvw2-2r0ff41
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - 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__Version=v1
- CAP__EventBus__FailedRetryInterval=300 - CAP__EventBus__FailedRetryInterval=300
- CAP__EventBus__FailedRetryCount=10 - CAP__EventBus__FailedRetryCount=10
@ -184,13 +273,8 @@ services:
- Redis__InstanceName=LINGYUN.Abp.Application - Redis__InstanceName=LINGYUN.Abp.Application
- AuthServer__Authority=http://127.0.0.1:44385/ - AuthServer__Authority=http://127.0.0.1:44385/
- AuthServer__ApiName=lingyun-abp-application - 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: environment:
- App__TrackingEntitiesChanged=true - App__TrackingEntitiesChanged=true
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra

111
docker-compose.override.windows.yml
View File

@ -1,79 +1,114 @@
version: '3.4' version: '3.4'
services: services:
identity-server-sts: sts-server:
build: build:
context: ./aspnet-core/services/Publish/identityserver context: ./aspnet-core/services/Publish/identityserver
volumes: volumes:
- D:\Projects\Development\Abp\Application\logs\ids-sts:/app/Logs - D:\Project\Abp\logs\ids-sts:/app/Logs
restart: always - D:\Project\Abp\data\ids-sts\Modules:/app/Modules
networks:
- framework
identity-server-admin: sts-api:
build: build:
context: ./aspnet-core/services/Publish/identityserver4-admin context: ./aspnet-core/services/Publish/identityserver4-admin
volumes: 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: depends_on:
- identity-server-sts - sts-server
restart: always networks:
- framework
admin-service: admin-api:
build: build:
context: ./aspnet-core/services/Publish/admin context: ./aspnet-core/services/Publish/admin
volumes: 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: depends_on:
- identity-server-sts - sts-server
restart: always networks:
- framework
localization-service: localization-api:
build: build:
context: ./aspnet-core/services/Publish/localization context: ./aspnet-core/services/Publish/localization
volumes: volumes:
- D:\Projects\Development\Abp\Application\logs\localization:/app/Logs - D:\Project\Abp\logs\localization:/app/Logs
restart: always - D:\Project\Abp\data\localization\Modules:/app/Modules
depends_on:
- sts-server
networks:
- framework
platform-service: platform-api:
build: build:
context: ./aspnet-core/services/Publish/platform context: ./aspnet-core/services/Publish/platform
volumes: volumes:
- D:\Projects\Development\Abp\Application\logs\platform:/app/Logs - D:\Project\Abp\logs\platform:/app/Logs
- D:\Projects\Development\Abp\Application\data\platform:/app/file-blob-storing - D:\Project\Abp\data\platform\Modules:/app/Modules
- D:\Project\Abp\data\platform:/app/file-blob-storing
depends_on: depends_on:
- identity-server-sts - sts-server
restart: always networks:
- framework
messages-service: messages-api:
build: build:
context: ./aspnet-core/services/Publish/messages context: ./aspnet-core/services/Publish/messages
volumes: 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: depends_on:
- identity-server-sts - sts-server
restart: always networks:
- framework
apigateway-admin-service: task-api:
build: build:
context: ./aspnet-core/services/Publish/apigateway-admin context: ./aspnet-core/services/Publish/task-management
volumes: 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: depends_on:
- identity-server-sts - sts-server
- admin-service networks:
restart: always - framework
apigateway-host-service: webhook-api:
build: build:
context: ./aspnet-core/services/Publish/apigateway-host context: ./aspnet-core/services/Publish/webhooks
volumes: 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: depends_on:
- identity-server-sts - sts-server
- apigateway-admin-service networks:
restart: always - framework
volumes: workflow-api:
dbdata: 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: networks:
linyun-abp: framework:
name: nt
external: true

10
docker-compose.override.yml
View File

@ -7,7 +7,6 @@ services:
volumes: volumes:
- /var/opt/abp/logs/ids-sts:/app/Logs - /var/opt/abp/logs/ids-sts:/app/Logs
- /var/opt/abp/data/ids-sts/Modules:/app/Modules - /var/opt/abp/data/ids-sts/Modules:/app/Modules
restart: always
networks: networks:
- framework - framework
@ -19,7 +18,6 @@ services:
- /var/opt/abp/data/ids-admin/Modules:/app/Modules - /var/opt/abp/data/ids-admin/Modules:/app/Modules
depends_on: depends_on:
- sts-server - sts-server
restart: always
networks: networks:
- framework - framework
@ -31,7 +29,6 @@ services:
- /var/opt/abp/data/backend-admin/Modules:/app/Modules - /var/opt/abp/data/backend-admin/Modules:/app/Modules
depends_on: depends_on:
- sts-server - sts-server
restart: always
networks: networks:
- framework - framework
@ -41,7 +38,6 @@ services:
volumes: volumes:
- /var/opt/abp/logs/localization:/app/Logs - /var/opt/abp/logs/localization:/app/Logs
- /var/opt/abp/data/localization/Modules:/app/Modules - /var/opt/abp/data/localization/Modules:/app/Modules
restart: always
depends_on: depends_on:
- sts-server - sts-server
networks: networks:
@ -56,7 +52,6 @@ services:
- /var/opt/abp/data/platform:/app/file-blob-storing - /var/opt/abp/data/platform:/app/file-blob-storing
depends_on: depends_on:
- sts-server - sts-server
restart: always
networks: networks:
- framework - framework
@ -68,7 +63,6 @@ services:
- /var/opt/abp/data/messages/Modules:/app/Modules - /var/opt/abp/data/messages/Modules:/app/Modules
depends_on: depends_on:
- sts-server - sts-server
restart: always
networks: networks:
- framework - framework
@ -80,7 +74,6 @@ services:
- /var/opt/abp/data/task-management/Modules:/app/Modules - /var/opt/abp/data/task-management/Modules:/app/Modules
depends_on: depends_on:
- sts-server - sts-server
restart: always
networks: networks:
- framework - framework
@ -92,7 +85,6 @@ services:
- /var/opt/abp/data/webhooks/Modules:/app/Modules - /var/opt/abp/data/webhooks/Modules:/app/Modules
depends_on: depends_on:
- sts-server - sts-server
restart: always
networks: networks:
- framework - framework
@ -104,7 +96,6 @@ services:
- /var/opt/abp/data/workflow/Modules:/app/Modules - /var/opt/abp/data/workflow/Modules:/app/Modules
depends_on: depends_on:
- sts-server - sts-server
restart: always
networks: networks:
- framework - framework
@ -114,7 +105,6 @@ services:
volumes: volumes:
- /var/opt/abp/logs/internal-apigateway:/app/Logs - /var/opt/abp/logs/internal-apigateway:/app/Logs
- /var/opt/abp/data/internal-apigateway/Modules:/app/Modules - /var/opt/abp/data/internal-apigateway/Modules:/app/Modules
restart: always
networks: networks:
- framework - framework

20
docker-compose.yml
View File

@ -3,70 +3,70 @@ version: '3.4'
services: services:
admin-api: admin-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30010:80" - "30010:80"
sts-api: sts-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30015:80" - "30015:80"
localization-api: localization-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30030:80" - "30030:80"
platform-api: platform-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30025:80" - "30025:80"
messages-api: messages-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30020:80" - "30020:80"
task-api: task-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30040:80" - "30040:80"
webhook-api: webhook-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30045:80" - "30045:80"
workflow-api: workflow-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30050:80" - "30050:80"
sts-server: sts-server:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "44385:80" - "44385:80"
internal-apigateway: internal-apigateway:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30000:80" - "30000:80"

22
gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/Ocelot/Multiplexer/AbpResponseMergeAggregator.cs
View File

@ -79,14 +79,26 @@ namespace Ocelot.Multiplexer
continue; continue;
} }
var content = await response.Content.ReadAsStringAsync(); var content = await response.Content.ReadAsStringAsync();
var contentObject = JsonConvert.DeserializeObject(content); try
if (responseObject == null)
{ {
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<KeyValuePair<string, IEnumerable<string>>>(),
content);
} }
} }

5
gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json
View File

@ -49,7 +49,10 @@
}, },
"AuthServer": { "AuthServer": {
"Authority": "http://127.0.0.1:44385/", "Authority": "http://127.0.0.1:44385/",
"ApiName": "lingyun-abp-application" "ApiName": "lingyun-abp-application",
"SwaggerClientId": "ApigatewayHostClient",
"SwaggerClientSecret": "1q2w3e*",
"ApiSocpes": "lingyun-abp-application"
}, },
"Serilog": { "Serilog": {
"MinimumLevel": { "MinimumLevel": {

Write Preview
Loading…
Cancel
Save