增加详细异常输出开关：App:ShowPii

修改docker配置文件，增加workflow、realtimemessage、task项目的部署
统一internalgetway的agileconfig代码

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

@@ -8,6 +8,9 @@
     "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

@@ -8,6 +8,9 @@
     "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

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

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

@@ -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);

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

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

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/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);

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

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