Merge branch 'feature/permission-management'

jxnkwlp · Jul 7, 2024 · 0c4970e · 0c4970e
2 parents 5de216e + c0a86f2
commit 0c4970e
Show file tree

Hide file tree

Showing 265 changed files with 2,943 additions and 8,559 deletions.
diff --git a/Sample.sln b/Sample.sln
@@ -67,25 +67,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DictionaryM
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DictionaryManagement.EntityFrameworkCore", "modules\dictionary-management\src\Passingwind.Abp.DictionaryManagement.EntityFrameworkCore\Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.csproj", "{2DB157B1-1EF2-4548-A154-3F05263C338B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dynamic-permission-management", "dynamic-permission-management", "{0262B53C-3807-4ACC-B1E6-FCC0817B6971}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "permission-management", "permission-management", "{0262B53C-3807-4ACC-B1E6-FCC0817B6971}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E4E4978C-8541-4C36-B258-800A8B177769}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DynamicPermissionManagement.Domain.Shared", "modules\dynamic-permission-management\src\Passingwind.Abp.DynamicPermissionManagement.Domain.Shared\Passingwind.Abp.DynamicPermissionManagement.Domain.Shared.csproj", "{41ED28CA-CB9A-446C-A63D-92D932195DD8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.PermissionManagement.Domain.Shared", "modules\permission-management\src\Passingwind.Abp.PermissionManagement.Domain.Shared\Passingwind.Abp.PermissionManagement.Domain.Shared.csproj", "{41ED28CA-CB9A-446C-A63D-92D932195DD8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DynamicPermissionManagement.Domain", "modules\dynamic-permission-management\src\Passingwind.Abp.DynamicPermissionManagement.Domain\Passingwind.Abp.DynamicPermissionManagement.Domain.csproj", "{4C42EC8C-0DDE-48EB-A1A9-6B093A9E9666}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.PermissionManagement.Domain", "modules\permission-management\src\Passingwind.Abp.PermissionManagement.Domain\Passingwind.Abp.PermissionManagement.Domain.csproj", "{4C42EC8C-0DDE-48EB-A1A9-6B093A9E9666}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DynamicPermissionManagement.Application.Contracts", "modules\dynamic-permission-management\src\Passingwind.Abp.DynamicPermissionManagement.Application.Contracts\Passingwind.Abp.DynamicPermissionManagement.Application.Contracts.csproj", "{12F3145F-76B7-46AF-B168-2F9265997F0A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.PermissionManagement.Application.Contracts", "modules\permission-management\src\Passingwind.Abp.PermissionManagement.Application.Contracts\Passingwind.Abp.PermissionManagement.Application.Contracts.csproj", "{12F3145F-76B7-46AF-B168-2F9265997F0A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DynamicPermissionManagement.Application", "modules\dynamic-permission-management\src\Passingwind.Abp.DynamicPermissionManagement.Application\Passingwind.Abp.DynamicPermissionManagement.Application.csproj", "{50FBAE74-1A47-4F83-B3DC-CAADDF8BE11E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.PermissionManagement.Application", "modules\permission-management\src\Passingwind.Abp.PermissionManagement.Application\Passingwind.Abp.PermissionManagement.Application.csproj", "{50FBAE74-1A47-4F83-B3DC-CAADDF8BE11E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore", "modules\dynamic-permission-management\src\Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore\Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.csproj", "{C96263B9-0FA9-4710-92D0-CDDD7400BD9B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.PermissionManagement.EntityFrameworkCore", "modules\permission-management\src\Passingwind.Abp.PermissionManagement.EntityFrameworkCore\Passingwind.Abp.PermissionManagement.EntityFrameworkCore.csproj", "{C96263B9-0FA9-4710-92D0-CDDD7400BD9B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DynamicPermissionManagement.MongoDB", "modules\dynamic-permission-management\src\Passingwind.Abp.DynamicPermissionManagement.MongoDB\Passingwind.Abp.DynamicPermissionManagement.MongoDB.csproj", "{A4BE1B4C-D3FF-45BA-8CCD-807BAAE3A441}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.PermissionManagement.MongoDB", "modules\permission-management\src\Passingwind.Abp.PermissionManagement.MongoDB\Passingwind.Abp.PermissionManagement.MongoDB.csproj", "{A4BE1B4C-D3FF-45BA-8CCD-807BAAE3A441}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DynamicPermissionManagement.HttpApi", "modules\dynamic-permission-management\src\Passingwind.Abp.DynamicPermissionManagement.HttpApi\Passingwind.Abp.DynamicPermissionManagement.HttpApi.csproj", "{18F8D5E8-54B4-4399-BC77-32A70DD286FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.PermissionManagement.HttpApi", "modules\permission-management\src\Passingwind.Abp.PermissionManagement.HttpApi\Passingwind.Abp.PermissionManagement.HttpApi.csproj", "{18F8D5E8-54B4-4399-BC77-32A70DD286FC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client", "modules\dynamic-permission-management\src\Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client\Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client.csproj", "{863B1141-4CAA-4AA1-8B5F-CD923AF67CD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Passingwind.Abp.PermissionManagement.HttpApi.Client", "modules\permission-management\src\Passingwind.Abp.PermissionManagement.HttpApi.Client\Passingwind.Abp.PermissionManagement.HttpApi.Client.csproj", "{863B1141-4CAA-4AA1-8B5F-CD923AF67CD4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "identity", "identity", "{4A4FBA8F-3B0A-4709-81EA-0238F219BA9F}"
 EndProject

diff --git a/common.props b/common.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <MicrosoftPackageVersion>8.0.4</MicrosoftPackageVersion>
     <AbpVersion>8.2.0</AbpVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
-</Project>
+</Project>
diff --git a/host/src/Sample.Application/Sample.Application.csproj b/host/src/Sample.Application/Sample.Application.csproj
@@ -14,6 +14,7 @@
     <ProjectReference Include="..\..\..\modules\file-management\src\Passingwind.Abp.FileManagement.Application\Passingwind.Abp.FileManagement.Application.csproj" />
     <ProjectReference Include="..\..\..\modules\identity-client\src\Passingwind.Abp.IdentityClient.Application\Passingwind.Abp.IdentityClient.Application.csproj" />
     <ProjectReference Include="..\..\..\modules\identity\src\Passingwind.Abp.Identity.Application\Passingwind.Abp.Identity.Application.csproj" />
+    <ProjectReference Include="..\..\..\modules\permission-management\src\Passingwind.Abp.PermissionManagement.Application\Passingwind.Abp.PermissionManagement.Application.csproj" />
     <ProjectReference Include="..\Sample.Domain\Sample.Domain.csproj" />
     <ProjectReference Include="..\Sample.Application.Contracts\Sample.Application.Contracts.csproj" />
   </ItemGroup>

diff --git a/host/src/Sample.Application/SampleApplicationModule.cs b/host/src/Sample.Application/SampleApplicationModule.cs
@@ -3,6 +3,7 @@
 using Passingwind.Abp.FileManagement;
 using Passingwind.Abp.Identity;
 using Passingwind.Abp.IdentityClient;
+using Passingwind.Abp.PermissionManagement;
 using Volo.Abp.Account;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.FeatureManagement;
@@ -29,6 +30,7 @@ namespace Sample;
 [DependsOn(typeof(FileManagementApplicationModule))]
 [DependsOn(typeof(IdentityApplicationModule))]
 [DependsOn(typeof(IdentityClientApplicationModule))]
+[DependsOn(typeof(PermissionManagementApplicationModule))]
 public class SampleApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)

