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

feat(logging): add the application name of Serilog enrichers

pull/347/head
cKey 4 years ago
parent
c12ee302da
commit
d6c12cd859
58 changed files with 711 additions and 303 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      aspnet-core/LINGYUN.MicroService.All.sln
  2. 32
      aspnet-core/LINGYUN.MicroService.ApiGateway.sln
  3. 7
      aspnet-core/LINGYUN.MicroService.BackendAdmin.sln
  4. 14
      aspnet-core/LINGYUN.MicroService.Common.sln
  5. 27
      aspnet-core/LINGYUN.MicroService.IdentityServer.sln
  6. 27
      aspnet-core/LINGYUN.MicroService.IdentityServerAdmin.sln
  7. 35
      aspnet-core/LINGYUN.MicroService.Localization.sln
  8. 27
      aspnet-core/LINGYUN.MicroService.Messages.sln
  9. 27
      aspnet-core/LINGYUN.MicroService.Platform.sln
  10. 9
      aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN/Abp/AuditLogging/Elasticsearch/ElasticsearchSecurityLogManager.cs
  11. 1
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Logging/Dto/LogFieldDto.cs
  12. 1
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Logging/Dto/LogGetByPagedDto.cs
  13. 15
      aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Logging/LogAppService.cs
  14. 1
      aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj
  15. 12
      aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs
  16. 7
      aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogField.cs
  17. 2
      aspnet-core/modules/logging/LINGYUN.Abp.Logging/LINGYUN/Abp/AuditLogging/DefaultLoggingManager.cs
  18. 2
      aspnet-core/modules/logging/LINGYUN.Abp.Logging/LINGYUN/Abp/AuditLogging/ILoggingManager.cs
  19. 1
      aspnet-core/modules/logging/LINGYUN.Abp.Logging/LINGYUN/Abp/AuditLogging/LogField.cs
  20. 16
      aspnet-core/modules/logging/LINGYUN.Abp.Logging/README.md
  21. 15
      aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN.Abp.Serilog.Enrichers.Application.csproj
  22. 8
      aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN/Abp/Serilog/Enrichers/Application/AbpSerilogEnrichersApplicationModule.cs
  23. 8
      aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN/Abp/Serilog/Enrichers/Application/AbpSerilogEnrichersConsts.cs
  24. 29
      aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN/Abp/Serilog/Enrichers/Application/ApplicationNameEnricher.cs
  25. 48
      aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/README.md
  26. 16
      aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/Serilog/ApplicationLoggerConfigurationExtensions.cs
  27. 54
      aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.Configure.cs
  28. 47
      aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs
  29. 1
      aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj
  30. 2
      aspnet-core/services/account/AuthServer.Host/appsettings.json
  31. 6
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.Configure.cs
  32. 3
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs
  33. 1
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj
  34. 2
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Properties/launchSettings.json
  35. 2
      aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.json
  36. 3
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/ApiGatewayHostModule.cs
  37. 1
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj
  38. 2
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/appsettings.json
  39. 6
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.Configure.cs
  40. 3
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.cs
  41. 1
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj
  42. 2
      aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.json
  43. 6
      aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.Configure.cs
  44. 5
      aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs
  45. 1
      aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj
  46. 2
      aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.json
  47. 6
      aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/AbpLocalizationManagementHttpApiHostModule.Configure.cs
  48. 3
      aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/AbpLocalizationManagementHttpApiHostModule.cs
  49. 1
      aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj
  50. 2
      aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/appsettings.json
  51. 8
      aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.Configure.cs
  52. 3
      aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.cs
  53. 1
      aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj
  54. 2
      aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.json
  55. 6
      aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.Configure.cs
  56. 3
      aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.cs
  57. 1
      aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj
  58. 2
      aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/appsettings.json

7
aspnet-core/LINGYUN.MicroService.All.sln
View File

@ -349,6 +349,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging.El
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging.EntityFrameworkCore", "modules\auditing\LINGYUN.Abp.AuditLogging.EntityFrameworkCore\LINGYUN.Abp.AuditLogging.EntityFrameworkCore.csproj", "{F71A0D28-397D-4094-B1C2-7925E1310676}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Serilog.Enrichers.Application", "modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj", "{CEAF0044-28D3-4585-B69D-D65FF6D4745E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -911,6 +913,10 @@ Global
{F71A0D28-397D-4094-B1C2-7925E1310676}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F71A0D28-397D-4094-B1C2-7925E1310676}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F71A0D28-397D-4094-B1C2-7925E1310676}.Release|Any CPU.Build.0 = Release|Any CPU
{CEAF0044-28D3-4585-B69D-D65FF6D4745E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CEAF0044-28D3-4585-B69D-D65FF6D4745E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CEAF0044-28D3-4585-B69D-D65FF6D4745E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CEAF0044-28D3-4585-B69D-D65FF6D4745E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -1083,6 +1089,7 @@ Global
{6C3D4C1C-4864-44A9-8649-9856ABF667FA} = {67DAB2A0-D407-4CAB-8414-AE3D0AC52FC4}
{AD3CC5B5-366B-4E34-8E80-EC5BB68B573A} = {67DAB2A0-D407-4CAB-8414-AE3D0AC52FC4}
{F71A0D28-397D-4094-B1C2-7925E1310676} = {67DAB2A0-D407-4CAB-8414-AE3D0AC52FC4}
{CEAF0044-28D3-4585-B69D-D65FF6D4745E} = {6FC0578B-CDF1-43AD-9F7E-4AA7E4720A02}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C95FDF91-16F2-4A8B-A4BE-0E62D1B66718}

32
aspnet-core/LINGYUN.MicroService.ApiGateway.sln
View File

