From 9dbd0a626c7cc747af2fef4185365ad74837df66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com>
Date: Fri, 13 Jan 2023 22:14:45 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7abp7.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
aspnet-core/Directory.Build.Microsoft.targets | 33 +-
aspnet-core/Directory.Build.Volo.targets | 175 +-
aspnet-core/Directory.Build.targets | 21 +-
aspnet-core/Lion.AbpPro.sln | 7 -
.../Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj | 2 +-
.../Lion.AbpPro.Core.Tests.csproj | 2 +-
.../Lion.AbpPro.Localization.Tests.csproj | 2 +-
.../Lion.AbpPro.WebGateway.csproj | 2 +-
aspnet-core/global.json | 2 +-
...AbpPro.BasicManagement.HttpApi.Host.csproj | 2 +-
.../Users/Dtos/GithubAccessTokenResponse.cs | 24 -
...onAbpApplicationConfigurationAppService.cs | 62 +-
....AbpPro.BasicManagement.Application.csproj | 2 +-
.../Lion.AbpPro.BasicManagement.Domain.csproj | 2 +-
.../BasicManagementDbContext.cs | 5 +-
...BasicManagement.EntityFrameworkCore.csproj | 2 +-
...Lion.AbpPro.BasicManagement.HttpApi.csproj | 2 +-
...o.BasicManagement.Application.Tests.csproj | 2 +-
...AbpPro.BasicManagement.Domain.Tests.csproj | 2 +-
...anagement.EntityFrameworkCore.Tests.csproj | 2 +-
.../BasicManagementConsoleApiClientModule.cs | 15 -
.../ClientDemoService.cs | 24 -
.../ConsoleTestAppHostedService.cs | 40 -
....HttpApi.Client.ConsoleTestApp.abppkg.json | 1 -
...ement.HttpApi.Client.ConsoleTestApp.csproj | 32 -
.../Program.cs | 22 -
.../appsettings.json | 21 -
.../appsettings.secrets.json | 2 -
...ion.AbpPro.BasicManagement.TestBase.csproj | 2 +-
...taDictionaryManagement.HttpApi.Host.csproj | 2 +-
...ataDictionaryManagement.Application.csproj | 2 +-
...Pro.DataDictionaryManagement.Domain.csproj | 2 +-
...onaryManagement.EntityFrameworkCore.csproj | 2 +-
...ro.DataDictionaryManagement.HttpApi.csproj | 2 +-
...tionaryManagement.Application.Tests.csproj | 2 +-
...taDictionaryManagement.Domain.Tests.csproj | 2 +-
...anagement.EntityFrameworkCore.Tests.csproj | 2 +-
...o.DataDictionaryManagement.TestBase.csproj | 2 +-
....AbpPro.FileManagement.HttpApi.Host.csproj | 2 +-
...n.AbpPro.FileManagement.Application.csproj | 2 +-
.../Lion.AbpPro.FileManagement.Domain.csproj | 2 +-
....FileManagement.EntityFrameworkCore.csproj | 2 +-
.../Lion.AbpPro.FileManagement.HttpApi.csproj | 2 +-
...ro.FileManagement.Application.Tests.csproj | 2 +-
....AbpPro.FileManagement.Domain.Tests.csproj | 2 +-
...anagement.EntityFrameworkCore.Tests.csproj | 2 +-
...Lion.AbpPro.FileManagement.TestBase.csproj | 2 +-
...NotificationManagement.HttpApi.Host.csproj | 2 +-
.../GlobalUsings.cs | 1 -
.../Hubs/NotificationHubAppService.cs | 16 +-
....NotificationManagement.Application.csproj | 2 +-
...bpPro.NotificationManagement.Domain.csproj | 2 +-
...ationManagement.EntityFrameworkCore.csproj | 2 +-
...pPro.NotificationManagement.HttpApi.csproj | 2 +-
...icationManagement.Application.Tests.csproj | 2 +-
...NotificationManagement.Domain.Tests.csproj | 2 +-
...anagement.EntityFrameworkCore.Tests.csproj | 2 +-
...Pro.NotificationManagement.TestBase.csproj | 2 +-
.../Lion.AbpPro.HttpApi.Host.csproj | 2 +-
.../Lion.AbpPro.Application.csproj | 2 +-
.../Lion.AbpPro.DbMigrator.csproj | 2 +-
.../Lion.AbpPro.Domain.csproj | 2 +-
.../EntityFrameworkCore/AbpProDbContext.cs | 4 +
.../Lion.AbpPro.EntityFrameworkCore.csproj | 2 +-
...230113040449_UpdateToAbpVnext7.Designer.cs | 1712 +
.../20230113040449_UpdateToAbpVnext7.cs | 161 +
.../AbpProDbContextModelSnapshot.cs | 171 +-
.../Lion.AbpPro.FreeSqlRepository.csproj | 2 +-
.../Lion.AbpPro.HttpApi.csproj | 2 +-
.../Lion.AbpPro.Application.Tests.csproj | 2 +-
.../Lion.AbpPro.Domain.Tests.csproj | 2 +-
...on.AbpPro.EntityFrameworkCore.Tests.csproj | 2 +-
...Lion.AbpPro.FreeSqlRepository.Tests.csproj | 2 +-
...bpPro.HttpApi.Client.ConsoleTestApp.csproj | 2 +-
.../Lion.AbpPro.TestBase.csproj | 2 +-
...Lion.AbpPro.Shared.Hosting.Gateways.csproj | 2 +-
.../GlobalUsings.cs | 1 -
...AbpPro.Shared.Hosting.Microservices.csproj | 2 +-
.../Mvc/Filters/LionResultFilter.cs | 11 +-
vben28/.env.development | 2 +-
vben28/.env.production | 2 +-
vben28/nswag/nswag.json | 2 +-
vben28/package.json | 5 +-
vben28/pnpm-lock.yaml | 56 +-
vben28/src/hooks/web/useSignalR.ts | 72 +-
vben28/src/services/ServiceProxies.ts | 26043 ++++++++--------
.../views/admin/dictionary/AbpDictionary.ts | 325 +-
.../views/admin/dictionary/AbpDictionary.vue | 367 +-
vben28/src/views/admin/settings/Setting.vue | 7 +-
89 files changed, 16027 insertions(+), 13527 deletions(-)
delete mode 100644 aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/GithubAccessTokenResponse.cs
delete mode 100644 aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/BasicManagementConsoleApiClientModule.cs
delete mode 100644 aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs
delete mode 100644 aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs
delete mode 100644 aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.abppkg.json
delete mode 100644 aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.csproj
delete mode 100644 aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Program.cs
delete mode 100644 aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.json
delete mode 100644 aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json
create mode 100644 aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20230113040449_UpdateToAbpVnext7.Designer.cs
create mode 100644 aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20230113040449_UpdateToAbpVnext7.cs
diff --git a/aspnet-core/Directory.Build.Microsoft.targets b/aspnet-core/Directory.Build.Microsoft.targets
index 8f24d1c5..1050fd89 100644
--- a/aspnet-core/Directory.Build.Microsoft.targets
+++ b/aspnet-core/Directory.Build.Microsoft.targets
@@ -1,23 +1,24 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/aspnet-core/Directory.Build.Volo.targets b/aspnet-core/Directory.Build.Volo.targets
index 6aa7628c..3b60efe8 100644
--- a/aspnet-core/Directory.Build.Volo.targets
+++ b/aspnet-core/Directory.Build.Volo.targets
@@ -1,91 +1,92 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/aspnet-core/Directory.Build.targets b/aspnet-core/Directory.Build.targets
index 53ef2d19..3a1ffe2a 100644
--- a/aspnet-core/Directory.Build.targets
+++ b/aspnet-core/Directory.Build.targets
@@ -38,17 +38,16 @@
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -66,7 +65,7 @@
-
+
@@ -81,8 +80,6 @@
-
-
diff --git a/aspnet-core/Lion.AbpPro.sln b/aspnet-core/Lion.AbpPro.sln
index c777b7c3..68bddd1f 100644
--- a/aspnet-core/Lion.AbpPro.sln
+++ b/aspnet-core/Lion.AbpPro.sln
@@ -186,8 +186,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.BasicManagement
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.BasicManagement.TestBase", "modules\BasicManagement\test\Lion.AbpPro.BasicManagement.TestBase\Lion.AbpPro.BasicManagement.TestBase.csproj", "{47F2E236-E6BE-4F52-8389-5CF03BDC9B78}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp", "modules\BasicManagement\test\Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp\Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.csproj", "{1368FE7F-E1A7-4FD5-AF05-CFA59C0E0E69}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests", "modules\BasicManagement\test\Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests\Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests.csproj", "{9ECCC0EC-CC5A-4E49-96BE-3F2B15CCD94D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.BasicManagement.Domain.Tests", "modules\BasicManagement\test\Lion.AbpPro.BasicManagement.Domain.Tests\Lion.AbpPro.BasicManagement.Domain.Tests.csproj", "{2BACB63E-2830-4371-AEBB-E8089E3EB316}"
@@ -468,10 +466,6 @@ Global
{47F2E236-E6BE-4F52-8389-5CF03BDC9B78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47F2E236-E6BE-4F52-8389-5CF03BDC9B78}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47F2E236-E6BE-4F52-8389-5CF03BDC9B78}.Release|Any CPU.Build.0 = Release|Any CPU
- {1368FE7F-E1A7-4FD5-AF05-CFA59C0E0E69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1368FE7F-E1A7-4FD5-AF05-CFA59C0E0E69}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1368FE7F-E1A7-4FD5-AF05-CFA59C0E0E69}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1368FE7F-E1A7-4FD5-AF05-CFA59C0E0E69}.Release|Any CPU.Build.0 = Release|Any CPU
{9ECCC0EC-CC5A-4E49-96BE-3F2B15CCD94D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9ECCC0EC-CC5A-4E49-96BE-3F2B15CCD94D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9ECCC0EC-CC5A-4E49-96BE-3F2B15CCD94D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -595,7 +589,6 @@ Global
{4D808FF7-C204-40F1-881D-21B27D8D290E} = {AF419621-2F14-45CE-AF1B-B688E1B21BCB}
{354E0590-F6B2-43F5-A563-F543C498F3EA} = {AF419621-2F14-45CE-AF1B-B688E1B21BCB}
{47F2E236-E6BE-4F52-8389-5CF03BDC9B78} = {6464122A-1DC2-45E8-B599-4B5C32FBC85B}
- {1368FE7F-E1A7-4FD5-AF05-CFA59C0E0E69} = {6464122A-1DC2-45E8-B599-4B5C32FBC85B}
{9ECCC0EC-CC5A-4E49-96BE-3F2B15CCD94D} = {6464122A-1DC2-45E8-B599-4B5C32FBC85B}
{2BACB63E-2830-4371-AEBB-E8089E3EB316} = {6464122A-1DC2-45E8-B599-4B5C32FBC85B}
{19A28EF9-A5AE-4EC5-851C-D2547E5FE29C} = {6464122A-1DC2-45E8-B599-4B5C32FBC85B}
diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj b/aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj
index 9ed054df..30696b60 100644
--- a/aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj
+++ b/aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj
@@ -1,7 +1,7 @@
- netstandard2.1
+ net7.0
Lion.AbpPro.CAP
diff --git a/aspnet-core/frameworks/test/Lion.AbpPro.Core.Tests/Lion.AbpPro.Core.Tests.csproj b/aspnet-core/frameworks/test/Lion.AbpPro.Core.Tests/Lion.AbpPro.Core.Tests.csproj
index dc443d4a..ecbb40f1 100644
--- a/aspnet-core/frameworks/test/Lion.AbpPro.Core.Tests/Lion.AbpPro.Core.Tests.csproj
+++ b/aspnet-core/frameworks/test/Lion.AbpPro.Core.Tests/Lion.AbpPro.Core.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
enable
false
diff --git a/aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion.AbpPro.Localization.Tests.csproj b/aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion.AbpPro.Localization.Tests.csproj
index 9ecd3ffc..40cfad70 100644
--- a/aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion.AbpPro.Localization.Tests.csproj
+++ b/aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion.AbpPro.Localization.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
enable
false
diff --git a/aspnet-core/gateways/Lion.AbpPro.WebGateway/Lion.AbpPro.WebGateway.csproj b/aspnet-core/gateways/Lion.AbpPro.WebGateway/Lion.AbpPro.WebGateway.csproj
index 9b740752..0c90498c 100644
--- a/aspnet-core/gateways/Lion.AbpPro.WebGateway/Lion.AbpPro.WebGateway.csproj
+++ b/aspnet-core/gateways/Lion.AbpPro.WebGateway/Lion.AbpPro.WebGateway.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
diff --git a/aspnet-core/global.json b/aspnet-core/global.json
index 1deca079..b6ff0a69 100644
--- a/aspnet-core/global.json
+++ b/aspnet-core/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "6.0.202",
+ "version": "7.0.102",
"rollForward": "latestFeature"
}
}
diff --git a/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Lion.AbpPro.BasicManagement.HttpApi.Host.csproj b/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Lion.AbpPro.BasicManagement.HttpApi.Host.csproj
index babbab88..af84b2e9 100644
--- a/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Lion.AbpPro.BasicManagement.HttpApi.Host.csproj
+++ b/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Lion.AbpPro.BasicManagement.HttpApi.Host.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.BasicManagement
true
Lion.AbpPro.BasicManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010
diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/GithubAccessTokenResponse.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/GithubAccessTokenResponse.cs
deleted file mode 100644
index 62b2299b..00000000
--- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/GithubAccessTokenResponse.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Lion.AbpPro.BasicManagement.Users.Dtos;
-
-public class GithubAccessTokenResponse
-{
- ///
- /// access_token
- ///
- [JsonProperty("access_token")]
- public string Access_token { get; set; }
-
- ///
- /// scope
- ///
- [JsonProperty("scope")]
- public string Scope { get; set; }
-
- ///
- /// token_type
- ///
- [JsonProperty("token_type")]
- public string TokenType { get; set; }
-}
\ No newline at end of file
diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/LionAbpApplicationConfigurationAppService.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/LionAbpApplicationConfigurationAppService.cs
index ad9b9338..4994df34 100644
--- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/LionAbpApplicationConfigurationAppService.cs
+++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/ApplicationConfigurations/LionAbpApplicationConfigurationAppService.cs
@@ -1,11 +1,12 @@
-namespace Lion.AbpPro.BasicManagement.ApplicationConfigurations;
+using Volo.Abp.Localization.External;
+
+namespace Lion.AbpPro.BasicManagement.ApplicationConfigurations;
[Dependency(ReplaceServices = true)]
public class LionAbpApplicationConfigurationAppService : ApplicationService, IAbpApplicationConfigurationAppService
{
private readonly AbpLocalizationOptions _localizationOptions;
private readonly AbpMultiTenancyOptions _multiTenancyOptions;
- private readonly IServiceProvider _serviceProvider;
private readonly IAbpAuthorizationPolicyProvider _abpAuthorizationPolicyProvider;
private readonly IPermissionDefinitionManager _permissionDefinitionManager;
private readonly DefaultAuthorizationPolicyProvider _defaultAuthorizationPolicyProvider;
@@ -23,7 +24,6 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
public LionAbpApplicationConfigurationAppService(
IOptions localizationOptions,
IOptions multiTenancyOptions,
- IServiceProvider serviceProvider,
IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider,
IPermissionDefinitionManager permissionDefinitionManager,
DefaultAuthorizationPolicyProvider defaultAuthorizationPolicyProvider,
@@ -38,7 +38,6 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
IOptions abpClockOptions,
ICachedObjectExtensionsDtoService cachedObjectExtensionsDtoService)
{
- _serviceProvider = serviceProvider;
_abpAuthorizationPolicyProvider = abpAuthorizationPolicyProvider;
_permissionDefinitionManager = permissionDefinitionManager;
_defaultAuthorizationPolicyProvider = defaultAuthorizationPolicyProvider;
@@ -56,7 +55,7 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
_multiTenancyOptions = multiTenancyOptions.Value;
}
- public virtual async Task GetAsync()
+ public virtual async Task GetAsync(ApplicationConfigurationRequestOptions options)
{
//TODO: Optimize & cache..?
@@ -66,7 +65,7 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
{
Auth = await GetAuthConfigAsync(),
Features = await GetFeaturesConfigAsync(),
- Localization = await GetLocalizationConfigAsync(),
+ //Localization = await GetLocalizationConfigAsync(),
CurrentUser = GetCurrentUser(),
Setting = await GetSettingConfigAsync(),
MultiTenancy = GetMultiTenancy(),
@@ -76,6 +75,11 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
ObjectExtensions = _cachedObjectExtensionsDtoService.Get()
};
+ if (options.IncludeLocalizationResources)
+ {
+ result.Localization = await GetLocalizationConfigAsync(options);
+ }
+
Logger.LogDebug("Executed AbpApplicationConfigurationAppService.GetAsync().");
return result;
@@ -129,7 +133,7 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
foreach (var policyName in policyNames)
{
- if (await _defaultAuthorizationPolicyProvider.GetPolicyAsync(policyName) == null && _permissionDefinitionManager.GetOrNull(policyName) != null)
+ if (await _defaultAuthorizationPolicyProvider.GetPolicyAsync(policyName) == null && _permissionDefinitionManager.GetOrNullAsync(policyName) != null)
{
abpPolicyNames.Add(policyName);
}
@@ -141,7 +145,7 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
foreach (var policyName in otherPolicyNames)
{
- authConfig.Policies[policyName] = true;
+ //authConfig.Policies[policyName] = true;
if (await _authorizationService.IsGrantedAsync(policyName))
{
@@ -152,7 +156,7 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
var result = await _permissionChecker.IsGrantedAsync(abpPolicyNames.ToArray());
foreach (var (key, value) in result.Result)
{
- authConfig.Policies[key] = true;
+ //authConfig.Policies[key] = true;
if (value == PermissionGrantResult.Granted)
{
authConfig.GrantedPolicies[key] = true;
@@ -208,26 +212,42 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
}
- protected virtual async Task GetLocalizationConfigAsync()
+ protected virtual async Task GetLocalizationConfigAsync(
+ ApplicationConfigurationRequestOptions options)
{
var localizationConfig = new ApplicationLocalizationConfigurationDto();
localizationConfig.Languages.AddRange(await _languageProvider.GetLanguagesAsync());
- foreach (var resource in _localizationOptions.Resources.Values)
+ if (options.IncludeLocalizationResources)
{
- var dictionary = new Dictionary();
+ var resourceNames = _localizationOptions
+ .Resources
+ .Values
+ .Select(x => x.ResourceName)
+ .Union(
+ await LazyServiceProvider
+ .LazyGetRequiredService()
+ .GetResourceNamesAsync()
+ );
+
+ foreach (var resourceName in resourceNames)
+ {
+ var dictionary = new Dictionary();
- var localizer = _serviceProvider.GetRequiredService(
- typeof(IStringLocalizer<>).MakeGenericType(resource.ResourceType)
- ) as IStringLocalizer;
+ var localizer = await StringLocalizerFactory
+ .CreateByResourceNameOrNullAsync(resourceName);
- foreach (var localizedString in localizer.GetAllStrings())
- {
- dictionary[localizedString.Name] = localizedString.Value;
- }
+ if (localizer != null)
+ {
+ foreach (var localizedString in await localizer.GetAllStringsAsync())
+ {
+ dictionary[localizedString.Name] = localizedString.Value;
+ }
+ }
- localizationConfig.Values[resource.ResourceName] = dictionary;
+ localizationConfig.Values[resourceName] = dictionary;
+ }
}
localizationConfig.CurrentCulture = GetCurrentCultureInfo();
@@ -294,7 +314,7 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
{
var result = new ApplicationFeatureConfigurationDto();
- foreach (var featureDefinition in _featureDefinitionManager.GetAll())
+ foreach (var featureDefinition in await _featureDefinitionManager.GetAllAsync())
{
if (!featureDefinition.IsVisibleToClients)
{
diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj
index 69be1ccf..d989a156 100644
--- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj
+++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.BasicManagement
diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Lion.AbpPro.BasicManagement.Domain.csproj b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Lion.AbpPro.BasicManagement.Domain.csproj
index 0cc0075d..b12c4cff 100644
--- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Lion.AbpPro.BasicManagement.Domain.csproj
+++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Lion.AbpPro.BasicManagement.Domain.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.BasicManagement
diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/EntityFrameworkCore/BasicManagementDbContext.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/EntityFrameworkCore/BasicManagementDbContext.cs
index 37b6c8d4..cffe1d87 100644
--- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/EntityFrameworkCore/BasicManagementDbContext.cs
+++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/EntityFrameworkCore/BasicManagementDbContext.cs
@@ -3,7 +3,8 @@
[ConnectionStringName(BasicManagementDbProperties.ConnectionStringName)]
public class BasicManagementDbContext : AbpDbContext, IBasicManagementDbContext
{
-
+ public DbSet FeatureGroups { get; set; }
+ public DbSet Features { get; set; }
public DbSet FeatureValues { get; set; }
public DbSet Users { get; set; }
public DbSet Roles { get; set; }
@@ -11,6 +12,8 @@ public class BasicManagementDbContext : AbpDbContext,
public DbSet OrganizationUnits { get; set; }
public DbSet SecurityLogs { get; set; }
public DbSet LinkUsers { get; set; }
+ public DbSet PermissionGroups { get; set; }
+ public DbSet Permissions { get; set; }
public DbSet PermissionGrants { get; set; }
public DbSet Settings { get; set; }
public DbSet Tenants { get; set; }
diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/Lion.AbpPro.BasicManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/Lion.AbpPro.BasicManagement.EntityFrameworkCore.csproj
index 1e9a6187..f1dd41c2 100644
--- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/Lion.AbpPro.BasicManagement.EntityFrameworkCore.csproj
+++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/Lion.AbpPro.BasicManagement.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.BasicManagement
diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi/Lion.AbpPro.BasicManagement.HttpApi.csproj b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi/Lion.AbpPro.BasicManagement.HttpApi.csproj
index 578798d1..b2291973 100644
--- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi/Lion.AbpPro.BasicManagement.HttpApi.csproj
+++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi/Lion.AbpPro.BasicManagement.HttpApi.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.BasicManagement
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Application.Tests/Lion.AbpPro.BasicManagement.Application.Tests.csproj b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Application.Tests/Lion.AbpPro.BasicManagement.Application.Tests.csproj
index 4ef91a81..551972be 100644
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Application.Tests/Lion.AbpPro.BasicManagement.Application.Tests.csproj
+++ b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Application.Tests/Lion.AbpPro.BasicManagement.Application.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.BasicManagement
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Domain.Tests/Lion.AbpPro.BasicManagement.Domain.Tests.csproj b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Domain.Tests/Lion.AbpPro.BasicManagement.Domain.Tests.csproj
index c7b54f0d..873cefe8 100644
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Domain.Tests/Lion.AbpPro.BasicManagement.Domain.Tests.csproj
+++ b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Domain.Tests/Lion.AbpPro.BasicManagement.Domain.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.BasicManagement
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests.csproj b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests.csproj
index 9c8dac5a..98072691 100644
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests.csproj
+++ b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.BasicManagement
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/BasicManagementConsoleApiClientModule.cs b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/BasicManagementConsoleApiClientModule.cs
deleted file mode 100644
index 28e899f4..00000000
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/BasicManagementConsoleApiClientModule.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Volo.Abp.Autofac;
-using Volo.Abp.Http.Client.IdentityModel;
-using Volo.Abp.Modularity;
-
-namespace Lion.AbpPro.BasicManagement;
-
-[DependsOn(
- typeof(AbpAutofacModule),
- typeof(BasicManagementHttpApiClientModule),
- typeof(AbpHttpClientIdentityModelModule)
- )]
-public class BasicManagementConsoleApiClientModule : AbpModule
-{
-
-}
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs
deleted file mode 100644
index 8a82d2d9..00000000
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.IdentityModel;
-
-namespace Lion.AbpPro.BasicManagement;
-
-public class ClientDemoService : ITransientDependency
-{
- private readonly IIdentityModelAuthenticationService _authenticationService;
- private readonly IConfiguration _configuration;
-
- public ClientDemoService(
- IIdentityModelAuthenticationService authenticationService,
- IConfiguration configuration)
- {
- _authenticationService = authenticationService;
- _configuration = configuration;
- }
-
- public async Task RunAsync()
- {
- await Task.CompletedTask;
- }
-}
\ No newline at end of file
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs
deleted file mode 100644
index 24fe7a73..00000000
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Microsoft.Extensions.Hosting;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-
-namespace Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp;
-
-public class ConsoleTestAppHostedService : IHostedService
-{
- private readonly IConfiguration _configuration;
-
- public ConsoleTestAppHostedService(IConfiguration configuration)
- {
- _configuration = configuration;
- }
-
- public async Task StartAsync(CancellationToken cancellationToken)
- {
- using (var application = await AbpApplicationFactory.CreateAsync(options =>
- {
- options.Services.ReplaceConfiguration(_configuration);
- options.UseAutofac();
- }))
- {
- await application.InitializeAsync();
-
- var demo = application.ServiceProvider.GetRequiredService();
- await demo.RunAsync();
-
- await application.ShutdownAsync();
- }
- }
-
- public Task StopAsync(CancellationToken cancellationToken)
- {
- return Task.CompletedTask;
- }
-}
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.abppkg.json b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.abppkg.json
deleted file mode 100644
index 9e26dfee..00000000
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.abppkg.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.csproj b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.csproj
deleted file mode 100644
index 019f66db..00000000
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- Exe
- net6.0
- Lion.AbpPro.BasicManagement
-
-
-
-
-
-
-
-
-
-
-
- PreserveNewest
- Always
-
-
-
- PreserveNewest
- Always
-
-
-
-
-
-
-
-
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Program.cs b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Program.cs
deleted file mode 100644
index aa51b4f8..00000000
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Program.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp;
-
-class Program
-{
- static async Task Main(string[] args)
- {
- await CreateHostBuilder(args).RunConsoleAsync();
- }
-
- public static IHostBuilder CreateHostBuilder(string[] args) =>
- Host.CreateDefaultBuilder(args)
- .AddAppSettingsSecretsJson()
- .ConfigureServices((hostContext, services) =>
- {
- services.AddHostedService();
- });
-}
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.json b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.json
deleted file mode 100644
index d5defdcb..00000000
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "RemoteServices": {
- "Default": {
- "BaseUrl": "https://localhost:44342/"
- },
- "BasicManagement": {
- "BaseUrl": "https://localhost:44324/"
- }
- },
- "IdentityClients": {
- "Default": {
- "GrantType": "password",
- "ClientId": "BasicManagement_App",
- "ClientSecret": "1q2w3e*",
- "UserName": "admin",
- "UserPassword": "1q2w3E*",
- "Authority": "https://localhost:44342/",
- "Scope": "BasicManagement"
- }
- }
-}
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json
deleted file mode 100644
index 7a73a41b..00000000
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.TestBase/Lion.AbpPro.BasicManagement.TestBase.csproj b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.TestBase/Lion.AbpPro.BasicManagement.TestBase.csproj
index 345cd965..a06efd37 100644
--- a/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.TestBase/Lion.AbpPro.BasicManagement.TestBase.csproj
+++ b/aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.TestBase/Lion.AbpPro.BasicManagement.TestBase.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.BasicManagement
diff --git a/aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host.csproj b/aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host.csproj
index b730ddbe..f3c00529 100644
--- a/aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.DataDictionaryManagement
true
Lion.AbpPro.DataDictionaryManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010
diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/Lion.AbpPro.DataDictionaryManagement.Application.csproj b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/Lion.AbpPro.DataDictionaryManagement.Application.csproj
index 343aeba0..88ac50f0 100644
--- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/Lion.AbpPro.DataDictionaryManagement.Application.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/Lion.AbpPro.DataDictionaryManagement.Application.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.DataDictionaryManagement
diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/Lion.AbpPro.DataDictionaryManagement.Domain.csproj b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/Lion.AbpPro.DataDictionaryManagement.Domain.csproj
index 1defd52d..e5becc45 100644
--- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/Lion.AbpPro.DataDictionaryManagement.Domain.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/Lion.AbpPro.DataDictionaryManagement.Domain.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.DataDictionaryManagement
diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj
index db555206..f5a1cb76 100644
--- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.DataDictionaryManagement
diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi/Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi/Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj
index 737ac116..695db021 100644
--- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi/Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi/Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj
@@ -1,7 +1,7 @@
- net6.0
+ net7.0
Lion.AbpPro.DataDictionaryManagement
diff --git a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Application.Tests/Lion.AbpPro.DataDictionaryManagement.Application.Tests.csproj b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Application.Tests/Lion.AbpPro.DataDictionaryManagement.Application.Tests.csproj
index b60bf3e4..b91d8304 100644
--- a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Application.Tests/Lion.AbpPro.DataDictionaryManagement.Application.Tests.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Application.Tests/Lion.AbpPro.DataDictionaryManagement.Application.Tests.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.DataDictionaryManagement
false
diff --git a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/Lion.AbpPro.DataDictionaryManagement.Domain.Tests.csproj b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/Lion.AbpPro.DataDictionaryManagement.Domain.Tests.csproj
index 8c6e3c69..7a5bf6e2 100644
--- a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/Lion.AbpPro.DataDictionaryManagement.Domain.Tests.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/Lion.AbpPro.DataDictionaryManagement.Domain.Tests.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.DataDictionaryManagement
false
diff --git a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests.csproj b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests.csproj
index f64f5879..164384f7 100644
--- a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.DataDictionaryManagement
false
diff --git a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/Lion.AbpPro.DataDictionaryManagement.TestBase.csproj b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/Lion.AbpPro.DataDictionaryManagement.TestBase.csproj
index 987f7ca9..b3f1d76e 100644
--- a/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/Lion.AbpPro.DataDictionaryManagement.TestBase.csproj
+++ b/aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/Lion.AbpPro.DataDictionaryManagement.TestBase.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.DataDictionaryManagement
false
diff --git a/aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Lion.AbpPro.FileManagement.HttpApi.Host.csproj b/aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Lion.AbpPro.FileManagement.HttpApi.Host.csproj
index c3e7fe90..c46de31b 100644
--- a/aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Lion.AbpPro.FileManagement.HttpApi.Host.csproj
+++ b/aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Lion.AbpPro.FileManagement.HttpApi.Host.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.FileManagement
true
Lion.AbpPro.FileManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010
diff --git a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application/Lion.AbpPro.FileManagement.Application.csproj b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application/Lion.AbpPro.FileManagement.Application.csproj
index c53cbfd2..d7dc515b 100644
--- a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application/Lion.AbpPro.FileManagement.Application.csproj
+++ b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application/Lion.AbpPro.FileManagement.Application.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.FileManagement
diff --git a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain/Lion.AbpPro.FileManagement.Domain.csproj b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain/Lion.AbpPro.FileManagement.Domain.csproj
index f80ed01c..7ac80592 100644
--- a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain/Lion.AbpPro.FileManagement.Domain.csproj
+++ b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain/Lion.AbpPro.FileManagement.Domain.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.FileManagement
diff --git a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.EntityFrameworkCore/Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.EntityFrameworkCore/Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj
index 674e2d4c..f633a485 100644
--- a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.EntityFrameworkCore/Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj
+++ b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.EntityFrameworkCore/Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.FileManagement
diff --git a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi/Lion.AbpPro.FileManagement.HttpApi.csproj b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi/Lion.AbpPro.FileManagement.HttpApi.csproj
index 55e351ab..a405bd7c 100644
--- a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi/Lion.AbpPro.FileManagement.HttpApi.csproj
+++ b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi/Lion.AbpPro.FileManagement.HttpApi.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro.FileManagement
diff --git a/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Application.Tests/Lion.AbpPro.FileManagement.Application.Tests.csproj b/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Application.Tests/Lion.AbpPro.FileManagement.Application.Tests.csproj
index 940dd032..5c6f2ed4 100644
--- a/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Application.Tests/Lion.AbpPro.FileManagement.Application.Tests.csproj
+++ b/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Application.Tests/Lion.AbpPro.FileManagement.Application.Tests.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.FileManagement
diff --git a/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Domain.Tests/Lion.AbpPro.FileManagement.Domain.Tests.csproj b/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Domain.Tests/Lion.AbpPro.FileManagement.Domain.Tests.csproj
index 72af8a72..fa119307 100644
--- a/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Domain.Tests/Lion.AbpPro.FileManagement.Domain.Tests.csproj
+++ b/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Domain.Tests/Lion.AbpPro.FileManagement.Domain.Tests.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.FileManagement
diff --git a/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests.csproj b/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests.csproj
index 0b45781e..ffe98582 100644
--- a/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests.csproj
+++ b/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.FileManagement
diff --git a/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.TestBase/Lion.AbpPro.FileManagement.TestBase.csproj b/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.TestBase/Lion.AbpPro.FileManagement.TestBase.csproj
index 10778d47..7c0491bd 100644
--- a/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.TestBase/Lion.AbpPro.FileManagement.TestBase.csproj
+++ b/aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.TestBase/Lion.AbpPro.FileManagement.TestBase.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.FileManagement
diff --git a/aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj b/aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj
index 95014414..496755b5 100644
--- a/aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj
+++ b/aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.NotificationManagement
true
Lion.AbpPro.NotificationManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010
diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/GlobalUsings.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/GlobalUsings.cs
index 7de127f6..ea216b77 100644
--- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/GlobalUsings.cs
+++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/GlobalUsings.cs
@@ -16,7 +16,6 @@ global using Microsoft.AspNetCore.Authorization;
global using Microsoft.AspNetCore.SignalR;
global using Microsoft.Extensions.DependencyInjection;
global using Microsoft.Extensions.Logging;
-global using Newtonsoft.Json;
global using Volo.Abp;
global using Volo.Abp.Application;
global using Volo.Abp.Application.Dtos;
diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Hubs/NotificationHubAppService.cs b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Hubs/NotificationHubAppService.cs
index 86b2b553..ba863ede 100644
--- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Hubs/NotificationHubAppService.cs
+++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Hubs/NotificationHubAppService.cs
@@ -1,16 +1,20 @@
-namespace Lion.AbpPro.NotificationManagement.Hubs;
+using Volo.Abp.Json;
+
+namespace Lion.AbpPro.NotificationManagement.Hubs;
public class NotificationHubAppService : NotificationManagementAppService, INotificationHubAppService
{
private readonly IHubContext _hubContext;
private readonly ILogger _logger;
-
+ private readonly IJsonSerializer _jsonSerializer;
public NotificationHubAppService(
IHubContext hubContext,
- ILogger logger)
+ ILogger logger,
+ IJsonSerializer jsonSerializer)
{
_hubContext = hubContext;
_logger = logger;
+ _jsonSerializer = jsonSerializer;
}
///
@@ -41,11 +45,11 @@ public class NotificationHubAppService : NotificationManagementAppService, INoti
await _hubContext.Clients
.Users(users.AsReadOnly().ToList())
.ReceiveTextMessageAsync(sendNotificationDto);
- _logger.LogInformation($"通知模块收到消息：{JsonConvert.SerializeObject(sendNotificationDto)},发送给：{JsonConvert.SerializeObject(users)}");
+ _logger.LogInformation($"通知模块收到消息：{_jsonSerializer.Serialize(sendNotificationDto)},发送给：{_jsonSerializer.Serialize(users)}");
}
else
{
- _logger.LogWarning($"消息未指定发送人:{JsonConvert.SerializeObject(sendNotificationDto)}");
+ _logger.LogWarning($"消息未指定发送人:{_jsonSerializer.Serialize(sendNotificationDto)}");
}
}
@@ -56,6 +60,6 @@ public class NotificationHubAppService : NotificationManagementAppService, INoti
private async Task SendMessageToAllClientAsync(SendNotificationDto sendNotificationDto)
{
await _hubContext.Clients.All.ReceiveBroadCastMessageAsync(sendNotificationDto);
- _logger.LogInformation($"通知模块收到消息：{JsonConvert.SerializeObject(sendNotificationDto)}");
+ _logger.LogInformation($"通知模块收到消息：{_jsonSerializer.Serialize(sendNotificationDto)}");
}
}
\ No newline at end of file
diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Lion.AbpPro.NotificationManagement.Application.csproj b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Lion.AbpPro.NotificationManagement.Application.csproj
index db319f5f..cf89ea7b 100644
--- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Lion.AbpPro.NotificationManagement.Application.csproj
+++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Lion.AbpPro.NotificationManagement.Application.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.NotificationManagement
diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Lion.AbpPro.NotificationManagement.Domain.csproj b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Lion.AbpPro.NotificationManagement.Domain.csproj
index 24c04df5..37d3bb88 100644
--- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Lion.AbpPro.NotificationManagement.Domain.csproj
+++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Lion.AbpPro.NotificationManagement.Domain.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.NotificationManagement
diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj
index a468b4b2..3985cfdd 100644
--- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj
+++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.NotificationManagement
diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Lion.AbpPro.NotificationManagement.HttpApi.csproj b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Lion.AbpPro.NotificationManagement.HttpApi.csproj
index e49d4ffb..6e6bc8ea 100644
--- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Lion.AbpPro.NotificationManagement.HttpApi.csproj
+++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Lion.AbpPro.NotificationManagement.HttpApi.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.NotificationManagement
diff --git a/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Application.Tests/Lion.AbpPro.NotificationManagement.Application.Tests.csproj b/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Application.Tests/Lion.AbpPro.NotificationManagement.Application.Tests.csproj
index a72b0277..e5a3fd95 100644
--- a/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Application.Tests/Lion.AbpPro.NotificationManagement.Application.Tests.csproj
+++ b/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Application.Tests/Lion.AbpPro.NotificationManagement.Application.Tests.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.NotificationManagement
false
diff --git a/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Domain.Tests/Lion.AbpPro.NotificationManagement.Domain.Tests.csproj b/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Domain.Tests/Lion.AbpPro.NotificationManagement.Domain.Tests.csproj
index 17c43c4f..c5a92e3a 100644
--- a/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Domain.Tests/Lion.AbpPro.NotificationManagement.Domain.Tests.csproj
+++ b/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Domain.Tests/Lion.AbpPro.NotificationManagement.Domain.Tests.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.NotificationManagement
false
diff --git a/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests.csproj b/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests.csproj
index b05d46ff..0e3cd1e2 100644
--- a/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests.csproj
+++ b/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.NotificationManagement
false
diff --git a/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.TestBase/Lion.AbpPro.NotificationManagement.TestBase.csproj b/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.TestBase/Lion.AbpPro.NotificationManagement.TestBase.csproj
index cb3e7c84..f94494dc 100644
--- a/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.TestBase/Lion.AbpPro.NotificationManagement.TestBase.csproj
+++ b/aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.TestBase/Lion.AbpPro.NotificationManagement.TestBase.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro.NotificationManagement
false
diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj
index 2600443f..bc0da53c 100644
--- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj
+++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro
true
Lion.AbpPro-4681b4fd-151f-4221-84a4-929d86723e4c
diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj b/aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj
index d2ed5c52..2366a8b8 100644
--- a/aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj
+++ b/aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro
diff --git a/aspnet-core/services/src/Lion.AbpPro.DbMigrator/Lion.AbpPro.DbMigrator.csproj b/aspnet-core/services/src/Lion.AbpPro.DbMigrator/Lion.AbpPro.DbMigrator.csproj
index b0398a23..b77c5e07 100644
--- a/aspnet-core/services/src/Lion.AbpPro.DbMigrator/Lion.AbpPro.DbMigrator.csproj
+++ b/aspnet-core/services/src/Lion.AbpPro.DbMigrator/Lion.AbpPro.DbMigrator.csproj
@@ -4,7 +4,7 @@
Exe
- net6.0
+ net7.0
diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj b/aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj
index 6917c113..e67ea470 100644
--- a/aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj
+++ b/aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj
@@ -3,7 +3,7 @@
- net6.0
+ net7.0
Lion.AbpPro
diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs
index d7aaaf56..d0f0c980 100644
--- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs
+++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs
@@ -24,7 +24,11 @@ namespace Lion.AbpPro.EntityFrameworkCore
public DbSet OrganizationUnits { get; set; }
public DbSet SecurityLogs { get; set; }
public DbSet LinkUsers { get; set; }
+ public DbSet FeatureGroups { get; set; }
+ public DbSet Features { get; set; }
public DbSet FeatureValues { get; set; }
+ public DbSet PermissionGroups { get; set; }
+ public DbSet Permissions { get; set; }
public DbSet PermissionGrants { get; set; }
public DbSet Settings { get; set; }
public DbSet Tenants { get; set; }
diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj
index 0a54b877..8864a6c9 100644
--- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj
+++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj
@@ -2,7 +2,7 @@
- net6.0
+ net7.0
Lion.AbpPro
diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20230113040449_UpdateToAbpVnext7.Designer.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20230113040449_UpdateToAbpVnext7.Designer.cs
new file mode 100644
index 00000000..f901e649
--- /dev/null
+++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20230113040449_UpdateToAbpVnext7.Designer.cs
@@ -0,0 +1,1712 @@
+//
+using System;
+using Lion.AbpPro.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Lion.AbpPro.Migrations
+{
+ [DbContext(typeof(AbpProDbContext))]
+ [Migration("20230113040449_UpdateToAbpVnext7")]
+ partial class UpdateToAbpVnext7
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
+ .HasAnnotation("ProductVersion", "7.0.2")
+ .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+ modelBuilder.Entity("Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates.DataDictionary", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("Code")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("varchar(1024)");
+
+ b.Property("DisplayText")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property("TenantId")
+ .HasColumnType("char(36)")
+ .HasColumnName("TenantId");
+
+ b.HasKey("Id");
+
+ b.ToTable("DataDictionary", (string)null);
+ });
+
+ modelBuilder.Entity("Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates.DataDictionaryDetail", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("Code")
+ .HasColumnType("longtext");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property("DataDictionaryId")
+ .HasColumnType("char(36)");
+
+ b.Property("Description")
+ .HasColumnType("longtext");
+
+ b.Property("DisplayText")
+ .HasColumnType("longtext");
+
+ b.Property("IsEnabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property("Order")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("DataDictionaryId");
+
+ b.ToTable("DataDictionaryDetail", (string)null);
+ });
+
+ modelBuilder.Entity("Lion.AbpPro.NotificationManagement.Notifications.Aggregates.Notification", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("Content")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("varchar(1024)");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property("MessageLevel")
+ .HasColumnType("int");
+
+ b.Property("MessageType")
+ .HasColumnType("int");
+
+ b.Property("SenderId")
+ .HasColumnType("char(36)");
+
+ b.Property("Title")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Notification", (string)null);
+ });
+
+ modelBuilder.Entity("Lion.AbpPro.NotificationManagement.Notifications.Aggregates.NotificationSubscription", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property("NotificationId")
+ .HasColumnType("char(36)");
+
+ b.Property("Read")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("ReadTime")
+ .HasColumnType("datetime(6)");
+
+ b.Property("ReceiveId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NotificationId");
+
+ b.ToTable("NotificationSubscription", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("ApplicationName")
+ .HasMaxLength(96)
+ .HasColumnType("varchar(96)")
+ .HasColumnName("ApplicationName");
+
+ b.Property("BrowserInfo")
+ .HasMaxLength(512)
+ .HasColumnType("varchar(512)")
+ .HasColumnName("BrowserInfo");
+
+ b.Property("ClientId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasColumnName("ClientId");
+
+ b.Property("ClientIpAddress")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasColumnName("ClientIpAddress");
+
+ b.Property("ClientName")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasColumnName("ClientName");
+
+ b.Property("Comments")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasColumnName("Comments");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CorrelationId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasColumnName("CorrelationId");
+
+ b.Property("Exceptions")
+ .HasColumnType("longtext");
+
+ b.Property("ExecutionDuration")
+ .HasColumnType("int")
+ .HasColumnName("ExecutionDuration");
+
+ b.Property("ExecutionTime")
+ .HasColumnType("datetime(6)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("HttpMethod")
+ .HasMaxLength(16)
+ .HasColumnType("varchar(16)")
+ .HasColumnName("HttpMethod");
+
+ b.Property("HttpStatusCode")
+ .HasColumnType("int")
+ .HasColumnName("HttpStatusCode");
+
+ b.Property("ImpersonatorTenantId")
+ .HasColumnType("char(36)")
+ .HasColumnName("ImpersonatorTenantId");
+
+ b.Property("ImpersonatorTenantName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasColumnName("ImpersonatorTenantName");
+
+ b.Property("ImpersonatorUserId")
+ .HasColumnType("char(36)")
+ .HasColumnName("ImpersonatorUserId");
+
+ b.Property("ImpersonatorUserName")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasColumnName("ImpersonatorUserName");
+
+ b.Property("TenantId")
+ .HasColumnType("char(36)")
+ .HasColumnName("TenantId");
+
+ b.Property("TenantName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasColumnName("TenantName");
+
+ b.Property("Url")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasColumnName("Url");
+
+ b.Property("UserId")
+ .HasColumnType("char(36)")
+ .HasColumnName("UserId");
+
+ b.Property("UserName")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasColumnName("UserName");
+
+ b.HasKey("Id");
+
+ b.HasIndex("TenantId", "ExecutionTime");
+
+ b.HasIndex("TenantId", "UserId", "ExecutionTime");
+
+ b.ToTable("AbpAuditLogs", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("AuditLogId")
+ .HasColumnType("char(36)")
+ .HasColumnName("AuditLogId");
+
+ b.Property("ExecutionDuration")
+ .HasColumnType("int")
+ .HasColumnName("ExecutionDuration");
+
+ b.Property("ExecutionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("ExecutionTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("MethodName")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasColumnName("MethodName");
+
+ b.Property("Parameters")
+ .HasMaxLength(2000)
+ .HasColumnType("varchar(2000)")
+ .HasColumnName("Parameters");
+
+ b.Property("ServiceName")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasColumnName("ServiceName");
+
+ b.Property("TenantId")
+ .HasColumnType("char(36)")
+ .HasColumnName("TenantId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AuditLogId");
+
+ b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
+
+ b.ToTable("AbpAuditLogActions", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("AuditLogId")
+ .HasColumnType("char(36)")
+ .HasColumnName("AuditLogId");
+
+ b.Property("ChangeTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("ChangeTime");
+
+ b.Property("ChangeType")
+ .HasColumnType("tinyint unsigned")
+ .HasColumnName("ChangeType");
+
+ b.Property("EntityId")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasColumnName("EntityId");
+
+ b.Property("EntityTenantId")
+ .HasColumnType("char(36)");
+
+ b.Property("EntityTypeFullName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasColumnName("EntityTypeFullName");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("TenantId")
+ .HasColumnType("char(36)")
+ .HasColumnName("TenantId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AuditLogId");
+
+ b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
+
+ b.ToTable("AbpEntityChanges", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("EntityChangeId")
+ .HasColumnType("char(36)");
+
+ b.Property("NewValue")
+ .HasMaxLength(512)
+ .HasColumnType("varchar(512)")
+ .HasColumnName("NewValue");
+
+ b.Property("OriginalValue")
+ .HasMaxLength(512)
+ .HasColumnType("varchar(512)")
+ .HasColumnName("OriginalValue");
+
+ b.Property("PropertyName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasColumnName("PropertyName");
+
+ b.Property("PropertyTypeFullName")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasColumnName("PropertyTypeFullName");
+
+ b.Property("TenantId")
+ .HasColumnType("char(36)")
+ .HasColumnName("TenantId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("EntityChangeId");
+
+ b.ToTable("AbpEntityPropertyChanges", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsAbandoned")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false);
+
+ b.Property("JobArgs")
+ .IsRequired()
+ .HasMaxLength(1048576)
+ .HasColumnType("longtext");
+
+ b.Property("JobName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)");
+
+ b.Property("LastTryTime")
+ .HasColumnType("datetime(6)");
+
+ b.Property("NextTryTime")
+ .HasColumnType("datetime(6)");
+
+ b.Property("Priority")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint unsigned")
+ .HasDefaultValue((byte)15);
+
+ b.Property("TryCount")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("smallint")
+ .HasDefaultValue((short)0);
+
+ b.HasKey("Id");
+
+ b.HasIndex("IsAbandoned", "NextTryTime");
+
+ b.ToTable("AbpBackgroundJobs", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureDefinitionRecord", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("AllowedProviders")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("DefaultValue")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("Description")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("DisplayName")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("GroupName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)");
+
+ b.Property("IsAvailableToHost")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("IsVisibleToClients")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)");
+
+ b.Property("ParentName")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)");
+
+ b.Property("ValueType")
+ .HasMaxLength(2048)
+ .HasColumnType("varchar(2048)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("GroupName");
+
+ b.HasIndex("Name")
+ .IsUnique();
+
+ b.ToTable("AbpFeatures", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureGroupDefinitionRecord", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("DisplayName")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Name")
+ .IsUnique();
+
+ b.ToTable("AbpFeatureGroups", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)");
+
+ b.Property("ProviderKey")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)");
+
+ b.Property("ProviderName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)");
+
+ b.Property("Value")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Name", "ProviderName", "ProviderKey")
+ .IsUnique();
+
+ b.ToTable("AbpFeatureValues", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("Description")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsStatic")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("Regex")
+ .HasMaxLength(512)
+ .HasColumnType("varchar(512)");
+
+ b.Property("RegexDescription")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)");
+
+ b.Property("Required")
+ .HasColumnType("tinyint(1)");
+
+ b.Property("ValueType")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("AbpClaimTypes", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("SourceTenantId")
+ .HasColumnType("char(36)");
+
+ b.Property("SourceUserId")
+ .HasColumnType("char(36)");
+
+ b.Property("TargetTenantId")
+ .HasColumnType("char(36)");
+
+ b.Property("TargetUserId")
+ .HasColumnType("char(36)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId")
+ .IsUnique();
+
+ b.ToTable("AbpLinkUsers", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsDefault")
+ .HasColumnType("tinyint(1)")
+ .HasColumnName("IsDefault");
+
+ b.Property("IsPublic")
+ .HasColumnType("tinyint(1)")
+ .HasColumnName("IsPublic");
+
+ b.Property("IsStatic")
+ .HasColumnType("tinyint(1)")
+ .HasColumnName("IsStatic");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("NormalizedName")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("TenantId")
+ .HasColumnType("char(36)")
+ .HasColumnName("TenantId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedName");
+
+ b.ToTable("AbpRoles", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("ClaimType")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.Property("ClaimValue")
+ .HasMaxLength(1024)
+ .HasColumnType("varchar(1024)");
+
+ b.Property("RoleId")
+ .HasColumnType("char(36)");
+
+ b.Property("TenantId")
+ .HasColumnType("char(36)")
+ .HasColumnName("TenantId");
+
+ b.HasKey("Id");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AbpRoleClaims", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("Action")
+ .HasMaxLength(96)
+ .HasColumnType("varchar(96)");
+
+ b.Property("ApplicationName")
+ .HasMaxLength(96)
+ .HasColumnType("varchar(96)");
+
+ b.Property("BrowserInfo")
+ .HasMaxLength(512)
+ .HasColumnType("varchar(512)");
+
+ b.Property("ClientId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)");
+
+ b.Property("ClientIpAddress")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CorrelationId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime(6)");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("Identity")
+ .HasMaxLength(96)
+ .HasColumnType("varchar(96)");
+
+ b.Property("TenantId")
+ .HasColumnType("char(36)")
+ .HasColumnName("TenantId");
+
+ b.Property("TenantName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)");
+
+ b.Property("UserId")
+ .HasColumnType("char(36)");
+
+ b.Property("UserName")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("TenantId", "Action");
+
+ b.HasIndex("TenantId", "ApplicationName");
+
+ b.HasIndex("TenantId", "Identity");
+
+ b.HasIndex("TenantId", "UserId");
+
+ b.ToTable("AbpSecurityLogs", (string)null);
+ });
+
+ modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("char(36)");
+
+ b.Property("AccessFailedCount")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasColumnName("AccessFailedCount");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId");
+
+ b.Property