chore: 升级abp7.0.0

aspnet-core/Directory.Build.Microsoft.targets

@@ -1,23 +1,24 @@
 <Project>
     <ItemGroup>
-        <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="6.0.0"/>
+        <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="7.0.2"/>
-        <PackageReference Update="Microsoft.Extensions.Hosting" Version="6.0.1"/>
+        <PackageReference Update="Microsoft.Extensions.Http" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.2"/>
+        <PackageReference Update="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.2"/>
+        
+        <PackageReference Update="Microsoft.Extensions.Hosting" Version="7.0.0" />
+        
+        <PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0"/>
         <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/>
-        <PackageReference Update="Microsoft.Extensions.Http" Version="6.0.0"/>
         <PackageReference Update="Microsoft.CSharp" Version="4.7.0"/>
         <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.7.0"/>
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.9.1"/>
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0"/>
-
-        <PackageReference Update="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.7" />
-        <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.7" />
-        <PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7"/>
-        <PackageReference Update="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.7"/>
-        <PackageReference Update="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.7"/>
-        <PackageReference Update="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.7"/>
-        <PackageReference Update="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.7"/>
-        <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.7"/>
-        <PackageReference Update="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.7"/>
-        <PackageReference Update="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.7"/>
-        <PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5"/>
     </ItemGroup>
 </Project>

aspnet-core/Directory.Build.Volo.targets

@@ -1,91 +1,92 @@
 <Project>
     <ItemGroup>
-        <PackageReference Update="Volo.Abp.Autofac" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Autofac" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Json" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Json" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Validation" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Validation" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Ddd.Domain" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Ddd.Domain" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AutoMapper" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AutoMapper" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.ObjectMapping" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.ObjectMapping" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Identity.AspNetCore" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Caching" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Caching" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.BlobStoring.Aliyun" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.BackgroundJobs" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.BackgroundJobs" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Authorization.Abstractions" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.BackgroundJobs.HangFire" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.TestBase" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AspNetCore.SignalR" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.TestBase" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.EntityFrameworkCore.MySQL" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Identity.EntityFrameworkCore" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.0.0"/>
-		<PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="7.0.0"/>
-		<PackageReference Update="Volo.Abp.Account.Web" Version="6.0.1"/>
+		<PackageReference Update="Volo.Abp.AspNetCore.Mvc.Contracts" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="6.0.1"/>
+		<PackageReference Update="Volo.Abp.Account.Web" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Caching.StackExchangeRedis" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Swashbuckle" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AspNetCore.Serilog" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Ddd.Application" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Swashbuckle" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Ddd.Application" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Authorization" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Ddd.Application.Contracts" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Dapper" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Authorization" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Dapper" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Http.Client" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AspNetCore.Mvc" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.MongoDB" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Http.Client" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.MongoDB" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Http.Client.IdentityModel" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Account.Application" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AspNetCore.MultiTenancy" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Identity.Application" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Account.Application" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Identity.Application" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.TenantManagement.Application" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.PermissionManagement.Application" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.TenantManagement.Application" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.SettingManagement.Application" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.FeatureManagement.Application" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.ObjectExtending" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.SettingManagement.Application" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.ObjectExtending" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Account.Application.Contracts" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Identity.Application.Contracts" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.TenantManagement.Application.Contracts" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.FeatureManagement.Application.Contracts" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Emailing" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.SettingManagement.Application.Contracts" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Emailing" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.BackgroundJobs.Domain" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AuditLogging.Domain" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.TenantManagement.Domain" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.FeatureManagement.Domain" Version="7.0.0"/>
-		<PackageReference Update="Volo.Abp.Identity.Domain" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.SettingManagement.Domain" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="6.0.1"/>
+		<PackageReference Update="Volo.Abp.Identity.Domain" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Identity.Domain.Shared" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AuditLogging.Domain.Shared" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.TenantManagement.Domain.Shared" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Account.HttpApi" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.SettingManagement.Domain.Shared" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Identity.HttpApi" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Account.HttpApi" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Identity.HttpApi" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.TenantManagement.HttpApi" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.SettingManagement.HttpApi" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Account.HttpApi.Client" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Identity.HttpApi.Client" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.PermissionManagement.HttpApi.Client" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.TenantManagement.HttpApi.Client" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.FeatureManagement.HttpApi.Client" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.SettingManagement.HttpApi.Client" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AspNetCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Core" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AspNetCore" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.Core" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.EntityFrameworkCore" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AspNetCore.TestBase" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.EventBus" Version="6.0.1"/>
+        <PackageReference Update="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.0.0"/>
-        <PackageReference Update="Volo.Abp.Localization" Version="6.0.1" />
+        <PackageReference Update="Volo.Abp.EventBus" Version="7.0.0"/>
+        <PackageReference Update="Volo.Abp.Localization" Version="7.0.0" />
     </ItemGroup>
 </Project>

aspnet-core/Directory.Build.targets

@@ -38,17 +38,16 @@
 
         <PackageReference Update="xunit" Version="2.4.1"/>
         <PackageReference Update="xunit.extensibility.execution" Version="2.4.1"/>
-        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3"/>
+        <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5"/>
 
         <PackageReference Update="Hangfire.Redis.StackExchange" Version="1.8.5"/>
 
-        <PackageReference Update="DotNetCore.CAP" Version="6.2.1"/>
+        <PackageReference Update="DotNetCore.CAP" Version="7.0.2"/>
-        <PackageReference Update="DotNetCore.CAP.Dashboard" Version="6.2.1"/>
+        <PackageReference Update="DotNetCore.CAP.Dashboard" Version="7.0.2"/>
-        <PackageReference Update="DotNetCore.CAP.Mysql" Version="6.2.1"/>
+        <PackageReference Update="DotNetCore.CAP.Mysql" Version="7.0.2"/>
-        <PackageReference Update="DotNetCore.CAP.Kafka" Version="6.2.1"/>
+        <PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="7.0.2"/>
-        <PackageReference Update="DotNetCore.CAP.RabbitMQ" Version="6.2.1"/>
+        <PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="7.0.2"/>
-        <PackageReference Update="DotNetCore.CAP.InMemoryStorage" Version="6.2.1"/>
+        <PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0"/>
-        <PackageReference Update="Savorboard.CAP.InMemoryMessageQueue" Version="6.0.0"/>
 
         <PackageReference Update="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1"/>
         <PackageReference Update="Swashbuckle.AspNetCore" Version="6.3.1"/>
@@ -82,8 +81,6 @@
         <PackageReference Update="Confluent.Kafka" Version="1.8.2.0"/>
 
 
-        <PackageReference Update="Newtonsoft.Json" Version="13.0.1"/>
-
         <!-- Idenity 一下三个包升级到最新版导致鉴权不通过-->
         <PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.10.0"/>
         <PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.10.0"/>

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}

aspnet-core/frameworks/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace />
         <AssemblyName>Lion.AbpPro.CAP</AssemblyName>
     </PropertyGroup>

aspnet-core/frameworks/test/Lion.AbpPro.Core.Tests/Lion.AbpPro.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <IsPackable>false</IsPackable>
         <RootNamespace />

aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion.AbpPro.Localization.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <IsPackable>false</IsPackable>
         <RootNamespace />

aspnet-core/gateways/Lion.AbpPro.WebGateway/Lion.AbpPro.WebGateway.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
     </PropertyGroup>
 
 

aspnet-core/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.202",
+    "version": "7.0.102",
     "rollForward": "latestFeature"
   }
 }

aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Lion.AbpPro.BasicManagement.HttpApi.Host.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
         <PreserveCompilationReferences>true</PreserveCompilationReferences>
         <UserSecretsId>Lion.AbpPro.BasicManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>

aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/GithubAccessTokenResponse.cs

@@ -1,24 +0,0 @@
-using Newtonsoft.Json;
-
-namespace Lion.AbpPro.BasicManagement.Users.Dtos;
-
-public class GithubAccessTokenResponse
-{
-    /// <summary>
-    /// access_token
-    /// </summary>
-    [JsonProperty("access_token")]
-    public string Access_token { get; set; }
-
-    /// <summary>
-    /// scope
-    /// </summary>
-    [JsonProperty("scope")]
-    public string Scope { get; set; }
-
-    /// <summary>
-    /// token_type
-    /// </summary>
-    [JsonProperty("token_type")]
-    public string TokenType { get; set; }
-}

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<AbpLocalizationOptions> localizationOptions,
         IOptions<AbpMultiTenancyOptions> multiTenancyOptions,