@ -33,7 +33,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.EventBus.CAP",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AspNetCore.HttpOverrides", "modules\common\LINGYUN.Abp.AspNetCore.HttpOverrides\LINGYUN.Abp.AspNetCore.HttpOverrides.csproj", "{7588F35B-7C0E-4D80-B43A-8A5C9AC6FE03}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.ApiGateway.Host", "services\apigateway\LINGYUN.Abp.ApiGateway.Host\LINGYUN.Abp.ApiGateway.Host.csproj", "{A38139F5-A856-4CA2-89F8-51798ED557CC}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "logging", "logging", "{68A9661A-E4CF-435A-BEAF-36A6A0A067CD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Serilog.Enrichers.Application", "modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj", "{BFF44515-64C7-48C9-BD3E-6ABEDA863F6A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "auditing", "auditing", "{7E784A72-D62C-4ECF-9CA6-F6EE88619ACF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging", "modules\auditing\LINGYUN.Abp.AuditLogging\LINGYUN.Abp.AuditLogging.csproj", "{767322CA-5502-4BF7-A324-691DFE17384A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging.Elasticsearch", "modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj", "{2E2D0BF4-85EC-45CE-9842-CDED25EE30A7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -85,10 +93,18 @@ Global
{7588F35B-7C0E-4D80-B43A-8A5C9AC6FE03}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7588F35B-7C0E-4D80-B43A-8A5C9AC6FE03}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7588F35B-7C0E-4D80-B43A-8A5C9AC6FE03}.Release|Any CPU.Build.0 = Release|Any CPU
{A38139F5-A856-4CA2-89F8-51798ED557CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A38139F5-A856-4CA2-89F8-51798ED557CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A38139F5-A856-4CA2-89F8-51798ED557CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A38139F5-A856-4CA2-89F8-51798ED557CC}.Release|Any CPU.Build.0 = Release|Any CPU
{BFF44515-64C7-48C9-BD3E-6ABEDA863F6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFF44515-64C7-48C9-BD3E-6ABEDA863F6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFF44515-64C7-48C9-BD3E-6ABEDA863F6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFF44515-64C7-48C9-BD3E-6ABEDA863F6A}.Release|Any CPU.Build.0 = Release|Any CPU
{767322CA-5502-4BF7-A324-691DFE17384A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{767322CA-5502-4BF7-A324-691DFE17384A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{767322CA-5502-4BF7-A324-691DFE17384A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{767322CA-5502-4BF7-A324-691DFE17384A}.Release|Any CPU.Build.0 = Release|Any CPU
{2E2D0BF4-85EC-45CE-9842-CDED25EE30A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E2D0BF4-85EC-45CE-9842-CDED25EE30A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E2D0BF4-85EC-45CE-9842-CDED25EE30A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E2D0BF4-85EC-45CE-9842-CDED25EE30A7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -107,7 +123,11 @@ Global
{D6629DD3-BA0F-44B5-A97F-3B992ECAB85D} = {630FB448-8C5C-438F-930D-B0209407DE6A}
{1DA1835B-9EA4-4095-A8CF-10E2778206D3} = {D6629DD3-BA0F-44B5-A97F-3B992ECAB85D}
{7588F35B-7C0E-4D80-B43A-8A5C9AC6FE03} = {D6629DD3-BA0F-44B5-A97F-3B992ECAB85D}
{A38139F5-A856-4CA2-89F8-51798ED557CC} = {F3B1B755-37B6-420B-9E82-A5BDFF2BF647}
{68A9661A-E4CF-435A-BEAF-36A6A0A067CD} = {630FB448-8C5C-438F-930D-B0209407DE6A}
{BFF44515-64C7-48C9-BD3E-6ABEDA863F6A} = {68A9661A-E4CF-435A-BEAF-36A6A0A067CD}
{7E784A72-D62C-4ECF-9CA6-F6EE88619ACF} = {630FB448-8C5C-438F-930D-B0209407DE6A}
{767322CA-5502-4BF7-A324-691DFE17384A} = {7E784A72-D62C-4ECF-9CA6-F6EE88619ACF}
{2E2D0BF4-85EC-45CE-9842-CDED25EE30A7} = {7E784A72-D62C-4ECF-9CA6-F6EE88619ACF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B327C65A-BD15-480D-825E-9D5A870C521A}

7
aspnet-core/LINGYUN.MicroService.BackendAdmin.sln
View File

@ -87,6 +87,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Logging", "modu
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Logging.Serilog.Elasticsearch", "modules\logging\LINGYUN.Abp.Logging.Serilog.Elasticsearch\LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj", "{EBDD5D30-7F82-46EB-A4E9-213932D14047}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Serilog.Enrichers.Application", "modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj", "{2AF1B4CF-471E-40FA-AF7B-CD730DA5EB7F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -213,6 +215,10 @@ Global
{EBDD5D30-7F82-46EB-A4E9-213932D14047}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EBDD5D30-7F82-46EB-A4E9-213932D14047}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EBDD5D30-7F82-46EB-A4E9-213932D14047}.Release|Any CPU.Build.0 = Release|Any CPU
{2AF1B4CF-471E-40FA-AF7B-CD730DA5EB7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2AF1B4CF-471E-40FA-AF7B-CD730DA5EB7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2AF1B4CF-471E-40FA-AF7B-CD730DA5EB7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2AF1B4CF-471E-40FA-AF7B-CD730DA5EB7F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -258,6 +264,7 @@ Global
{FC5C41DC-3E6E-4775-A6A2-D5B5B490B13D} = {ED23B2F3-87C1-44B6-8906-9DE739422C2C}
{0C800A57-2658-4640-99A1-A02805EE6E99} = {FC5C41DC-3E6E-4775-A6A2-D5B5B490B13D}
{EBDD5D30-7F82-46EB-A4E9-213932D14047} = {FC5C41DC-3E6E-4775-A6A2-D5B5B490B13D}
{2AF1B4CF-471E-40FA-AF7B-CD730DA5EB7F} = {FC5C41DC-3E6E-4775-A6A2-D5B5B490B13D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1573B900-87BA-4AD3-B785-6DD78127ADEF}

14
aspnet-core/LINGYUN.MicroService.Common.sln
View File

@ -176,6 +176,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Logging", "modu
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Logging.Serilog.Elasticsearch", "modules\logging\LINGYUN.Abp.Logging.Serilog.Elasticsearch\LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj", "{CD556F2A-A96B-43A2-8BB3-6C0EBA27EB02}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Serilog.Enrichers.Application", "modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj", "{CCB4AE25-7059-4CA0-A3AB-CBB863A3F672}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Localization.Dynamic", "modules\common\LINGYUN.Abp.Localization.Dynamic\LINGYUN.Abp.Localization.Dynamic.csproj", "{4635BDFB-B647-43E2-BAA5-D3C17899AF24}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -454,6 +458,14 @@ Global
{CD556F2A-A96B-43A2-8BB3-6C0EBA27EB02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD556F2A-A96B-43A2-8BB3-6C0EBA27EB02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD556F2A-A96B-43A2-8BB3-6C0EBA27EB02}.Release|Any CPU.Build.0 = Release|Any CPU
{CCB4AE25-7059-4CA0-A3AB-CBB863A3F672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CCB4AE25-7059-4CA0-A3AB-CBB863A3F672}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CCB4AE25-7059-4CA0-A3AB-CBB863A3F672}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CCB4AE25-7059-4CA0-A3AB-CBB863A3F672}.Release|Any CPU.Build.0 = Release|Any CPU
{4635BDFB-B647-43E2-BAA5-D3C17899AF24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4635BDFB-B647-43E2-BAA5-D3C17899AF24}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4635BDFB-B647-43E2-BAA5-D3C17899AF24}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4635BDFB-B647-43E2-BAA5-D3C17899AF24}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -542,6 +554,8 @@ Global
{23F4260D-87C1-4AA6-A302-0A8A76D53BA1} = {02EA4E78-5891-43BC-944F-3E52FEE032E4}
{CE7E525F-8628-4076-8A2E-B615B944D140} = {23F4260D-87C1-4AA6-A302-0A8A76D53BA1}
{CD556F2A-A96B-43A2-8BB3-6C0EBA27EB02} = {23F4260D-87C1-4AA6-A302-0A8A76D53BA1}
{CCB4AE25-7059-4CA0-A3AB-CBB863A3F672} = {23F4260D-87C1-4AA6-A302-0A8A76D53BA1}
{4635BDFB-B647-43E2-BAA5-D3C17899AF24} = {E73A0F8B-2B4B-4CED-82A4-1EE5E0B89744}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {06C707C6-02C0-411A-AD3B-2D0E13787CB8}

27
aspnet-core/LINGYUN.MicroService.IdentityServer.sln
View File

