Refactor

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs

@@ -72,11 +72,6 @@ namespace Volo.Abp.Cli
                 options.Generators[AngularServiceProxyGenerator.Name] = typeof(AngularServiceProxyGenerator);
                 options.Generators[CSharpServiceProxyGenerator.Name] = typeof(CSharpServiceProxyGenerator);
             });
-
-            Configure<DynamicJavaScriptProxyOptions>(options =>
-            {
-                options.EnabledAllModules = true;
-            });
         }
     }
 }

framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/DynamicJavaScriptProxyOptions.cs

@@ -4,13 +4,21 @@ namespace Volo.Abp.Http.ProxyScripting.Generators.JQuery
 {
     public class DynamicJavaScriptProxyOptions
     {
-        public HashSet<string> EnabledModules { get; set; }
-
-        public bool EnabledAllModules { get; set; }
+        public HashSet<string> DisabledModules { get; }
 
         public DynamicJavaScriptProxyOptions()
         {
-            EnabledModules = new HashSet<string> { "app" };
+            DisabledModules = new HashSet<string>();
+        }
+
+        public void DisableModule(string module)
+        {
+            DisabledModules.AddIfNotContains(module);
+        }
+
+        public void EnableModule(string module)
+        {
+            DisabledModules.Remove(module);
         }
     }
 }

framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs

@@ -52,17 +52,12 @@ namespace Volo.Abp.Http.ProxyScripting.Generators.JQuery
 
         private bool ShouldCreateModuleScript(KeyValuePair<string, ModuleApiDescriptionModel> module)
         {
-            if (_dynamicJavaScriptProxyOptions.EnabledAllModules)
+            if (_dynamicJavaScriptProxyOptions.DisabledModules.Contains(module.Key))
             {
-                return true;
+                return false;
             }
 
-            if (_dynamicJavaScriptProxyOptions.EnabledModules.Any(m => m.Equals(module.Key, StringComparison.CurrentCultureIgnoreCase)))
-            {
-                return true;
-            }
-
-            return false;
+            return true;
         }
 
         private static void AddModuleScript(StringBuilder script, ModuleApiDescriptionModel module)

modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AccountRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public static class AccountRemoteServiceConsts
     {
         public const string RemoteServiceName = "AbpAccount";
+
+        public const string ModuleName = "account";
     }
-}
+}

modules/account/src/Volo.Abp.Account.HttpApi/Volo/Abp/Account/AccountController.cs

@@ -6,7 +6,7 @@ using Volo.Abp.Identity;
 namespace Volo.Abp.Account
 {
     [RemoteService(Name = AccountRemoteServiceConsts.RemoteServiceName)]
-    [Area("account")]
+    [Area(AccountRemoteServiceConsts.ModuleName)]
     [Route("api/account")]
     public class AccountController : AbpControllerBase, IAccountAppService
     {

modules/account/src/Volo.Abp.Account.HttpApi/Volo/Abp/Account/ProfileController.cs

@@ -1,12 +1,11 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.Identity;
 
 namespace Volo.Abp.Account
 {
     [RemoteService(Name = AccountRemoteServiceConsts.RemoteServiceName)]
-    [Area("account")]
+    [Area(AccountRemoteServiceConsts.ModuleName)]
     [ControllerName("Profile")]
     [Route("/api/account/my-profile")]
     public class ProfileController : AbpControllerBase, IProfileAppService

modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs

@@ -9,6 +9,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.ExceptionHandling;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Identity.AspNetCore;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
@@ -62,6 +63,11 @@ namespace Volo.Abp.Account.Web
             {
                 options.AddProfile<AbpAccountWebAutoMapperProfile>(validate: true);
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(AccountRemoteServiceConsts.ModuleName);
+            });
         }
 
         private void ConfigureProfileManagementPage()

modules/blogging/src/Volo.Blogging.Admin.Application.Contracts/Volo/Blogging/Admin/BloggingAdminRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public static class BloggingAdminRemoteServiceConsts
     {
         public const string RemoteServiceName = "BloggingAdmin";
+
+        public const string ModuleNmae = "bloggingAdmin";
     }
 }