-        IServiceProvider serviceProvider,
         IAbpAuthorizationPolicyProvider abpAuthorizationPolicyProvider,
         IPermissionDefinitionManager permissionDefinitionManager,
         DefaultAuthorizationPolicyProvider defaultAuthorizationPolicyProvider,
@@ -38,7 +38,6 @@ public class LionAbpApplicationConfigurationAppService : ApplicationService, IAb
         IOptions<AbpClockOptions> 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<ApplicationConfigurationDto> GetAsync()
+    public virtual async Task<ApplicationConfigurationDto> 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<ApplicationLocalizationConfigurationDto> GetLocalizationConfigAsync()
+    protected virtual async Task<ApplicationLocalizationConfigurationDto> 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<string, string>();
+            var resourceNames = _localizationOptions
+                .Resources
+                .Values
+                .Select(x => x.ResourceName)
+                .Union(
+                    await LazyServiceProvider
+                        .LazyGetRequiredService<IExternalLocalizationStore>()
+                        .GetResourceNamesAsync()
+                );
+
+            foreach (var resourceName in resourceNames)
+            {
+                var dictionary = new Dictionary<string, string>();
 
-            var localizer = _serviceProvider.GetRequiredService(
+                var localizer = await StringLocalizerFactory
-                typeof(IStringLocalizer<>).MakeGenericType(resource.ResourceType)
+                    .CreateByResourceNameOrNullAsync(resourceName);
-            ) as IStringLocalizer;
 
-            foreach (var localizedString in localizer.GetAllStrings())
+                if (localizer != null)
-            {
+                {
-                dictionary[localizedString.Name] = localizedString.Value;
+                    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)
             {

aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/Lion.AbpPro.BasicManagement.Domain.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/EntityFrameworkCore/BasicManagementDbContext.cs

@@ -3,7 +3,8 @@
 [ConnectionStringName(BasicManagementDbProperties.ConnectionStringName)]
 public class BasicManagementDbContext : AbpDbContext<BasicManagementDbContext>, IBasicManagementDbContext
 {
-   
+    public DbSet<FeatureGroupDefinitionRecord> FeatureGroups { get; set; }
+    public DbSet<FeatureDefinitionRecord> Features { get; set; }
     public DbSet<FeatureValue> FeatureValues { get; set; }
     public DbSet<IdentityUser> Users { get; set; }
     public DbSet<IdentityRole> Roles { get; set; }
@@ -11,6 +12,8 @@ public class BasicManagementDbContext : AbpDbContext<BasicManagementDbContext>,
     public DbSet<OrganizationUnit> OrganizationUnits { get; set; }
     public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
     public DbSet<IdentityLinkUser> LinkUsers { get; set; }
+    public DbSet<PermissionGroupDefinitionRecord> PermissionGroups { get; set; }
+    public DbSet<PermissionDefinitionRecord> Permissions { get; set; }
     public DbSet<PermissionGrant> PermissionGrants { get; set; }
     public DbSet<Setting> Settings { get; set; }
     public DbSet<Tenant> Tenants { get; set; }

aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.EntityFrameworkCore/Lion.AbpPro.BasicManagement.EntityFrameworkCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi/Lion.AbpPro.BasicManagement.HttpApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Application.Tests/Lion.AbpPro.BasicManagement.Application.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.Domain.Tests/Lion.AbpPro.BasicManagement.Domain.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests/Lion.AbpPro.BasicManagement.EntityFrameworkCore.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/BasicManagementConsoleApiClientModule.cs

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

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs

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

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs

@@ -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<BasicManagementConsoleApiClientModule>(options =>
-        {
-           options.Services.ReplaceConfiguration(_configuration);
-           options.UseAutofac();
-        }))
-        {
-            await application.InitializeAsync();
-
-            var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-            await demo.RunAsync();
-
-            await application.ShutdownAsync();
-        }
-    }
-
-    public Task StopAsync(CancellationToken cancellationToken)
-    {
-        return Task.CompletedTask;
-    }
-}

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.abppkg.json

@@ -1 +0,0 @@
-{}

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp.csproj

@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" />
-    <PackageReference Include="Volo.Abp.Autofac"  />
-    <ProjectReference Include="..\..\src\Lion.AbpPro.BasicManagement.HttpApi.Client\Lion.AbpPro.BasicManagement.HttpApi.Client.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="appsettings.json" />
-    <Content Include="appsettings.json">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Remove="appsettings.secrets.json" />
-    <Content Include="appsettings.secrets.json">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting"  />
-  </ItemGroup>
-
-</Project>

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/Program.cs

@@ -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<ConsoleTestAppHostedService>();
-            });
-}

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.json

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

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json

@@ -1,2 +0,0 @@
-{
-}

aspnet-core/modules/BasicManagement/test/Lion.AbpPro.BasicManagement.TestBase/Lion.AbpPro.BasicManagement.TestBase.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
         <PreserveCompilationReferences>true</PreserveCompilationReferences>
         <UserSecretsId>Lion.AbpPro.DataDictionaryManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>

aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application/Lion.AbpPro.DataDictionaryManagement.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain/Lion.AbpPro.DataDictionaryManagement.Domain.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi/Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Application.Tests/Lion.AbpPro.DataDictionaryManagement.Application.Tests.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.Domain.Tests/Lion.AbpPro.DataDictionaryManagement.Domain.Tests.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests/Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.Tests.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

aspnet-core/modules/DataDictionaryManagement/test/Lion.AbpPro.DataDictionaryManagement.TestBase/Lion.AbpPro.DataDictionaryManagement.TestBase.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/Lion.AbpPro.FileManagement.HttpApi.Host.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
         <PreserveCompilationReferences>true</PreserveCompilationReferences>
         <UserSecretsId>Lion.AbpPro.FileManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>

aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application/Lion.AbpPro.FileManagement.Application.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain/Lion.AbpPro.FileManagement.Domain.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.EntityFrameworkCore/Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi/Lion.AbpPro.FileManagement.HttpApi.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Application.Tests/Lion.AbpPro.FileManagement.Application.Tests.csproj

@@ -3,7 +3,7 @@
   
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.Domain.Tests/Lion.AbpPro.FileManagement.Domain.Tests.csproj

@@ -3,7 +3,7 @@
   
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests/Lion.AbpPro.FileManagement.EntityFrameworkCore.Tests.csproj

@@ -3,7 +3,7 @@
   
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/FileManagement/test/Lion.AbpPro.FileManagement.TestBase/Lion.AbpPro.FileManagement.TestBase.csproj

@@ -3,7 +3,7 @@
   
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj

@@ -3,7 +3,7 @@
   
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <UserSecretsId>Lion.AbpPro.NotificationManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>

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;

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<NotificationHub, INotificationHub> _hubContext;
     private readonly ILogger<NotificationAppService> _logger;
-
+    private readonly IJsonSerializer _jsonSerializer;
     public NotificationHubAppService(
         IHubContext<NotificationHub, INotificationHub> hubContext,
-        ILogger<NotificationAppService> logger)
+        ILogger<NotificationAppService> logger, 
+        IJsonSerializer jsonSerializer)
     {
         _hubContext = hubContext;
         _logger = logger;
+        _jsonSerializer = jsonSerializer;
     }
 
     /// <summary>
@@ -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)}");
     }
 }

aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application/Lion.AbpPro.NotificationManagement.Application.csproj

@@ -3,7 +3,7 @@
  
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain/Lion.AbpPro.NotificationManagement.Domain.csproj

@@ -3,7 +3,7 @@
     
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
     </PropertyGroup>
 

aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.EntityFrameworkCore/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj

@@ -3,7 +3,7 @@
  
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi/Lion.AbpPro.NotificationManagement.HttpApi.csproj

@@ -3,7 +3,7 @@
  
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
   </PropertyGroup>
 

aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Application.Tests/Lion.AbpPro.NotificationManagement.Application.Tests.csproj

@@ -3,7 +3,7 @@
     
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.Domain.Tests/Lion.AbpPro.NotificationManagement.Domain.Tests.csproj