diff --git a/host/src/Sample.Domain/Sample.Domain.csproj b/host/src/Sample.Domain/Sample.Domain.csproj
@@ -14,6 +14,7 @@
     <ProjectReference Include="..\..\..\modules\file-management\src\Passingwind.Abp.FileManagement.Domain\Passingwind.Abp.FileManagement.Domain.csproj" />
     <ProjectReference Include="..\..\..\modules\identity-client\src\Passingwind.Abp.IdentityClient.Domain\Passingwind.Abp.IdentityClient.Domain.csproj" />
     <ProjectReference Include="..\..\..\modules\identity\src\Passingwind.Abp.Identity.Domain\Passingwind.Abp.Identity.Domain.csproj" />
+    <ProjectReference Include="..\..\..\modules\permission-management\src\Passingwind.Abp.PermissionManagement.Domain\Passingwind.Abp.PermissionManagement.Domain.csproj" />
     <ProjectReference Include="..\Sample.Domain.Shared\Sample.Domain.Shared.csproj" />
   </ItemGroup>
 

diff --git a/host/src/Sample.Domain/SampleDomainModule.cs b/host/src/Sample.Domain/SampleDomainModule.cs
@@ -4,6 +4,7 @@
 using Passingwind.Abp.FileManagement;
 using Passingwind.Abp.Identity;
 using Passingwind.Abp.IdentityClient;
+using Passingwind.Abp.PermissionManagement;
 using Sample.MultiTenancy;
 using Volo.Abp.AuditLogging;
 using Volo.Abp.BackgroundJobs;
@@ -38,6 +39,7 @@ namespace Sample;
 [DependsOn(typeof(FileManagementDomainModule))]
 [DependsOn(typeof(IdentityClientDomainModule))]
 [DependsOn(typeof(IdentityDomainModule))]
+[DependsOn(typeof(PermissionManagementDomainModule))]
 public class SampleDomainModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)

diff --git a/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleDbContext.cs b/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleDbContext.cs
@@ -3,6 +3,7 @@
 using Passingwind.Abp.FileManagement.EntityFrameworkCore;
 using Passingwind.Abp.Identity.EntityFrameworkCore;
 using Passingwind.Abp.IdentityClient.EntityFrameworkCore;
+using Passingwind.Abp.PermissionManagement.EntityFrameworkCore;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
 using Volo.Abp.Data;
@@ -86,6 +87,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.ConfigureIdentityClient();
         modelBuilder.ConfigureApiKey();
         modelBuilder.ConfigureIdentityV2();
+        modelBuilder.ConfigurePermissionManagementV2();
 
         /* Configure your own tables/entities inside here */
 

diff --git a/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleEntityFrameworkCoreModule.cs b/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleEntityFrameworkCoreModule.cs
@@ -3,6 +3,7 @@
 using Passingwind.Abp.FileManagement.EntityFrameworkCore;
 using Passingwind.Abp.Identity.EntityFrameworkCore;
 using Passingwind.Abp.IdentityClient.EntityFrameworkCore;
+using Passingwind.Abp.PermissionManagement.EntityFrameworkCore;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
@@ -33,6 +34,7 @@ namespace Sample.EntityFrameworkCore;
 [DependsOn(typeof(FileManagementEntityFrameworkCoreModule))]
 [DependsOn(typeof(IdentityClientEntityFrameworkCoreModule))]
 [DependsOn(typeof(IdentityEntityFrameworkCoreModule))]
+[DependsOn(typeof(PermissionManagementEntityFrameworkCoreModule))]
 public class SampleEntityFrameworkCoreModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)