Merge pull request #872 from leehom0123/master

docker配置修改及增加showPii配置
colinin · Sep 12, 2023 · 099d2a8 · 099d2a8
2 parents 674d463 + afc41d8
commit 099d2a8
Show file tree

Hide file tree

Showing 31 changed files with 396 additions and 132 deletions.
diff --git a/...-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs b/...-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs
@@ -30,8 +30,10 @@
 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 override void PreConfigureServices(ServiceConfigurationContext context)
     {
         var configuration = context.Services.GetConfiguration();
 
+        var showPii = configuration.GetValue<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json
@@ -15,7 +15,8 @@
         "127.0.0.1"
       ]
     },
-    "CorsOrigins": "http://127.0.0.1:3100"
+    "CorsOrigins": "http://127.0.0.1:3100",
+    "ShowPii": true
   },
   "Auditing": {
     "AllEntitiesSelector": true

diff --git a/...croService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs b/...croService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs
@@ -14,8 +14,10 @@
 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 @@ public override void PreConfigureServices(ServiceConfigurationContext context)
         {
             var configuration = context.Services.GetConfiguration();
 
+            var showPii = configuration.GetValue<bool>("App:ShowPii");
+            IdentityModelEventSource.ShowPII = showPii;
+
+
             PreConfigureApp();
             PreConfigureFeature();
             PreConfigureCAP(configuration);

diff --git a/...services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json b/...services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json
@@ -9,7 +9,8 @@
     "tag": "Localization"
   },
   "App": {
-    "CorsOrigins": "http://127.0.0.1:3100"
+    "CorsOrigins": "http://127.0.0.1:3100",
+    "ShowPii": true
   },
   "Auditing": {
     "AllEntitiesSelector": true

diff --git a/...es/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs b/...es/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs
@@ -27,9 +27,11 @@
 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 override void PreConfigureServices(ServiceConfigurationContext context)
     {
         var configuration = context.Services.GetConfiguration();
 
+        var showPii = configuration.GetValue<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

diff --git a/...ore/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json b/...ore/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json
@@ -16,7 +16,8 @@
         "127.0.0.1"
       ]
     },
-    "CorsOrigins": "http://127.0.0.1:3100"
+    "CorsOrigins": "http://127.0.0.1:3100",
+    "ShowPii": true
   },
   "Auditing": {
     "AllEntitiesSelector": true

diff --git a/...services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs b/...services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs
@@ -36,8 +36,10 @@
 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 override void PreConfigureServices(ServiceConfigurationContext context)
     {
         var configuration = context.Services.GetConfiguration();
 
+        var showPii = configuration.GetValue<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

diff --git a/...t-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json b/...t-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json
@@ -15,7 +15,8 @@
       "KnownProxies": [
         "127.0.0.1"
       ]
-    }
+    },
+    "ShowPii": true
   },
   "Auditing": {
     "AllEntitiesSelector": true

diff --git a/...e/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs b/...e/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs
@@ -21,8 +21,10 @@
 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 override void PreConfigureServices(ServiceConfigurationContext context)
     {
         var configuration = context.Services.GetConfiguration();
 
+        var showPii = configuration.GetValue<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

diff --git a/...et-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json b/...et-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
   },

diff --git a/...es/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs b/...es/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs
@@ -22,8 +22,10 @@
 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 override void PreConfigureServices(ServiceConfigurationContext context)
     {
         var configuration = context.Services.GetConfiguration();
 
+        var showPii = configuration.GetValue<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

diff --git a/...ore/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json b/...ore/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
   },

diff --git a/...es/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs b/...es/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs
@@ -23,8 +23,10 @@
 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 override void PreConfigureServices(ServiceConfigurationContext context)
     {
         var configuration = context.Services.GetConfiguration();
 
+        var showPii = configuration.GetValue<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

diff --git a/...ore/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json b/...ore/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

diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile
@@ -11,4 +11,4 @@ EXPOSE 80/tcp
 VOLUME [ "./app/Logs" ]
 VOLUME [ "./app/Modules" ]
 
-ENTRYPOINT ["dotnet", "LY.MicroService.IdentityServer.HttpApi.Host.dll"]
+ENTRYPOINT ["dotnet", "LY.MicroService.identityServer.HttpApi.Host.dll"]
diff --git a/...e/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs b/...e/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs
@@ -15,8 +15,10 @@
 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 override void PreConfigureServices(ServiceConfigurationContext context)
     {
         var configuration = context.Services.GetConfiguration();
 
+        var showPii = configuration.GetValue<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs
@@ -3,6 +3,7 @@
 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 async static Task<int> Main(string[] args)
             Console.Title = "IdentityServer.HttpApi.Host";
             Log.Information("Starting IdentityServer.HttpApi.Host.");
 
+
             var builder = WebApplication.CreateBuilder(args);
             builder.Host.AddAppSettingsSecretsJson()
                 .UseAutofac()

diff --git a/...et-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json b/...et-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json
@@ -11,7 +11,8 @@
   "App": {
     "SelfUrl": "http://127.0.0.1:30015/",
     "StsUrl": "http://127.0.0.1:44385/",
-    "CorsOrigins": "http://127.0.0.1:3100"
+    "CorsOrigins": "http://127.0.0.1:3100",
+    "ShowPii": true
   },
   "Auditing": {
     "AllEntitiesSelector": true

diff --git a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.cs
@@ -23,8 +23,10 @@
 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 override void PreConfigureServices(ServiceConfigurationContext context)
         var configuration = context.Services.GetConfiguration();
         var hostingEnvironment = context.Services.GetHostingEnvironment();
 
+        var showPii = configuration.GetValue<bool>("App:ShowPii");
+        IdentityModelEventSource.ShowPII = showPii;
+
+
         PreConfigureApp();
         PreConfigureFeature();
         PreConfigureCAP(configuration);

diff --git a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json
@@ -29,7 +29,8 @@
           }
         }
       }
-    }
+    },
+    "ShowPii": true
   },
   "Auditing": {
     "AllEntitiesSelector": true