@@ -3,7 +3,7 @@
  
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
       <IsPackable>false</IsPackable> 
   </PropertyGroup>

aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests/Lion.AbpPro.NotificationManagement.EntityFrameworkCore.Tests.csproj

@@ -3,7 +3,7 @@
     
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

aspnet-core/modules/NotificationManagement/test/Lion.AbpPro.NotificationManagement.TestBase/Lion.AbpPro.NotificationManagement.TestBase.csproj

@@ -3,7 +3,7 @@
     
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Lion.AbpPro.HttpApi.Host.csproj

@@ -2,7 +2,7 @@
 
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro</RootNamespace>
         <PreserveCompilationReferences>true</PreserveCompilationReferences>
         <UserSecretsId>Lion.AbpPro-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>

aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj

@@ -2,7 +2,7 @@
     
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro</RootNamespace>
     </PropertyGroup>
 

aspnet-core/services/src/Lion.AbpPro.DbMigrator/Lion.AbpPro.DbMigrator.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj

@@ -3,7 +3,7 @@
   
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro</RootNamespace>
   </PropertyGroup>
 

aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs

@@ -24,7 +24,11 @@ namespace Lion.AbpPro.EntityFrameworkCore
         public DbSet<OrganizationUnit> OrganizationUnits { get; set; }
         public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
         public DbSet<IdentityLinkUser> LinkUsers { get; set; }
+        public DbSet<FeatureGroupDefinitionRecord> FeatureGroups { get; set; }
+        public DbSet<FeatureDefinitionRecord> Features { get; set; }
         public DbSet<FeatureValue> FeatureValues { get; set; }
+        public DbSet<PermissionGroupDefinitionRecord> PermissionGroups { get; set; }
+        public DbSet<PermissionDefinitionRecord> Permissions { get; set; }
         public DbSet<PermissionGrant> PermissionGrants { get; set; }
         public DbSet<Setting> Settings { get; set; }
         public DbSet<Tenant> Tenants { get; set; }

aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj

@@ -2,7 +2,7 @@
 
     
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Lion.AbpPro</RootNamespace>
     </PropertyGroup>
 

aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20230113040449_UpdateToAbpVnext7.cs

@@ -0,0 +1,161 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Lion.AbpPro.Migrations
+{
+    /// <inheritdoc />
+    public partial class UpdateToAbpVnext7 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "AbpFeatureGroups",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DisplayName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpFeatureGroups", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "AbpFeatures",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    GroupName = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Name = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ParentName = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DisplayName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DefaultValue = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsVisibleToClients = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    IsAvailableToHost = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    AllowedProviders = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ValueType = table.Column<string>(type: "varchar(2048)", maxLength: 2048, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpFeatures", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "AbpPermissionGroups",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DisplayName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpPermissionGroups", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "AbpPermissions",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    GroupName = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Name = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ParentName = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DisplayName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsEnabled = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    MultiTenancySide = table.Column<byte>(type: "tinyint unsigned", nullable: false),
+                    Providers = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    StateCheckers = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AbpPermissions", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpFeatureGroups_Name",
+                table: "AbpFeatureGroups",
+                column: "Name",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpFeatures_GroupName",
+                table: "AbpFeatures",
+                column: "GroupName");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpFeatures_Name",
+                table: "AbpFeatures",
+                column: "Name",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpPermissionGroups_Name",
+                table: "AbpPermissionGroups",
+                column: "Name",
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpPermissions_GroupName",
+                table: "AbpPermissions",
+                column: "GroupName");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AbpPermissions_Name",
+                table: "AbpPermissions",
+                column: "Name",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AbpFeatureGroups");
+
+            migrationBuilder.DropTable(
+                name: "AbpFeatures");
+
+            migrationBuilder.DropTable(
+                name: "AbpPermissionGroups");
+
+            migrationBuilder.DropTable(
+                name: "AbpPermissions");
+        }
+    }
+}

aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs

@@ -18,7 +18,7 @@ namespace Lion.AbpPro.Migrations
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
-                .HasAnnotation("ProductVersion", "6.0.7")
+                .HasAnnotation("ProductVersion", "7.0.2")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             modelBuilder.Entity("Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates.DataDictionary", b =>
@@ -574,6 +574,93 @@ namespace Lion.AbpPro.Migrations
                     b.ToTable("AbpBackgroundJobs", (string)null);
                 });
 
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AllowedProviders")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("DefaultValue")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<bool>("IsAvailableToHost")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsVisibleToClients")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<string>("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<Guid>("Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("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<Guid>("Id")
@@ -876,7 +963,8 @@ namespace Lion.AbpPro.Migrations
                         .HasColumnName("ExtraProperties");
 
                     b.Property<bool>("IsActive")
-                        .HasColumnType("tinyint(1)");
+                        .HasColumnType("tinyint(1)")
+                        .HasColumnName("IsActive");
 
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
@@ -1208,6 +1296,58 @@ namespace Lion.AbpPro.Migrations
                     b.ToTable("AbpOrganizationUnitRoles", (string)null);
                 });
 
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<byte>("MultiTenancySide")
+                        .HasColumnType("tinyint unsigned");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.Property<string>("StateCheckers")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("AbpPermissions", (string)null);
+                });
+
             modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
                 {
                     b.Property<Guid>("Id")
@@ -1240,6 +1380,33 @@ namespace Lion.AbpPro.Migrations
                     b.ToTable("AbpPermissionGrants", (string)null);
                 });
 
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGroupDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("varchar(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("AbpPermissionGroups", (string)null);
+                });
+
             modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
                 {
                     b.Property<Guid>("Id")

aspnet-core/services/src/Lion.AbpPro.FreeSqlRepository/Lion.AbpPro.FreeSqlRepository.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 

aspnet-core/services/src/Lion.AbpPro.HttpApi/Lion.AbpPro.HttpApi.csproj

@@ -3,7 +3,7 @@
   
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro</RootNamespace>
   </PropertyGroup>
 

aspnet-core/services/test/Lion.AbpPro.Application.Tests/Lion.AbpPro.Application.Tests.csproj

@@ -2,7 +2,7 @@
   
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

aspnet-core/services/test/Lion.AbpPro.Domain.Tests/Lion.AbpPro.Domain.Tests.csproj

@@ -3,7 +3,7 @@
   
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

aspnet-core/services/test/Lion.AbpPro.EntityFrameworkCore.Tests/Lion.AbpPro.EntityFrameworkCore.Tests.csproj

@@ -3,7 +3,7 @@
   
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

aspnet-core/services/test/Lion.AbpPro.FreeSqlRepository.Tests/Lion.AbpPro.FreeSqlRepository.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 

aspnet-core/services/test/Lion.AbpPro.HttpApi.Client.ConsoleTestApp/Lion.AbpPro.HttpApi.Client.ConsoleTestApp.csproj

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

aspnet-core/services/test/Lion.AbpPro.TestBase/Lion.AbpPro.TestBase.csproj

@@ -3,7 +3,7 @@
   
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Lion.AbpPro</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Gateways/Lion.AbpPro.Shared.Hosting.Gateways.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace />
     </PropertyGroup>
     <ItemGroup>

aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/GlobalUsings.cs

@@ -24,7 +24,6 @@ global using Microsoft.Extensions.Logging.Abstractions;
 global using Microsoft.Extensions.Options;
 global using Microsoft.OpenApi.Any;
 global using Microsoft.OpenApi.Models;
-global using Newtonsoft.Json;
 global using Serilog;
 global using Serilog.Exceptions;
 global using Serilog.Sinks.Elasticsearch;

aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Lion.AbpPro.Shared.Hosting.Microservices.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <RootNamespace />
     </PropertyGroup>
     <ItemGroup>

aspnet-core/shared/Lion.AbpPro.Shared.Hosting.Microservices/Microsoft/AspNetCore/Mvc/Filters/LionResultFilter.cs

@@ -1,4 +1,6 @@
-namespace Microsoft.AspNetCore.Mvc.Filters;
+using System.Text.Json;
+
+namespace Microsoft.AspNetCore.Mvc.Filters;
 
 public class LionResultFilter : IResultFilter, ITransientDependency
 {
@@ -7,7 +9,8 @@ public class LionResultFilter : IResultFilter, ITransientDependency
         // 如果是page 直接return
         if (context.ActionDescriptor.IsPageAction()) return;
 
-        var controllerHasDontWrapResultAttribute = context.ActionDescriptor.AsControllerActionDescriptor().ControllerTypeInfo.GetCustomAttributes(typeof(WrapResultAttribute), true).Any();
+        var controllerHasDontWrapResultAttribute =
+            context.ActionDescriptor.AsControllerActionDescriptor().ControllerTypeInfo.GetCustomAttributes(typeof(WrapResultAttribute), true).Any();
         var controllerActionHasDontWrapResultAttribute = context.ActionDescriptor.GetMethodInfo().GetCustomAttributes(typeof(WrapResultAttribute), true).Any();
         if (controllerHasDontWrapResultAttribute || controllerActionHasDontWrapResultAttribute)
         {
@@ -18,11 +21,13 @@ public class LionResultFilter : IResultFilter, ITransientDependency
                 result.SetSuccess(((ObjectResult)context.Result).Value);
             }
 
+            var jsonSerializer = context.GetService<IJsonSerializer>();
+
             context.Result = new ContentResult()
             {
                 StatusCode = (int)HttpStatusCode.OK,
                 ContentType = "application/json;charset=utf-8",
-                Content = JsonConvert.SerializeObject(result)
+                Content = jsonSerializer.Serialize(result)
             };
         }
     }

