From 108e53daa3915da80314aeb975c8f47976c8f1cd Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 23 Apr 2024 09:14:12 +0800 Subject: [PATCH] fix(claims): map abp claim types to jwt --- .github/workflows/build.yml | 1 - aspnet-core/Directory.Build.props | 3 +- aspnet-core/LINGYUN.MicroService.All.sln | 10 + .../LINGYUN.MicroService.TaskManagement.sln | 7 + ...INGYUN.MicroService.WebhooksManagement.sln | 7 + aspnet-core/LINGYUN.MicroService.Workflow.sln | 7 + .../LINGYUN.Abp.Security.csproj | 16 + .../Security/Claims/JwtClaimTypesMapping.cs | 20 + .../appsettings.json | 3 +- .../BackendAdminDbMigrationEventHandler.cs | 2 + aspnet-core/modules/oss-management/README.md | 2 +- .../appsettings.Development.json | 2 +- .../LY.MicroService.AuthServer/package.json | 4 +- ...BackendAdminHttpApiHostModule.Configure.cs | 16 +- ...roService.BackendAdmin.HttpApi.Host.csproj | 1 + .../appsettings.Development.json | 4 +- .../package-lock.json | 508 ++++++++++-------- .../package.json | 4 +- .../LY.MicroService.IdentityServer/yarn.lock | 311 ++++++----- ...LocalizationManagement.HttpApi.Host.csproj | 1 + ...onManagementHttpApiHostModule.Configure.cs | 16 +- ...LocalizationManagementHttpApiHostModule.cs | 12 +- .../appsettings.Development.json | 3 +- ...ice.PlatformManagement.HttpApi.Host.csproj | 1 + ...rmManagementHttpApiHostModule.Configure.cs | 4 +- .../PlatformManagementHttpApiHostModule.cs | 14 +- .../appsettings.Development.json | 3 +- ...ervice.RealtimeMessage.HttpApi.Host.csproj | 1 + ...ltimeMessageHttpApiHostModule.Configure.cs | 4 +- .../RealtimeMessageHttpApiHostModule.cs | 10 +- .../appsettings.Development.json | 3 +- ...Service.TaskManagement.HttpApi.Host.csproj | 1 + ...skManagementHttpApiHostModule.Configure.cs | 4 +- .../TaskManagementHttpApiHostModule.cs | 2 +- .../appsettings.Development.json | 3 +- ...ice.WebhooksManagement.HttpApi.Host.csproj | 1 + ...ksManagementHttpApiHostModule.Configure.cs | 4 +- .../WebhooksManagementHttpApiHostModule.cs | 2 +- .../appsettings.Development.json | 3 +- ...ice.WorkflowManagement.HttpApi.Host.csproj | 1 + ...owManagementHttpApiHostModule.Configure.cs | 5 +- .../WorkflowManagementHttpApiHostModule.cs | 2 +- .../appsettings.Development.json | 3 +- 43 files changed, 587 insertions(+), 444 deletions(-) create mode 100644 aspnet-core/framework/security/LINGYUN.Abp.Security/LINGYUN.Abp.Security.csproj create mode 100644 aspnet-core/framework/security/LINGYUN.Abp.Security/Volo/Abp/Security/Claims/JwtClaimTypesMapping.cs diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 589688a0a..4eac27a84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,6 @@ name: "Build" on: push: - branches: [ master ] paths: - "**.cs" - "**.csproj" diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index 88cba33d2..9573001e5 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -1,7 +1,7 @@  8.1.0 - 3.0.0 + 3.0.5 8.1.0 1.12.0 1.0.2 @@ -13,6 +13,7 @@ 1.6.9 2.0.3 1.8.6 + 6.2.0 7.15.1 13.0.1 1.8.0 diff --git a/aspnet-core/LINGYUN.MicroService.All.sln b/aspnet-core/LINGYUN.MicroService.All.sln index 3ba5d7428..a1119eb5a 100644 --- a/aspnet-core/LINGYUN.MicroService.All.sln +++ b/aspnet-core/LINGYUN.MicroService.All.sln @@ -705,6 +705,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Dynamic.Queryab EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.DataProtection.Tests", "tests\LINGYUN.Abp.DataProtection.Tests\LINGYUN.Abp.DataProtection.Tests.csproj", "{AAC0C407-B4B9-4E90-99FC-2D793AC229D9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "security", "security", "{9D1302BE-3886-49F8-B0CD-35D2AC1E5A37}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Security", "framework\security\LINGYUN.Abp.Security\LINGYUN.Abp.Security.csproj", "{4C71CA88-0D04-4DDB-8906-B953908B8B8B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1791,6 +1795,10 @@ Global {AAC0C407-B4B9-4E90-99FC-2D793AC229D9}.Debug|Any CPU.Build.0 = Debug|Any CPU {AAC0C407-B4B9-4E90-99FC-2D793AC229D9}.Release|Any CPU.ActiveCfg = Release|Any CPU {AAC0C407-B4B9-4E90-99FC-2D793AC229D9}.Release|Any CPU.Build.0 = Release|Any CPU + {4C71CA88-0D04-4DDB-8906-B953908B8B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C71CA88-0D04-4DDB-8906-B953908B8B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C71CA88-0D04-4DDB-8906-B953908B8B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C71CA88-0D04-4DDB-8906-B953908B8B8B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2131,6 +2139,8 @@ Global {86E85013-7C71-4770-9323-18897A64F5B2} = {4FAE314C-36CB-4E3F-85B7-41D0A428B37D} {014A9583-0EAA-48A4-ACBE-07DC88159E13} = {4FAE314C-36CB-4E3F-85B7-41D0A428B37D} {AAC0C407-B4B9-4E90-99FC-2D793AC229D9} = {370D7CD5-1E17-4F3D-BBFA-03429F6D4F2F} + {9D1302BE-3886-49F8-B0CD-35D2AC1E5A37} = {C5CAD011-DF84-4914-939C-0C029DCEF26F} + {4C71CA88-0D04-4DDB-8906-B953908B8B8B} = {9D1302BE-3886-49F8-B0CD-35D2AC1E5A37} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C95FDF91-16F2-4A8B-A4BE-0E62D1B66718} diff --git a/aspnet-core/LINGYUN.MicroService.TaskManagement.sln b/aspnet-core/LINGYUN.MicroService.TaskManagement.sln index 774fb105a..b33ff44de 100644 --- a/aspnet-core/LINGYUN.MicroService.TaskManagement.sln +++ b/aspnet-core/LINGYUN.MicroService.TaskManagement.sln @@ -134,6 +134,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.MultiTenancy.Ed EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AspNetCore.HttpOverrides", "framework\common\LINGYUN.Abp.AspNetCore.HttpOverrides\LINGYUN.Abp.AspNetCore.HttpOverrides.csproj", "{088064DD-D141-4E9A-B185-E332920A323A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Security", "framework\security\LINGYUN.Abp.Security\LINGYUN.Abp.Security.csproj", "{BEE1B759-5B65-481B-928B-8BC6A89A7C13}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -348,6 +350,10 @@ Global {088064DD-D141-4E9A-B185-E332920A323A}.Debug|Any CPU.Build.0 = Debug|Any CPU {088064DD-D141-4E9A-B185-E332920A323A}.Release|Any CPU.ActiveCfg = Release|Any CPU {088064DD-D141-4E9A-B185-E332920A323A}.Release|Any CPU.Build.0 = Release|Any CPU + {BEE1B759-5B65-481B-928B-8BC6A89A7C13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BEE1B759-5B65-481B-928B-8BC6A89A7C13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BEE1B759-5B65-481B-928B-8BC6A89A7C13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BEE1B759-5B65-481B-928B-8BC6A89A7C13}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -405,6 +411,7 @@ Global {6E030005-EEA7-480E-9E68-4FC74CFCAF42} = {5A41C31A-B966-418B-B446-5BA1D7E61A62} {B3E81983-629A-4380-B4C2-50E247916F5E} = {5A41C31A-B966-418B-B446-5BA1D7E61A62} {088064DD-D141-4E9A-B185-E332920A323A} = {5A41C31A-B966-418B-B446-5BA1D7E61A62} + {BEE1B759-5B65-481B-928B-8BC6A89A7C13} = {5A41C31A-B966-418B-B446-5BA1D7E61A62} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E1FD1F4C-D344-408B-97CF-B6F1F6D7D293} diff --git a/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln b/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln index d02895a4b..0b5627cd3 100644 --- a/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln +++ b/aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln @@ -143,6 +143,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{03B4 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AspNetCore.HttpOverrides", "framework\common\LINGYUN.Abp.AspNetCore.HttpOverrides\LINGYUN.Abp.AspNetCore.HttpOverrides.csproj", "{0DFDAC71-BCB9-44CF-A44A-E8288E75246F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Security", "framework\security\LINGYUN.Abp.Security\LINGYUN.Abp.Security.csproj", "{8F11DADB-557A-4ECF-BEBB-19AFA71998A1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -369,6 +371,10 @@ Global {0DFDAC71-BCB9-44CF-A44A-E8288E75246F}.Debug|Any CPU.Build.0 = Debug|Any CPU {0DFDAC71-BCB9-44CF-A44A-E8288E75246F}.Release|Any CPU.ActiveCfg = Release|Any CPU {0DFDAC71-BCB9-44CF-A44A-E8288E75246F}.Release|Any CPU.Build.0 = Release|Any CPU + {8F11DADB-557A-4ECF-BEBB-19AFA71998A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8F11DADB-557A-4ECF-BEBB-19AFA71998A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8F11DADB-557A-4ECF-BEBB-19AFA71998A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8F11DADB-557A-4ECF-BEBB-19AFA71998A1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -440,6 +446,7 @@ Global {5C1E48DE-6247-475B-BDB5-651521AC3A47} = {FB7A9794-06D2-42CF-939E-4626497B97BD} {004CC7A9-92FF-4E98-8F1D-550D07CB47F0} = {FB7A9794-06D2-42CF-939E-4626497B97BD} {0DFDAC71-BCB9-44CF-A44A-E8288E75246F} = {FB7A9794-06D2-42CF-939E-4626497B97BD} + {8F11DADB-557A-4ECF-BEBB-19AFA71998A1} = {FB7A9794-06D2-42CF-939E-4626497B97BD} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {80ED12A5-C899-459F-A181-ADCC9D680DE5} diff --git a/aspnet-core/LINGYUN.MicroService.Workflow.sln b/aspnet-core/LINGYUN.MicroService.Workflow.sln index f1415327f..767219e2e 100644 --- a/aspnet-core/LINGYUN.MicroService.Workflow.sln +++ b/aspnet-core/LINGYUN.MicroService.Workflow.sln @@ -161,6 +161,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Saas.EntityFram EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AspNetCore.HttpOverrides", "framework\common\LINGYUN.Abp.AspNetCore.HttpOverrides\LINGYUN.Abp.AspNetCore.HttpOverrides.csproj", "{4D055853-DE80-4145-BB2F-33EB6B379F5E}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Security", "framework\security\LINGYUN.Abp.Security\LINGYUN.Abp.Security.csproj", "{E4783690-052A-4AB0-837E-BDBC77CC7EEC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -431,6 +433,10 @@ Global {4D055853-DE80-4145-BB2F-33EB6B379F5E}.Debug|Any CPU.Build.0 = Debug|Any CPU {4D055853-DE80-4145-BB2F-33EB6B379F5E}.Release|Any CPU.ActiveCfg = Release|Any CPU {4D055853-DE80-4145-BB2F-33EB6B379F5E}.Release|Any CPU.Build.0 = Release|Any CPU + {E4783690-052A-4AB0-837E-BDBC77CC7EEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E4783690-052A-4AB0-837E-BDBC77CC7EEC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E4783690-052A-4AB0-837E-BDBC77CC7EEC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E4783690-052A-4AB0-837E-BDBC77CC7EEC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -504,6 +510,7 @@ Global {911B7C56-1908-42B5-BCE8-860DE650AE31} = {AD002164-CFB4-4583-BF13-62C815009ADE} {CAE0492C-11A3-424C-8613-7DAB83E4FB60} = {AD002164-CFB4-4583-BF13-62C815009ADE} {4D055853-DE80-4145-BB2F-33EB6B379F5E} = {6DA78E72-BA55-4ECF-97DB-6258174D3E2A} + {E4783690-052A-4AB0-837E-BDBC77CC7EEC} = {6DA78E72-BA55-4ECF-97DB-6258174D3E2A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6BB7A5DE-DA12-44DC-BC9B-0F6CA524346F} diff --git a/aspnet-core/framework/security/LINGYUN.Abp.Security/LINGYUN.Abp.Security.csproj b/aspnet-core/framework/security/LINGYUN.Abp.Security/LINGYUN.Abp.Security.csproj new file mode 100644 index 000000000..bb74fcc26 --- /dev/null +++ b/aspnet-core/framework/security/LINGYUN.Abp.Security/LINGYUN.Abp.Security.csproj @@ -0,0 +1,16 @@ + + + + + + + netstandard2.0 + + + + + + + + + diff --git a/aspnet-core/framework/security/LINGYUN.Abp.Security/Volo/Abp/Security/Claims/JwtClaimTypesMapping.cs b/aspnet-core/framework/security/LINGYUN.Abp.Security/Volo/Abp/Security/Claims/JwtClaimTypesMapping.cs new file mode 100644 index 000000000..5296e1f4f --- /dev/null +++ b/aspnet-core/framework/security/LINGYUN.Abp.Security/Volo/Abp/Security/Claims/JwtClaimTypesMapping.cs @@ -0,0 +1,20 @@ +using IdentityModel; + +namespace Volo.Abp.Security.Claims; + +public static class JwtClaimTypesMapping +{ + public static void MapAbpClaimTypes() + { + AbpClaimTypes.UserId = JwtClaimTypes.Subject; + AbpClaimTypes.Role = JwtClaimTypes.Role; + AbpClaimTypes.UserName = JwtClaimTypes.PreferredUserName; + AbpClaimTypes.Name = JwtClaimTypes.GivenName; + AbpClaimTypes.SurName = JwtClaimTypes.FamilyName; + AbpClaimTypes.PhoneNumber = JwtClaimTypes.PhoneNumber; + AbpClaimTypes.PhoneNumberVerified = JwtClaimTypes.PhoneNumberVerified; + AbpClaimTypes.Email = JwtClaimTypes.Email; + AbpClaimTypes.EmailVerified = JwtClaimTypes.EmailVerified; + AbpClaimTypes.ClientId = JwtClaimTypes.ClientId; + } +} diff --git a/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/appsettings.json b/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/appsettings.json index f8f9db178..c3cba7638 100644 --- a/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/appsettings.json +++ b/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/appsettings.json @@ -3,7 +3,8 @@ "Default": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456;SslMode=None", "AbpIdentity": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456;SslMode=None", "OpenIddict": "Server=127.0.0.1;Database=AuthServer-v70;User Id=root;Password=123456;SslMode=None", - "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None" + "AbpSaas": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None", + "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform-v70;User Id=root;Password=123456;SslMode=None" }, "StringEncryption": { "DefaultPassPhrase": "s46c5q55nxpeS8Ra", diff --git a/aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/BackendAdminDbMigrationEventHandler.cs b/aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/BackendAdminDbMigrationEventHandler.cs index bea2cdf2e..9d4657e70 100644 --- a/aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/BackendAdminDbMigrationEventHandler.cs +++ b/aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/BackendAdminDbMigrationEventHandler.cs @@ -64,6 +64,8 @@ protected async virtual Task SeedAdminRolePermissionsAsync(Guid tenantId) { using (CurrentTenant.Change(tenantId)) { + + Logger.LogInformation("Seeding the new tenant admin role permissions..."); var definitionPermissions = await PermissionDefinitionManager.GetPermissionsAsync(); var grantPermissions = definitionPermissions diff --git a/aspnet-core/modules/oss-management/README.md b/aspnet-core/modules/oss-management/README.md index d53d6ddc2..95fcf46d4 100644 --- a/aspnet-core/modules/oss-management/README.md +++ b/aspnet-core/modules/oss-management/README.md @@ -22,7 +22,7 @@ File-Management更名为Oss-Management * [LINGYUN.Abp.OssManagement.FileSystem.ImageSharp](./LINGYUN.Abp.OssManagement.FileSystem.ImageSharp) Oss本地对象的ImageSharp扩展，当前端传递需求处理对象时，此模块用于实现基于图形文件流的处理 * [LINGYUN.Abp.OssManagement.FileSystem.Imaging](./LINGYUN.Abp.OssManagement.FileSystem.Imaging) Oss本地对象的Volo.Abp.Imaging扩展 * [LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp](./LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp) Oss本地对象的Volo.Abp.Imaging.ImageSharp扩展 -* [LINGYUN.Abp.OssManagement.Nexus](./LINGYUN.Abp.OssManagement.Nexu s) Oss管理的Nexus实现，管理来自私有Nexus仓库的RAW存储类型 +* [LINGYUN.Abp.OssManagement.Nexus](./LINGYUN.Abp.OssManagement.Nexus) Oss管理的Nexus实现，管理来自私有Nexus仓库的RAW存储类型 ### 权限定义 diff --git a/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json index 6c9e8c017..fd1ab3c06 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.AuthServer/appsettings.Development.json @@ -70,7 +70,7 @@ "HostName": "127.0.0.1", "Port": 5672, "UserName": "admin", - "Password": "admin", + "Password": "123456", "ExchangeName": "LINGYUN.Abp.Application", "VirtualHost": "/" } diff --git a/aspnet-core/services/LY.MicroService.AuthServer/package.json b/aspnet-core/services/LY.MicroService.AuthServer/package.json index 7c55ad172..dcfb9b6c8 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/package.json +++ b/aspnet-core/services/LY.MicroService.AuthServer/package.json @@ -1,8 +1,8 @@ { - "version": "7.3.2", + "version": "8.1.0", "name": "my-app-auth-server", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.3.3" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "3.1.0" } } \ No newline at end of file diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs index 82e7ad43b..2fc062fc3 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.Configure.cs @@ -1,5 +1,4 @@ -using Autofac.Core; -using DotNetCore.CAP; +using DotNetCore.CAP; using LINGYUN.Abp.ExceptionHandling; using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.Localization.CultureMap; @@ -7,14 +6,15 @@ using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using LINGYUN.Abp.TextTemplating; -using Medallion.Threading.Redis; using Medallion.Threading; +using Medallion.Threading.Redis; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Logging; using Microsoft.OpenApi.Models; using StackExchange.Redis; using System; @@ -36,13 +36,10 @@ using Volo.Abp.Localization; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; -using Volo.Abp.Threading; -using Volo.Abp.VirtualFileSystem; -using Microsoft.IdentityModel.Logging; -using Microsoft.AspNetCore.Identity; using Volo.Abp.Security.Claims; using Volo.Abp.SettingManagement; -using Volo.Abp.AspNetCore.Authentication.JwtBearer.DynamicClaims; +using Volo.Abp.Threading; +using Volo.Abp.VirtualFileSystem; namespace LY.MicroService.BackendAdmin; @@ -62,6 +59,7 @@ private void PreConfigureFeature() private void PreConfigureApp(IConfiguration configuration) { + JwtClaimTypesMapping.MapAbpClaimTypes(); AbpSerilogEnrichersConsts.ApplicationName = ApplicationName; PreConfigure(options => @@ -252,7 +250,7 @@ private void ConfigureIdentity(IConfiguration configuration) Configure(options => { options.IsDynamicClaimsEnabled = true; - options.RemoteRefreshUrl = configuration["AuthServerUrl"] + options.RemoteRefreshUrl; + options.RemoteRefreshUrl = configuration["App:RefreshClaimsUrl"] + options.RemoteRefreshUrl; }); } diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj index 9d8586f6a..9e8078974 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj @@ -62,6 +62,7 @@ + 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 index 61c7dd856..d48fc65ca 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json @@ -16,9 +16,9 @@ ] }, "CorsOrigins": "http://127.0.0.1:3100", - "ShowPii": true + "ShowPii": true, + "RefreshClaimsUrl": "http://127.0.0.1:30015" }, - "AuthServerUrl": "http://127.0.0.1:30015", "Auditing": { "AllEntitiesSelector": true }, diff --git a/aspnet-core/services/LY.MicroService.IdentityServer/package-lock.json b/aspnet-core/services/LY.MicroService.IdentityServer/package-lock.json index 59a22c41c..50ce98181 100644 --- a/aspnet-core/services/LY.MicroService.IdentityServer/package-lock.json +++ b/aspnet-core/services/LY.MicroService.IdentityServer/package-lock.json @@ -8,13 +8,13 @@ "name": "my-app-identityserver", "version": "7.3.2", "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.3.3" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "3.1.0" } }, "node_modules/@abp/aspnetcore.mvc.ui": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.2.3.tgz", - "integrity": "sha512-KJCw6OxjQBgNw4QoSoDQOe32bFF9NvHdD09zMVsoCB/GgN66dcbZnk+ldidHcwjLFDPXOuHJMx+TKmno3VgUaQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.1.0.tgz", + "integrity": "sha512-aIUc837hnaEuZP7EV3xgMv7xM7z0KrgYlpPbOSRlR1tHS6ASvQEQec8fsdAZ+9GyYuaWKppXpkNsPu2e8KKALg==", "dependencies": { "ansi-colors": "^4.1.1", "extend-object": "^1.0.0", @@ -25,215 +25,215 @@ } }, "node_modules/@abp/aspnetcore.mvc.ui.theme.leptonxlite": { - "version": "2.3.3", - "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.3.tgz", - "integrity": "sha512-96hwhfJwnDRl6+ytAL4rSOpQCSd/41Fd5OtSsYjIMn8p96QLbO8WvhZEuzno3CFa/x916WJ87fjBN9+DkHRtWg==", + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-3.1.0.tgz", + "integrity": "sha512-roc/hdUUSaJv7OZGW0n45owyXdCWgyI7VU7IHhoO4MgkBRvFVYx+YWSg/Jf50ovos1yyzC/fpGNyv13tt5HAuw==", "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.2.1" + "@abp/aspnetcore.mvc.ui.theme.shared": "~8.1.0" } }, "node_modules/@abp/aspnetcore.mvc.ui.theme.shared": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.2.3.tgz", - "integrity": "sha512-+G2mM/BJWqgGqZFg6GP28PaCtq+YlRmRfg7r0JQ1wkAN9pc11yKm0LRQjFnkcVBzg0A+N2hZqnFbW7wQhwXOHg==", - "dependencies": { - "@abp/aspnetcore.mvc.ui": "~7.2.3", - "@abp/bootstrap": "~7.2.3", - "@abp/bootstrap-datepicker": "~7.2.3", - "@abp/bootstrap-daterangepicker": "~7.2.3", - "@abp/datatables.net-bs5": "~7.2.3", - "@abp/font-awesome": "~7.2.3", - "@abp/jquery-form": "~7.2.3", - "@abp/jquery-validation-unobtrusive": "~7.2.3", - "@abp/lodash": "~7.2.3", - "@abp/luxon": "~7.2.3", - "@abp/malihu-custom-scrollbar-plugin": "~7.2.3", - "@abp/moment": "~7.2.3", - "@abp/select2": "~7.2.3", - "@abp/sweetalert2": "~7.2.3", - "@abp/timeago": "~7.2.3", - "@abp/toastr": "~7.2.3" + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.1.0.tgz", + "integrity": "sha512-Dp2msuUp9WGZ3AynB1t0mHhtqf4yVCU4XqCmgLcL8hfVklzkxxk7Bs+8XB4oITPAXY3xgV3k62RXr+AuwdmMVA==", + "dependencies": { + "@abp/aspnetcore.mvc.ui": "~8.1.0", + "@abp/bootstrap": "~8.1.0", + "@abp/bootstrap-datepicker": "~8.1.0", + "@abp/bootstrap-daterangepicker": "~8.1.0", + "@abp/datatables.net-bs5": "~8.1.0", + "@abp/font-awesome": "~8.1.0", + "@abp/jquery-form": "~8.1.0", + "@abp/jquery-validation-unobtrusive": "~8.1.0", + "@abp/lodash": "~8.1.0", + "@abp/luxon": "~8.1.0", + "@abp/malihu-custom-scrollbar-plugin": "~8.1.0", + "@abp/moment": "~8.1.0", + "@abp/select2": "~8.1.0", + "@abp/sweetalert2": "~8.1.0", + "@abp/timeago": "~8.1.0", + "@abp/toastr": "~8.1.0" } }, "node_modules/@abp/bootstrap": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/bootstrap/-/bootstrap-7.2.3.tgz", - "integrity": "sha512-Z00q1sAwo9PvFSpfFlbbUHPMyghLOzuEuAzz/8nA6tK7WR0KQBS/0zGC0nK9hNwbyZ4FqKwPSznRVwuwrnqyhQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/bootstrap/-/bootstrap-8.1.0.tgz", + "integrity": "sha512-Wik15yDg+7VnJDNqJALULcghaBL1rPzBWBAqf9kGSet5X+tzjffJQqz0IpiPm+UoZ5FaBuGizxSViftgW25DAA==", "dependencies": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "bootstrap": "^5.1.3" } }, "node_modules/@abp/bootstrap-datepicker": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.2.3.tgz", - "integrity": "sha512-wiKVXftVrXcjwz0FpshD6P4WW3CNk/4cLH15aaqRjM+J0BigDeH9CczlpVc7jXdn+c8plHIRz0t5tqlUud7dIQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.1.0.tgz", + "integrity": "sha512-8O5cYHTKDXz6vNaPMsIyzevTC3IAt+GR7mKCATcR+zvk0FvTUnph7AJ1inswwGi56cSlkpEY3ChoEvYOAN66LQ==", "dependencies": { "bootstrap-datepicker": "^1.9.0" } }, "node_modules/@abp/bootstrap-daterangepicker": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.2.3.tgz", - "integrity": "sha512-ChdnXMzHvg+HwrUtw2z6KuqRTqHVOq8qEBai+IPW6PykJSML+tZKzer3jzDIzyHq68OIqom3n3xL0XpcniKMew==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.1.0.tgz", + "integrity": "sha512-goHaUaS/bpUWUkMAhqx1UjYuxGnQtcRyqnpEv/cs09my4CnqhAecBdhlQlkoQ1OkQ2sIyEvGQCmTdnm+uJD0jA==", "dependencies": { "bootstrap-daterangepicker": "^3.1.0" } }, "node_modules/@abp/core": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/core/-/core-7.2.3.tgz", - "integrity": "sha512-UyKBWwXbKCzKZwV2YJPgP3v2naDFsfJzV+KEHpdgLdPZyrpBhp+bQ80VNVe2HHrD/bLfhM4fu9pCXw6RYZKnvA==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/core/-/core-8.1.0.tgz", + "integrity": "sha512-8yt3FZbtk0iM1asj/wnAB3yg/DcH58AGMTdmyftvgGj1HDLve4kYbnYEzSiM1thmZqhQrkXSQ9JiRJOB5Gd+EA==", "dependencies": { - "@abp/utils": "~7.2.3" + "@abp/utils": "~8.1.0" } }, "node_modules/@abp/datatables.net": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/datatables.net/-/datatables.net-7.2.3.tgz", - "integrity": "sha512-g+LmRMg4Sk34iU/MN4RpgC/yd8NVEjhVWg/kT+nuWunsnwLHkcfK59KPGXn9ZLktL4VqQYj2WeXbDv8TEbOObg==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/datatables.net/-/datatables.net-8.1.0.tgz", + "integrity": "sha512-2qH1gwL1sPveYWzkowCZg2L74y8dP6Kai2BEgxSrpCmzQ+s7vA5UiCGyHnVTZmBZZpSA1XATDwjnGxAM/pxisQ==", "dependencies": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "datatables.net": "^1.11.4" } }, "node_modules/@abp/datatables.net-bs5": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.2.3.tgz", - "integrity": "sha512-TmXTkIX+Vb1O/fER5JeRlWIOZLoSXG4QD3F0ZbebrjgS9k7oSu9igR/VhXBs1m1lvOqcNKv7Y4LTNRAMw+Mi0A==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.1.0.tgz", + "integrity": "sha512-RW9/ipH0o2i7mRhH0fIhVfwm6DJCKFnWuVhRcYJNxcDjZ5wBuAXzUJMQzhr4fmgu5/C63FxvDhIYjObQYEd8FQ==", "dependencies": { - "@abp/datatables.net": "~7.2.3", + "@abp/datatables.net": "~8.1.0", "datatables.net-bs5": "^1.11.4" } }, "node_modules/@abp/font-awesome": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/font-awesome/-/font-awesome-7.2.3.tgz", - "integrity": "sha512-+4QRhfU08t1MYkmzTPX0B+p+SZQtOqtlDafzeDm5X6fbOlxV1hi97eRWtLtLgLjodjJWztpECWcsTUTgDhExwQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/font-awesome/-/font-awesome-8.1.0.tgz", + "integrity": "sha512-UNT8Eo5AzI/ZMTYjcK2kpDNGAn8YW1ECVzqoQ/lpOOVjwA/YTMvnNmcVAFKY5rAL3IJpI1Rw9LTP3v55634wfQ==", "dependencies": { - "@abp/core": "~7.2.3", - "@fortawesome/fontawesome-free": "^5.15.4" + "@abp/core": "~8.1.0", + "@fortawesome/fontawesome-free": "^6.5.1" } }, "node_modules/@abp/jquery": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/jquery/-/jquery-7.2.3.tgz", - "integrity": "sha512-r/p3D2QlV57YvrGJsLfTuIJGwLSSi5AVFtkmgKyfpyXYOCNb+TVF9sEZOZnoZebX6cT0JRvtUfZ0dk6ZBebAzg==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/jquery/-/jquery-8.1.0.tgz", + "integrity": "sha512-H1wG08Zfs1EHN+4JB75075kEfYqwu4t208FXKEPGGarcrlY1vKEB4nV6zyYj9I1SPInhpcXESMNnqqLfElJr5Q==", "dependencies": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "jquery": "~3.6.0" } }, "node_modules/@abp/jquery-form": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/jquery-form/-/jquery-form-7.2.3.tgz", - "integrity": "sha512-ucdGIZ0sxefakGRei9BJvDuoN16fKsYfpOT70/udw3k7uC3gFJD0AvAlEOEZPsFZhpNoqUKexNMym4lZovqBkg==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/jquery-form/-/jquery-form-8.1.0.tgz", + "integrity": "sha512-ZMJHBCAyjarYG+KqCEcUHTs7F1A06XEx+qHDNxw50l78cJCGHzL+nCu6Nt3ECE4ddwznWonR17GoLw7clz+6bg==", "dependencies": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "jquery-form": "^4.3.0" } }, "node_modules/@abp/jquery-validation": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/jquery-validation/-/jquery-validation-7.2.3.tgz", - "integrity": "sha512-drpE5mXErHQPk/4KChsj3zwNCA4GqNlYquTtHNv9/t5S/NuGqFAkchPV6mRYaiQypcxCndZQNSUEqnWxbuMY0g==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/jquery-validation/-/jquery-validation-8.1.0.tgz", + "integrity": "sha512-ZcmMXPEPd0FbR5ezOEAl+tE1xDibP+xXyH7nYkq/Oba60bWY1nvkfgvLjD3Jza8oKvvxEqp+T50yd9fXLb6tDQ==", "dependencies": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "jquery-validation": "^1.19.3" } }, "node_modules/@abp/jquery-validation-unobtrusive": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.2.3.tgz", - "integrity": "sha512-Hcf1sqAFRIAYKqvN1pZGed+lazzY1nztvcmQlOOgUquiXRS3QjI3dIvxWw5nekJwUPqMpSfuC1GErQo0KpE1fw==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.1.0.tgz", + "integrity": "sha512-lVa1gk5h0BDWWbM8i6PDA65mkOwBoiqNzauI+dL/GFH8FEFI4OiMBynvYCSJ7RwrrrAanuycvXJ98ffXRnLBMA==", "dependencies": { - "@abp/jquery-validation": "~7.2.3", + "@abp/jquery-validation": "~8.1.0", "jquery-validation-unobtrusive": "^3.2.12" } }, "node_modules/@abp/lodash": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/lodash/-/lodash-7.2.3.tgz", - "integrity": "sha512-5KuXPPpa2mkTlUYPR83bUTJUSSGoq9/kFSf9fYC0Wk2mFFeG4mRK6mXwcyHTfYshQe2qxuncxZsJ+4j5uQN9PA==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/lodash/-/lodash-8.1.0.tgz", + "integrity": "sha512-i/4aOx6+3/luYKK6dob1a8aELysTJ0PIf32ercMj2S6UhkRK7BDBL/UpYdvadr6QgXsjQwlWtzbOtdKREMuOYA==", "dependencies": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "lodash": "^4.17.21" } }, "node_modules/@abp/luxon": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/luxon/-/luxon-7.2.3.tgz", - "integrity": "sha512-Y3IT1GbyuNSAzfpGnc5uzjz3Z/nDRUpYiZhoX0XeoQlJ+GyVT/+dytsZbuQBLgEWmQJhk9zxdcITXFT5vrWDcw==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/luxon/-/luxon-8.1.0.tgz", + "integrity": "sha512-rJ2xnxTNLg/En/IvaabZTW/76KGGKIERZKb3ogqygPLft9nCFCTtiGreJ0XgcXNgy7QV2CJGs0gIR1bkCHJh8g==", "dependencies": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "luxon": "^2.3.0" } }, "node_modules/@abp/malihu-custom-scrollbar-plugin": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.2.3.tgz", - "integrity": "sha512-wq9eBrw/bY3wb50v5zuL0qOcVLOT86XN2ZJQj69O/bi2+0WNdLRCqMHhY0kaafb7UIBAlKChKA/xeICwCZxn+w==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.1.0.tgz", + "integrity": "sha512-UORI6PYaUNTE8V7XvXgJs1dLB4xtmKVGS1P1zFisGOcS/uT1zLnxnzZMsbUz0HZxzWUssNRG4ndt5ISaWa4KiA==", "dependencies": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "malihu-custom-scrollbar-plugin": "^3.1.5" } }, "node_modules/@abp/moment": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/moment/-/moment-7.2.3.tgz", - "integrity": "sha512-pXsOzSom9RZHRGWuVaLIVzSkPayIcWMMmgSyo8T3gtZzZG/QJbpBWT+pug0X8pmV8So4d9E0LjacmODBKLM30A==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/moment/-/moment-8.1.0.tgz", + "integrity": "sha512-jc7IlccPRm31RQbpIwgq9hZppExFcZr/y4FfbmtdNiMfp73HKgZtAEMGoQNVJubb/MJ46dug5Id/7Wl9TQxfAA==", "dependencies": { "moment": "^2.9.0" } }, "node_modules/@abp/select2": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/select2/-/select2-7.2.3.tgz", - "integrity": "sha512-Cdzl467UftB421W+l8uikGr2NlOsHwxKDxt5yPrF03LEec1MBys5y7UPUV1TEO6l0xwAVi4mW8dXaawyIOSjUA==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/select2/-/select2-8.1.0.tgz", + "integrity": "sha512-v6DsN9B4R3fBfnHcllovtEn7b8b/8DoNr3wFsqQ03Py+JfFsZ4te725zQAPD/a7pCBvdcv3kjrUkhDwMb7Pezg==", "dependencies": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "select2": "^4.0.13" } }, "node_modules/@abp/sweetalert2": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/sweetalert2/-/sweetalert2-7.2.3.tgz", - "integrity": "sha512-KHZD1YRMN6Z4JxPfXuEwocubooux8nKq6sPNG6RKg+rWpp23Fp8nX/ZngJNywVXSRqzrdEvUAM+92JG7zMwKXw==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/sweetalert2/-/sweetalert2-8.1.0.tgz", + "integrity": "sha512-NW/tlX6c0a1M85CZwyEjBQhCqObtvn18T26rGfbKv7W2USHvWt00bQ7+Bo1TKo2vfqPq4MRrG0qxD8bebh7vDQ==", "dependencies": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "sweetalert2": "^11.3.6" } }, "node_modules/@abp/timeago": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/timeago/-/timeago-7.2.3.tgz", - "integrity": "sha512-7eiibNXJWBGpQnitd/i8aWUNHOkcsuq8fAwBLJWvG8Whhh1nmBEjng0pGhheMqo0xoydefWi1K2uZDg99tKPeQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/timeago/-/timeago-8.1.0.tgz", + "integrity": "sha512-SiZ7kE68LHCZJH2xOlDFYjLw7hQ4PIthQz3lv4ChNQ5Ynij3ckNrLiYgPwSyrQD3oymBt0OGHqGbI93M031Q8w==", "dependencies": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "timeago": "^1.6.7" } }, "node_modules/@abp/toastr": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/toastr/-/toastr-7.2.3.tgz", - "integrity": "sha512-2zNMQE6ArRULP6xl+M66/EY83ZrXfNY+sNHUkmZH4uqfGhqR/ijKIQm1quxCLDmUcAjRr1kzu8BCc98pc9tfFw==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/toastr/-/toastr-8.1.0.tgz", + "integrity": "sha512-bExDOV5AwbVfIuZsROM8WgrkvBK6TJgJF9g/OAe7/JfTcih3Yv1aquDiX9/yOQrIj9WsKezImv0OHkH581S3fA==", "dependencies": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "toastr": "^2.1.4" } }, "node_modules/@abp/utils": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/utils/-/utils-7.2.3.tgz", - "integrity": "sha512-hejxDJhSI9Kor4mS9c/JHHQrW/wLXC/XMOJMUcBVkX/5IQd9GU9EW63oalNQyVA3gz3h5obnb0Qcfdv65wc5Pg==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/utils/-/utils-8.1.0.tgz", + "integrity": "sha512-SYcIMu+BNyv8Om6OdnIBgtMlBvD+1JiL7US0OEuy9ly18LonyIcwi2PKmQhuzDUu03gh0yvhDJ1q+NMv/SRz/Q==", "dependencies": { - "just-compare": "^1.3.0" + "just-compare": "^2.3.0" } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "5.15.4", - "resolved": "https://registry.npmmirror.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz", - "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==", + "version": "6.5.2", + "resolved": "https://registry.npmmirror.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz", + "integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==", "hasInstallScript": true, "engines": { "node": ">=6" @@ -2152,9 +2152,9 @@ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" }, "node_modules/just-compare": { - "version": "1.5.1", - "resolved": "https://registry.npmmirror.com/just-compare/-/just-compare-1.5.1.tgz", - "integrity": "sha512-xDEEFHNIyJNmN4uo/2RVeUcay9THtN/5ka/iw98Y/gsa8w9KXZQuyaf5eFUY6VlntA2+G+bdPmdhqqTs7T+BRw==" + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/just-compare/-/just-compare-2.3.0.tgz", + "integrity": "sha512-6shoR7HDT+fzfL3gBahx1jZG3hWLrhPAf+l7nCwahDdT9XDtosB9kIF0ZrzUp5QY8dJWfQVr5rnsPqsbvflDzg==" }, "node_modules/just-debounce": { "version": "1.1.0", @@ -3722,12 +3722,35 @@ } }, "node_modules/through2-filter": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/through2-filter/-/through2-filter-3.0.0.tgz", - "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==", + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/through2-filter/-/through2-filter-3.1.0.tgz", + "integrity": "sha512-VhZsTsfrIJjyUi6GeecnwcOJlmoqgIdGFDjqnV5ape+F1DN8GejfPO66XyIhoinxmxGImiUTrq9RwpTN5yszGA==", + "dependencies": { + "through2": "^4.0.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/through2-filter/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/through2-filter/node_modules/through2": { + "version": "4.0.2", + "resolved": "https://registry.npmmirror.com/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", "dependencies": { - "through2": "~2.0.0", - "xtend": "~4.0.0" + "readable-stream": "3" } }, "node_modules/time-stamp": { @@ -4201,9 +4224,9 @@ }, "dependencies": { "@abp/aspnetcore.mvc.ui": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.2.3.tgz", - "integrity": "sha512-KJCw6OxjQBgNw4QoSoDQOe32bFF9NvHdD09zMVsoCB/GgN66dcbZnk+ldidHcwjLFDPXOuHJMx+TKmno3VgUaQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.1.0.tgz", + "integrity": "sha512-aIUc837hnaEuZP7EV3xgMv7xM7z0KrgYlpPbOSRlR1tHS6ASvQEQec8fsdAZ+9GyYuaWKppXpkNsPu2e8KKALg==", "requires": { "ansi-colors": "^4.1.1", "extend-object": "^1.0.0", @@ -4214,215 +4237,215 @@ } }, "@abp/aspnetcore.mvc.ui.theme.leptonxlite": { - "version": "2.3.3", - "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.3.tgz", - "integrity": "sha512-96hwhfJwnDRl6+ytAL4rSOpQCSd/41Fd5OtSsYjIMn8p96QLbO8WvhZEuzno3CFa/x916WJ87fjBN9+DkHRtWg==", + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-3.1.0.tgz", + "integrity": "sha512-roc/hdUUSaJv7OZGW0n45owyXdCWgyI7VU7IHhoO4MgkBRvFVYx+YWSg/Jf50ovos1yyzC/fpGNyv13tt5HAuw==", "requires": { - "@abp/aspnetcore.mvc.ui.theme.shared": "~7.2.1" + "@abp/aspnetcore.mvc.ui.theme.shared": "~8.1.0" } }, "@abp/aspnetcore.mvc.ui.theme.shared": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.2.3.tgz", - "integrity": "sha512-+G2mM/BJWqgGqZFg6GP28PaCtq+YlRmRfg7r0JQ1wkAN9pc11yKm0LRQjFnkcVBzg0A+N2hZqnFbW7wQhwXOHg==", - "requires": { - "@abp/aspnetcore.mvc.ui": "~7.2.3", - "@abp/bootstrap": "~7.2.3", - "@abp/bootstrap-datepicker": "~7.2.3", - "@abp/bootstrap-daterangepicker": "~7.2.3", - "@abp/datatables.net-bs5": "~7.2.3", - "@abp/font-awesome": "~7.2.3", - "@abp/jquery-form": "~7.2.3", - "@abp/jquery-validation-unobtrusive": "~7.2.3", - "@abp/lodash": "~7.2.3", - "@abp/luxon": "~7.2.3", - "@abp/malihu-custom-scrollbar-plugin": "~7.2.3", - "@abp/moment": "~7.2.3", - "@abp/select2": "~7.2.3", - "@abp/sweetalert2": "~7.2.3", - "@abp/timeago": "~7.2.3", - "@abp/toastr": "~7.2.3" + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.1.0.tgz", + "integrity": "sha512-Dp2msuUp9WGZ3AynB1t0mHhtqf4yVCU4XqCmgLcL8hfVklzkxxk7Bs+8XB4oITPAXY3xgV3k62RXr+AuwdmMVA==", + "requires": { + "@abp/aspnetcore.mvc.ui": "~8.1.0", + "@abp/bootstrap": "~8.1.0", + "@abp/bootstrap-datepicker": "~8.1.0", + "@abp/bootstrap-daterangepicker": "~8.1.0", + "@abp/datatables.net-bs5": "~8.1.0", + "@abp/font-awesome": "~8.1.0", + "@abp/jquery-form": "~8.1.0", + "@abp/jquery-validation-unobtrusive": "~8.1.0", + "@abp/lodash": "~8.1.0", + "@abp/luxon": "~8.1.0", + "@abp/malihu-custom-scrollbar-plugin": "~8.1.0", + "@abp/moment": "~8.1.0", + "@abp/select2": "~8.1.0", + "@abp/sweetalert2": "~8.1.0", + "@abp/timeago": "~8.1.0", + "@abp/toastr": "~8.1.0" } }, "@abp/bootstrap": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/bootstrap/-/bootstrap-7.2.3.tgz", - "integrity": "sha512-Z00q1sAwo9PvFSpfFlbbUHPMyghLOzuEuAzz/8nA6tK7WR0KQBS/0zGC0nK9hNwbyZ4FqKwPSznRVwuwrnqyhQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/bootstrap/-/bootstrap-8.1.0.tgz", + "integrity": "sha512-Wik15yDg+7VnJDNqJALULcghaBL1rPzBWBAqf9kGSet5X+tzjffJQqz0IpiPm+UoZ5FaBuGizxSViftgW25DAA==", "requires": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "bootstrap": "^5.1.3" } }, "@abp/bootstrap-datepicker": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.2.3.tgz", - "integrity": "sha512-wiKVXftVrXcjwz0FpshD6P4WW3CNk/4cLH15aaqRjM+J0BigDeH9CczlpVc7jXdn+c8plHIRz0t5tqlUud7dIQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.1.0.tgz", + "integrity": "sha512-8O5cYHTKDXz6vNaPMsIyzevTC3IAt+GR7mKCATcR+zvk0FvTUnph7AJ1inswwGi56cSlkpEY3ChoEvYOAN66LQ==", "requires": { "bootstrap-datepicker": "^1.9.0" } }, "@abp/bootstrap-daterangepicker": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.2.3.tgz", - "integrity": "sha512-ChdnXMzHvg+HwrUtw2z6KuqRTqHVOq8qEBai+IPW6PykJSML+tZKzer3jzDIzyHq68OIqom3n3xL0XpcniKMew==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.1.0.tgz", + "integrity": "sha512-goHaUaS/bpUWUkMAhqx1UjYuxGnQtcRyqnpEv/cs09my4CnqhAecBdhlQlkoQ1OkQ2sIyEvGQCmTdnm+uJD0jA==", "requires": { "bootstrap-daterangepicker": "^3.1.0" } }, "@abp/core": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/core/-/core-7.2.3.tgz", - "integrity": "sha512-UyKBWwXbKCzKZwV2YJPgP3v2naDFsfJzV+KEHpdgLdPZyrpBhp+bQ80VNVe2HHrD/bLfhM4fu9pCXw6RYZKnvA==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/core/-/core-8.1.0.tgz", + "integrity": "sha512-8yt3FZbtk0iM1asj/wnAB3yg/DcH58AGMTdmyftvgGj1HDLve4kYbnYEzSiM1thmZqhQrkXSQ9JiRJOB5Gd+EA==", "requires": { - "@abp/utils": "~7.2.3" + "@abp/utils": "~8.1.0" } }, "@abp/datatables.net": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/datatables.net/-/datatables.net-7.2.3.tgz", - "integrity": "sha512-g+LmRMg4Sk34iU/MN4RpgC/yd8NVEjhVWg/kT+nuWunsnwLHkcfK59KPGXn9ZLktL4VqQYj2WeXbDv8TEbOObg==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/datatables.net/-/datatables.net-8.1.0.tgz", + "integrity": "sha512-2qH1gwL1sPveYWzkowCZg2L74y8dP6Kai2BEgxSrpCmzQ+s7vA5UiCGyHnVTZmBZZpSA1XATDwjnGxAM/pxisQ==", "requires": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "datatables.net": "^1.11.4" } }, "@abp/datatables.net-bs5": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.2.3.tgz", - "integrity": "sha512-TmXTkIX+Vb1O/fER5JeRlWIOZLoSXG4QD3F0ZbebrjgS9k7oSu9igR/VhXBs1m1lvOqcNKv7Y4LTNRAMw+Mi0A==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.1.0.tgz", + "integrity": "sha512-RW9/ipH0o2i7mRhH0fIhVfwm6DJCKFnWuVhRcYJNxcDjZ5wBuAXzUJMQzhr4fmgu5/C63FxvDhIYjObQYEd8FQ==", "requires": { - "@abp/datatables.net": "~7.2.3", + "@abp/datatables.net": "~8.1.0", "datatables.net-bs5": "^1.11.4" } }, "@abp/font-awesome": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/font-awesome/-/font-awesome-7.2.3.tgz", - "integrity": "sha512-+4QRhfU08t1MYkmzTPX0B+p+SZQtOqtlDafzeDm5X6fbOlxV1hi97eRWtLtLgLjodjJWztpECWcsTUTgDhExwQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/font-awesome/-/font-awesome-8.1.0.tgz", + "integrity": "sha512-UNT8Eo5AzI/ZMTYjcK2kpDNGAn8YW1ECVzqoQ/lpOOVjwA/YTMvnNmcVAFKY5rAL3IJpI1Rw9LTP3v55634wfQ==", "requires": { - "@abp/core": "~7.2.3", - "@fortawesome/fontawesome-free": "^5.15.4" + "@abp/core": "~8.1.0", + "@fortawesome/fontawesome-free": "^6.5.1" } }, "@abp/jquery": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/jquery/-/jquery-7.2.3.tgz", - "integrity": "sha512-r/p3D2QlV57YvrGJsLfTuIJGwLSSi5AVFtkmgKyfpyXYOCNb+TVF9sEZOZnoZebX6cT0JRvtUfZ0dk6ZBebAzg==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/jquery/-/jquery-8.1.0.tgz", + "integrity": "sha512-H1wG08Zfs1EHN+4JB75075kEfYqwu4t208FXKEPGGarcrlY1vKEB4nV6zyYj9I1SPInhpcXESMNnqqLfElJr5Q==", "requires": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "jquery": "~3.6.0" } }, "@abp/jquery-form": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/jquery-form/-/jquery-form-7.2.3.tgz", - "integrity": "sha512-ucdGIZ0sxefakGRei9BJvDuoN16fKsYfpOT70/udw3k7uC3gFJD0AvAlEOEZPsFZhpNoqUKexNMym4lZovqBkg==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/jquery-form/-/jquery-form-8.1.0.tgz", + "integrity": "sha512-ZMJHBCAyjarYG+KqCEcUHTs7F1A06XEx+qHDNxw50l78cJCGHzL+nCu6Nt3ECE4ddwznWonR17GoLw7clz+6bg==", "requires": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "jquery-form": "^4.3.0" } }, "@abp/jquery-validation": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/jquery-validation/-/jquery-validation-7.2.3.tgz", - "integrity": "sha512-drpE5mXErHQPk/4KChsj3zwNCA4GqNlYquTtHNv9/t5S/NuGqFAkchPV6mRYaiQypcxCndZQNSUEqnWxbuMY0g==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/jquery-validation/-/jquery-validation-8.1.0.tgz", + "integrity": "sha512-ZcmMXPEPd0FbR5ezOEAl+tE1xDibP+xXyH7nYkq/Oba60bWY1nvkfgvLjD3Jza8oKvvxEqp+T50yd9fXLb6tDQ==", "requires": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "jquery-validation": "^1.19.3" } }, "@abp/jquery-validation-unobtrusive": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.2.3.tgz", - "integrity": "sha512-Hcf1sqAFRIAYKqvN1pZGed+lazzY1nztvcmQlOOgUquiXRS3QjI3dIvxWw5nekJwUPqMpSfuC1GErQo0KpE1fw==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.1.0.tgz", + "integrity": "sha512-lVa1gk5h0BDWWbM8i6PDA65mkOwBoiqNzauI+dL/GFH8FEFI4OiMBynvYCSJ7RwrrrAanuycvXJ98ffXRnLBMA==", "requires": { - "@abp/jquery-validation": "~7.2.3", + "@abp/jquery-validation": "~8.1.0", "jquery-validation-unobtrusive": "^3.2.12" } }, "@abp/lodash": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/lodash/-/lodash-7.2.3.tgz", - "integrity": "sha512-5KuXPPpa2mkTlUYPR83bUTJUSSGoq9/kFSf9fYC0Wk2mFFeG4mRK6mXwcyHTfYshQe2qxuncxZsJ+4j5uQN9PA==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/lodash/-/lodash-8.1.0.tgz", + "integrity": "sha512-i/4aOx6+3/luYKK6dob1a8aELysTJ0PIf32ercMj2S6UhkRK7BDBL/UpYdvadr6QgXsjQwlWtzbOtdKREMuOYA==", "requires": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "lodash": "^4.17.21" } }, "@abp/luxon": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/luxon/-/luxon-7.2.3.tgz", - "integrity": "sha512-Y3IT1GbyuNSAzfpGnc5uzjz3Z/nDRUpYiZhoX0XeoQlJ+GyVT/+dytsZbuQBLgEWmQJhk9zxdcITXFT5vrWDcw==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/luxon/-/luxon-8.1.0.tgz", + "integrity": "sha512-rJ2xnxTNLg/En/IvaabZTW/76KGGKIERZKb3ogqygPLft9nCFCTtiGreJ0XgcXNgy7QV2CJGs0gIR1bkCHJh8g==", "requires": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "luxon": "^2.3.0" } }, "@abp/malihu-custom-scrollbar-plugin": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.2.3.tgz", - "integrity": "sha512-wq9eBrw/bY3wb50v5zuL0qOcVLOT86XN2ZJQj69O/bi2+0WNdLRCqMHhY0kaafb7UIBAlKChKA/xeICwCZxn+w==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.1.0.tgz", + "integrity": "sha512-UORI6PYaUNTE8V7XvXgJs1dLB4xtmKVGS1P1zFisGOcS/uT1zLnxnzZMsbUz0HZxzWUssNRG4ndt5ISaWa4KiA==", "requires": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "malihu-custom-scrollbar-plugin": "^3.1.5" } }, "@abp/moment": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/moment/-/moment-7.2.3.tgz", - "integrity": "sha512-pXsOzSom9RZHRGWuVaLIVzSkPayIcWMMmgSyo8T3gtZzZG/QJbpBWT+pug0X8pmV8So4d9E0LjacmODBKLM30A==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/moment/-/moment-8.1.0.tgz", + "integrity": "sha512-jc7IlccPRm31RQbpIwgq9hZppExFcZr/y4FfbmtdNiMfp73HKgZtAEMGoQNVJubb/MJ46dug5Id/7Wl9TQxfAA==", "requires": { "moment": "^2.9.0" } }, "@abp/select2": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/select2/-/select2-7.2.3.tgz", - "integrity": "sha512-Cdzl467UftB421W+l8uikGr2NlOsHwxKDxt5yPrF03LEec1MBys5y7UPUV1TEO6l0xwAVi4mW8dXaawyIOSjUA==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/select2/-/select2-8.1.0.tgz", + "integrity": "sha512-v6DsN9B4R3fBfnHcllovtEn7b8b/8DoNr3wFsqQ03Py+JfFsZ4te725zQAPD/a7pCBvdcv3kjrUkhDwMb7Pezg==", "requires": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "select2": "^4.0.13" } }, "@abp/sweetalert2": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/sweetalert2/-/sweetalert2-7.2.3.tgz", - "integrity": "sha512-KHZD1YRMN6Z4JxPfXuEwocubooux8nKq6sPNG6RKg+rWpp23Fp8nX/ZngJNywVXSRqzrdEvUAM+92JG7zMwKXw==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/sweetalert2/-/sweetalert2-8.1.0.tgz", + "integrity": "sha512-NW/tlX6c0a1M85CZwyEjBQhCqObtvn18T26rGfbKv7W2USHvWt00bQ7+Bo1TKo2vfqPq4MRrG0qxD8bebh7vDQ==", "requires": { - "@abp/core": "~7.2.3", + "@abp/core": "~8.1.0", "sweetalert2": "^11.3.6" } }, "@abp/timeago": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/timeago/-/timeago-7.2.3.tgz", - "integrity": "sha512-7eiibNXJWBGpQnitd/i8aWUNHOkcsuq8fAwBLJWvG8Whhh1nmBEjng0pGhheMqo0xoydefWi1K2uZDg99tKPeQ==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/timeago/-/timeago-8.1.0.tgz", + "integrity": "sha512-SiZ7kE68LHCZJH2xOlDFYjLw7hQ4PIthQz3lv4ChNQ5Ynij3ckNrLiYgPwSyrQD3oymBt0OGHqGbI93M031Q8w==", "requires": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "timeago": "^1.6.7" } }, "@abp/toastr": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/toastr/-/toastr-7.2.3.tgz", - "integrity": "sha512-2zNMQE6ArRULP6xl+M66/EY83ZrXfNY+sNHUkmZH4uqfGhqR/ijKIQm1quxCLDmUcAjRr1kzu8BCc98pc9tfFw==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/toastr/-/toastr-8.1.0.tgz", + "integrity": "sha512-bExDOV5AwbVfIuZsROM8WgrkvBK6TJgJF9g/OAe7/JfTcih3Yv1aquDiX9/yOQrIj9WsKezImv0OHkH581S3fA==", "requires": { - "@abp/jquery": "~7.2.3", + "@abp/jquery": "~8.1.0", "toastr": "^2.1.4" } }, "@abp/utils": { - "version": "7.2.3", - "resolved": "https://registry.npmmirror.com/@abp/utils/-/utils-7.2.3.tgz", - "integrity": "sha512-hejxDJhSI9Kor4mS9c/JHHQrW/wLXC/XMOJMUcBVkX/5IQd9GU9EW63oalNQyVA3gz3h5obnb0Qcfdv65wc5Pg==", + "version": "8.1.0", + "resolved": "https://registry.npmmirror.com/@abp/utils/-/utils-8.1.0.tgz", + "integrity": "sha512-SYcIMu+BNyv8Om6OdnIBgtMlBvD+1JiL7US0OEuy9ly18LonyIcwi2PKmQhuzDUu03gh0yvhDJ1q+NMv/SRz/Q==", "requires": { - "just-compare": "^1.3.0" + "just-compare": "^2.3.0" } }, "@fortawesome/fontawesome-free": { - "version": "5.15.4", - "resolved": "https://registry.npmmirror.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz", - "integrity": "sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==" + "version": "6.5.2", + "resolved": "https://registry.npmmirror.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz", + "integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==" }, "@popperjs/core": { "version": "2.11.8", @@ -5952,9 +5975,9 @@ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" }, "just-compare": { - "version": "1.5.1", - "resolved": "https://registry.npmmirror.com/just-compare/-/just-compare-1.5.1.tgz", - "integrity": "sha512-xDEEFHNIyJNmN4uo/2RVeUcay9THtN/5ka/iw98Y/gsa8w9KXZQuyaf5eFUY6VlntA2+G+bdPmdhqqTs7T+BRw==" + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/just-compare/-/just-compare-2.3.0.tgz", + "integrity": "sha512-6shoR7HDT+fzfL3gBahx1jZG3hWLrhPAf+l7nCwahDdT9XDtosB9kIF0ZrzUp5QY8dJWfQVr5rnsPqsbvflDzg==" }, "just-debounce": { "version": "1.1.0", @@ -7188,12 +7211,31 @@ } }, "through2-filter": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/through2-filter/-/through2-filter-3.0.0.tgz", - "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==", + "version": "3.1.0", + "resolved": "https://registry.npmmirror.com/through2-filter/-/through2-filter-3.1.0.tgz", + "integrity": "sha512-VhZsTsfrIJjyUi6GeecnwcOJlmoqgIdGFDjqnV5ape+F1DN8GejfPO66XyIhoinxmxGImiUTrq9RwpTN5yszGA==", "requires": { - "through2": "~2.0.0", - "xtend": "~4.0.0" + "through2": "^4.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "through2": { + "version": "4.0.2", + "resolved": "https://registry.npmmirror.com/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "requires": { + "readable-stream": "3" + } + } } }, "time-stamp": { diff --git a/aspnet-core/services/LY.MicroService.IdentityServer/package.json b/aspnet-core/services/LY.MicroService.IdentityServer/package.json index e0ba78575..ce795b41f 100644 --- a/aspnet-core/services/LY.MicroService.IdentityServer/package.json +++ b/aspnet-core/services/LY.MicroService.IdentityServer/package.json @@ -1,8 +1,8 @@ { - "version": "7.3.2", + "version": "8.1.0", "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "2.3.3" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "3.1.0" } } \ No newline at end of file diff --git a/aspnet-core/services/LY.MicroService.IdentityServer/yarn.lock b/aspnet-core/services/LY.MicroService.IdentityServer/yarn.lock index 0728a474e..91e2249d3 100644 --- a/aspnet-core/services/LY.MicroService.IdentityServer/yarn.lock +++ b/aspnet-core/services/LY.MicroService.IdentityServer/yarn.lock @@ -2,39 +2,39 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@2.3.3": - version "2.3.3" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.3.tgz" - integrity sha512-96hwhfJwnDRl6+ytAL4rSOpQCSd/41Fd5OtSsYjIMn8p96QLbO8WvhZEuzno3CFa/x916WJ87fjBN9+DkHRtWg== - dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" - -"@abp/aspnetcore.mvc.ui.theme.shared@~7.2.1": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.2.3.tgz" - integrity sha512-+G2mM/BJWqgGqZFg6GP28PaCtq+YlRmRfg7r0JQ1wkAN9pc11yKm0LRQjFnkcVBzg0A+N2hZqnFbW7wQhwXOHg== - dependencies: - "@abp/aspnetcore.mvc.ui" "~7.2.3" - "@abp/bootstrap" "~7.2.3" - "@abp/bootstrap-datepicker" "~7.2.3" - "@abp/bootstrap-daterangepicker" "~7.2.3" - "@abp/datatables.net-bs5" "~7.2.3" - "@abp/font-awesome" "~7.2.3" - "@abp/jquery-form" "~7.2.3" - "@abp/jquery-validation-unobtrusive" "~7.2.3" - "@abp/lodash" "~7.2.3" - "@abp/luxon" "~7.2.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.2.3" - "@abp/moment" "~7.2.3" - "@abp/select2" "~7.2.3" - "@abp/sweetalert2" "~7.2.3" - "@abp/timeago" "~7.2.3" - "@abp/toastr" "~7.2.3" - -"@abp/aspnetcore.mvc.ui@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.2.3.tgz" - integrity sha512-KJCw6OxjQBgNw4QoSoDQOe32bFF9NvHdD09zMVsoCB/GgN66dcbZnk+ldidHcwjLFDPXOuHJMx+TKmno3VgUaQ== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@3.1.0": + version "3.1.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-3.1.0.tgz" + integrity sha512-roc/hdUUSaJv7OZGW0n45owyXdCWgyI7VU7IHhoO4MgkBRvFVYx+YWSg/Jf50ovos1yyzC/fpGNyv13tt5HAuw== + dependencies: + "@abp/aspnetcore.mvc.ui.theme.shared" "~8.1.0" + +"@abp/aspnetcore.mvc.ui.theme.shared@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-8.1.0.tgz" + integrity sha512-Dp2msuUp9WGZ3AynB1t0mHhtqf4yVCU4XqCmgLcL8hfVklzkxxk7Bs+8XB4oITPAXY3xgV3k62RXr+AuwdmMVA== + dependencies: + "@abp/aspnetcore.mvc.ui" "~8.1.0" + "@abp/bootstrap" "~8.1.0" + "@abp/bootstrap-datepicker" "~8.1.0" + "@abp/bootstrap-daterangepicker" "~8.1.0" + "@abp/datatables.net-bs5" "~8.1.0" + "@abp/font-awesome" "~8.1.0" + "@abp/jquery-form" "~8.1.0" + "@abp/jquery-validation-unobtrusive" "~8.1.0" + "@abp/lodash" "~8.1.0" + "@abp/luxon" "~8.1.0" + "@abp/malihu-custom-scrollbar-plugin" "~8.1.0" + "@abp/moment" "~8.1.0" + "@abp/select2" "~8.1.0" + "@abp/sweetalert2" "~8.1.0" + "@abp/timeago" "~8.1.0" + "@abp/toastr" "~8.1.0" + +"@abp/aspnetcore.mvc.ui@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-8.1.0.tgz" + integrity sha512-aIUc837hnaEuZP7EV3xgMv7xM7z0KrgYlpPbOSRlR1tHS6ASvQEQec8fsdAZ+9GyYuaWKppXpkNsPu2e8KKALg== dependencies: ansi-colors "^4.1.1" extend-object "^1.0.0" @@ -43,165 +43,165 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.2.3.tgz" - integrity sha512-wiKVXftVrXcjwz0FpshD6P4WW3CNk/4cLH15aaqRjM+J0BigDeH9CczlpVc7jXdn+c8plHIRz0t5tqlUud7dIQ== +"@abp/bootstrap-datepicker@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-8.1.0.tgz" + integrity sha512-8O5cYHTKDXz6vNaPMsIyzevTC3IAt+GR7mKCATcR+zvk0FvTUnph7AJ1inswwGi56cSlkpEY3ChoEvYOAN66LQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.2.3.tgz" - integrity sha512-ChdnXMzHvg+HwrUtw2z6KuqRTqHVOq8qEBai+IPW6PykJSML+tZKzer3jzDIzyHq68OIqom3n3xL0XpcniKMew== +"@abp/bootstrap-daterangepicker@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-8.1.0.tgz" + integrity sha512-goHaUaS/bpUWUkMAhqx1UjYuxGnQtcRyqnpEv/cs09my4CnqhAecBdhlQlkoQ1OkQ2sIyEvGQCmTdnm+uJD0jA== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/bootstrap/-/bootstrap-7.2.3.tgz" - integrity sha512-Z00q1sAwo9PvFSpfFlbbUHPMyghLOzuEuAzz/8nA6tK7WR0KQBS/0zGC0nK9hNwbyZ4FqKwPSznRVwuwrnqyhQ== +"@abp/bootstrap@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/bootstrap/-/bootstrap-8.1.0.tgz" + integrity sha512-Wik15yDg+7VnJDNqJALULcghaBL1rPzBWBAqf9kGSet5X+tzjffJQqz0IpiPm+UoZ5FaBuGizxSViftgW25DAA== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~8.1.0" bootstrap "^5.1.3" -"@abp/core@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/core/-/core-7.2.3.tgz" - integrity sha512-UyKBWwXbKCzKZwV2YJPgP3v2naDFsfJzV+KEHpdgLdPZyrpBhp+bQ80VNVe2HHrD/bLfhM4fu9pCXw6RYZKnvA== +"@abp/core@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/core/-/core-8.1.0.tgz" + integrity sha512-8yt3FZbtk0iM1asj/wnAB3yg/DcH58AGMTdmyftvgGj1HDLve4kYbnYEzSiM1thmZqhQrkXSQ9JiRJOB5Gd+EA== dependencies: - "@abp/utils" "~7.2.3" + "@abp/utils" "~8.1.0" -"@abp/datatables.net-bs5@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.2.3.tgz" - integrity sha512-TmXTkIX+Vb1O/fER5JeRlWIOZLoSXG4QD3F0ZbebrjgS9k7oSu9igR/VhXBs1m1lvOqcNKv7Y4LTNRAMw+Mi0A== +"@abp/datatables.net-bs5@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/datatables.net-bs5/-/datatables.net-bs5-8.1.0.tgz" + integrity sha512-RW9/ipH0o2i7mRhH0fIhVfwm6DJCKFnWuVhRcYJNxcDjZ5wBuAXzUJMQzhr4fmgu5/C63FxvDhIYjObQYEd8FQ== dependencies: - "@abp/datatables.net" "~7.2.3" + "@abp/datatables.net" "~8.1.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/datatables.net/-/datatables.net-7.2.3.tgz" - integrity sha512-g+LmRMg4Sk34iU/MN4RpgC/yd8NVEjhVWg/kT+nuWunsnwLHkcfK59KPGXn9ZLktL4VqQYj2WeXbDv8TEbOObg== +"@abp/datatables.net@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/datatables.net/-/datatables.net-8.1.0.tgz" + integrity sha512-2qH1gwL1sPveYWzkowCZg2L74y8dP6Kai2BEgxSrpCmzQ+s7vA5UiCGyHnVTZmBZZpSA1XATDwjnGxAM/pxisQ== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~8.1.0" datatables.net "^1.11.4" -"@abp/font-awesome@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/font-awesome/-/font-awesome-7.2.3.tgz" - integrity sha512-+4QRhfU08t1MYkmzTPX0B+p+SZQtOqtlDafzeDm5X6fbOlxV1hi97eRWtLtLgLjodjJWztpECWcsTUTgDhExwQ== +"@abp/font-awesome@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/font-awesome/-/font-awesome-8.1.0.tgz" + integrity sha512-UNT8Eo5AzI/ZMTYjcK2kpDNGAn8YW1ECVzqoQ/lpOOVjwA/YTMvnNmcVAFKY5rAL3IJpI1Rw9LTP3v55634wfQ== dependencies: - "@abp/core" "~7.2.3" - "@fortawesome/fontawesome-free" "^5.15.4" + "@abp/core" "~8.1.0" + "@fortawesome/fontawesome-free" "^6.5.1" -"@abp/jquery-form@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/jquery-form/-/jquery-form-7.2.3.tgz" - integrity sha512-ucdGIZ0sxefakGRei9BJvDuoN16fKsYfpOT70/udw3k7uC3gFJD0AvAlEOEZPsFZhpNoqUKexNMym4lZovqBkg== +"@abp/jquery-form@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/jquery-form/-/jquery-form-8.1.0.tgz" + integrity sha512-ZMJHBCAyjarYG+KqCEcUHTs7F1A06XEx+qHDNxw50l78cJCGHzL+nCu6Nt3ECE4ddwznWonR17GoLw7clz+6bg== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~8.1.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.2.3.tgz" - integrity sha512-Hcf1sqAFRIAYKqvN1pZGed+lazzY1nztvcmQlOOgUquiXRS3QjI3dIvxWw5nekJwUPqMpSfuC1GErQo0KpE1fw== +"@abp/jquery-validation-unobtrusive@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-8.1.0.tgz" + integrity sha512-lVa1gk5h0BDWWbM8i6PDA65mkOwBoiqNzauI+dL/GFH8FEFI4OiMBynvYCSJ7RwrrrAanuycvXJ98ffXRnLBMA== dependencies: - "@abp/jquery-validation" "~7.2.3" + "@abp/jquery-validation" "~8.1.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/jquery-validation/-/jquery-validation-7.2.3.tgz" - integrity sha512-drpE5mXErHQPk/4KChsj3zwNCA4GqNlYquTtHNv9/t5S/NuGqFAkchPV6mRYaiQypcxCndZQNSUEqnWxbuMY0g== +"@abp/jquery-validation@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/jquery-validation/-/jquery-validation-8.1.0.tgz" + integrity sha512-ZcmMXPEPd0FbR5ezOEAl+tE1xDibP+xXyH7nYkq/Oba60bWY1nvkfgvLjD3Jza8oKvvxEqp+T50yd9fXLb6tDQ== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~8.1.0" jquery-validation "^1.19.3" -"@abp/jquery@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/jquery/-/jquery-7.2.3.tgz" - integrity sha512-r/p3D2QlV57YvrGJsLfTuIJGwLSSi5AVFtkmgKyfpyXYOCNb+TVF9sEZOZnoZebX6cT0JRvtUfZ0dk6ZBebAzg== +"@abp/jquery@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/jquery/-/jquery-8.1.0.tgz" + integrity sha512-H1wG08Zfs1EHN+4JB75075kEfYqwu4t208FXKEPGGarcrlY1vKEB4nV6zyYj9I1SPInhpcXESMNnqqLfElJr5Q== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~8.1.0" jquery "~3.6.0" -"@abp/lodash@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/lodash/-/lodash-7.2.3.tgz" - integrity sha512-5KuXPPpa2mkTlUYPR83bUTJUSSGoq9/kFSf9fYC0Wk2mFFeG4mRK6mXwcyHTfYshQe2qxuncxZsJ+4j5uQN9PA== +"@abp/lodash@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/lodash/-/lodash-8.1.0.tgz" + integrity sha512-i/4aOx6+3/luYKK6dob1a8aELysTJ0PIf32ercMj2S6UhkRK7BDBL/UpYdvadr6QgXsjQwlWtzbOtdKREMuOYA== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~8.1.0" lodash "^4.17.21" -"@abp/luxon@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/luxon/-/luxon-7.2.3.tgz" - integrity sha512-Y3IT1GbyuNSAzfpGnc5uzjz3Z/nDRUpYiZhoX0XeoQlJ+GyVT/+dytsZbuQBLgEWmQJhk9zxdcITXFT5vrWDcw== +"@abp/luxon@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/luxon/-/luxon-8.1.0.tgz" + integrity sha512-rJ2xnxTNLg/En/IvaabZTW/76KGGKIERZKb3ogqygPLft9nCFCTtiGreJ0XgcXNgy7QV2CJGs0gIR1bkCHJh8g== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~8.1.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.2.3.tgz" - integrity sha512-wq9eBrw/bY3wb50v5zuL0qOcVLOT86XN2ZJQj69O/bi2+0WNdLRCqMHhY0kaafb7UIBAlKChKA/xeICwCZxn+w== +"@abp/malihu-custom-scrollbar-plugin@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-8.1.0.tgz" + integrity sha512-UORI6PYaUNTE8V7XvXgJs1dLB4xtmKVGS1P1zFisGOcS/uT1zLnxnzZMsbUz0HZxzWUssNRG4ndt5ISaWa4KiA== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~8.1.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/moment/-/moment-7.2.3.tgz" - integrity sha512-pXsOzSom9RZHRGWuVaLIVzSkPayIcWMMmgSyo8T3gtZzZG/QJbpBWT+pug0X8pmV8So4d9E0LjacmODBKLM30A== +"@abp/moment@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/moment/-/moment-8.1.0.tgz" + integrity sha512-jc7IlccPRm31RQbpIwgq9hZppExFcZr/y4FfbmtdNiMfp73HKgZtAEMGoQNVJubb/MJ46dug5Id/7Wl9TQxfAA== dependencies: moment "^2.9.0" -"@abp/select2@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/select2/-/select2-7.2.3.tgz" - integrity sha512-Cdzl467UftB421W+l8uikGr2NlOsHwxKDxt5yPrF03LEec1MBys5y7UPUV1TEO6l0xwAVi4mW8dXaawyIOSjUA== +"@abp/select2@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/select2/-/select2-8.1.0.tgz" + integrity sha512-v6DsN9B4R3fBfnHcllovtEn7b8b/8DoNr3wFsqQ03Py+JfFsZ4te725zQAPD/a7pCBvdcv3kjrUkhDwMb7Pezg== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~8.1.0" select2 "^4.0.13" -"@abp/sweetalert2@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/sweetalert2/-/sweetalert2-7.2.3.tgz" - integrity sha512-KHZD1YRMN6Z4JxPfXuEwocubooux8nKq6sPNG6RKg+rWpp23Fp8nX/ZngJNywVXSRqzrdEvUAM+92JG7zMwKXw== +"@abp/sweetalert2@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/sweetalert2/-/sweetalert2-8.1.0.tgz" + integrity sha512-NW/tlX6c0a1M85CZwyEjBQhCqObtvn18T26rGfbKv7W2USHvWt00bQ7+Bo1TKo2vfqPq4MRrG0qxD8bebh7vDQ== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~8.1.0" sweetalert2 "^11.3.6" -"@abp/timeago@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/timeago/-/timeago-7.2.3.tgz" - integrity sha512-7eiibNXJWBGpQnitd/i8aWUNHOkcsuq8fAwBLJWvG8Whhh1nmBEjng0pGhheMqo0xoydefWi1K2uZDg99tKPeQ== +"@abp/timeago@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/timeago/-/timeago-8.1.0.tgz" + integrity sha512-SiZ7kE68LHCZJH2xOlDFYjLw7hQ4PIthQz3lv4ChNQ5Ynij3ckNrLiYgPwSyrQD3oymBt0OGHqGbI93M031Q8w== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~8.1.0" timeago "^1.6.7" -"@abp/toastr@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/toastr/-/toastr-7.2.3.tgz" - integrity sha512-2zNMQE6ArRULP6xl+M66/EY83ZrXfNY+sNHUkmZH4uqfGhqR/ijKIQm1quxCLDmUcAjRr1kzu8BCc98pc9tfFw== +"@abp/toastr@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/toastr/-/toastr-8.1.0.tgz" + integrity sha512-bExDOV5AwbVfIuZsROM8WgrkvBK6TJgJF9g/OAe7/JfTcih3Yv1aquDiX9/yOQrIj9WsKezImv0OHkH581S3fA== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~8.1.0" toastr "^2.1.4" -"@abp/utils@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/utils/-/utils-7.2.3.tgz" - integrity sha512-hejxDJhSI9Kor4mS9c/JHHQrW/wLXC/XMOJMUcBVkX/5IQd9GU9EW63oalNQyVA3gz3h5obnb0Qcfdv65wc5Pg== +"@abp/utils@~8.1.0": + version "8.1.0" + resolved "https://registry.npmmirror.com/@abp/utils/-/utils-8.1.0.tgz" + integrity sha512-SYcIMu+BNyv8Om6OdnIBgtMlBvD+1JiL7US0OEuy9ly18LonyIcwi2PKmQhuzDUu03gh0yvhDJ1q+NMv/SRz/Q== dependencies: - just-compare "^1.3.0" + just-compare "^2.3.0" -"@fortawesome/fontawesome-free@^5.15.4": - version "5.15.4" - resolved "https://registry.npmmirror.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz" - integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg== +"@fortawesome/fontawesome-free@^6.5.1": + version "6.5.2" + resolved "https://registry.npmmirror.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz" + integrity sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q== "@popperjs/core@^2.11.8": version "2.11.8" @@ -1497,10 +1497,10 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== -just-compare@^1.3.0: - version "1.5.1" - resolved "https://registry.npmmirror.com/just-compare/-/just-compare-1.5.1.tgz" - integrity sha512-xDEEFHNIyJNmN4uo/2RVeUcay9THtN/5ka/iw98Y/gsa8w9KXZQuyaf5eFUY6VlntA2+G+bdPmdhqqTs7T+BRw== +just-compare@^2.3.0: + version "2.3.0" + resolved "https://registry.npmmirror.com/just-compare/-/just-compare-2.3.0.tgz" + integrity sha512-6shoR7HDT+fzfL3gBahx1jZG3hWLrhPAf+l7nCwahDdT9XDtosB9kIF0ZrzUp5QY8dJWfQVr5rnsPqsbvflDzg== just-debounce@^1.0.0: version "1.1.0" @@ -2044,6 +2044,15 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@3: + version "3.6.2" + resolved "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readdirp@^2.2.1: version "2.2.1" resolved "https://registry.npmmirror.com/readdirp/-/readdirp-2.2.1.tgz" @@ -2326,7 +2335,7 @@ stream-shift@^1.0.0: resolved "https://registry.npmmirror.com/stream-shift/-/stream-shift-1.0.3.tgz" integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ== -string_decoder@~1.1.1: +string_decoder@^1.1.1, string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz" integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== @@ -2375,14 +2384,13 @@ sweetalert2@^11.3.6: integrity sha512-5Jlzrmaitay6KzU+2+LhYu9q+L4v/dZ8oZyEDH14ep0C/QilCnFLHmqAyD/Lhq/lm5DiwsOs6Tr58iv8k3wyGg== through2-filter@^3.0.0: - version "3.0.0" - resolved "https://registry.npmmirror.com/through2-filter/-/through2-filter-3.0.0.tgz" - integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA== + version "3.1.0" + resolved "https://registry.npmmirror.com/through2-filter/-/through2-filter-3.1.0.tgz" + integrity sha512-VhZsTsfrIJjyUi6GeecnwcOJlmoqgIdGFDjqnV5ape+F1DN8GejfPO66XyIhoinxmxGImiUTrq9RwpTN5yszGA== dependencies: - through2 "~2.0.0" - xtend "~4.0.0" + through2 "^4.0.2" -through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: +through2@^2.0.0, through2@^2.0.3: version "2.0.5" resolved "https://registry.npmmirror.com/through2/-/through2-2.0.5.tgz" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -2390,6 +2398,13 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" +through2@^4.0.2: + version "4.0.2" + resolved "https://registry.npmmirror.com/through2/-/through2-4.0.2.tgz" + integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== + dependencies: + readable-stream "3" + time-stamp@^1.0.0: version "1.1.0" resolved "https://registry.npmmirror.com/time-stamp/-/time-stamp-1.1.0.tgz" @@ -2533,7 +2548,7 @@ use@^3.1.0: resolved "https://registry.npmmirror.com/use/-/use-3.1.1.tgz" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== -util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== @@ -2631,7 +2646,7 @@ wrappy@1: resolved "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -xtend@~4.0.0, xtend@~4.0.1: +xtend@~4.0.1: version "4.0.2" resolved "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj index e8c8958bc..46699574d 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj @@ -48,6 +48,7 @@ + diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs index a394b0d67..3ed64e8ff 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.Configure.cs @@ -1,17 +1,21 @@ using DotNetCore.CAP; +using LINGYUN.Abp.AspNetCore.HttpOverrides.Forwarded; using LINGYUN.Abp.ExceptionHandling; using LINGYUN.Abp.ExceptionHandling.Emailing; using LINGYUN.Abp.Localization.CultureMap; +using LINGYUN.Abp.LocalizationManagement.Localization; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; -using Medallion.Threading.Redis; using Medallion.Threading; +using Medallion.Threading.Redis; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Logging; using Microsoft.OpenApi.Models; using StackExchange.Redis; using System; @@ -28,13 +32,9 @@ using Volo.Abp.Json.SystemTextJson; using Volo.Abp.Localization; using Volo.Abp.MultiTenancy; +using Volo.Abp.Security.Claims; using Volo.Abp.Threading; using Volo.Abp.VirtualFileSystem; -using LINGYUN.Abp.LocalizationManagement.Localization; -using Microsoft.IdentityModel.Logging; -using LINGYUN.Abp.AspNetCore.HttpOverrides.Forwarded; -using Microsoft.AspNetCore.HttpOverrides; -using Volo.Abp.Security.Claims; namespace LY.MicroService.LocalizationManagement; @@ -64,6 +64,7 @@ private void PreForwardedHeaders() private void PreConfigureApp(IConfiguration configuration) { + JwtClaimTypesMapping.MapAbpClaimTypes(); AbpSerilogEnrichersConsts.ApplicationName = ApplicationName; PreConfigure(options => @@ -211,11 +212,12 @@ private void ConfigureMultiTenancy(IConfiguration configuration) }); } - private void ConfigureIdentity() + private void ConfigureIdentity(IConfiguration configuration) { Configure(options => { options.IsDynamicClaimsEnabled = true; + options.RemoteRefreshUrl = configuration["App:RefreshClaimsUrl"] + options.RemoteRefreshUrl; }); } diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs index 8266d50fd..25e0ef848 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LocalizationManagementHttpApiHostModule.cs @@ -74,13 +74,13 @@ public override void ConfigureServices(ServiceConfigurationContext context) var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - ConfigureIdentity(); ConfigureDbContext(); ConfigureLocalization(); ConfigreExceptionHandling(); ConfigureVirtualFileSystem(); ConfigureFeatureManagement(); ConfigureCaching(configuration); + ConfigureIdentity(configuration); ConfigureAuditing(configuration); ConfigureSwagger(context.Services); ConfigureMultiTenancy(configuration); @@ -97,6 +97,8 @@ public override void OnApplicationInitialization(ApplicationInitializationContex var env = context.GetEnvironment(); app.UseForwardedHeaders(); + // 本地化 + app.UseMapRequestLocalization(); // http调用链 app.UseCorrelationId(); // 虚拟文件系统 @@ -107,13 +109,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex app.UseCors(DefaultCorsPolicyName); // 认证 app.UseAuthentication(); - // IDS与JWT不匹配可能造成鉴权错误 - // TODO: abp在某个更新版本建议移除此中间价 - app.UseAbpClaimsMap(); - // jwt - app.UseJwtTokenMiddleware(); - // 本地化 - app.UseMapRequestLocalization(); + app.UseDynamicClaims(); // 授权 app.UseAuthorization(); // Swagger diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json index 053a7aef8..024c7c99f 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json @@ -10,7 +10,8 @@ }, "App": { "CorsOrigins": "http://127.0.0.1:3100", - "ShowPii": true + "ShowPii": true, + "RefreshClaimsUrl": "http://127.0.0.1:30015" }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj index 6fa1023ab..2653dd4ce 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj @@ -54,6 +54,7 @@ + diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs index 077d712c5..1b3d7e0d0 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.Configure.cs @@ -70,6 +70,7 @@ private void PreForwardedHeaders() private void PreConfigureApp(IConfiguration configuration) { + JwtClaimTypesMapping.MapAbpClaimTypes(); AbpSerilogEnrichersConsts.ApplicationName = ApplicationName; PreConfigure(options => @@ -261,11 +262,12 @@ private void ConfigureMultiTenancy(IConfiguration configuration) } } - private void ConfigureIdentity() + private void ConfigureIdentity(IConfiguration configuration) { Configure(options => { options.IsDynamicClaimsEnabled = true; + options.RemoteRefreshUrl = configuration["App:RefreshClaimsUrl"] + options.RemoteRefreshUrl; }); } diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs index c0669c48a..5d36c088f 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/PlatformManagementHttpApiHostModule.cs @@ -111,7 +111,6 @@ public override void ConfigureServices(ServiceConfigurationContext context) var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - ConfigureIdentity(); ConfigureDbContext(); ConfigureBlobStoring(); ConfigureLocalization(); @@ -120,6 +119,7 @@ public override void ConfigureServices(ServiceConfigurationContext context) ConfigureVirtualFileSystem(); ConfigureFeatureManagement(); ConfigureCaching(configuration); + ConfigureIdentity(configuration); ConfigureAuditing(configuration); ConfigureSwagger(context.Services); ConfigureMultiTenancy(configuration); @@ -150,7 +150,10 @@ public override void OnApplicationInitialization(ApplicationInitializationContex { var app = context.GetApplicationBuilder(); var env = context.GetEnvironment(); + app.UseForwardedHeaders(); + // 本地化 + app.UseMapRequestLocalization(); // http调用链 app.UseCorrelationId(); // 虚拟文件系统 @@ -161,15 +164,10 @@ public override void OnApplicationInitialization(ApplicationInitializationContex app.UseCors(DefaultCorsPolicyName); // 认证 app.UseAuthentication(); - // IDS与JWT不匹配可能造成鉴权错误 - // TODO: abp在某个更新版本建议移除此中间价 - app.UseAbpClaimsMap(); - // jwt - app.UseJwtTokenMiddleware(); + app.UseDynamicClaims(); // 多租户 app.UseMultiTenancy(); - // 本地化 - app.UseMapRequestLocalization(); + // 授权 app.UseAuthorization(); // Swagger diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json index 8884c217d..c963b9da1 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json @@ -17,7 +17,8 @@ ] }, "CorsOrigins": "http://127.0.0.1:3100", - "ShowPii": true + "ShowPii": true, + "RefreshClaimsUrl": "http://127.0.0.1:30015" }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj index 8d2a63312..4bf02e7ea 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj @@ -56,6 +56,7 @@ + diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs index 0b77c8282..836f72a70 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.Configure.cs @@ -72,6 +72,7 @@ private void PreForwardedHeaders() private void PreConfigureApp(IConfiguration configuration) { + JwtClaimTypesMapping.MapAbpClaimTypes(); AbpSerilogEnrichersConsts.ApplicationName = ApplicationName; PreConfigure(options => @@ -302,11 +303,12 @@ private void ConfigureMultiTenancy(IConfiguration configuration) } } - private void ConfigureIdentity() + private void ConfigureIdentity(IConfiguration configuration) { Configure(options => { options.IsDynamicClaimsEnabled = true; + options.RemoteRefreshUrl = configuration["App:RefreshClaimsUrl"] + options.RemoteRefreshUrl; }); } diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs index b1b560723..31e290b55 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs @@ -126,7 +126,6 @@ public override void ConfigureServices(ServiceConfigurationContext context) var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - ConfigureIdentity(); ConfigureDbContext(); ConfigureLocalization(); ConfigureNotifications(); @@ -136,6 +135,7 @@ public override void ConfigureServices(ServiceConfigurationContext context) ConfigureFeatureManagement(); ConfigureCaching(configuration); ConfigureAuditing(configuration); + ConfigureIdentity(configuration); ConfigureSwagger(context.Services); ConfigureMultiTenancy(configuration); ConfigureJsonSerializer(configuration); @@ -149,6 +149,8 @@ public override void OnApplicationInitialization(ApplicationInitializationContex { var app = context.GetApplicationBuilder(); app.UseForwardedHeaders(); + // 本地化 + app.UseMapRequestLocalization(); // http调用链 app.UseCorrelationId(); // 虚拟文件系统 @@ -159,13 +161,9 @@ public override void OnApplicationInitialization(ApplicationInitializationContex app.UseCors(DefaultCorsPolicyName); // 认证 app.UseAuthentication(); - app.UseAbpClaimsMap(); - // jwt - app.UseJwtTokenMiddleware(); + app.UseDynamicClaims(); // 多租户 app.UseMultiTenancy(); - // 本地化 - app.UseMapRequestLocalization(); // 授权 app.UseAuthorization(); // Swagger diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json index bbdc46c20..f6d5771f5 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json @@ -16,7 +16,8 @@ "127.0.0.1" ] }, - "ShowPii": true + "ShowPii": true, + "RefreshClaimsUrl": "http://127.0.0.1:30015" }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj index a936d189a..e7c025969 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj @@ -61,6 +61,7 @@ + diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs index 9909fe6aa..35f6ebffc 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.Configure.cs @@ -65,6 +65,7 @@ private void PreForwardedHeaders() private void PreConfigureApp(IConfiguration configuration) { + JwtClaimTypesMapping.MapAbpClaimTypes(); AbpSerilogEnrichersConsts.ApplicationName = ApplicationName; PreConfigure(options => @@ -264,11 +265,12 @@ private void ConfigureMultiTenancy(IConfiguration configuration) } } - private void ConfigureIdentity() + private void ConfigureIdentity(IConfiguration configuration) { Configure(options => { options.IsDynamicClaimsEnabled = true; + options.RemoteRefreshUrl = configuration["App:RefreshClaimsUrl"] + options.RemoteRefreshUrl; }); } diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs index 5bd169a46..e812faf1b 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/TaskManagementHttpApiHostModule.cs @@ -98,7 +98,6 @@ public override void ConfigureServices(ServiceConfigurationContext context) var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - ConfigureIdentity(); ConfigureDbContext(); ConfigureLocalization(); ConfigureBackgroundTasks(); @@ -107,6 +106,7 @@ public override void ConfigureServices(ServiceConfigurationContext context) ConfigureFeatureManagement(); ConfigureCaching(configuration); ConfigureAuditing(configuration); + ConfigureIdentity(configuration); ConfigureMultiTenancy(configuration); ConfigureSwagger(context.Services); ConfigureJsonSerializer(configuration); diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json index 0e9feb2d4..41145a1da 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/appsettings.Development.json @@ -9,7 +9,8 @@ "tag": "LINGYUN.Abp.TaskManagement" }, "App": { - "ShowPii": true + "ShowPii": true, + "RefreshClaimsUrl": "http://127.0.0.1:30015" }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj index 5b76a49b9..71f6ce4a6 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj @@ -55,6 +55,7 @@ + diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs index d37cf44e5..5e4e8606f 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs @@ -73,6 +73,7 @@ private void PreForwardedHeaders() private void PreConfigureApp(IConfiguration configuration) { + JwtClaimTypesMapping.MapAbpClaimTypes(); AbpSerilogEnrichersConsts.ApplicationName = ApplicationName; PreConfigure(options => @@ -324,11 +325,12 @@ private void ConfigureMultiTenancy(IConfiguration configuration) } } - private void ConfigureIdentity() + private void ConfigureIdentity(IConfiguration configuration) { Configure(options => { options.IsDynamicClaimsEnabled = true; + options.RemoteRefreshUrl = configuration["App:RefreshClaimsUrl"] + options.RemoteRefreshUrl; }); } diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs index 53f8b8668..55b5902e1 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.cs @@ -99,7 +99,6 @@ public override void ConfigureServices(ServiceConfigurationContext context) var configuration = context.Services.GetConfiguration(); ConfigureWrapper(); - ConfigureIdentity(); ConfigureDbContext(); ConfigureLocalization(); ConfigureExceptionHandling(); @@ -107,6 +106,7 @@ public override void ConfigureServices(ServiceConfigurationContext context) ConfigureFeatureManagement(); ConfigureCaching(configuration); ConfigureAuditing(configuration); + ConfigureIdentity(configuration); ConfigureMultiTenancy(configuration); ConfigureSwagger(context.Services); ConfigureWebhooks(context.Services); diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json index fa587f56c..8b95d63e7 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/appsettings.Development.json @@ -9,7 +9,8 @@ "tag": "LINGYUN.Abp.WebhooksManagement" }, "App": { - "ShowPii": true + "ShowPii": true, + "RefreshClaimsUrl": "http://127.0.0.1:30015" }, "Auditing": { "AllEntitiesSelector": true diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj index 21b2bb249..89c1ab674 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj @@ -57,6 +57,7 @@ + diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs index 487c3bbd5..153e7e86c 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs @@ -75,6 +75,7 @@ private void PreConfigureForwardedHeaders() private void PreConfigureApp(IConfiguration configuration) { + JwtClaimTypesMapping.MapAbpClaimTypes(); AbpSerilogEnrichersConsts.ApplicationName = ApplicationName; PreConfigure(options => @@ -354,11 +355,13 @@ private void ConfigureMultiTenancy(IConfiguration configuration) } } - private void ConfigureIdentity() + private void ConfigureIdentity(IConfiguration configuration) { Configure(options => { options.IsDynamicClaimsEnabled = true; + options.RemoteRefreshUrl = configuration["App:RefreshClaimsUrl"] + options.RemoteRefreshUrl; + }); } diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs index f7005fb82..d03fae438 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs @@ -102,7 +102,6 @@ public override void ConfigureServices(ServiceConfigurationContext context) var hostingEnvironment = context.Services.GetHostingEnvironment(); var configuration = context.Services.GetConfiguration(); - ConfigureIdentity(); ConfigureDbContext(); ConfigureLocalization(); ConfigureBackgroundTasks(); @@ -110,6 +109,7 @@ public override void ConfigureServices(ServiceConfigurationContext context) ConfigureVirtualFileSystem(); ConfigureCaching(configuration); ConfigureAuditing(configuration); + ConfigureIdentity(configuration); ConfigureMultiTenancy(configuration); ConfigureSwagger(context.Services); ConfigureEndpoints(context.Services); diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json index 96c19979c..30b411b28 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json @@ -10,7 +10,8 @@ }, "App": { "CorsOrigins": "http://127.0.0.1:3100", - "ShowPii": true + "ShowPii": true, + "RefreshClaimsUrl": "http://127.0.0.1:30015" }, "Auditing": { "AllEntitiesSelector": true