Merge branch 'dev' into cotur/cms-kit/comments

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

@@ -3,8 +3,8 @@ using Volo.CmsKit.Contents;
 
 namespace Volo.CmsKit.Public.Contents
 {
-    public interface IContentAppService
+    public interface IContentPublicAppService
     {
         Task<ContentDto> GetAsync(GetContentInput input);
     }
-}
+}

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

@@ -3,7 +3,7 @@ using Volo.CmsKit.Contents;
 
 namespace Volo.CmsKit.Public.Contents
 {
-    public class ContentPublicAppService : CmsKitAppServiceBase, IContentAppService
+    public class ContentPublicAppService : CmsKitPublicAppServiceBase, IContentPublicAppService
     {
         protected IContentRepository ContentRepository { get; }
 

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Contents/ContentController.cs

@@ -9,11 +9,11 @@ namespace Volo.CmsKit.Public.Contents
     [RemoteService(Name = CmsKitCommonRemoteServiceConsts.RemoteServiceName)]
     [Area("cms-kit")]
     [Route("api/cms-kit-public/contents")]
-    public class ContentController : CmsKitControllerBase, IContentAppService
+    public class ContentController : CmsKitControllerBase, IContentPublicAppService
     {
-        protected readonly IContentAppService _contentAppService;
+        protected readonly IContentPublicAppService _contentAppService;
 
-        public ContentController(IContentAppService contentAppService)
+        public ContentController(IContentPublicAppService contentAppService)
         {
             _contentAppService = contentAppService;
         }

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs

@@ -12,11 +12,11 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
     public class ContentViewComponent : AbpViewComponent
     {
         private readonly IContentRenderer contentRenderer;
-        private readonly IContentAppService contentAppService;
+        private readonly IContentPublicAppService contentAppService;
 
         public ContentViewComponent(
             IContentRenderer contentRenderer,
-            IContentAppService contentAppService)
+            IContentPublicAppService contentAppService)
         {
             this.contentRenderer = contentRenderer;
             this.contentAppService = contentAppService;