vben28/.env.development

@@ -26,4 +26,4 @@ VITE_GLOB_API_URL_PREFIX=
 VITE_API_URL= http://localhost:44315/
 
 # WEBSOCKE 地址
-VITE_WEBSOCKE_URL= http://localhost:44315/
+VITE_WEBSOCKE_URL= http://localhost:44315/signalr/notification

vben28/.env.production

@@ -40,4 +40,4 @@ VITE_API_URL= http://116.205.177.85:8080
 
 
 # WEBSOCKE 地址
-VITE_WEBSOCKE_URL= http://116.205.177.85:8080
+VITE_WEBSOCKE_URL= http://116.205.177.85:8080/signalr/notification

vben28/package.json

@@ -37,7 +37,7 @@
     "@iconify/iconify": "^2.2.1",
     "@logicflow/core": "^1.1.13",
     "@logicflow/extension": "^1.1.13",
-    "@microsoft/signalr": "^6.0.6",
+    "@microsoft/signalr": "^7.0.2",
     "@vue/runtime-core": "^3.2.33",
     "@vue/shared": "^3.2.33",
     "@vueuse/core": "^8.3.0",
@@ -55,7 +55,7 @@
     "lodash-es": "^4.17.21",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
-    "nswag": "^13.16.1",
+    "nswag": "^13.18.2",
     "path-to-regexp": "^6.2.0",
     "pinia": "2.0.12",
     "print-js": "^1.6.0",
@@ -112,7 +112,6 @@
     "eslint-plugin-vue": "^8.6.0",
     "esno": "^0.14.1",
     "fs-extra": "^10.1.0",
-
     "inquirer": "^8.2.2",
     "less": "^4.1.2",
     "lint-staged": "12.3.7",

vben28/pnpm-lock.yaml

@@ -14,7 +14,7 @@ specifiers:
   '@iconify/json': ^2.1.30
   '@logicflow/core': ^1.1.13
   '@logicflow/extension': ^1.1.13
-  '@microsoft/signalr': ^6.0.6
+  '@microsoft/signalr': ^7.0.2
   '@purge-icons/generated': ^0.8.1
   '@types/codemirror': ^5.60.5
   '@types/crypto-js': ^4.1.1
@@ -69,7 +69,7 @@ specifiers:
   mockjs: ^1.1.0
   npm-run-all: ^4.1.5
   nprogress: ^0.2.0
-  nswag: ^13.16.1
+  nswag: ^13.18.2
   oidc-client: ^1.11.5
   path-to-regexp: ^6.2.0
   picocolors: ^1.0.0
@@ -126,7 +126,7 @@ dependencies:
   '@iconify/iconify': 2.2.1
   '@logicflow/core': 1.1.13
   '@logicflow/extension': 1.1.13
-  '@microsoft/signalr': registry.npmmirror.com/@microsoft/signalr/6.0.6
+  '@microsoft/signalr': registry.npmmirror.com/@microsoft/signalr/7.0.2
   '@vue/runtime-core': 3.2.33
   '@vue/shared': 3.2.33
   '@vueuse/core': 8.3.0_vue@3.2.33
@@ -145,7 +145,7 @@ dependencies:
   lodash-es: 4.17.21
   mockjs: 1.1.0
   nprogress: 0.2.0
-  nswag: registry.npmmirror.com/nswag/13.16.1
+  nswag: registry.npmmirror.com/nswag/13.18.2
   oidc-client: registry.npmmirror.com/oidc-client/1.11.5
   path-to-regexp: 6.2.0
   pinia: 2.0.12_ifhmkzsxec62ezvqv7qmanm4bq
@@ -2054,7 +2054,7 @@ packages:
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
     dependencies:
       '@types/minimatch': 3.0.5
-      '@types/node': 17.0.25
+      '@types/node': registry.npmmirror.com/@types/node/17.0.25
     dev: true
 
   /@types/imagemin-gifsicle/7.0.1:
@@ -4766,7 +4766,7 @@ packages:
     dependencies:
       graceful-fs: 4.2.10
       jsonfile: 4.0.0
-      universalify: 0.1.2
+      universalify: registry.npmmirror.com/universalify/0.1.2
     dev: true
 
   /functional-red-black-tree/1.0.1:
@@ -8370,11 +8370,6 @@ packages:
     resolution: {integrity: sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==}
     dev: true
 
-  /universalify/0.1.2:
-    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
-    engines: {node: '>= 4.0.0'}
-    dev: true
-
   /universalify/2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
     engines: {node: '>= 10.0.0'}
@@ -9191,14 +9186,14 @@ packages:
     dev: true
     optional: true
 
-  registry.npmmirror.com/@microsoft/signalr/6.0.6:
+  registry.npmmirror.com/@microsoft/signalr/7.0.2:
-    resolution: {integrity: sha512-3dTLtgwEXUeE9R/3NZQslh1B2WbppeHVXdnpvSZc7Yz+tP5Yiw3KCVUHwKUVnYmd9/2v3DaI/pvCdihrss49zA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@microsoft/signalr/-/signalr-6.0.6.tgz}
+    resolution: {integrity: sha512-U+o33K2m6nnMojZzBrjrApKgYfiQ0A0t4I2F5oFJObgfzRSDS9v0YoYgkmva5nbPftUp3YcR5XmH0S/1+BZT6Q==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@microsoft/signalr/-/signalr-7.0.2.tgz}
     name: '@microsoft/signalr'
-    version: 6.0.6
+    version: 7.0.2
     dependencies:
       abort-controller: registry.npmmirror.com/abort-controller/3.0.0
-      eventsource: registry.npmmirror.com/eventsource/1.1.2
+      eventsource: registry.npmmirror.com/eventsource/2.0.2
-      fetch-cookie: registry.npmmirror.com/fetch-cookie/0.11.0
+      fetch-cookie: registry.npmmirror.com/fetch-cookie/2.1.0
       node-fetch: registry.npmmirror.com/node-fetch/2.6.7
       ws: registry.npmmirror.com/ws/7.5.8
     transitivePeerDependencies:
@@ -10157,11 +10152,11 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
-  registry.npmmirror.com/eventsource/1.1.2:
+  registry.npmmirror.com/eventsource/2.0.2:
-    resolution: {integrity: sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eventsource/-/eventsource-1.1.2.tgz}
+    resolution: {integrity: sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/eventsource/-/eventsource-2.0.2.tgz}
     name: eventsource
-    version: 1.1.2
+    version: 2.0.2
-    engines: {node: '>=0.12.0'}
+    engines: {node: '>=12.0.0'}
     dev: false
 
   registry.npmmirror.com/execa/0.7.0:
@@ -10254,12 +10249,12 @@ packages:
       pend: registry.npmmirror.com/pend/1.2.0
     dev: true
 
