Merge pull request #872 from leehom0123/master

docker配置修改及增加showPii配置

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<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

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

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<bool>("App:ShowPii");
+            IdentityModelEventSource.ShowPII = showPii;
+
+
             PreConfigureApp();
             PreConfigureFeature();
             PreConfigureCAP(configuration);

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

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<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

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

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<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

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

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<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

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

@@ -4,10 +4,13 @@
     "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"
   },
+  "App": {
+    "ShowPii": true
+  },
   "Auditing": {
     "AllEntitiesSelector": true
   },

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<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

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

@@ -4,10 +4,13 @@
     "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"
   },
+  "App": {
+    "ShowPii": true
+  },
   "Auditing": {
     "AllEntitiesSelector": true
   },

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<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

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

@@ -4,12 +4,13 @@
     "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"
   },
   "App": {
-    "CorsOrigins": "http://127.0.0.1:3100"
+    "CorsOrigins": "http://127.0.0.1:3100",
+    "ShowPii": true
   },
   "Auditing": {
     "AllEntitiesSelector": true

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"]

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<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

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;
@@ -21,6 +22,7 @@ public class Program
             Console.Title = "IdentityServer.HttpApi.Host";
             Log.Information("Starting IdentityServer.HttpApi.Host.");
 
+
             var builder = WebApplication.CreateBuilder(args);
             builder.Host.AddAppSettingsSecretsJson()
                 .UseAutofac()

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

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<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json

@@ -29,7 +29,8 @@
           }
         }
       }
