Merge pull request #16347 from abpframework/auto-merge/rel-6-0/1885

Merge branch rel-7.0 with rel-6.0

modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs

@@ -93,23 +93,47 @@ public class AbpOpenIddictDomainModule : AbpModule
                 typeof(OpenIddictApplication)
             );
 
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                OpenIddictModuleExtensionConsts.ModuleName,
+                OpenIddictModuleExtensionConsts.EntityNames.Application,
+                typeof(OpenIddictApplicationModel)
+            );
+
             ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
                 OpenIddictModuleExtensionConsts.ModuleName,
                 OpenIddictModuleExtensionConsts.EntityNames.Authorization,
                 typeof(OpenIddictAuthorization)
             );
 
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                OpenIddictModuleExtensionConsts.ModuleName,
+                OpenIddictModuleExtensionConsts.EntityNames.Authorization,
+                typeof(OpenIddictAuthorizationModel)
+            );
+
             ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
                 OpenIddictModuleExtensionConsts.ModuleName,
                 OpenIddictModuleExtensionConsts.EntityNames.Scope,
                 typeof(OpenIddictScope)
             );
 
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                OpenIddictModuleExtensionConsts.ModuleName,
+                OpenIddictModuleExtensionConsts.EntityNames.Scope,
+                typeof(OpenIddictScopeModel)
+            );
+
             ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
                 OpenIddictModuleExtensionConsts.ModuleName,
                 OpenIddictModuleExtensionConsts.EntityNames.Token,
                 typeof(OpenIddictToken)
             );
+
+            ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity(
+                OpenIddictModuleExtensionConsts.ModuleName,
+                OpenIddictModuleExtensionConsts.EntityNames.Token,
+                typeof(OpenIddictTokenModel)
+            );
         });
     }
 }