-  registry.npmmirror.com/fetch-cookie/0.11.0:
+  registry.npmmirror.com/fetch-cookie/2.1.0:
-    resolution: {integrity: sha512-BQm7iZLFhMWFy5CZ/162sAGjBfdNWb7a8LEqqnzsHFhxT/X/SVj/z2t2nu3aJvjlbQkrAlTUApplPRjWyH4mhA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fetch-cookie/-/fetch-cookie-0.11.0.tgz}
+    resolution: {integrity: sha512-39+cZRbWfbibmj22R2Jy6dmTbAWC+oqun1f1FzQaNurkPDUP4C38jpeZbiXCR88RKRVDp8UcDrbFXkNhN+NjYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/fetch-cookie/-/fetch-cookie-2.1.0.tgz}
     name: fetch-cookie
-    version: 0.11.0
+    version: 2.1.0
-    engines: {node: '>=8'}
     dependencies:
+      set-cookie-parser: registry.npmmirror.com/set-cookie-parser/2.5.1
       tough-cookie: registry.npmmirror.com/tough-cookie/4.0.0
     dev: false
 
@@ -11111,10 +11106,10 @@ packages:
       path-key: registry.npmmirror.com/path-key/2.0.1
     dev: true
 
-  registry.npmmirror.com/nswag/13.16.1:
+  registry.npmmirror.com/nswag/13.18.2:
-    resolution: {integrity: sha512-L/ll7TeMaYMVPGTT8T9MrEVP1FjSod8/quRB9WuFPdvgFAsDILBwVuSifghzaX9DXmo1G5C22xmE1/53EPywig==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nswag/-/nswag-13.16.1.tgz}
+    resolution: {integrity: sha512-7OpG9WkrZUO2+9I7hgQsaAHujsP/tCaIs7ML2B4wUuFLjSsG6lHucyrREyVO/h9l3MM/Cw4RlEGFBbluWhgeYg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/nswag/-/nswag-13.18.2.tgz}
     name: nswag
-    version: 13.16.1
+    version: 13.18.2
     engines: {npm: '>=3.10.8'}
     hasBin: true
     dev: false
@@ -11645,6 +11640,12 @@ packages:
     dependencies:
       randombytes: registry.npmmirror.com/randombytes/2.1.0
 
+  registry.npmmirror.com/set-cookie-parser/2.5.1:
+    resolution: {integrity: sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz}
+    name: set-cookie-parser
+    version: 2.5.1
+    dev: false
+
   registry.npmmirror.com/setprototypeof/1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz}
     name: setprototypeof
@@ -12021,7 +12022,6 @@ packages:
     name: universalify
     version: 0.1.2
     engines: {node: '>= 4.0.0'}
-    dev: false
 
   registry.npmmirror.com/universalify/2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz}

vben28/src/hooks/web/useSignalR.ts

@@ -1,17 +1,16 @@
 import * as signalR from '@microsoft/signalr';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useUserStoreWithOut } from '/@/store/modules/user';
-let connection:signalR.HubConnection;
+let connection: signalR.HubConnection;
 export function useSignalR() {
-
   /**
    * 开始连接SignalR
    */
   async function startConnect() {
-     try {
+    try {
       connectionsignalR();
       await connection.start();
-      } catch (err) {
+    } catch (err) {
       console.log(err);
       setTimeout(() => startConnect(), 5000);
     }
@@ -20,49 +19,45 @@ export function useSignalR() {
   /**
    * 关闭SignalR连接
    */
-  function closeConnect(): void {8
+  function closeConnect(): void {
+    8;
     if (connection) {
       connection.stop();
     }
   }
 
-  async function connectionsignalR(){
+  async function connectionsignalR() {
     const userStore = useUserStoreWithOut();
     const token = userStore.getToken;
-    const url = (import.meta.env.VITE_WEBSOCKE_URL as string) + '/signalr/notification';
     connection = new signalR.HubConnectionBuilder()
-    .withUrl(url, {
+      .withUrl(import.meta.env.VITE_WEBSOCKE_URL, {
-      accessTokenFactory: () => token,
+        accessTokenFactory: () => token,
-      skipNegotiation: true,
+        skipNegotiation: true,
-      transport: signalR.HttpTransportType.WebSockets,
+        transport: signalR.HttpTransportType.WebSockets,
-    })  
+      })
-    .withAutomaticReconnect({
+      .withAutomaticReconnect({
-      nextRetryDelayInMilliseconds: retryContext => {
+        nextRetryDelayInMilliseconds: (retryContext) => {
-
+          //重连规则：重连次数<300：间隔1s;重试次数<3000:间隔3s;重试次数>3000:间隔30s
-        //重连规则：重连次数<300：间隔1s;重试次数<3000:间隔3s;重试次数>3000:间隔30s
+          const count = retryContext.previousRetryCount / 300;
-        let count = retryContext.previousRetryCount / 300;
+          if (count < 1) {
-        if (count < 1)//重试次数<300,间隔1s
+            //重试次数<300,间隔1s
-        {
+            return 1000;
-          return 1000;
+          } else if (count < 10) {
-        }
+            //重试次数>300:间隔5s
-        else if (count < 10) //重试次数>300:间隔5s
+            return 1000 * 5;
-        {
+          } //重试次数>3000:间隔30s
-          return 1000 * 5;
+          else {
+            return 1000 * 30;
+          }
+        },
+      })
+      .configureLogging(signalR.LogLevel.Debug)
+      .build();
 
-        }
+    //接收普通文本消息
-        else //重试次数>3000:间隔30s
+    connection.on('ReceiveTextMessageAsync', ReceiveTextMessageHandlerAsync);
-        {
+    //接收广播消息
-          return 1000 * 30;
+    connection.on('ReceiveBroadCastMessageAsync', ReceiveBroadCastMessageHandlerAsync);
-        }
-      }
-    })
-    .configureLogging(signalR.LogLevel.Debug)
-    .build();   
-
-      //接收普通文本消息
-      connection.on('ReceiveTextMessageAsync', ReceiveTextMessageHandlerAsync);
-      //接收广播消息
-      connection.on('ReceiveBroadCastMessageAsync', ReceiveBroadCastMessageHandlerAsync);
   }
 
   /**
@@ -100,7 +95,6 @@ export function useSignalR() {
    * @param message 消息体
    */
   function ReceiveBroadCastMessageHandlerAsync(message: any) {
-  
     const { notification } = useMessage();
     if (message.messageLevel == 10) {
       notification.warn({

vben28/src/views/admin/dictionary/AbpDictionary.ts

@@ -1,39 +1,39 @@
-import { FormSchema } from "/@/components/Table";
+import { FormSchema } from '/@/components/Table';
-import { BasicColumn } from "/@/components/Table";
+import { BasicColumn } from '/@/components/Table';
-import { message } from "ant-design-vue";
+import { message } from 'ant-design-vue';
-import { useI18n } from "/@/hooks/web/useI18n";
+import { useI18n } from '/@/hooks/web/useI18n';
 import {
   PagingDataDictionaryInput,
   DataDictionaryServiceProxy,
   SetDataDictinaryDetailInput,
   DeleteDataDictionaryDetailInput,
-  IdInput
+  IdInput,
-} from "/@/services/ServiceProxies";
+} from '/@/services/ServiceProxies';
-import { h } from "vue";
+import { h } from 'vue';
-import { Switch } from "ant-design-vue";
+import { Switch } from 'ant-design-vue';
 
 const { t } = useI18n();
 export const tableColumns: BasicColumn[] = [
   {
-    title: t("routes.admin.dictionaryCode"),
+    title: t('routes.admin.dictionaryCode'),
-    dataIndex: "code"
+    dataIndex: 'code',
   },
   {
-    title: t("routes.admin.dictionaryDisplayText"),
+    title: t('routes.admin.dictionaryDisplayText'),
-    dataIndex: "displayText"
+    dataIndex: 'displayText',
   },
   {
-    title: t("routes.admin.dictionaryOrder"),
+    title: t('routes.admin.dictionaryOrder'),
-    dataIndex: "order"
+    dataIndex: 'order',
   },
   {
-    title: t("common.status"),
+    title: t('common.status'),
-    dataIndex: "isEnabled",
+    dataIndex: 'isEnabled',
     customRender: ({ record }) => {
       return h(Switch, {
         checked: record.isEnabled,
-        checkedChildren: "是",
+        checkedChildren: '是',
-        unCheckedChildren: "否",
+        unCheckedChildren: '否',
         onChange(checked: boolean) {
           const request = new SetDataDictinaryDetailInput();
           request.dataDictionaryId = record.dataDictionaryId;
@@ -42,99 +42,96 @@ export const tableColumns: BasicColumn[] = [
           enableDictionaryAsync(request)
             .then(() => {
               record.isEnabled = checked;
-              message.success(t("common.operationSuccess"));
             })
-            .catch(() => {
+            .catch(() => {});
-              message.error(t("common.operationFail"));
+        },
-            });
-        }
       });
-    }
+    },
   },
   {
-    dataIndex: "description",
+    dataIndex: 'description',
-    title: t("routes.admin.dictionaryDescription")
+    title: t('routes.admin.dictionaryDescription'),
-  }
+  },
 ];
 //字典类型表格
 export const dictionaryTypeTableColumns: BasicColumn[] = [
   {
-    title: t("routes.admin.dictionaryCode") + "|" + t("routes.admin.dictionaryDisplayText"),
+    title: t('routes.admin.dictionaryCode') + '|' + t('routes.admin.dictionaryDisplayText'),
-    dataIndex: "text",
+    dataIndex: 'text',
-    align: "left"
+    align: 'left',
-  }
+  },
 ];
 //字典项查询
 export const searchFormSchema: FormSchema[] = [
   {
-    field: "filter",
+    field: 'filter',
-    label: "",
+    label: '',
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 6
+      span: 6,
-    }
+    },
-  }
+  },
 ];
 
 //字典类型查询
 export const searchDictionaryFormSchema: FormSchema[] = [
   {
-    field: "filter",
+    field: 'filter',
-    label: "",
+    label: '',
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
-  }
+  },
 ];
 
 //新增字典项
 export const createFormSchema: FormSchema[] = [
   {
-    field: "id",
+    field: 'id',
-    label: "",
+    label: '',
     ifShow: false,
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
   },
   {
-    field: "typeDisplayText",
+    field: 'typeDisplayText',
-    label: t("routes.admin.dictionaryTypeName"),
+    label: t('routes.admin.dictionaryTypeName'),
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 18
+      span: 18,
     },
     componentProps: {
-      disabled: true
+      disabled: true,
-    }
+    },
   },
   {
-    field: "code",
+    field: 'code',
-    label: t("routes.admin.dictionaryCode"),
+    label: t('routes.admin.dictionaryCode'),
     required: true,
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
   },
   {
-    field: "displayText",
+    field: 'displayText',
-    label: t("routes.admin.dictionaryDisplayText"),
+    label: t('routes.admin.dictionaryDisplayText'),
-    component: "Input",
+    component: 'Input',
     required: true,
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
   },
   {
-    field: "order",
+    field: 'order',
-    label: t("routes.admin.dictionaryOrder"),
+    label: t('routes.admin.dictionaryOrder'),
     required: true,
-    component: "InputNumber",
+    component: 'InputNumber',
     colProps: {
-      span: 18
+      span: 18,
     },
     dynamicRules: () => {
       return [
@@ -145,69 +142,69 @@ export const createFormSchema: FormSchema[] = [
             if (regNull.test(value)) {
               return Promise.resolve();
             }
-            return Promise.reject(t("routes.admin.nonZeroMessage"));
+            return Promise.reject(t('routes.admin.nonZeroMessage'));
-          }
+          },
-        }
+        },
       ];
