Rearrange the application layer of the cmskit.

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo.CmsKit.Admin.Application.Contracts.csproj

@@ -9,9 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj" />
-    <ProjectReference Include="..\Volo.CmsKit.Domain.Shared\Volo.CmsKit.Domain.Shared.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />
   </ItemGroup>
 
 </Project>

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminApplicationContractsModule.cs

@@ -1,13 +1,9 @@
-using Volo.Abp.Application;
-using Volo.Abp.Modularity;
-using Volo.Abp.Authorization;
+using Volo.Abp.Modularity;
 
 namespace Volo.CmsKit.Admin
 {
     [DependsOn(
-        typeof(CmsKitDomainSharedModule),
-        typeof(AbpDddApplicationContractsModule),
-        typeof(AbpAuthorizationModule)
+        typeof(CmsKitCommonApplicationContractsModule)
         )]
     public class CmsKitAdminApplicationContractsModule : AbpModule
     {

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo.CmsKit.Admin.Application.csproj

@@ -9,10 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Admin.Application.Contracts\Volo.CmsKit.Admin.Application.Contracts.csproj" />
-    <ProjectReference Include="..\Volo.CmsKit.Domain\Volo.CmsKit.Domain.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Common.Application\Volo.CmsKit.Common.Application.csproj" />
   </ItemGroup>
 
 </Project>

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminAppService.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.Application.Services;
-using Volo.CmsKit.Localization;
-
-namespace Volo.CmsKit.Admin
-{
-    public abstract class AdminAppService : ApplicationService
-    {
-        protected AdminAppService()
-        {
-            LocalizationResource = typeof(CmsKitResource);
-            ObjectMapperContext = typeof(CmsKitAdminApplicationModule);
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminAppService.cs

@@ -0,0 +1,10 @@
+namespace Volo.CmsKit
+{
+    public abstract class CmsKitAdminAppService : CmsKitAppService
+    {
+        protected CmsKitAdminAppService()
+        {
+            ObjectMapperContext = typeof(CmsKitAdminApplicationModule);
+        }
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminApplicationAutoMapperProfile.cs → modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationAutoMapperProfile.cs

@@ -1,14 +1,14 @@
 using AutoMapper;
 
-namespace Volo.CmsKit.Admin
+namespace Volo.CmsKit
 {
-    public class AdminApplicationAutoMapperProfile : Profile
+    public class CmsKitAdminApplicationAutoMapperProfile : Profile
     {
-        public AdminApplicationAutoMapperProfile()
+        public CmsKitAdminApplicationAutoMapperProfile()
         {
             /* You can configure your AutoMapper mapping configuration here.
              * Alternatively, you can split your mapping configurations
              * into multiple profile classes for a better organization. */
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs → modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationModule.cs

@@ -1,15 +1,14 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Application;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
-using Volo.Abp.Application;
+using Volo.CmsKit.Admin;
 
-namespace Volo.CmsKit.Admin
+namespace Volo.CmsKit
 {
     [DependsOn(
-        typeof(CmsKitDomainModule),
         typeof(CmsKitAdminApplicationContractsModule),
-        typeof(AbpDddApplicationModule),
-        typeof(AbpAutoMapperModule)
+        typeof(CmsKitCommonApplicationModule)
         )]
     public class CmsKitAdminApplicationModule : AbpModule
     {

modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs

@@ -3,7 +3,6 @@ using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.Application;
 using Volo.CmsKit.Admin;
-using Volo.CmsKit.Public;
 
 namespace Volo.CmsKit
 {

modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo.CmsKit.Common.Application.Contracts.csproj

@@ -10,6 +10,8 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Volo.CmsKit.Domain.Shared\Volo.CmsKit.Domain.Shared.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj" />
     </ItemGroup>
 
 </Project>

modules/cms-kit/src/Volo.CmsKit.Common.Application.Contracts/Volo/CmsKit/CmsKitCommonApplicationContractsModule.cs

@@ -1,12 +1,16 @@
-using Volo.Abp.Modularity;
+using Volo.Abp.Application;
+using Volo.Abp.Authorization;
+using Volo.Abp.Modularity;
 
 namespace Volo.CmsKit
 {
     [DependsOn(
-        typeof(CmsKitDomainSharedModule)
+        typeof(CmsKitDomainSharedModule),
+        typeof(AbpDddApplicationContractsModule),
+        typeof(AbpAuthorizationModule)
     )]
     public class CmsKitCommonApplicationContractsModule : AbpModule
     {
-        
+
     }
 }

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo.CmsKit.Common.Application.csproj

@@ -9,6 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
         <ProjectReference Include="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />
         <ProjectReference Include="..\Volo.CmsKit.Domain\Volo.CmsKit.Domain.csproj" />

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitAdminAppService.cs

@@ -0,0 +1,13 @@
+using Volo.Abp.Application.Services;
+using Volo.CmsKit.Localization;
+
+namespace Volo.CmsKit
+{
+    public abstract class CmsKitAppService : ApplicationService
+    {
+        protected CmsKitAppService()
+        {
+            LocalizationResource = typeof(CmsKitResource);
+        }
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/CmsKitCommonApplicationModule.cs

@@ -1,4 +1,5 @@
 using Volo.Abp.Application;
+using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 
 namespace Volo.CmsKit
@@ -6,8 +7,9 @@ namespace Volo.CmsKit
     [DependsOn(
         typeof(CmsKitCommonApplicationContractsModule),
         typeof(CmsKitDomainModule),
-        typeof(AbpDddApplicationModule)
-        )]
+        typeof(AbpDddApplicationModule),
+        typeof(AbpAutoMapperModule)
+    )]
     public class CmsKitCommonApplicationModule : AbpModule
     {
     }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo.CmsKit.Public.Application.Contracts.csproj

@@ -9,9 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj" />
-    <ProjectReference Include="..\Volo.CmsKit.Domain.Shared\Volo.CmsKit.Domain.Shared.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />
   </ItemGroup>
 
 </Project>

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/CmsKitPublicApplicationContractsModule.cs

@@ -1,13 +1,9 @@
-using Volo.Abp.Application;
-using Volo.Abp.Authorization;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 
 namespace Volo.CmsKit
 {
     [DependsOn(
-        typeof(CmsKitDomainSharedModule),
-        typeof(AbpDddApplicationContractsModule),
-        typeof(AbpAuthorizationModule)
+        typeof(CmsKitCommonApplicationContractsModule)
         )]
     public class CmsKitPublicApplicationContractsModule : AbpModule
     {

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo.CmsKit.Public.Application.csproj

@@ -9,10 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Common.Application\Volo.CmsKit.Common.Application.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
-    <ProjectReference Include="..\Volo.CmsKit.Domain\Volo.CmsKit.Domain.csproj" />
   </ItemGroup>
 
 </Project>

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicAppService.cs

@@ -0,0 +1,10 @@
+namespace Volo.CmsKit
+{
+    public abstract class CmsKitPublicAppService : CmsKitAppService
+    {
+        protected CmsKitPublicAppService()
+        {
+            ObjectMapperContext = typeof(CmsKitPublicApplicationModule);
+        }
+    }
+}

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicApplicationModule.cs → modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicApplicationModule.cs

@@ -1,15 +1,13 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Application;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
-using Volo.Abp.Application;
 
-namespace Volo.CmsKit.Public
+namespace Volo.CmsKit
 {
     [DependsOn(
-        typeof(CmsKitDomainModule),
-        typeof(CmsKitPublicApplicationContractsModule),
-        typeof(AbpDddApplicationModule),
-        typeof(AbpAutoMapperModule)
+        typeof(CmsKitCommonApplicationModule),
+        typeof(CmsKitPublicApplicationContractsModule)
         )]
     public class CmsKitPublicApplicationModule : AbpModule
     {

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicAppService.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.Application.Services;
-using Volo.CmsKit.Localization;
-
-namespace Volo.CmsKit.Public
-{
-    public abstract class PublicAppService : ApplicationService
-    {
-        protected PublicAppService()
-        {
-            LocalizationResource = typeof(CmsKitResource);
-            ObjectMapperContext = typeof(CmsKitPublicApplicationModule);
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs → modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/PublicApplicationAutoMapperProfile.cs

@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace Volo.CmsKit.Public
+namespace Volo.CmsKit
 {
     public class PublicApplicationAutoMapperProfile : Profile
     {

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Reactions/ReactionPublicAppService.cs

@@ -5,7 +5,7 @@ using Volo.Abp.Application.Services;
 
 namespace Volo.CmsKit.Reactions
 {
-    public class ReactionPublicAppService : ApplicationService, IReactionPublicAppService
+    public class ReactionPublicAppService : CmsKitPublicAppService, IReactionPublicAppService
     {
         public Task<ListResultDto<ReactionDto>> GetAvailableReactions(
             GetAvailableReactionsDto getAvailableReactionsDto)