-    }
+    },
+    "ShowPii": true
   },
   "Auditing": {
     "AllEntitiesSelector": true

docker-compose.agile.config.yml

@@ -3,19 +3,20 @@ 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
 
-  identity-server-sts:
+  sts-server:
     environment:
-      - AgileConfig__env=PROD
+      - AgileConfig__IsEnabled=true
+      - AgileConfig__env=DEV
       - AgileConfig__appId=LINGYUN.Abp.AuthServer
       - AgileConfig__secret=1q2w3E*
       - AgileConfig__nodes=http://agile-config:5000
@@ -24,9 +25,10 @@ services:
     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
@@ -35,20 +37,22 @@ services:
     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__name=BackendAdmin
-      - AgileConfig__tag=Backend.Admin
+      - AgileConfig__tag=BackendAdmin
     depends_on:
       - agile-config
 
-  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
@@ -57,9 +61,10 @@ services:
     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
@@ -68,35 +73,62 @@ services:
     depends_on:
       - agile-config
 
-  messages-service:
+  messages-api:
     environment:
-      - AgileConfig__env=PROD
+      - AgileConfig__IsEnabled=true
-      - AgileConfig__appId=LINGYUN.Abp.Messages
+      - AgileConfig__env=DEV
+      - AgileConfig__appId=LINGYUN.Abp.Message
       - AgileConfig__secret=1q2w3E*
       - AgileConfig__nodes=http://agile-config:5000
-      - AgileConfig__name=Messages
+      - AgileConfig__name=Message
-      - AgileConfig__tag=Messages
+      - AgileConfig__tag=Message
     depends_on:
       - agile-config
 
-  apigateway-admin-service:
+  task-api:
     environment:
-      - AgileConfig__env=PROD
+      - AgileConfig__IsEnabled=true
-      - AgileConfig__appId=LINGYUN.Abp.Apigateway.Admin
+      - AgileConfig__env=DEV
+      - AgileConfig__appId=LINGYUN.Abp.Task
       - AgileConfig__secret=1q2w3E*
       - AgileConfig__nodes=http://agile-config:5000
-      - AgileConfig__name=Apigateway.Admin
+      - AgileConfig__name=Task
-      - AgileConfig__tag=Apigateway.Admin
+      - AgileConfig__tag=Task
     depends_on:
       - agile-config
 
-  apigateway-host-service:
+  webhook-api:
     environment:
-      - AgileConfig__env=PROD
+      - AgileConfig__IsEnabled=true
-      - AgileConfig__appId=LINGYUN.Abp.Apigateway
+      - AgileConfig__env=DEV
+      - AgileConfig__appId=LINGYUN.Abp.Webhooks
       - AgileConfig__secret=1q2w3E*
       - AgileConfig__nodes=http://agile-config:5000
-      - AgileConfig__name=Apigateway
+      - AgileConfig__name=Webhooks
-      - AgileConfig__tag=Apigateway
+      - AgileConfig__tag=Webhooks
+    depends_on:
+      - agile-config
+
+  workflow-api:
+    environment:
+      - AgileConfig__IsEnabled=true
+      - AgileConfig__env=DEV
+      - AgileConfig__appId=LINGYUN.Abp.Workflow
+      - AgileConfig__secret=1q2w3E*
+      - AgileConfig__nodes=http://agile-config:5000
+      - AgileConfig__name=Workflow
+      - AgileConfig__tag=Workflow
+    depends_on:
+      - agile-config
+
+  internal-apigateway:
+    environment:
+      - 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

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,78 @@ 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__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__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:
+    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,
+      - 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:
+    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,
+      - 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 +275,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

docker-compose.override.windows.yml

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

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,11 +105,10 @@ services:
     volumes:
       - /var/opt/abp/logs/internal-apigateway:/app/Logs
       - /var/opt/abp/data/internal-apigateway/Modules:/app/Modules
-    restart: always
     networks:
       - framework
 
 networks:
   framework:
-    external:
+    name: linyun-abp
-      name: ly_app_net
+    external: true

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"

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<bool>("App:ShowPii");
+            IdentityModelEventSource.ShowPII = showPii;
+
             ConfigureLocalization();
             ConfigureJsonSerializer();
             ConfigureVirtualFileSystem();

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);
+                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);
                 }
             }
 

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()
+               .UseAutofac()
-                .ConfigureAppConfiguration((context, config) =>
+               .ConfigureAppConfiguration((context, config) =>
-                {
+               {
-                    //// 加入 ocelot配置文件
+                   //// 加入 ocelot配置文件
-                    //config.AddJsonFile(
+                   //config.AddJsonFile(
-                    //$"ocelot.{context.HostingEnvironment.EnvironmentName ?? "Development"}.json",
+                   //$"ocelot.{context.HostingEnvironment.EnvironmentName ?? "Development"}.json",
-                    //optional: true,
+                   //optional: true,
-                    //reloadOnChange: true);
+                   //reloadOnChange: true);
 
-                    config.AddAutoOcelotConfig("OcelotConfig", builder.Environment);
+                   config.AddAutoOcelotConfig("OcelotConfig", builder.Environment);
 
-                    var configuration = config.Build();
+                   var configuration = config.Build();
-                    if (configuration.GetSection("AgileConfig").Exists())
+                   var agileConfigEnabled = configuration["AgileConfig:IsEnabled"];
-                    {
+                   if (agileConfigEnabled.IsNullOrEmpty() || bool.Parse(agileConfigEnabled))
-                        config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration));
+                   {
-                    }
+                       config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration));
-                })
+                   }
+               })
                 .UseSerilog((context, provider, config) =>
                 {
                     config.ReadFrom.Configuration(context.Configuration);

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,8 +50,11 @@
     "InstanceName": "LINGYUN.Abp.Application"
   },
   "AuthServer": {
-    "Authority": "http://127.0.0.1:44385/",
+    "Authority": "http://host.docker.internal:44385/",
-    "ApiName": "lingyun-abp-application"
+    "ApiName": "lingyun-abp-application",
+    "SwaggerClientId": "ApigatewayHostClient",
+    "SwaggerClientSecret": "1q2w3e*",
+    "ApiSocpes": "lingyun-abp-application"
   },
   "Serilog": {
     "MinimumLevel": {

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<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         Configure<InternalApiGatewayOptions>(options =>
         {
             options.Aggregator.ConfigurationUrl.ClientName = "_Abp_Application_Configuration";

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