-    }
+    },
   },
   {
-    field: "description",
+    field: 'description',
-    label: t("routes.admin.dictionaryDescription"),
+    label: t('routes.admin.dictionaryDescription'),
-    component: "InputTextArea",
+    component: 'InputTextArea',
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
-  }
+  },
 ];
 //编辑字典项
 export const editFormSchema: FormSchema[] = [
   {
-    field: "dataDictionaryId",
+    field: 'dataDictionaryId',
-    label: "",
+    label: '',
     ifShow: false,
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
   },
   {
-    field: "id",
+    field: 'id',
-    label: "",
+    label: '',
     ifShow: false,
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
   },
   {
-    field: "code",
+    field: 'code',
-    label: t("routes.admin.dictionaryCode"),
+    label: t('routes.admin.dictionaryCode'),
     required: true,
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 18
+      span: 18,
     },
     componentProps: {
-      disabled: true
+      disabled: true,
-    }
+    },
   },
   {
-    field: "displayText",
+    field: 'displayText',
-    label: t("routes.admin.dictionaryDisplayText"),
+    label: t('routes.admin.dictionaryDisplayText'),
-    component: "Input",
+    component: 'Input',
     required: true,
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
   },
   {
-    field: "order",
+    field: 'order',
-    label: t("routes.admin.dictionaryOrder"),
+    label: t('routes.admin.dictionaryOrder'),
     required: true,
-    component: "InputNumber",
+    component: 'InputNumber',
     colProps: {
-      span: 18
+      span: 18,
     },
     dynamicRules: () => {
       return [
@@ -218,99 +215,99 @@ export const editFormSchema: FormSchema[] = [
             if (regNull.test(value)) {
               return Promise.resolve();
             }
-            return Promise.reject(t("routes.admin.nonZeroMessage"));
+            return Promise.reject(t('routes.admin.nonZeroMessage'));
-          }
+          },
-        }
+        },
       ];