modules/blogging/src/Volo.Blogging.Admin.HttpApi/Volo/Blogging/Admin/BlogManagementController.cs

@@ -11,7 +11,7 @@ using Volo.Blogging.Blogs.Dtos;
 namespace Volo.Blogging.Admin
 {
     [RemoteService(Name = BloggingAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("bloggingAdmin")]
+    [Area(BloggingAdminRemoteServiceConsts.ModuleName)]
     [Route("api/blogging/blogs/admin")]
     public class BlogManagementController : AbpControllerBase, IBlogManagementAppService
     {

modules/blogging/src/Volo.Blogging.Admin.Web/BloggingAdminWebModule.cs

@@ -3,6 +3,7 @@ using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
@@ -48,6 +49,11 @@ namespace Volo.Blogging.Admin
             {
                 options.AddProfile<AbpBloggingAdminWebAutoMapperProfile>(validate: true);
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(BloggingAdminRemoteServiceConsts.ModuleName);
+            });
         }
     }
 }

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public static class BloggingRemoteServiceConsts
     {
         public const string RemoteServiceName = "Blogging";
+
+        public const string ModuleName = "blogging";
     }
 }

modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogFilesController.cs

@@ -8,7 +8,7 @@ using Volo.Blogging.Files;
 namespace Volo.Blogging
 {
     [RemoteService(Name = BloggingRemoteServiceConsts.RemoteServiceName)]
-    [Area("blogging")]
+    [Area(BloggingRemoteServiceConsts.ModuleName)]
     [Route("api/blogging/files")]
     public class BlogFilesController : AbpControllerBase, IFileAppService
     {

modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/BlogsController.cs

@@ -10,7 +10,7 @@ using Volo.Blogging.Blogs.Dtos;
 namespace Volo.Blogging
 {
     [RemoteService(Name = BloggingRemoteServiceConsts.RemoteServiceName)]
-    [Area("blogging")]
+    [Area(BloggingRemoteServiceConsts.ModuleName)]
     [Route("api/blogging/blogs")]
     public class BlogsController : AbpControllerBase, IBlogAppService
     {

modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/CommentsController.cs

@@ -10,7 +10,7 @@ using Volo.Blogging.Comments.Dtos;
 namespace Volo.Blogging
 {
     [RemoteService(Name = BloggingRemoteServiceConsts.RemoteServiceName)]
-    [Area("blogging")]
+    [Area(BloggingRemoteServiceConsts.ModuleName)]
     [Route("api/blogging/comments")]
     public class CommentsController : AbpControllerBase, ICommentAppService
     {

modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/PostsController.cs

@@ -9,7 +9,7 @@ using Volo.Blogging.Posts;
 namespace Volo.Blogging
 {
     [RemoteService(Name = BloggingRemoteServiceConsts.RemoteServiceName)]
-    [Area("blogging")]
+    [Area(BloggingRemoteServiceConsts.ModuleName)]
     [Route("api/blogging/posts")]
     public class PostsController : AbpControllerBase, IPostAppService
     {

modules/blogging/src/Volo.Blogging.HttpApi/Volo/Blogging/TagsController.cs

@@ -10,7 +10,7 @@ using Volo.Blogging.Tagging.Dtos;
 namespace Volo.Blogging
 {
     [RemoteService(Name = BloggingRemoteServiceConsts.RemoteServiceName)]
-    [Area("blogging")]
+    [Area(BloggingRemoteServiceConsts.ModuleName)]
     [Route("api/blogging/tags")]
     public class TagsController : AbpControllerBase, ITagAppService
     {

modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs

@@ -6,6 +6,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
@@ -72,6 +73,11 @@ namespace Volo.Blogging
                 options.Conventions.AddPageRoute("/Blogs/Posts/Edit", routePrefix + "{blogShortName}/posts/{postId}/edit");
                 options.Conventions.AddPageRoute("/Blogs/Posts/New", routePrefix + "{blogShortName}/posts/new");
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(BloggingRemoteServiceConsts.ModuleName);
+            });
         }
     }
 }

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

@@ -3,5 +3,7 @@
     public class CmsKitAdminRemoteServiceConsts
     {
         public const string RemoteServiceName = "CmsKitAdmin";
+
+        public const string ModuleName = "cms-kit-admin";
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Blogs/BlogAdminController.cs

@@ -12,7 +12,7 @@ namespace Volo.CmsKit.Admin.Blogs
 {
     [RequiresGlobalFeature(typeof(BlogsFeature))]
     [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-admin")]
+    [Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
     [Authorize(CmsKitAdminPermissions.Blogs.Default)]
     [Route("api/cms-kit-admin/blogs")]
     public class BlogAdminController : CmsKitAdminController, IBlogAdminAppService

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Blogs/BlogFeatureAdminController.cs

@@ -13,7 +13,7 @@ namespace Volo.CmsKit.Admin.Blogs
 {
     [RequiresGlobalFeature(typeof(BlogsFeature))]
     [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-admin")]
+    [Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
     [Authorize(CmsKitAdminPermissions.Blogs.Features)]
     [Route("api/cms-kit-admin/blogs/{blogId}/features")]
     public class BlogFeatureAdminController : CmsKitAdminController, IBlogFeatureAdminAppService

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Blogs/BlogPostAdminController.cs

@@ -12,7 +12,7 @@ namespace Volo.CmsKit.Admin.Blogs
 {
     [RequiresGlobalFeature(typeof(BlogsFeature))]
     [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-admin")]
+    [Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
     [Authorize(CmsKitAdminPermissions.BlogPosts.Default)]
     [Route("api/cms-kit-admin/blogs/blog-posts")]
     public class BlogPostAdminController : CmsKitAdminController, IBlogPostAdminAppService

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Comments/CommentAdminController.cs

@@ -13,7 +13,7 @@ namespace Volo.CmsKit.Admin.Comments
     [Authorize(CmsKitAdminPermissions.Comments.Default)]
     [RequiresGlobalFeature(typeof(CommentsFeature))]
     [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-admin")]
+    [Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-admin/comments")]
     public class CommentAdminController : CmsKitAdminController, ICommentAdminAppService
     {
@@ -45,4 +45,4 @@ namespace Volo.CmsKit.Admin.Comments
             return CommentAdminAppService.DeleteAsync(id);
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/MediaDescriptors/MediaDescriptorAdminController.cs

@@ -13,7 +13,7 @@ namespace Volo.CmsKit.Admin.MediaDescriptors
 {
     [RequiresGlobalFeature(typeof(MediaFeature))]
     [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-admin")]
+    [Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-admin/media")]
     public class MediaDescriptorAdminController : CmsKitAdminController, IMediaDescriptorAdminAppService
     {
@@ -38,4 +38,4 @@ namespace Volo.CmsKit.Admin.MediaDescriptors
             return MediaDescriptorAdminAppService.DeleteAsync(id);
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Menus/MenuItemAdminController.cs

@@ -13,7 +13,7 @@ namespace Volo.CmsKit.Admin.Menus
 {
     [RequiresGlobalFeature(typeof(MenuFeature))]
     [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-admin")]
+    [Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
     [Authorize(CmsKitAdminPermissions.Menus.Default)]
     [Route("api/cms-kit-admin/menu-items")]
     public class MenuItemAdminController : CmsKitAdminController, IMenuItemAdminAppService

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Pages/PageAdminController.cs

@@ -13,7 +13,7 @@ namespace Volo.CmsKit.Admin.Pages
 {
     [RequiresGlobalFeature(typeof(PagesFeature))]
     [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-admin")]
+    [Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
     [Authorize(CmsKitAdminPermissions.Pages.Default)]
     [Route("api/cms-kit-admin/pages")]
     public class PageAdminController : CmsKitAdminController, IPageAdminAppService
@@ -61,4 +61,4 @@ namespace Volo.CmsKit.Admin.Pages
             return PageAdminAppService.DeleteAsync(id);
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Tags/EntityTagAdminController.cs

@@ -10,7 +10,7 @@ namespace Volo.CmsKit.Admin.Tags
 {
     [RequiresGlobalFeature(typeof(TagsFeature))]
     [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-admin")]
+    [Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-admin/entity-tags")]
     public class EntityTagAdminController : CmsKitAdminController, IEntityTagAdminAppService
     {

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Tags/TagAdminController.cs

@@ -15,7 +15,7 @@ namespace Volo.CmsKit.Admin.Tags
 {
     [RequiresGlobalFeature(typeof(TagsFeature))]
     [RemoteService(Name = CmsKitAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-admin")]
+    [Area(CmsKitAdminRemoteServiceConsts.ModuleName)]
     [Authorize(CmsKitAdminPermissions.Tags.Default)]
     [Route("api/cms-kit-admin/tags")]
     public class TagAdminController : CmsKitAdminController, ITagAdminAppService

modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs

@@ -11,6 +11,7 @@ using Volo.CmsKit.Permissions;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars;
 using Volo.Abp.Localization;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 
 namespace Volo.CmsKit.Admin.Web
 {
@@ -152,6 +153,11 @@ namespace Volo.CmsKit.Admin.Web
                             );
                     });
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(CmsKitAdminRemoteServiceConsts.ModuleName);
+            });
         }
     }
 }

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

@@ -3,5 +3,7 @@
     public class CmsKitCommonRemoteServiceConsts
     {
         public const string RemoteServiceName = "CmsKitCommon";
+
+        public const string ModuleName = "cms-kit-common";
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo/CmsKit/Blogs/BlogFeatureController.cs

@@ -10,7 +10,7 @@ namespace Volo.CmsKit.Blogs
 {
     [RequiresGlobalFeature(typeof(BlogsFeature))]
     [RemoteService(Name = CmsKitCommonRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-common")]
+    [Area(CmsKitCommonRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit/blogs/{blogId}/features")]
     public class BlogFeatureController : CmsKitControllerBase, IBlogFeatureAppService
     {

modules/cms-kit/src/Volo.CmsKit.Common.HttpApi/Volo/CmsKit/MediaDescriptors/MediaDescriptorController.cs

@@ -10,7 +10,7 @@ namespace Volo.CmsKit.MediaDescriptors
 {
     [RequiresGlobalFeature(typeof(MediaFeature))]
     [RemoteService(Name = CmsKitCommonRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit-common")]
+    [Area(CmsKitCommonRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit/media")]
     public class MediaDescriptorController : CmsKitControllerBase, IMediaDescriptorAppService
     {
@@ -28,4 +28,4 @@ namespace Volo.CmsKit.MediaDescriptors
             return MediaDescriptorAppService.DownloadAsync(id);
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs

@@ -1,5 +1,6 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 using Volo.CmsKit.Reactions;
@@ -36,6 +37,11 @@ namespace Volo.CmsKit.Web
             {
                 options.FileSets.AddEmbedded<CmsKitCommonWebModule>();
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(CmsKitCommonRemoteServiceConsts.ModuleName);
+            });
         }
     }
 }

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

@@ -3,5 +3,7 @@
     public class CmsKitPublicRemoteServiceConsts
     {
         public const string RemoteServiceName = "CmsKitPublic";
+
+        public const string ModuleName = "cms-kit";
     }
 }

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Blogs/BlogPostPublicController.cs

@@ -11,7 +11,7 @@ namespace Volo.CmsKit.Public.Blogs
 {
     [RequiresGlobalFeature(typeof(BlogsFeature))]
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit")]
+    [Area(CmsKitPublicRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-public/blog-posts")]
     public class BlogPostPublicController : CmsKitPublicControllerBase, IBlogPostPublicAppService
     {

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Comments/CommentPublicController.cs

@@ -10,7 +10,7 @@ namespace Volo.CmsKit.Public.Comments
 {
     [RequiresGlobalFeature(typeof(CommentsFeature))]
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit")]
+    [Area(CmsKitPublicRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-public/comments")]
     public class CommentPublicController :  CmsKitPublicControllerBase, ICommentPublicAppService
     {

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Menus/MenuItemPublicController.cs

@@ -10,7 +10,7 @@ namespace Volo.CmsKit.Public.Menus
 {
     [RequiresGlobalFeature(typeof(BlogsFeature))]
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit")]
+    [Area(CmsKitPublicRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-public/menu-items")]
     public class MenuItemPublicController : CmsKitPublicControllerBase, IMenuItemPublicAppService
     {
@@ -27,4 +27,4 @@ namespace Volo.CmsKit.Public.Menus
             return MenuPublicAppService.GetListAsync();
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Pages/PagesPublicController.cs

@@ -8,7 +8,7 @@ namespace Volo.CmsKit.Public.Pages
 {
     [RequiresGlobalFeature(typeof(PagesFeature))]
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit")]
+    [Area(CmsKitPublicRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-public/pages")]
     public class PagesPublicController : CmsKitPublicControllerBase, IPagePublicAppService
     {
@@ -26,4 +26,4 @@ namespace Volo.CmsKit.Public.Pages
             return PageAppService.FindBySlugAsync(slug);
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Ratings/RatingPublicController.cs

@@ -9,7 +9,7 @@ namespace Volo.CmsKit.Public.Ratings
 {
     [RequiresGlobalFeature(typeof(RatingsFeature))]
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit")]
+    [Area(CmsKitPublicRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-public/ratings")]
     public class RatingPublicController : CmsKitPublicControllerBase, IRatingPublicAppService
     {
@@ -41,4 +41,4 @@ namespace Volo.CmsKit.Public.Ratings
             return RatingPublicAppService.GetGroupedStarCountsAsync(entityType, entityId);
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Reactions/ReactionPublicController.cs

@@ -9,7 +9,7 @@ namespace Volo.CmsKit.Public.Reactions
 {
     [RequiresGlobalFeature(typeof(ReactionsFeature))]
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit")]
+    [Area(CmsKitPublicRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-public/reactions")]
     public class ReactionPublicController : CmsKitPublicControllerBase, IReactionPublicAppService
     {

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Tags/TagPublicController.cs

@@ -10,7 +10,7 @@ namespace Volo.CmsKit.Public.Tags
 {
     [RequiresGlobalFeature(typeof(TagsFeature))]
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit")]
+    [Area(CmsKitPublicRemoteServiceConsts.ModuleName)]
     [Route("api/cms-kit-public/tags")]
     public class TagPublicController : CmsKitPublicControllerBase, ITagAppService
     {
@@ -28,4 +28,4 @@ namespace Volo.CmsKit.Public.Tags
             return TagAppService.GetAllRelatedTagsAsync(entityType, entityId);
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs

@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.GlobalFeatures;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
@@ -66,6 +67,11 @@ namespace Volo.CmsKit.Public.Web
                     .UseGridTables()
                     .UsePipeTables()
                     .Build());
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(CmsKitPublicRemoteServiceConsts.ModuleName);
+            });
         }
 
         public override void PostConfigureServices(ServiceConfigurationContext context)

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public static class DocsAdminRemoteServiceConsts
     {
         public const string RemoteServiceName = "AbpDocsAdmin";
+
+        public const string ModuleName = "docs-admin";
     }
 }

modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocumentsAdminController.cs

@@ -10,7 +10,7 @@ using Volo.Docs.Admin.Documents;
 namespace Volo.Docs.Admin
 {
     [RemoteService(Name = DocsAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("docs-admin")]
+    [Area(DocsAdminRemoteServiceConsts.ModuleName)]
     [ControllerName("DocumentsAdmin")]
     [Route("api/docs/admin/documents")]
     public class DocumentsAdminController : AbpControllerBase, IDocumentAdminAppService

modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs

@@ -9,7 +9,7 @@ using Volo.Docs.Admin.Projects;
 namespace Volo.Docs.Admin
 {
     [RemoteService(Name = DocsAdminRemoteServiceConsts.RemoteServiceName)]
-    [Area("docs-admin")]
+    [Area(DocsAdminRemoteServiceConsts.ModuleName)]
     [ControllerName("ProjectsAdmin")]
     [Route("api/docs/admin/projects")]
     public class ProjectsAdminController : AbpControllerBase, IProjectAdminAppService

modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs

@@ -2,6 +2,7 @@
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
@@ -46,6 +47,11 @@ namespace Volo.Docs.Admin
             {
                 options.AddProfile<DocsAdminWebAutoMapperProfile>(validate: true);
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(DocsAdminRemoteServiceConsts.ModuleName);
+            });
         }
     }
 }

modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/DocsRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public static class DocsRemoteServiceConsts
     {
         public const string RemoteServiceName = "AbpDocs";
+
+        public const string ModuleName = "docs";
     }
 }

modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Documents/DocsDocumentController.cs

@@ -7,7 +7,7 @@ using Volo.Abp.AspNetCore.Mvc;
 namespace Volo.Docs.Documents
 {
     [RemoteService(Name = DocsRemoteServiceConsts.RemoteServiceName)]
-    [Area("docs")]
+    [Area(DocsRemoteServiceConsts.ModuleName)]
     [ControllerName("Document")]
     [Route("api/docs/documents")]
     public class DocsDocumentController :  AbpController, IDocumentAppService

modules/docs/src/Volo.Docs.HttpApi/Volo/Docs/Projects/DocsProjectController.cs

@@ -8,7 +8,7 @@ using Volo.Docs.Documents;
 namespace Volo.Docs.Projects
 {
     [RemoteService(Name = DocsRemoteServiceConsts.RemoteServiceName)]
-    [Area("docs")]
+    [Area(DocsRemoteServiceConsts.ModuleName)]
     [ControllerName("Project")]
     [Route("api/docs/projects")]
     public class DocsProjectController : AbpControllerBase, IProjectAppService

modules/docs/src/Volo.Docs.Web/Areas/Documents/DocumentResourceController.cs

@@ -10,7 +10,7 @@ using Volo.Docs.Documents;
 namespace Volo.Docs.Areas.Documents
 {
     [RemoteService(Name = DocsRemoteServiceConsts.RemoteServiceName)]
-    [Area("docs")]
+    [Area(DocsRemoteServiceConsts.ModuleName)]
     [ControllerName("DocumentResource")]
     [Route("document-resources")]
     public class DocumentResourceController : AbpController

modules/docs/src/Volo.Docs.Web/DocsWebModule.cs

@@ -9,6 +9,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Packages;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Prismjs;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 using Volo.Docs.Bundling;
@@ -85,6 +86,11 @@ namespace Volo.Docs
                     .Extensions<PrismjsScriptBundleContributor>()
                     .Add<PrismjsScriptBundleContributorDocsExtension>();
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(DocsRemoteServiceConsts.ModuleName);
+            });
         }
     }
 }

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/FeatureManagementRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public class FeatureManagementRemoteServiceConsts
     {
         public const string RemoteServiceName = "AbpFeatureManagement";
+
+        public const string ModuleName = "featureManagement";
     }
-}
+}

modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs

@@ -5,7 +5,7 @@ using Volo.Abp.AspNetCore.Mvc;
 namespace Volo.Abp.FeatureManagement
 {
     [RemoteService(Name = FeatureManagementRemoteServiceConsts.RemoteServiceName)]
-    [Area("featureManagement")]
+    [Area(FeatureManagementRemoteServiceConsts.ModuleName)]
     [Route("api/feature-management/features")]
     public class FeaturesController : AbpControllerBase, IFeatureAppService
     {

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs

@@ -4,6 +4,7 @@ using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.FeatureManagement.Localization;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 
@@ -46,6 +47,11 @@ namespace Volo.Abp.FeatureManagement
             {
                 //Configure authorization.
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(FeatureManagementRemoteServiceConsts.ModuleName);
+            });
         }
     }
 }

modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public static class IdentityRemoteServiceConsts
     {
         public const string RemoteServiceName = "AbpIdentity";
+
+        public const string ModuleName = "identity";
     }
 }

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityRoleController.cs

@@ -7,7 +7,7 @@ using Volo.Abp.AspNetCore.Mvc;
 namespace Volo.Abp.Identity
 {
     [RemoteService(Name = IdentityRemoteServiceConsts.RemoteServiceName)]
-    [Area("identity")]
+    [Area(IdentityRemoteServiceConsts.ModuleName)]
     [ControllerName("Role")]
     [Route("api/identity/roles")]
     public class IdentityRoleController : AbpControllerBase, IIdentityRoleAppService

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserController.cs

@@ -7,7 +7,7 @@ using Volo.Abp.AspNetCore.Mvc;
 namespace Volo.Abp.Identity
 {
     [RemoteService(Name = IdentityRemoteServiceConsts.RemoteServiceName)]
-    [Area("identity")]
+    [Area(IdentityRemoteServiceConsts.ModuleName)]
     [ControllerName("User")]
     [Route("api/identity/users")]
     public class IdentityUserController : AbpControllerBase, IIdentityUserAppService

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserLookupController.cs

@@ -8,7 +8,7 @@ using Volo.Abp.Users;
 namespace Volo.Abp.Identity
 {
     [RemoteService(Name = IdentityRemoteServiceConsts.RemoteServiceName)]
-    [Area("identity")]
+    [Area(IdentityRemoteServiceConsts.ModuleName)]
     [ControllerName("UserLookup")]
     [Route("api/identity/users/lookup")]
     public class IdentityUserLookupController : AbpControllerBase, IIdentityUserLookupAppService

modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs

@@ -4,6 +4,7 @@ using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Identity.Localization;
 using Volo.Abp.Identity.Web.Navigation;
 using Volo.Abp.Localization;
@@ -66,8 +67,8 @@ namespace Volo.Abp.Identity.Web
                 options.Conventions.AuthorizePage("/Identity/Roles/CreateModal", IdentityPermissions.Roles.Create);
                 options.Conventions.AuthorizePage("/Identity/Roles/EditModal", IdentityPermissions.Roles.Update);
             });
-            
-            
+
+
             Configure<AbpPageToolbarOptions>(options =>
             {
                 options.Configure<Volo.Abp.Identity.Web.Pages.Identity.Users.IndexModel>(
@@ -81,7 +82,7 @@ namespace Volo.Abp.Identity.Web
                         );
                     }
                 );
-                
+
                 options.Configure<Volo.Abp.Identity.Web.Pages.Identity.Roles.IndexModel>(
                     toolbar =>
                     {
@@ -94,6 +95,11 @@ namespace Volo.Abp.Identity.Web
                     }
                 );
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(IdentityRemoteServiceConsts.ModuleName);
+            });
         }
 
         public override void PostConfigureServices(ServiceConfigurationContext context)
@@ -107,7 +113,7 @@ namespace Volo.Abp.Identity.Web
                         createFormTypes: new[] { typeof(Volo.Abp.Identity.Web.Pages.Identity.Roles.CreateModalModel.RoleInfoModel) },
                         editFormTypes: new[] { typeof(Volo.Abp.Identity.Web.Pages.Identity.Roles.EditModalModel.RoleInfoModel) }
                     );
-                
+
                 ModuleExtensionConfigurationHelper
                     .ApplyEntityConfigurationToUi(
                         IdentityModuleExtensionConsts.ModuleName,

modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/PermissionManagementRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public class PermissionManagementRemoteServiceConsts
     {
         public const string RemoteServiceName = "AbpPermissionManagement";
+
+        public const string ModuleName = "permissionManagement";
     }
-}
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs

@@ -5,7 +5,7 @@ using Volo.Abp.AspNetCore.Mvc;
 namespace Volo.Abp.PermissionManagement
 {
     [RemoteService(Name = PermissionManagementRemoteServiceConsts.RemoteServiceName)]
-    [Area("permissionManagement")]
+    [Area(PermissionManagementRemoteServiceConsts.ModuleName)]
     [Route("api/permission-management/permissions")]
     public class PermissionsController : AbpControllerBase, IPermissionAppService
     {

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs

@@ -2,6 +2,7 @@
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AutoMapper;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.Localization;
 using Volo.Abp.VirtualFileSystem;
@@ -38,6 +39,11 @@ namespace Volo.Abp.PermissionManagement.Web
             {
                 options.AddProfile<AbpPermissionManagementWebAutoMapperProfile>(validate: true);
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(PermissionManagementRemoteServiceConsts.ModuleName);
+            });
         }
     }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public class SettingManagementRemoteServiceConsts
     {
         public const string RemoteServiceName = "SettingManagement";
+
+        public const string ModuleName = "settingManagement";
     }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.HttpApi/Volo/Abp/SettingManagement/EmailSettingsController.cs

@@ -5,7 +5,7 @@ using Volo.Abp.AspNetCore.Mvc;
 namespace Volo.Abp.SettingManagement
 {
     [RemoteService(Name = SettingManagementRemoteServiceConsts.RemoteServiceName)]
-    [Area("settingManagement")]
+    [Area(SettingManagementRemoteServiceConsts.ModuleName)]
     [Route("api/setting-management/emailing")]
     public class EmailSettingsController : AbpControllerBase, IEmailSettingsAppService
     {

modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Modularity;
 using Volo.Abp.SettingManagement.Web.Navigation;
 using Volo.Abp.SettingManagement.Web.Pages.SettingManagement;
@@ -52,6 +53,11 @@ namespace Volo.Abp.SettingManagement.Web
                             configuration.AddFiles("/Pages/SettingManagement/Components/EmailSettingGroup/Default.js");
                         });
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(SettingManagementRemoteServiceConsts.ModuleName);
+            });
         }
     }
 }

modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantManagementRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public class TenantManagementRemoteServiceConsts
     {
         public const string RemoteServiceName = "AbpTenantManagement";
+
+        public const string ModuleName = "multi-tenancy";
     }
-}
+}

modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo/Abp/TenantManagement/TenantController.cs

@@ -8,7 +8,7 @@ namespace Volo.Abp.TenantManagement
 {
     [Controller]
     [RemoteService(Name = TenantManagementRemoteServiceConsts.RemoteServiceName)]
-    [Area("multi-tenancy")]
+    [Area(TenantManagementRemoteServiceConsts.ModuleName)]
     [Route("api/multi-tenancy/tenants")]
     public class TenantController : AbpControllerBase, ITenantAppService //TODO: Throws exception on validation if we inherit from Controller
     {
@@ -74,4 +74,4 @@ namespace Volo.Abp.TenantManagement
             return TenantAppService.DeleteDefaultConnectionStringAsync(id);
         }
     }
-}
+}

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs

@@ -5,6 +5,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.FeatureManagement;
+using Volo.Abp.Http.ProxyScripting.Generators.JQuery;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
@@ -62,7 +63,7 @@ namespace Volo.Abp.TenantManagement.Web
                 options.Conventions.AuthorizePage("/TenantManagement/Tenants/CreateModal", TenantManagementPermissions.Tenants.Create);
                 options.Conventions.AuthorizePage("/TenantManagement/Tenants/EditModal", TenantManagementPermissions.Tenants.Update);
             });
-            
+
             Configure<AbpPageToolbarOptions>(options =>
             {
                 options.Configure<Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants.IndexModel>(
@@ -74,7 +75,7 @@ namespace Volo.Abp.TenantManagement.Web
                             name: "ManageHostFeatures",
                             requiredPolicyName: FeatureManagementPermissions.ManageHostFeatures
                         );
-                        
+
                         toolbar.AddButton(
                             LocalizableString.Create<AbpTenantManagementResource>("NewTenant"),
                             icon: "plus",
@@ -84,6 +85,11 @@ namespace Volo.Abp.TenantManagement.Web
                     }
                 );
             });
+
+            Configure<DynamicJavaScriptProxyOptions>(options =>
+            {
+                options.DisableModule(TenantManagementRemoteServiceConsts.ModuleName);
+            });
         }
 
         public override void PostConfigureServices(ServiceConfigurationContext context)
@@ -100,4 +106,4 @@ namespace Volo.Abp.TenantManagement.Web
             });
         }
     }
-}
+}

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameRemoteServiceConsts.cs

@@ -3,5 +3,7 @@
     public class MyProjectNameRemoteServiceConsts
     {
         public const string RemoteServiceName = "MyProjectName";
+
+        public const string ModuleName = "myProjectName";
     }
 }

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/Samples/SampleController.cs

@@ -5,7 +5,7 @@ using Volo.Abp;
 
 namespace MyCompanyName.MyProjectName.Samples
 {
-    [Area("MyProjectName")]
+    [Area(MyProjectNameRemoteServiceConsts.ModuleName)]
     [RemoteService(Name = MyProjectNameRemoteServiceConsts.RemoteServiceName)]
     [Route("api/MyProjectName/sample")]
     public class SampleController : MyProjectNameController, ISampleAppService