@ -59,6 +59,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "theming", "theming", "{1D7C
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Identity.WeChat", "modules\wechat\LINGYUN.Abp.Identity.WeChat\LINGYUN.Abp.Identity.WeChat.csproj", "{46C3E5D2-7738-4C0F-AC51-C61A024CAF23}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "logging", "logging", "{ACA1734A-4BF5-4DF9-94CF-3E5B3535B480}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "auditing", "auditing", "{42D02351-CF36-402A-B89A-F10D3DAD8EC8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging", "modules\auditing\LINGYUN.Abp.AuditLogging\LINGYUN.Abp.AuditLogging.csproj", "{6D86FA60-9969-4401-851C-6B8845B3FCC9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging.Elasticsearch", "modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj", "{489CC1F9-C648-4E3C-869B-0CEE0454EE9E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Serilog.Enrichers.Application", "modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj", "{596F645E-19F4-45C4-BED6-7BB6B32F5684}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -141,6 +151,18 @@ Global
{46C3E5D2-7738-4C0F-AC51-C61A024CAF23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46C3E5D2-7738-4C0F-AC51-C61A024CAF23}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46C3E5D2-7738-4C0F-AC51-C61A024CAF23}.Release|Any CPU.Build.0 = Release|Any CPU
{6D86FA60-9969-4401-851C-6B8845B3FCC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D86FA60-9969-4401-851C-6B8845B3FCC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D86FA60-9969-4401-851C-6B8845B3FCC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6D86FA60-9969-4401-851C-6B8845B3FCC9}.Release|Any CPU.Build.0 = Release|Any CPU
{489CC1F9-C648-4E3C-869B-0CEE0454EE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{489CC1F9-C648-4E3C-869B-0CEE0454EE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{489CC1F9-C648-4E3C-869B-0CEE0454EE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{489CC1F9-C648-4E3C-869B-0CEE0454EE9E}.Release|Any CPU.Build.0 = Release|Any CPU
{596F645E-19F4-45C4-BED6-7BB6B32F5684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{596F645E-19F4-45C4-BED6-7BB6B32F5684}.Debug|Any CPU.Build.0 = Debug|Any CPU
{596F645E-19F4-45C4-BED6-7BB6B32F5684}.Release|Any CPU.ActiveCfg = Release|Any CPU
{596F645E-19F4-45C4-BED6-7BB6B32F5684}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -171,6 +193,11 @@ Global
{D63C0CA8-554D-43F2-8DB4-8B464E4C1CDA} = {98887A8F-7040-4FA1-842F-A4C77A61ED09}
{79CAF2CA-E9E1-48A5-A21F-3786383C12E0} = {98887A8F-7040-4FA1-842F-A4C77A61ED09}
{46C3E5D2-7738-4C0F-AC51-C61A024CAF23} = {AF8AECC8-0F42-4FC5-B3C0-00987BA8279F}
{ACA1734A-4BF5-4DF9-94CF-3E5B3535B480} = {7C727110-59CA-495B-8143-C5DDEDE41289}
{42D02351-CF36-402A-B89A-F10D3DAD8EC8} = {7C727110-59CA-495B-8143-C5DDEDE41289}
{6D86FA60-9969-4401-851C-6B8845B3FCC9} = {42D02351-CF36-402A-B89A-F10D3DAD8EC8}
{489CC1F9-C648-4E3C-869B-0CEE0454EE9E} = {42D02351-CF36-402A-B89A-F10D3DAD8EC8}
{596F645E-19F4-45C4-BED6-7BB6B32F5684} = {ACA1734A-4BF5-4DF9-94CF-3E5B3535B480}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FCB77471-9ECB-4666-A316-1D6A6285A468}

27
aspnet-core/LINGYUN.MicroService.IdentityServerAdmin.sln
View File

@ -75,6 +75,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AspNetCore.Mvc.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.WeChat.MiniProgram", "modules\wechat\LINGYUN.Abp.WeChat.MiniProgram\LINGYUN.Abp.WeChat.MiniProgram.csproj", "{AD1C3335-A2A1-49C1-A6DB-817C54859B65}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "auditing", "auditing", "{B603FEC6-2944-4F95-9090-23F1E7076115}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "logging", "logging", "{80E73A15-533B-41A2-A156-0EE7FF9B9C1B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging", "modules\auditing\LINGYUN.Abp.AuditLogging\LINGYUN.Abp.AuditLogging.csproj", "{5A56F74D-C903-4D9E-A7BD-819C4B793776}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging.Elasticsearch", "modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj", "{8906DFC9-EA5C-4CDF-9196-8E85D37E8EAC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Serilog.Enrichers.Application", "modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj", "{83168929-00E1-468C-8AD4-2C142E7B9ED6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -193,6 +203,18 @@ Global
{AD1C3335-A2A1-49C1-A6DB-817C54859B65}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD1C3335-A2A1-49C1-A6DB-817C54859B65}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AD1C3335-A2A1-49C1-A6DB-817C54859B65}.Release|Any CPU.Build.0 = Release|Any CPU
{5A56F74D-C903-4D9E-A7BD-819C4B793776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A56F74D-C903-4D9E-A7BD-819C4B793776}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A56F74D-C903-4D9E-A7BD-819C4B793776}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A56F74D-C903-4D9E-A7BD-819C4B793776}.Release|Any CPU.Build.0 = Release|Any CPU
{8906DFC9-EA5C-4CDF-9196-8E85D37E8EAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8906DFC9-EA5C-4CDF-9196-8E85D37E8EAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8906DFC9-EA5C-4CDF-9196-8E85D37E8EAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8906DFC9-EA5C-4CDF-9196-8E85D37E8EAC}.Release|Any CPU.Build.0 = Release|Any CPU
{83168929-00E1-468C-8AD4-2C142E7B9ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83168929-00E1-468C-8AD4-2C142E7B9ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83168929-00E1-468C-8AD4-2C142E7B9ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83168929-00E1-468C-8AD4-2C142E7B9ED6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -232,6 +254,11 @@ Global
{70C4FA43-0526-48E3-B852-A21395502604} = {89BA9708-62E5-4FD6-A28A-CF9E1C26DCAE}
{B3181D37-F379-4E16-8621-5E739C519393} = {FD2DDD48-8F84-4924-BBAF-52080AB32267}
{AD1C3335-A2A1-49C1-A6DB-817C54859B65} = {7EE9651C-17B0-4343-A2ED-92439F8C9019}
{B603FEC6-2944-4F95-9090-23F1E7076115} = {14B8F528-C649-4FAD-9BBB-6C979ED403E1}
{80E73A15-533B-41A2-A156-0EE7FF9B9C1B} = {14B8F528-C649-4FAD-9BBB-6C979ED403E1}
{5A56F74D-C903-4D9E-A7BD-819C4B793776} = {B603FEC6-2944-4F95-9090-23F1E7076115}
{8906DFC9-EA5C-4CDF-9196-8E85D37E8EAC} = {B603FEC6-2944-4F95-9090-23F1E7076115}
{83168929-00E1-468C-8AD4-2C142E7B9ED6} = {80E73A15-533B-41A2-A156-0EE7FF9B9C1B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {785FFF4D-BC59-499E-88A3-7CB7A7667228}

35
aspnet-core/LINGYUN.MicroService.Localization.sln
View File

@ -19,17 +19,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Localization.Dy
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.LocalizationManagement.Domain", "modules\lt\LINGYUN.Abp.LocalizationManagement.Domain\LINGYUN.Abp.LocalizationManagement.Domain.csproj", "{56AE0031-E7A1-4848-B49B-748C85BA596E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore", "modules\lt\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj", "{FAB14701-1EC3-434F-86B3-8E74E32C863C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore", "modules\lt\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj", "{FAB14701-1EC3-434F-86B3-8E74E32C863C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.LocalizationManagement.Application.Contracts", "modules\lt\LINGYUN.Abp.LocalizationManagement.Application.Contracts\LINGYUN.Abp.LocalizationManagement.Application.Contracts.csproj", "{3BE4838C-835C-4D8E-A2A6-8B8ED82E9438}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.LocalizationManagement.Application.Contracts", "modules\lt\LINGYUN.Abp.LocalizationManagement.Application.Contracts\LINGYUN.Abp.LocalizationManagement.Application.Contracts.csproj", "{3BE4838C-835C-4D8E-A2A6-8B8ED82E9438}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.LocalizationManagement.Application", "modules\lt\LINGYUN.Abp.LocalizationManagement.Application\LINGYUN.Abp.LocalizationManagement.Application.csproj", "{58A101BA-386B-4783-B720-4E0AAC71D170}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.LocalizationManagement.Application", "modules\lt\LINGYUN.Abp.LocalizationManagement.Application\LINGYUN.Abp.LocalizationManagement.Application.csproj", "{58A101BA-386B-4783-B720-4E0AAC71D170}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "controllers", "controllers", "{56389F5B-58D0-4763-9E88-D2464C305E2A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.LocalizationManagement.HttpApi", "modules\lt\LINGYUN.Abp.LocalizationManagement.HttpApi\LINGYUN.Abp.LocalizationManagement.HttpApi.csproj", "{473785CC-C076-4D6F-AA1A-FAD4CFE73244}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.LocalizationManagement.HttpApi", "modules\lt\LINGYUN.Abp.LocalizationManagement.HttpApi\LINGYUN.Abp.LocalizationManagement.HttpApi.csproj", "{473785CC-C076-4D6F-AA1A-FAD4CFE73244}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.LocalizationManagement.HttpApi.Host", "services\localization\LINGYUN.Abp.LocalizationManagement.HttpApi.Host\LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj", "{4535F41E-7DAC-4025-BACC-025843445A1C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.LocalizationManagement.HttpApi.Host", "services\localization\LINGYUN.Abp.LocalizationManagement.HttpApi.Host\LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj", "{4535F41E-7DAC-4025-BACC-025843445A1C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.EventBus.CAP", "modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.csproj", "{E984184E-066E-4E66-A044-284EB7062EF3}"
EndProject
@ -37,6 +37,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.ExceptionHandli
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.MultiTenancy.DbFinder", "modules\tenants\LINGYUN.Abp.MultiTenancy.DbFinder\LINGYUN.Abp.MultiTenancy.DbFinder.csproj", "{C28D515B-A1A8-480E-9341-E25AE6C8A8A8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "logging", "logging", "{F89D9154-58D8-4F26-8DD7-F907D68DB9E5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "auditing", "auditing", "{0C15D7EE-42C4-4FB5-9970-8ED75B02EE9E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Serilog.Enrichers.Application", "modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj", "{7BC49B77-7EFF-4998-9628-748DF18125C6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging", "modules\auditing\LINGYUN.Abp.AuditLogging\LINGYUN.Abp.AuditLogging.csproj", "{B71D1883-106A-409B-958A-2D1F561F4357}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging.Elasticsearch", "modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj", "{EB92BC91-D883-4AB0-9F93-72AA9D7CC68C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -87,6 +97,18 @@ Global
{C28D515B-A1A8-480E-9341-E25AE6C8A8A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C28D515B-A1A8-480E-9341-E25AE6C8A8A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C28D515B-A1A8-480E-9341-E25AE6C8A8A8}.Release|Any CPU.Build.0 = Release|Any CPU
{7BC49B77-7EFF-4998-9628-748DF18125C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7BC49B77-7EFF-4998-9628-748DF18125C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7BC49B77-7EFF-4998-9628-748DF18125C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7BC49B77-7EFF-4998-9628-748DF18125C6}.Release|Any CPU.Build.0 = Release|Any CPU
{B71D1883-106A-409B-958A-2D1F561F4357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B71D1883-106A-409B-958A-2D1F561F4357}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B71D1883-106A-409B-958A-2D1F561F4357}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B71D1883-106A-409B-958A-2D1F561F4357}.Release|Any CPU.Build.0 = Release|Any CPU
{EB92BC91-D883-4AB0-9F93-72AA9D7CC68C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB92BC91-D883-4AB0-9F93-72AA9D7CC68C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB92BC91-D883-4AB0-9F93-72AA9D7CC68C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB92BC91-D883-4AB0-9F93-72AA9D7CC68C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -103,6 +125,9 @@ Global
{E984184E-066E-4E66-A044-284EB7062EF3} = {19D90C55-2B0C-4E41-8BE5-23BA946071DB}
{FA58403F-8933-4624-B683-2B35E50193E8} = {19D90C55-2B0C-4E41-8BE5-23BA946071DB}
{C28D515B-A1A8-480E-9341-E25AE6C8A8A8} = {19D90C55-2B0C-4E41-8BE5-23BA946071DB}
{7BC49B77-7EFF-4998-9628-748DF18125C6} = {F89D9154-58D8-4F26-8DD7-F907D68DB9E5}
{B71D1883-106A-409B-958A-2D1F561F4357} = {0C15D7EE-42C4-4FB5-9970-8ED75B02EE9E}
{EB92BC91-D883-4AB0-9F93-72AA9D7CC68C} = {0C15D7EE-42C4-4FB5-9970-8ED75B02EE9E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F65E7489-B7F7-469E-8D24-7CBEEBACD119}

27
aspnet-core/LINGYUN.MicroService.Messages.sln
View File

@ -83,6 +83,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.EventBus.CAP",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Identity.WeChat", "modules\wechat\LINGYUN.Abp.Identity.WeChat\LINGYUN.Abp.Identity.WeChat.csproj", "{DC71289C-18A7-4E4B-A653-E66941EB19AE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "auditing", "auditing", "{F566D959-7F56-4EB4-A448-A87AEFC92178}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "logging", "logging", "{91E005C0-3A78-47C2-86F1-A21362ED350E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Serilog.Enrichers.Application", "modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj", "{321FC8A7-D595-431A-AC14-1F5E1B901BCF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging", "modules\auditing\LINGYUN.Abp.AuditLogging\LINGYUN.Abp.AuditLogging.csproj", "{4D594462-D10D-46AF-980E-95EDE676F1CF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging.Elasticsearch", "modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj", "{69F5D2A0-480E-4461-9C30-1678F23258C1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -225,6 +235,18 @@ Global
{DC71289C-18A7-4E4B-A653-E66941EB19AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DC71289C-18A7-4E4B-A653-E66941EB19AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC71289C-18A7-4E4B-A653-E66941EB19AE}.Release|Any CPU.Build.0 = Release|Any CPU
{321FC8A7-D595-431A-AC14-1F5E1B901BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{321FC8A7-D595-431A-AC14-1F5E1B901BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{321FC8A7-D595-431A-AC14-1F5E1B901BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{321FC8A7-D595-431A-AC14-1F5E1B901BCF}.Release|Any CPU.Build.0 = Release|Any CPU
{4D594462-D10D-46AF-980E-95EDE676F1CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D594462-D10D-46AF-980E-95EDE676F1CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D594462-D10D-46AF-980E-95EDE676F1CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D594462-D10D-46AF-980E-95EDE676F1CF}.Release|Any CPU.Build.0 = Release|Any CPU
{69F5D2A0-480E-4461-9C30-1678F23258C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69F5D2A0-480E-4461-9C30-1678F23258C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69F5D2A0-480E-4461-9C30-1678F23258C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69F5D2A0-480E-4461-9C30-1678F23258C1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -267,6 +289,11 @@ Global
{32D4DB5D-74D1-4166-85EA-B2D8F14B8058} = {C00828FB-E7D5-4086-BA50-02022594AB73}
{C49B50D4-5D63-47E6-82F7-E742181CF9DE} = {C00828FB-E7D5-4086-BA50-02022594AB73}
{DC71289C-18A7-4E4B-A653-E66941EB19AE} = {78164C5C-63B9-4FB6-ACC9-6496E236C946}
{F566D959-7F56-4EB4-A448-A87AEFC92178} = {0C7AA298-2957-4D71-A8F1-1C3C7932A1B3}
{91E005C0-3A78-47C2-86F1-A21362ED350E} = {0C7AA298-2957-4D71-A8F1-1C3C7932A1B3}
{321FC8A7-D595-431A-AC14-1F5E1B901BCF} = {91E005C0-3A78-47C2-86F1-A21362ED350E}
{4D594462-D10D-46AF-980E-95EDE676F1CF} = {F566D959-7F56-4EB4-A448-A87AEFC92178}
{69F5D2A0-480E-4461-9C30-1678F23258C1} = {F566D959-7F56-4EB4-A448-A87AEFC92178}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6238659A-7267-49B9-A499-8746BDEED6B8}

27
aspnet-core/LINGYUN.MicroService.Platform.sln
View File

@ -74,6 +74,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.SettingManageme
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OssManagement.SettingManagement", "modules\oss-management\LINGYUN.Abp.OssManagement.SettingManagement\LINGYUN.Abp.OssManagement.SettingManagement.csproj", "{07D1B07A-3C95-40A8-AA53-619EC067FD45}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "auditing", "auditing", "{20E8BAE5-C13E-4F86-9EB0-EF24F50442B5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "logging", "logging", "{D845545B-57C4-43A1-985B-23C372340CD6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging", "modules\auditing\LINGYUN.Abp.AuditLogging\LINGYUN.Abp.AuditLogging.csproj", "{04D53D5C-873D-4A66-98D4-88195E927E20}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging.Elasticsearch", "modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj", "{F90823E2-53DC-4751-BCCD-6C11B3899592}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Serilog.Enrichers.Application", "modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj", "{6C048526-5A14-4835-B8BA-1C0C6E887225}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -184,6 +194,18 @@ Global
{07D1B07A-3C95-40A8-AA53-619EC067FD45}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07D1B07A-3C95-40A8-AA53-619EC067FD45}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07D1B07A-3C95-40A8-AA53-619EC067FD45}.Release|Any CPU.Build.0 = Release|Any CPU
{04D53D5C-873D-4A66-98D4-88195E927E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{04D53D5C-873D-4A66-98D4-88195E927E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04D53D5C-873D-4A66-98D4-88195E927E20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{04D53D5C-873D-4A66-98D4-88195E927E20}.Release|Any CPU.Build.0 = Release|Any CPU
{F90823E2-53DC-4751-BCCD-6C11B3899592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F90823E2-53DC-4751-BCCD-6C11B3899592}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F90823E2-53DC-4751-BCCD-6C11B3899592}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F90823E2-53DC-4751-BCCD-6C11B3899592}.Release|Any CPU.Build.0 = Release|Any CPU
{6C048526-5A14-4835-B8BA-1C0C6E887225}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C048526-5A14-4835-B8BA-1C0C6E887225}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C048526-5A14-4835-B8BA-1C0C6E887225}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C048526-5A14-4835-B8BA-1C0C6E887225}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -220,6 +242,11 @@ Global
{3855CE63-91CF-4F96-97F6-BEAB444B25CB} = {15BDA03E-DE8E-46E4-96A8-CA3F2872E812}
{D1D288D1-3178-439F-8EFD-E29D6F66E673} = {3855CE63-91CF-4F96-97F6-BEAB444B25CB}
{07D1B07A-3C95-40A8-AA53-619EC067FD45} = {C7D0EB39-3418-4A7C-AD94-FAB76F023E88}
{20E8BAE5-C13E-4F86-9EB0-EF24F50442B5} = {15BDA03E-DE8E-46E4-96A8-CA3F2872E812}
{D845545B-57C4-43A1-985B-23C372340CD6} = {15BDA03E-DE8E-46E4-96A8-CA3F2872E812}
{04D53D5C-873D-4A66-98D4-88195E927E20} = {20E8BAE5-C13E-4F86-9EB0-EF24F50442B5}
{F90823E2-53DC-4751-BCCD-6C11B3899592} = {20E8BAE5-C13E-4F86-9EB0-EF24F50442B5}
{6C048526-5A14-4835-B8BA-1C0C6E887225} = {D845545B-57C4-43A1-985B-23C372340CD6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {03D3B66F-8926-4C00-B7AB-A21761EC859E}

9
aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN/Abp/AuditLogging/Elasticsearch/ElasticsearchSecurityLogManager.cs
View File

@ -18,6 +18,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
[Dependency(ReplaceServices = true)]
public class ElasticsearchSecurityLogManager : ISecurityLogManager, ISingletonDependency
{
private readonly AbpSecurityLogOptions _securityLogOptions;
private readonly AbpElasticsearchOptions _elasticsearchOptions;
private readonly AbpAuditLoggingElasticsearchOptions _options;
private readonly ICurrentTenant _currentTenant;
@ -29,6 +30,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
public ElasticsearchSecurityLogManager(
ICurrentTenant currentTenant,
IGuidGenerator guidGenerator,
IOptions<AbpSecurityLogOptions> securityLogOptions,
IOptions<AbpElasticsearchOptions> elasticsearchOptions,
IOptions<AbpAuditLoggingElasticsearchOptions> options,
IElasticsearchClientFactory clientFactory)
@ -37,6 +39,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
_currentTenant = currentTenant;
_guidGenerator = guidGenerator;
_clientFactory = clientFactory;
_securityLogOptions = securityLogOptions.Value;
_elasticsearchOptions = elasticsearchOptions.Value;
Logger = NullLogger<ElasticsearchSecurityLogManager>.Instance;
@ -46,6 +49,12 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
SecurityLogInfo securityLogInfo,
CancellationToken cancellationToken = default(CancellationToken))
{
// TODO: 框架不把这玩意儿放在 ISecurityLogManager?
if (!_securityLogOptions.IsEnabled)
{
return;
}
var client = _clientFactory.Create();
var securityLog = new SecurityLog(

1
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Logging/Dto/LogFieldDto.cs
View File

@ -4,6 +4,7 @@
{
public string MachineName { get; set; }
public string Environment { get; set; }
public string Application { get; set; }
public string Context { get; set; }
public string ActionId { get; set; }
public string ActionName { get; set; }

1
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Logging/Dto/LogGetByPagedDto.cs
View File

@ -9,6 +9,7 @@ namespace LINGYUN.Abp.Auditing.Logging
public DateTime? EndTime { get; set; }
public string MachineName { get; set; }
public string Environment { get; set; }
public string Application { get; set; }
public string Context { get; set; }
public string RequestId { get; set; }
public string RequestPath { get; set; }

15
aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN/Abp/Auditing/Logging/LogAppService.cs
View File

@ -26,18 +26,19 @@ namespace LINGYUN.Abp.Auditing.Logging
var count = await _manager.GetCountAsync(
input.StartTime, input.EndTime,
input.MachineName, input.Environment,
input.Context, input.RequestId,
input.RequestPath, input.CorrelationId,
input.ProcessId, input.ThreadId,
input.HasException);
input.Application, input.Context,
input.RequestId, input.RequestPath,
input.CorrelationId, input.ProcessId,
input.ThreadId, input.HasException);
var logs = await _manager.GetListAsync(
input.Sorting, input.MaxResultCount, input.SkipCount,
input.StartTime, input.EndTime,
input.MachineName, input.Environment, input.Context,
input.MachineName, input.Environment,
input.Application, input.Context,
input.RequestId, input.RequestPath,
input.CorrelationId, input.ProcessId, input.ThreadId,
input.HasException,
input.CorrelationId, input.ProcessId,
input.ThreadId, input.HasException,
includeDetails: false);
return new PagedResultDto<LogDto>(count,

1
aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj
View File

@ -14,6 +14,7 @@
<ItemGroup>
<ProjectReference Include="..\..\elasticsearch\LINGYUN.Abp.Elasticsearch\LINGYUN.Abp.Elasticsearch.csproj" />
<ProjectReference Include="..\LINGYUN.Abp.Logging\LINGYUN.Abp.Logging.csproj" />
<ProjectReference Include="..\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
</ItemGroup>
</Project>

12
aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs
View File

@ -67,6 +67,7 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
DateTime? endTime = null,
string machineName = null,
string environment = null,
string application = null,
string context = null,
string requestId = null,
string requestPath = null,
@ -83,6 +84,7 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
endTime,
machineName,
environment,
application,
context,
requestId,
requestPath,
@ -107,6 +109,9 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
/// <param name="skipCount"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="machineName"></param>
/// <param name="environment"></param>
/// <param name="application"></param>
/// <param name="context"></param>
/// <param name="requestId"></param>
/// <param name="requestPath"></param>
@ -125,6 +130,7 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
DateTime? endTime = null,
string machineName = null,
string environment = null,
string application = null,
string context = null,
string requestId = null,
string requestPath = null,
@ -145,6 +151,7 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
endTime,
machineName,
environment,
application,
context,
requestId,
requestPath,
@ -182,6 +189,7 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
DateTime? endTime = null,
string machineName = null,
string environment = null,
string application = null,
string context = null,
string requestId = null,
string requestPath = null,
@ -208,6 +216,10 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
{
querys.Add((log) => log.Term((q) => q.Field((f) => f.Fields.Environment.Suffix("keyword")).Value(environment)));
}
if (!application.IsNullOrWhiteSpace())
{
querys.Add((log) => log.Term((q) => q.Field((f) => f.Fields.Application.Suffix("keyword")).Value(application)));
}
if (!context.IsNullOrWhiteSpace())
{
querys.Add((log) => log.Term((q) => q.Field((f) => f.Fields.Context.Suffix("keyword")).Value(context)));

7
aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogField.cs
View File

@ -1,4 +1,6 @@
namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
using LINGYUN.Abp.Serilog.Enrichers.Application;
namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch
{
public class SerilogField
{
@ -8,6 +10,9 @@
[Nest.PropertyName(AbpLoggingEnricherPropertyNames.EnvironmentName)]
public string Environment { get; set; }
[Nest.PropertyName(AbpSerilogEnrichersConsts.ApplicationNamePropertyName)]
public string Application { get; set; }
[Nest.PropertyName("SourceContext")]
public string Context { get; set; }

2
aspnet-core/modules/logging/LINGYUN.Abp.Logging/LINGYUN/Abp/AuditLogging/DefaultLoggingManager.cs
View File

@ -30,6 +30,7 @@ namespace LINGYUN.Abp.Logging
DateTime? endTime = null,
string machineName = null,
string environment = null,
string application = null,
string context = null,
string requestId = null,
string requestPath = null,
@ -51,6 +52,7 @@ namespace LINGYUN.Abp.Logging
DateTime? endTime = null,
string machineName = null,
string environment = null,
string application = null,
string context = null,
string requestId = null,
string requestPath = null,

2
aspnet-core/modules/logging/LINGYUN.Abp.Logging/LINGYUN/Abp/AuditLogging/ILoggingManager.cs
View File

@ -16,6 +16,7 @@ namespace LINGYUN.Abp.Logging
DateTime? endTime = null,
string machineName = null,
string environment = null,
string application = null,
string context = null,
string requestId = null,
string requestPath = null,
@ -33,6 +34,7 @@ namespace LINGYUN.Abp.Logging
DateTime? endTime = null,
string machineName = null,
string environment = null,
string application = null,
string context = null,
string requestId = null,
string requestPath = null,

1
aspnet-core/modules/logging/LINGYUN.Abp.Logging/LINGYUN/Abp/AuditLogging/LogField.cs
View File

@ -4,6 +4,7 @@
{
public string MachineName { get; set; }
public string Environment { get; set; }
public string Application { get; set; }
public string Context { get; set; }
public string ActionId { get; set; }
public string ActionName { get; set; }

16
aspnet-core/modules/logging/LINGYUN.Abp.Logging/README.md
View File

@ -13,19 +13,3 @@ public class YouProjectModule : AbpModule
// other
}
```
## 配置项
* AbpLoggingOptions.ApplicationPropertyName 用于自定义ApplicationName字段的名称
* AbpLoggingOptions.ApplicationName 在日志中标识当前应用的名称
## appsettings.json
```json
{
"Logging": {
"ApplicationName": "app"
}
}
```

15
aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN.Abp.Serilog.Enrichers.Application.csproj
View File

@ -0,0 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Volo.Abp.Core" Version="4.4.0" />
</ItemGroup>
</Project>

8
aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN/Abp/Serilog/Enrichers/Application/AbpSerilogEnrichersApplicationModule.cs
View File

@ -0,0 +1,8 @@
using Volo.Abp.Modularity;
namespace LINGYUN.Abp.Serilog.Enrichers.Application
{
public class AbpSerilogEnrichersApplicationModule : AbpModule
{
}
}

8
aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN/Abp/Serilog/Enrichers/Application/AbpSerilogEnrichersConsts.cs
View File

@ -0,0 +1,8 @@
namespace LINGYUN.Abp.Serilog.Enrichers.Application
{
public class AbpSerilogEnrichersConsts
{
public const string ApplicationNamePropertyName = "ApplicationName";
public static string ApplicationName { get; set; } = "app";
}
}

29
aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN/Abp/Serilog/Enrichers/Application/ApplicationNameEnricher.cs
View File

@ -0,0 +1,29 @@
using Serilog.Core;
using Serilog.Events;
namespace LINGYUN.Abp.Serilog.Enrichers.Application
{
public class ApplicationNameEnricher : ILogEventEnricher
{
LogEventProperty _cachedProperty;
public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
{
logEvent.AddPropertyIfAbsent(GetLogEventProperty(propertyFactory));
}
private LogEventProperty GetLogEventProperty(ILogEventPropertyFactory propertyFactory)
{
if (_cachedProperty == null)
_cachedProperty = CreateProperty(propertyFactory);
return _cachedProperty;
}
private static LogEventProperty CreateProperty(ILogEventPropertyFactory propertyFactory)
{
return propertyFactory.CreateProperty(
AbpSerilogEnrichersConsts.ApplicationNamePropertyName,
AbpSerilogEnrichersConsts.ApplicationName);
}
}
}

48
aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/README.md
View File

@ -0,0 +1,48 @@
# LINGYUN.Abp.Serilog.Enrichers.Application
日志属性添加应用程序标识
## 模块引用
```csharp
[DependsOn(typeof(AbpSerilogEnrichersApplicationModule))]
public class YouProjectModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
AbpSerilogEnrichersConsts.ApplicationName = "demo-app";
}
}
```
## 配置项
以下为字段常量,需要明确变更
* AbpSerilogEnrichersConsts.ApplicationNamePropertyName 用于自定义ApplicationName字段的名称
* AbpSerilogEnrichersConsts.ApplicationName 在日志中标识当前应用的名称
## How to Use
```csharp
Log.Logger = new LoggerConfiguration()
.Enrich.WithApplicationName()
// ...other configuration...
.CreateLogger();
```
**Or**
```json
{
"Serilog": {
"MinimumLevel": {
"Default": "Information"
},
"Enrich": [ "WithApplicationName" ]
}
}
```

16
aspnet-core/modules/logging/LINGYUN.Abp.Serilog.Enrichers.Application/Serilog/ApplicationLoggerConfigurationExtensions.cs
View File

@ -0,0 +1,16 @@
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Serilog.Configuration;
using System;
namespace Serilog
{
public static class ApplicationLoggerConfigurationExtensions
{
public static LoggerConfiguration WithApplicationName(
this LoggerEnrichmentConfiguration enrichmentConfiguration)
{
if (enrichmentConfiguration == null) throw new ArgumentNullException(nameof(enrichmentConfiguration));
return enrichmentConfiguration.With<ApplicationNameEnricher>();
}
}
}

54
aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.Configure.cs
View File

@ -1,18 +1,25 @@
using Microsoft.AspNetCore.Cors;
using DotNetCore.CAP;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Caching.StackExchangeRedis;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using StackExchange.Redis;
using System;
using System.IO;
using System.Linq;
using System.Security.Cryptography.X509Certificates;
using System.Text.Encodings.Web;
using System.Text.Unicode;
using Volo.Abp.Account.Localization;
using Volo.Abp.Auditing;
using Volo.Abp.Caching;
using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.IdentityServer;
using Volo.Abp.Json.SystemTextJson;
using Volo.Abp.Localization;
using Volo.Abp.MultiTenancy;
@ -23,6 +30,51 @@ namespace AuthServer.Host
{
public partial class AuthIdentityServerModule
{
private void PreConfigureApp()
{
AbpSerilogEnrichersConsts.ApplicationName = "Identity-Server-STS";
}
private void PreConfigureCAP(IConfiguration configuration)
{
PreConfigure<CapOptions>(options =>
{
options
.UseMySql(configuration.GetConnectionString("Default"))
.UseRabbitMQ(rabbitMQOptions =>
{
configuration.GetSection("CAP:RabbitMQ").Bind(rabbitMQOptions);
})
.UseDashboard();
});
}
private void PreConfigureCertificate(IConfiguration configuration, IWebHostEnvironment environment)
{
var cerConfig = configuration.GetSection("Certificates");
if (environment.IsProduction() &&
cerConfig.Exists())
{
// 开发环境下存在证书配置
// 且证书文件存在则使用自定义的证书文件来启动Ids服务器
var cerPath = Path.Combine(environment.ContentRootPath, cerConfig["CerPath"]);
if (File.Exists(cerPath))
{
PreConfigure<AbpIdentityServerBuilderOptions>(options =>
{
options.AddDeveloperSigningCredential = false;
});
var cer = new X509Certificate2(cerPath, cerConfig["Password"]);
PreConfigure<IIdentityServerBuilder>(builder =>
{
builder.AddSigningCredential(cer);
});
}
}
}
private void ConfigureDbContext()
{
Configure<AbpDbContextOptions>(options =>

47
aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs
View File

@ -1,5 +1,4 @@
using DotNetCore.CAP;
using LINGYUN.Abp.AspNetCore.HttpOverrides;
using LINGYUN.Abp.AspNetCore.HttpOverrides;
using LINGYUN.Abp.AuditLogging.Elasticsearch;
using LINGYUN.Abp.EventBus.CAP;
using LINGYUN.Abp.Identity.EntityFrameworkCore;
@ -8,14 +7,12 @@ using LINGYUN.Abp.IdentityServer.EntityFrameworkCore;
using LINGYUN.Abp.IdentityServer.WeChat;
using LINGYUN.Abp.MultiTenancy.DbFinder;
using LINGYUN.Abp.PermissionManagement.Identity;
using LINGYUN.Abp.Serilog.Enrichers.Application;
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 System.IO;
using System.Security.Cryptography.X509Certificates;
using Volo.Abp;
using Volo.Abp.Account;
using Volo.Abp.Account.Web;
@ -28,7 +25,6 @@ using Volo.Abp.Caching.StackExchangeRedis;
using Volo.Abp.EntityFrameworkCore.MySQL;
using Volo.Abp.FeatureManagement.EntityFrameworkCore;
using Volo.Abp.Identity;
using Volo.Abp.IdentityServer;
using Volo.Abp.IdentityServer.Jwt;
using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement.EntityFrameworkCore;
@ -38,8 +34,8 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace AuthServer.Host
{
[DependsOn(
typeof(AbpSerilogEnrichersApplicationModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAuditLoggingElasticsearchModule),
typeof(AbpAccountWebIdentityServerModule),
typeof(AbpAccountApplicationModule),
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
@ -58,6 +54,7 @@ namespace AuthServer.Host
typeof(AbpFeatureManagementEntityFrameworkCoreModule),
typeof(AbpTenantManagementEntityFrameworkCoreModule),
typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
typeof(AbpAuditLoggingElasticsearchModule), // 放在 AbpIdentity 模块之后,避免被覆盖
typeof(AbpAspNetCoreHttpOverridesModule),
typeof(AbpDbFinderMultiTenancyModule),
typeof(AbpCAPEventBusModule),
@ -72,39 +69,9 @@ namespace AuthServer.Host
var configuration = context.Services.GetConfiguration();
var hostingEnvironment = context.Services.GetHostingEnvironment();
PreConfigure<CapOptions>(options =>
{
options
.UseMySql(configuration.GetConnectionString("Default"))
.UseRabbitMQ(rabbitMQOptions =>
{
configuration.GetSection("CAP:RabbitMQ").Bind(rabbitMQOptions);
})
.UseDashboard();
});
var cerConfig = configuration.GetSection("Certificates");
if (hostingEnvironment.IsProduction() &&
cerConfig.Exists())
{
// 开发环境下存在证书配置
// 且证书文件存在则使用自定义的证书文件来启动Ids服务器
var cerPath = Path.Combine(hostingEnvironment.ContentRootPath, cerConfig["CerPath"]);
if (File.Exists(cerPath))
{
PreConfigure<AbpIdentityServerBuilderOptions>(options =>
{
options.AddDeveloperSigningCredential = false;
});
var cer = new X509Certificate2(cerPath, cerConfig["Password"]);
PreConfigure<IIdentityServerBuilder>(builder =>
{
builder.AddSigningCredential(cer);
});
}
}
PreConfigureApp();
PreConfigureCAP(configuration);
PreConfigureCertificate(configuration, hostingEnvironment);
}
public override void ConfigureServices(ServiceConfigurationContext context)

1
aspnet-core/services/account/AuthServer.Host/AuthServer.Host.csproj
View File

@ -64,6 +64,7 @@
<ProjectReference Include="..\..\..\modules\identityServer\LINGYUN.Abp.IdentityServer.WeChat\LINGYUN.Abp.IdentityServer.WeChat.csproj" />
<ProjectReference Include="..\..\..\modules\identity\LINGYUN.Abp.Identity.EntityFrameworkCore\LINGYUN.Abp.Identity.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\identity\LINGYUN.Abp.PermissionManagement.Domain.Identity\LINGYUN.Abp.PermissionManagement.Domain.Identity.csproj" />
<ProjectReference Include="..\..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
<ProjectReference Include="..\..\..\modules\tenants\LINGYUN.Abp.MultiTenancy.DbFinder\LINGYUN.Abp.MultiTenancy.DbFinder.csproj" />
<ProjectReference Include="..\..\..\modules\tenants\LINGYUN.Abp.MultiTenancy\LINGYUN.Abp.MultiTenancy.csproj" />
</ItemGroup>

2
aspnet-core/services/account/AuthServer.Host/appsettings.json
View File

@ -13,7 +13,7 @@
"DotNetCore": "Information"
}
},
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName" ],
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName" ],
"WriteTo": [
{
"Name": "Console",

6
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.Configure.cs
View File

@ -1,6 +1,7 @@
using DotNetCore.CAP;
using LINGYUN.Abp.ExceptionHandling;
using LINGYUN.Abp.ExceptionHandling.Emailing;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.Extensions.Caching.StackExchangeRedis;
@ -28,6 +29,11 @@ namespace LINGYUN.Abp.BackendAdmin
{
public partial class BackendAdminHostModule
{
private void PreConfigureApp()
{
AbpSerilogEnrichersConsts.ApplicationName = "Backend-Admin";
}
private void PreConfigureCAP(IConfiguration configuration)
{
PreConfigure<CapOptions>(options =>

3
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs
View File

@ -8,6 +8,7 @@ using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore;
using LINGYUN.Abp.Logging.Serilog.Elasticsearch;
using LINGYUN.Abp.MultiTenancy.DbFinder;
using LINGYUN.Abp.PermissionManagement.Identity;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using LINGYUN.Abp.SettingManagement;
using LINGYUN.Abp.Sms.Aliyun;
using LINGYUN.Abp.TenantManagement;
@ -37,6 +38,7 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace LINGYUN.Abp.BackendAdmin
{
[DependsOn(
typeof(AbpSerilogEnrichersApplicationModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpLoggingSerilogElasticsearchModule),
typeof(AbpAuditLoggingElasticsearchModule),
@ -77,6 +79,7 @@ namespace LINGYUN.Abp.BackendAdmin
{
var configuration = context.Services.GetConfiguration();
PreConfigureApp();
PreConfigureCAP(configuration);
}

1
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/LINGYUN.Abp.BackendAdmin.HttpApi.Host.csproj
View File

@ -71,6 +71,7 @@
<ProjectReference Include="..\..\..\modules\features\LINGYUN.Abp.FeatureManagement.Client\LINGYUN.Abp.FeatureManagement.Client.csproj" />
<ProjectReference Include="..\..\..\modules\identityServer\LINGYUN.Abp.IdentityServer.Application.Contracts\LINGYUN.Abp.IdentityServer.Application.Contracts.csproj" />
<ProjectReference Include="..\..\..\modules\logging\LINGYUN.Abp.Logging.Serilog.Elasticsearch\LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj" />
<ProjectReference Include="..\..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
<ProjectReference Include="..\..\..\modules\lt\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\identity\LINGYUN.Abp.PermissionManagement.Domain.Identity\LINGYUN.Abp.PermissionManagement.Domain.Identity.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.Sms.Aliyun\LINGYUN.Abp.Sms.Aliyun.csproj" />

2
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Properties/launchSettings.json
View File

@ -13,7 +13,7 @@
"launchBrowser": false,
"applicationUrl": "http://0.0.0.0:30010",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Production"
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}

2
aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/appsettings.json
View File

@ -13,7 +13,7 @@
"DotNetCore": "Information"
}
},
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName" ],
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName" ],
"WriteTo": [
{
"Name": "Console",

3
aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/ApiGatewayHostModule.cs
View File

@ -1,6 +1,7 @@
using DotNetCore.CAP;
using LINGYUN.Abp.AspNetCore.HttpOverrides;
using LINGYUN.Abp.EventBus.CAP;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using LINGYUN.ApiGateway.Localization;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder;
@ -37,6 +38,7 @@ namespace LINGYUN.ApiGateway
{
[DependsOn(
typeof(AbpAutofacModule),
typeof(AbpSerilogEnrichersApplicationModule),
typeof(AbpHttpClientIdentityModelModule),
typeof(AbpCachingStackExchangeRedisModule),
typeof(AbpAutoMapperModule),
@ -49,6 +51,7 @@ namespace LINGYUN.ApiGateway
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
AbpSerilogEnrichersConsts.ApplicationName = "ApiGateWay";
var configuration = context.Services.GetConfiguration();
// 不启用则使用本地配置文件的方式启动Ocelot

1
aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/LINGYUN.ApiGateway.Host.csproj
View File

@ -38,6 +38,7 @@
<ProjectReference Include="..\..\..\modules\apigateway\LINGYUN.ApiGateway.HttpApi.Client\LINGYUN.ApiGateway.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.AspNetCore.HttpOverrides\LINGYUN.Abp.AspNetCore.HttpOverrides.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.csproj" />
<ProjectReference Include="..\..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
</ItemGroup>
</Project>

2
aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/appsettings.json
View File

@ -12,7 +12,7 @@
"Microsoft": "Warning"
}
},
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName" ],
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName" ],
"WriteTo": [
{
"Name": "Console",

6
aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.Configure.cs
View File

@ -1,4 +1,5 @@
using DotNetCore.CAP;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.Extensions.Caching.StackExchangeRedis;
@ -22,6 +23,11 @@ namespace LINGYUN.ApiGateway
{
public partial class ApiGatewayHttpApiHostModule
{
private void PreConfigureApp()
{
AbpSerilogEnrichersConsts.ApplicationName = "ApiGateWay-Admin";
}
private void PreConfigureCAP(IConfiguration configuration)
{
PreConfigure<CapOptions>(options =>

3
aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.cs
View File

@ -2,6 +2,7 @@
using LINGYUN.Abp.AuditLogging.Elasticsearch;
using LINGYUN.Abp.EventBus.CAP;
using LINGYUN.Abp.MultiTenancy.DbFinder;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using LINGYUN.ApiGateway.EntityFrameworkCore;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@ -20,6 +21,7 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace LINGYUN.ApiGateway
{
[DependsOn(
typeof(AbpSerilogEnrichersApplicationModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAuditLoggingElasticsearchModule),
typeof(ApiGatewayApplicationModule),
@ -41,6 +43,7 @@ namespace LINGYUN.ApiGateway
{
var configuration = context.Services.GetConfiguration();
PreConfigureApp();
PreConfigureCAP(configuration);
}

1
aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/LINGYUN.ApiGateway.HttpApi.Host.csproj
View File

@ -45,6 +45,7 @@
<ProjectReference Include="..\..\..\modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.AspNetCore.HttpOverrides\LINGYUN.Abp.AspNetCore.HttpOverrides.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.csproj" />
<ProjectReference Include="..\..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
<ProjectReference Include="..\..\..\modules\tenants\LINGYUN.Abp.MultiTenancy.DbFinder\LINGYUN.Abp.MultiTenancy.DbFinder.csproj" />
</ItemGroup>

2
aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/appsettings.json
View File

@ -13,7 +13,7 @@
"DotNetCore": "Debug"
}
},
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName" ],
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName" ],
"WriteTo": [
{
"Name": "Console",

6
aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.Configure.cs
View File

@ -1,6 +1,7 @@
using DotNetCore.CAP;
using LINGYUN.Abp.ExceptionHandling;
using LINGYUN.Abp.ExceptionHandling.Emailing;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Identity;
@ -32,6 +33,11 @@ namespace LINGYUN.Abp.IdentityServer4
{
public partial class AbpIdentityServerAdminHttpApiHostModule
{
private void PreConfigureApp()
{
AbpSerilogEnrichersConsts.ApplicationName = "Identity-Server-Admin";
}
private void PreConfigureCAP(IConfiguration configuration)
{
PreConfigure<CapOptions>(options =>

5
aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs
View File

@ -4,6 +4,7 @@ using LINGYUN.Abp.EventBus.CAP;
using LINGYUN.Abp.ExceptionHandling.Emailing;
using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore;
using LINGYUN.Abp.MultiTenancy.DbFinder;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using LINGYUN.Abp.Sms.Aliyun;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@ -24,8 +25,8 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace LINGYUN.Abp.IdentityServer4
{
[DependsOn(
typeof(AbpSerilogEnrichersApplicationModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAuditLoggingElasticsearchModule),
typeof(AbpAspNetCoreMultiTenancyModule),
typeof(LINGYUN.Abp.Account.AbpAccountApplicationModule),
typeof(LINGYUN.Abp.Account.AbpAccountHttpApiModule),
@ -41,6 +42,7 @@ namespace LINGYUN.Abp.IdentityServer4
typeof(AbpPermissionManagementEntityFrameworkCoreModule),
typeof(AbpLocalizationManagementEntityFrameworkCoreModule),
typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
typeof(AbpAuditLoggingElasticsearchModule),
typeof(AbpEmailingExceptionHandlingModule),
typeof(AbpCAPEventBusModule),
typeof(AbpAliyunSmsModule),
@ -55,6 +57,7 @@ namespace LINGYUN.Abp.IdentityServer4
{
var configuration = context.Services.GetConfiguration();
PreConfigureApp();
PreConfigureCAP(configuration);
PreConfigureIdentity();
}

1
aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/LINGYUN.Abp.IdentityServer4.HttpApi.Host.csproj
View File

@ -67,6 +67,7 @@
<ProjectReference Include="..\..\..\modules\identity\LINGYUN.Abp.Identity.Application\LINGYUN.Abp.Identity.Application.csproj" />
<ProjectReference Include="..\..\..\modules\identity\LINGYUN.Abp.Identity.EntityFrameworkCore\LINGYUN.Abp.Identity.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\identity\LINGYUN.Abp.Identity.HttpApi\LINGYUN.Abp.Identity.HttpApi.csproj" />
<ProjectReference Include="..\..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
<ProjectReference Include="..\..\..\modules\lt\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\tenants\LINGYUN.Abp.MultiTenancy.DbFinder\LINGYUN.Abp.MultiTenancy.DbFinder.csproj" />
</ItemGroup>

2
aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/appsettings.json
View File

@ -13,7 +13,7 @@
"DotNetCore": "Debug"
}
},
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName" ],
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName" ],
"WriteTo": [
{
"Name": "Console",

6
aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/AbpLocalizationManagementHttpApiHostModule.Configure.cs
View File

@ -1,6 +1,7 @@
using DotNetCore.CAP;
using LINGYUN.Abp.ExceptionHandling;
using LINGYUN.Abp.ExceptionHandling.Emailing;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.Extensions.Caching.StackExchangeRedis;
@ -25,6 +26,11 @@ namespace LINGYUN.Abp.LocalizationManagement
{
public partial class AbpLocalizationManagementHttpApiHostModule
{
private void PreConfigureApp()
{
AbpSerilogEnrichersConsts.ApplicationName = "Localization";
}
private void PreConfigureCAP(IConfiguration configuration)
{
PreConfigure<CapOptions>(options =>

3
aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/AbpLocalizationManagementHttpApiHostModule.cs
View File

@ -4,6 +4,7 @@ using LINGYUN.Abp.EventBus.CAP;
using LINGYUN.Abp.ExceptionHandling.Emailing;
using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore;
using LINGYUN.Abp.MultiTenancy.DbFinder;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
@ -22,6 +23,7 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace LINGYUN.Abp.LocalizationManagement
{
[DependsOn(
typeof(AbpSerilogEnrichersApplicationModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAuditLoggingElasticsearchModule),
typeof(AbpAspNetCoreMultiTenancyModule),
@ -46,6 +48,7 @@ namespace LINGYUN.Abp.LocalizationManagement
{
var configuration = context.Services.GetConfiguration();
PreConfigureApp();
PreConfigureCAP(configuration);
}

1
aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/LINGYUN.Abp.LocalizationManagement.HttpApi.Host.csproj
View File

@ -39,6 +39,7 @@
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.AspNetCore.HttpOverrides\LINGYUN.Abp.AspNetCore.HttpOverrides.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.ExceptionHandling.Emailing\LINGYUN.Abp.ExceptionHandling.Emailing.csproj" />
<ProjectReference Include="..\..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
<ProjectReference Include="..\..\..\modules\lt\LINGYUN.Abp.LocalizationManagement.Application\LINGYUN.Abp.LocalizationManagement.Application.csproj" />
<ProjectReference Include="..\..\..\modules\lt\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\lt\LINGYUN.Abp.LocalizationManagement.HttpApi\LINGYUN.Abp.LocalizationManagement.HttpApi.csproj" />

2
aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/appsettings.json
View File

@ -15,7 +15,7 @@
"DotNetCore": "Information"
}
},
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName" ],
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName" ],
"WriteTo": [
{
"Name": "Console",

8
aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.Configure.cs
View File

@ -1,6 +1,7 @@
using DotNetCore.CAP;
using LINGYUN.Abp.ExceptionHandling;
using LINGYUN.Abp.MessageService.Localization;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.DataProtection;
@ -28,6 +29,11 @@ namespace LINGYUN.Abp.MessageService
{
public partial class AbpMessageServiceHttpApiHostModule
{
private void PreConfigureApp()
{
AbpSerilogEnrichersConsts.ApplicationName = "MessageService";
}
private void PreConfigureCAP(IConfiguration configuration)
{
PreConfigure<CapOptions>(options =>
@ -86,7 +92,7 @@ namespace LINGYUN.Abp.MessageService
Configure<AbpAuditingOptions>(options =>
{
options.ApplicationName = "Localization";
options.ApplicationName = "MessageService";
// 是否启用实体变更记录
var entitiesChangedConfig = configuration.GetSection("App:TrackingEntitiesChanged");
if (entitiesChangedConfig.Exists() && entitiesChangedConfig.Get<bool>())

3
aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.cs
View File

@ -14,6 +14,7 @@ using LINGYUN.Abp.MultiTenancy.DbFinder;
using LINGYUN.Abp.Notifications.SignalR;
using LINGYUN.Abp.Notifications.Sms;
using LINGYUN.Abp.Notifications.WeChat.MiniProgram;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -34,6 +35,7 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace LINGYUN.Abp.MessageService
{
[DependsOn(
typeof(AbpSerilogEnrichersApplicationModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAuditLoggingElasticsearchModule),
typeof(AbpAspNetCoreMultiTenancyModule),
@ -70,6 +72,7 @@ namespace LINGYUN.Abp.MessageService
{
var configuration = context.Services.GetConfiguration();
PreConfigureApp();
PreConfigureCAP(configuration);
}

1
aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/LINGYUN.Abp.MessageService.HttpApi.Host.csproj
View File

@ -57,6 +57,7 @@
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.IM.SignalR\LINGYUN.Abp.IM.SignalR.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.Notifications.SignalR\LINGYUN.Abp.Notifications.SignalR.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.Notifications.Sms\LINGYUN.Abp.Notifications.Sms.csproj" />
<ProjectReference Include="..\..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
<ProjectReference Include="..\..\..\modules\lt\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\message\LINGYUN.Abp.MessageService.Application\LINGYUN.Abp.MessageService.Application.csproj" />
<ProjectReference Include="..\..\..\modules\message\LINGYUN.Abp.MessageService.EntityFrameworkCore\LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj" />

2
aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/appsettings.json
View File

@ -15,7 +15,7 @@
"DotNetCore": "Information"
}
},
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName" ],
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName" ],
"WriteTo": [
{
"Name": "Console",

6
aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.Configure.cs
View File

@ -1,6 +1,7 @@
using DotNetCore.CAP;
using LINGYUN.Abp.ExceptionHandling;
using LINGYUN.Abp.ExceptionHandling.Emailing;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Server.Kestrel.Core;
@ -28,6 +29,11 @@ namespace LINGYUN.Platform
{
public partial class AppPlatformHttpApiHostModule
{
private void PreConfigureApp()
{
AbpSerilogEnrichersConsts.ApplicationName = "Platform";
}
private void PreConfigureCAP(IConfiguration configuration)
{
PreConfigure<CapOptions>(options =>

3
aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.cs
View File

@ -10,6 +10,7 @@ using LINGYUN.Abp.OssManagement;
using LINGYUN.Abp.OssManagement.FileSystem;
using LINGYUN.Abp.OssManagement.FileSystem.ImageSharp;
using LINGYUN.Abp.OssManagement.SettingManagement;
using LINGYUN.Abp.Serilog.Enrichers.Application;
using LINGYUN.Platform.EntityFrameworkCore;
using LINGYUN.Platform.HttpApi;
using Microsoft.AspNetCore.Builder;
@ -34,6 +35,7 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace LINGYUN.Platform
{
[DependsOn(
typeof(AbpSerilogEnrichersApplicationModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAuditLoggingElasticsearchModule),
typeof(AbpAspNetCoreMultiTenancyModule),
@ -71,6 +73,7 @@ namespace LINGYUN.Platform
{
var configuration = context.Services.GetConfiguration();
PreConfigureApp();
PreConfigureCAP(configuration);
}

1
aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/LINGYUN.Platform.HttpApi.Host.csproj
View File

@ -60,6 +60,7 @@
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.Features.LimitValidation.Redis.Client\LINGYUN.Abp.Features.LimitValidation.Redis.Client.csproj" />
<ProjectReference Include="..\..\..\modules\common\LINGYUN.Abp.Notifications\LINGYUN.Abp.Notifications.csproj" />
<ProjectReference Include="..\..\..\modules\features\LINGYUN.Abp.Features.Client\LINGYUN.Abp.Features.Client.csproj" />
<ProjectReference Include="..\..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
<ProjectReference Include="..\..\..\modules\lt\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\oss-management\LINGYUN.Abp.OssManagement.Aliyun\LINGYUN.Abp.OssManagement.Aliyun.csproj" />
<ProjectReference Include="..\..\..\modules\oss-management\LINGYUN.Abp.OssManagement.Application\LINGYUN.Abp.OssManagement.Application.csproj" />

2
aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/appsettings.json
View File

@ -15,7 +15,7 @@
"DotNetCore": "Information"
}
},
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName" ],
"Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName" ],
"WriteTo": [
{
"Name": "Console",

Write Preview
Loading…
Cancel
Save