-    }
+    },
   },
   {
-    field: "description",
+    field: 'description',
-    label: t("routes.admin.dictionaryDescription"),
+    label: t('routes.admin.dictionaryDescription'),
-    component: "InputTextArea",
+    component: 'InputTextArea',
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
-  }
+  },
 ];
 //新增字典类型
 export const createDictionaryTypeFormSchema: FormSchema[] = [
   {
-    field: "code",
+    field: 'code',
-    label: t("routes.admin.dictionaryCode"),
+    label: t('routes.admin.dictionaryCode'),
-    component: "Input",
+    component: 'Input',
     required: true,
     colProps: {
-      span: 22
+      span: 22,
-    }
+    },
   },
   {
-    field: "displayText",
+    field: 'displayText',
-    label: t("routes.admin.dictionaryDisplayText"),
+    label: t('routes.admin.dictionaryDisplayText'),
-    component: "Input",
+    component: 'Input',
     required: true,
     colProps: {
-      span: 22
+      span: 22,
-    }
+    },
   },
   {
-    field: "description",
+    field: 'description',
-    label: t("routes.admin.dictionaryDescription"),
+    label: t('routes.admin.dictionaryDescription'),
-    component: "InputTextArea",
+    component: 'InputTextArea',
     colProps: {
-      span: 22
+      span: 22,
-    }
+    },
-  }
+  },
 ];
 //编辑字典类型
 export const editDictionaryTypeFormSchema: FormSchema[] = [
   {
-    field: "code",
+    field: 'code',
-    label: t("routes.admin.dictionaryCode"),
+    label: t('routes.admin.dictionaryCode'),
-    component: "Input",
+    component: 'Input',
     required: true,
     colProps: {
-      span: 22
+      span: 22,
     },
     componentProps: {
-      disabled: true
+      disabled: true,
-    }
+    },
   },
   {
-    field: "displayText",
+    field: 'displayText',
-    label: t("routes.admin.dictionaryDisplayText"),
+    label: t('routes.admin.dictionaryDisplayText'),
-    component: "Input",
+    component: 'Input',
     required: true,
     colProps: {
-      span: 22
+      span: 22,
-    }
+    },
   },
   {
-    field: "description",
+    field: 'description',
-    label: t("routes.admin.dictionaryDescription"),
+    label: t('routes.admin.dictionaryDescription'),
-    component: "InputTextArea",
+    component: 'InputTextArea',
     colProps: {
-      span: 22
+      span: 22,
-    }
+    },
   },
   {
-    field: "key",
+    field: 'key',
-    label: "",
+    label: '',
     ifShow: false,
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
   },
   {
-    field: "id",
+    field: 'id',
-    label: "",
+    label: '',
     ifShow: false,
-    component: "Input",
+    component: 'Input',
     colProps: {
-      span: 18
+      span: 18,
-    }
+    },
-  }
+  },
 ];
 
 /**
@@ -330,13 +327,13 @@ export async function createDictionaryTypeAsync({
   changeOkLoading,
   closeModal,
   validate,
-  resetFields
+  resetFields,
 }) {
   changeOkLoading(true);
   await validate();
   const _dataDictionaryServiceProxy = new DataDictionaryServiceProxy();
   await _dataDictionaryServiceProxy.create(request);
-  message.success(t("common.operationSuccess"));
+  message.success(t('common.operationSuccess'));
   resetFields();
   changeOkLoading(false);
   closeModal();
@@ -348,7 +345,7 @@ export async function editDictionaryTypeAsync({ request, changeOkLoading, valida
   await validate();
   const _dataDictionaryServiceProxy = new DataDictionaryServiceProxy();
   await _dataDictionaryServiceProxy.update(request);
-  message.success(t("common.operationSuccess"));
+  message.success(t('common.operationSuccess'));
   changeOkLoading(false);
   closeModal();
 }
@@ -365,13 +362,13 @@ export async function createDetailsDictionaryAsync({
   changeOkLoading,
   validate,
   resetFields,
-  closeModal
+  closeModal,
 }) {
   changeOkLoading(true);
   await validate();
   const _dataDictionaryServiceProxy = new DataDictionaryServiceProxy();
   await _dataDictionaryServiceProxy.createDetail(request);
-  message.success(t("common.operationSuccess"));
+  message.success(t('common.operationSuccess'));
   resetFields();
   changeOkLoading(false);
   closeModal();
@@ -389,13 +386,13 @@ export async function editDetailsDictionaryAsync({
   request,
   changeOkLoading,
   validate,
-  closeModal
+  closeModal,
 }) {
   changeOkLoading(true);
   await validate();
   const _dataDictionaryServiceProxy = new DataDictionaryServiceProxy();
   await _dataDictionaryServiceProxy.updateDetail(request);
-  message.success(t("common.operationSuccess"));
+  message.success(t('common.operationSuccess'));
   changeOkLoading(false);
   closeModal();
 }
@@ -413,6 +410,6 @@ export async function deleteDictionaryTypeAsync({ id, reloadType }) {
   const _dataDictionaryServiceProxy = new DataDictionaryServiceProxy();
   const request = new IdInput();
   request.id = id;
-  await _dataDictionaryServiceProxy.deleteDictinaryType(request);
+  await _dataDictionaryServiceProxy.deleteDataDictionaryType(request);
   reloadType();
 }

vben28/src/views/admin/dictionary/AbpDictionary.vue

@@ -8,13 +8,12 @@
         @selection-change="onSelectChange"
         :clickToRowSelect="false"
       >
-    <template #bodyCell="{ column, record }">
+        <template #bodyCell="{ column, record }">
-      <template v-if="column.key === 'text'">
+          <template v-if="column.key === 'text'">
-           {{ record.code }}|
+            {{ record.code }}|
-          {{ record.displayText }}
+            {{ record.displayText }}
-      </template>
+          </template>
-     
+        </template>
-    </template>
 
         <template #toolbar>
           <a-button
@@ -23,21 +22,20 @@
             preIcon="ant-design:plus-circle-outlined"
             @click="handleCreateType"
           >
-            {{ t("common.createText") }}
+            {{ t('common.createText') }}
-          </a-button
+          </a-button>
-          >
         </template>
         <template #action="{ record }">
           <TableAction
             :dropDownActions="[
               {
                 label: t('common.editText'),
-                auth:'AbpIdentity.DataDictionaryManagement.Update',
+                auth: 'AbpIdentity.DataDictionaryManagement.Update',
                 onClick: handleEditType.bind(null, record),
               },
               {
                 label: t('common.delText'),
-                 auth:'AbpIdentity.DataDictionaryManagement.Delete',
+                auth: 'AbpIdentity.DataDictionaryManagement.Delete',
                 onClick: handleDeleteDictionaryType.bind(null, record),
               },
             ]"
@@ -53,9 +51,8 @@
             type="primary"
             @click="handleCreate"
           >
-            {{ t("common.createText") }}
+            {{ t('common.createText') }}
-          </a-button
+          </a-button>
-          >
         </template>
 
         <template #action="{ record }">
@@ -86,187 +83,187 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from "vue";
+  import { defineComponent, ref } from 'vue';
-import { BasicTable, useTable, TableAction } from "/@/components/Table";
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { PageWrapper } from '/@/components/Page';
+  import { PageWrapper } from '/@/components/Page';
-import { useModal } from "/@/components/Modal";
+  import { useModal } from '/@/components/Modal';
-import CreateAbpDictionary from "./CreateAbpDictionary.vue";
+  import CreateAbpDictionary from './CreateAbpDictionary.vue';
-import EditAbpDictionary from "./EditAbpDictionary.vue";
+  import EditAbpDictionary from './EditAbpDictionary.vue';
-import EditAbpDictionaryType from "./EditAbpDictionaryType.vue";
+  import EditAbpDictionaryType from './EditAbpDictionaryType.vue';
-import CreateAbpDictionaryType from "./CreateAbpDictionaryType.vue";
+  import CreateAbpDictionaryType from './CreateAbpDictionaryType.vue';
 
-import { useI18n } from "/@/hooks/web/useI18n";
+  import { useI18n } from '/@/hooks/web/useI18n';
-import {
+  import {
-  tableColumns,
+    tableColumns,
-  searchFormSchema,
+    searchFormSchema,
-  getDictionaryTypeAsync,
+    getDictionaryTypeAsync,
-  dictionaryTypeTableColumns,
+    dictionaryTypeTableColumns,
-  searchDictionaryFormSchema,
+    searchDictionaryFormSchema,
-  getDictionaryDetailsAsync,
+    getDictionaryDetailsAsync,
-  deleteDetailAsync,
+    deleteDetailAsync,
-  deleteDictionaryTypeAsync
+    deleteDictionaryTypeAsync,
-} from "/@/views/admin/dictionary/AbpDictionary";
+  } from '/@/views/admin/dictionary/AbpDictionary';
-import { useMessage } from "/@/hooks/web/useMessage";
+  import { useMessage } from '/@/hooks/web/useMessage';
-import { Tag, message } from "ant-design-vue";
+  import { Tag, message } from 'ant-design-vue';
 
-export default defineComponent({
+  export default defineComponent({
-  name: "AbpDictionary",
+    name: 'AbpDictionary',
-  components: {
+    components: {
-    BasicTable,
+      BasicTable,
-    PageWrapper,
+      PageWrapper,
-    TableAction,
+      TableAction,
-    Tag,
+      Tag,
-    CreateAbpDictionaryType,
+      CreateAbpDictionaryType,
-    CreateAbpDictionary,
+      CreateAbpDictionary,
-    EditAbpDictionary,
+      EditAbpDictionary,
-    EditAbpDictionaryType
+      EditAbpDictionaryType,
-  },
+    },
-  setup() {
+    setup() {
-    const { t } = useI18n();
+      const { t } = useI18n();
 
-    const [registerCreateModal, { openModal: createModal }] = useModal();
+      const [registerCreateModal, { openModal: createModal }] = useModal();
-    const [registerEditModal, { openModal: editModal }] = useModal();
+      const [registerEditModal, { openModal: editModal }] = useModal();
-    const [registerEditTypeModal, { openModal: editTypeModal }] = useModal();
+      const [registerEditTypeModal, { openModal: editTypeModal }] = useModal();
-    const [registerCreateType, { openModal: createTypeModal }] = useModal();
+      const [registerCreateType, { openModal: createTypeModal }] = useModal();
-    const selectedDataDictionaryIdRef = ref("");
+      const selectedDataDictionaryIdRef = ref('');
-    const selectedDataDictionaryDisplayTextRef = ref("");
+      const selectedDataDictionaryDisplayTextRef = ref('');
 
-    //左边表格
+      //左边表格
-    const [registerTypeTable, { reload: reloadType, clearSelectedRowKeys }] = useTable({
+      const [registerTypeTable, { reload: reloadType, clearSelectedRowKeys }] = useTable({
-      columns: dictionaryTypeTableColumns,
+        columns: dictionaryTypeTableColumns,
-      formConfig: {
+        formConfig: {
-        labelWidth: 0,
+          labelWidth: 0,
-        schemas: searchDictionaryFormSchema,
+          schemas: searchDictionaryFormSchema,
-        showResetButton: false
+          showResetButton: false,
-      },
+        },
-      api: getDictionaryTypeAsync,
+        api: getDictionaryTypeAsync,
-      useSearchForm: true,
+        useSearchForm: true,
-      showTableSetting: false,
+        showTableSetting: false,
-      showIndexColumn: false,
+        showIndexColumn: false,
-      bordered: true,
+        bordered: true,
-      canResize: true,
+        canResize: true,
-      rowSelection: { type: "radio" },
+        rowSelection: { type: 'radio' },
-      pagination: false,
+        pagination: false,
-      actionColumn: {
+        actionColumn: {
-        width: 50,
+          width: 50,
-        title: t("common.action"),
+          title: t('common.action'),
-        dataIndex: "action",
+          dataIndex: 'action',
-        slots: { customRender: "action" }
+          slots: { customRender: 'action' },
-      }
+        },
-    });
+      });
 
-    //勾选事件
+      //勾选事件
-    const onSelectChange = ({ rows }) => {
+      const onSelectChange = ({ rows }) => {
-      selectedDataDictionaryIdRef.value = rows[0].id;
+        selectedDataDictionaryIdRef.value = rows[0].id;
-      selectedDataDictionaryDisplayTextRef.value = rows[0].displayText;
+        selectedDataDictionaryDisplayTextRef.value = rows[0].displayText;
-      reload();
+        reload();
-    };
+      };
 
-    const handleCreate = () => {
+      const handleCreate = () => {
-      if (selectedDataDictionaryIdRef.value == "") {
+        if (selectedDataDictionaryIdRef.value == '') {
-        message.error(t("routes.admin.chooseDictionary"));
+          message.error(t('routes.admin.chooseDictionary'));
-        return;
+          return;
-      } else {
+        } else {
-        let dictionaryCreate = {
+          let dictionaryCreate = {
-          id: selectedDataDictionaryIdRef.value,
+            id: selectedDataDictionaryIdRef.value,
-          displayText: selectedDataDictionaryDisplayTextRef.value
+            displayText: selectedDataDictionaryDisplayTextRef.value,
-        };
+          };
-        createModal(true, { dictionaryCreate: dictionaryCreate });
+          createModal(true, { dictionaryCreate: dictionaryCreate });
-      }
-    };
-    const handleEditType = (record: Recordable) => {
-      editTypeModal(true, {
-        record: record
-      });
-    };
-    const handleDeleteDictionaryType = async (record: Recordable) => {
-      let msg = t("common.askDelete");
-      createConfirm({
-        iconType: "warning",
-        title: t("common.tip"),
-        content: msg,
-        onOk: async () => {
-          await deleteDictionaryTypeAsync({
-            id: record.id,
-            reloadType
-          });
-          await reload();
         }
+      };
+      const handleEditType = (record: Recordable) => {
+        editTypeModal(true, {
+          record: record,
+        });
+      };
+      const handleDeleteDictionaryType = async (record: Recordable) => {
+        let msg = t('common.askDelete');
+        createConfirm({
+          iconType: 'warning',
+          title: t('common.tip'),
+          content: msg,
+          onOk: async () => {
+            await deleteDictionaryTypeAsync({
+              id: record.id,
+              reloadType,
+            });
+            await reload();
+          },
+        });
+      };
+      const [registerTable, { reload }] = useTable({
+        columns: tableColumns,
+        formConfig: {
+          labelWidth: 120,
+          schemas: searchFormSchema,
+        },
+        api: getDictionaryPageDetailsAsync,
+        useSearchForm: true,
+        showTableSetting: true,
+        showIndexColumn: true,
+        bordered: true,
+        canResize: true,
+        actionColumn: {
+          width: 150,
+          title: t('common.action'),
+          dataIndex: 'action',
+          slots: { customRender: 'action' },
+        },
       });
-    };
-    const [registerTable, { reload }] = useTable({
-      columns: tableColumns,
-      formConfig: {
-        labelWidth: 120,
-        schemas: searchFormSchema
-      },
-      api: getDictionaryPageDetailsAsync,
-      useSearchForm: true,
-      showTableSetting: true,
-      showIndexColumn: true,
-      bordered: true,
-      canResize: true,
-      actionColumn: {
-        width: 150,
-        title: t("common.action"),
-        dataIndex: "action",
-        slots: { customRender: "action" }
-      }
-    });
 
-    async function getDictionaryPageDetailsAsync(params) {
+      async function getDictionaryPageDetailsAsync(params) {
-      if (selectedDataDictionaryIdRef.value == "") {
+        if (selectedDataDictionaryIdRef.value == '') {
-        return [];
+          return [];
+        }
+        params.dataDictionaryId = selectedDataDictionaryIdRef.value;
+        return await getDictionaryDetailsAsync({ params });
       }
-      params.dataDictionaryId = selectedDataDictionaryIdRef.value;
-      return await getDictionaryDetailsAsync({ params });
-    }
 
-    const handleEdit = (record: Recordable) => {
+      const handleEdit = (record: Recordable) => {
-      editModal(true, {
+        editModal(true, {
-        record: record
+          record: record,
-      });
+        });
-    };
+      };
-    const handleCreateType = () => {
+      const handleCreateType = () => {
-      createTypeModal(true);
+        createTypeModal(true);
-    };
+      };
-    const { createConfirm } = useMessage();
+      const { createConfirm } = useMessage();
-    const handleDelete = async (record: Recordable) => {
+      const handleDelete = async (record: Recordable) => {
-      let msg = t("common.askDelete");
+        let msg = t('common.askDelete');
-      createConfirm({
+        createConfirm({
-        iconType: "warning",
+          iconType: 'warning',
-        title: t("common.tip"),
+          title: t('common.tip'),
-        content: msg,
+          content: msg,
-        onOk: async () => {
+          onOk: async () => {
-          await deleteDetailAsync({
+            await deleteDetailAsync({
-            dataDictionaryId: record.dataDictionaryId,
+              dataDictionaryId: record.dataDictionaryId,
-            dataDictionaryDetailId: record.id,
+              dataDictionaryDetailId: record.id,
-            reload
+              reload,
-          });
+            });
-        }
+          },
-      });
+        });
-    };
+      };
-    return {
+      return {
-      registerTable,
+        registerTable,
-      registerCreateModal,
+        registerCreateModal,
-      registerEditModal,
+        registerEditModal,
-      registerEditTypeModal,
+        registerEditTypeModal,
-      handleCreate,
+        handleCreate,
-      handleEdit,
+        handleEdit,
-      handleEditType,
+        handleEditType,
-      reload,
+        reload,
-      registerTypeTable,
+        registerTypeTable,
-      registerCreateType,
+        registerCreateType,
-      handleCreateType,
+        handleCreateType,
-      reloadType,
+        reloadType,
-      onSelectChange,
+        onSelectChange,
-      clearSelectedRowKeys,
+        clearSelectedRowKeys,
-      t,
+        t,
-      handleDelete,
+        handleDelete,
-      handleDeleteDictionaryType
+        handleDeleteDictionaryType,
-    };
+      };
-  }
+    },
-});
+  });
 </script>
 
 <style lang="less" scoped></style>

vben28/src/views/admin/settings/Setting.vue

@@ -19,8 +19,8 @@
                       @update:checked="(val) => (setting.value = val)"
                     >
                     </a-checkbox>
+                    {{ setting.description }}
                   </div>
-                  {{ setting.description }}
                 </a-form-item>
 
                 <a-button
@@ -41,9 +41,9 @@
 <script lang="ts">
   import { defineComponent, reactive, toRefs, onMounted } from 'vue';
   import { Tabs } from 'ant-design-vue';
-  import { CollapseContainer,ScrollContainer } from '/@/components/Container/index';
+  import { CollapseContainer, ScrollContainer } from '/@/components/Container/index';
   import { SettingOutput, UpdateSettingInput } from '/@/services/ServiceProxies';
-  import { getAllSettingsAsync, updateSettingsAsync } from "/@/views/admin/settings/Setting";
+  import { getAllSettingsAsync, updateSettingsAsync } from '/@/views/admin/settings/Setting';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { PageWrapper } from '/@/components/Page';
   import { message } from 'ant-design-vue';
@@ -71,7 +71,6 @@
 
       const updateSettingValues = async (item: any) => {
         try {
-      
           const prefix = 'setting_';
           const request = new UpdateSettingInput();
           request.values as {};