Merge pull request #4101 from abpframework/liangshiwei/support-virtualpath

Support virtual path deployment

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/Default.cshtml

@@ -5,12 +5,13 @@
     var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\"";
     var cssClass = string.IsNullOrEmpty(menuItem.CssClass) ? string.Empty : menuItem.CssClass;
     var disabled = menuItem.IsDisabled ? "disabled" : string.Empty;
+    var url = string.IsNullOrEmpty(menuItem.Url) ? "#" : Url.Content(menuItem.Url);
     if (menuItem.IsLeaf)
     {
         if (menuItem.Url != null)
         {
             <li class="nav-item @cssClass @disabled" @elementId>
-                <a class="nav-link" href="@(menuItem.Url ?? "#")">
+                <a class="nav-link" href="@url">
                     @if (menuItem.Icon != null)
                     {
                         if (menuItem.Icon.StartsWith("fa"))
@@ -46,4 +47,4 @@
             </div>
         </li>
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/_MenuItem.cshtml

@@ -4,12 +4,13 @@
     var elementId = string.IsNullOrEmpty(Model.ElementId) ? string.Empty : $"id=\"{Model.ElementId}\"";
     var cssClass = string.IsNullOrEmpty(Model.CssClass) ? string.Empty : Model.CssClass;
     var disabled = Model.IsDisabled ? "disabled" : string.Empty;
+    var url = string.IsNullOrEmpty(Model.Url) ? "#" : Url.Content(Model.Url);
 }
 @if (Model.IsLeaf)
 {
     if (Model.Url != null)
     {
-        <a class="dropdown-item @cssClass @disabled" href="@(Model.Url ?? "#")" @Html.Raw(elementId)>
+        <a class="dropdown-item @cssClass @disabled" href="@url" @Html.Raw(elementId)>
             @if (Model.Icon != null)
             {
                 if (Model.Icon.StartsWith("fa"))

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/Default.cshtml

@@ -12,7 +12,7 @@
         <div class="dropdown-menu dropdown-menu-right border-0 shadow-sm" aria-labelledby="dropdownMenuLink">
             @foreach (var language in Model.OtherLanguages)
             {
-                <a class="dropdown-item" href="/Abp/Languages/Switch?culture=@(language.CultureName)&uiCulture=@(language.UiCultureName)&returnUrl=@(System.Net.WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))">@language.DisplayName</a>
+                <a class="dropdown-item" href="~/Abp/Languages/Switch?culture=@(language.CultureName)&uiCulture=@(language.UiCultureName)&returnUrl=@(System.Net.WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))">@language.DisplayName</a>
             }
         </div>
     </div> 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml

@@ -27,8 +27,9 @@
                 var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\"";
                 var cssClass = string.IsNullOrEmpty(menuItem.CssClass) ? string.Empty : menuItem.CssClass;
                 var disabled = menuItem.IsDisabled ? "disabled" : string.Empty;
+                var url = string.IsNullOrEmpty(menuItem.Url) ? "#" : Url.Content(menuItem.Url);
 
-                <a class="dropdown-item @cssClass @disabled" href="@(menuItem.Url ?? "#")" target="@menuItem.Target" @Html.Raw(elementId)>
+                <a class="dropdown-item @cssClass @disabled" href="@url" target="@menuItem.Target" @Html.Raw(elementId)>
                     @if (menuItem.Icon != null)
                     {
                         if (menuItem.Icon.StartsWith("fa"))

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpApplicationPath/AbpApplicationPathViewComponent.cs

@@ -0,0 +1,19 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpApplicationPath
+{
+    public class AbpApplicationPathViewComponent : AbpViewComponent
+    {
+        public IViewComponentResult Invoke()
+        {
+            var applicationPath = ViewContext.HttpContext.Request.PathBase.Value;
+            var model = new AbpApplicationPathViewComponentModel
+            {
+                ApplicationPath = applicationPath == null ? "/" : applicationPath.EnsureEndsWith('/')
+            };
+
+            return View("~/Pages/Shared/Components/AbpApplicationPath/Default.cshtml",model);
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpApplicationPath/AbpApplicationPathViewComponentModel.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpApplicationPath
+{
+    public class AbpApplicationPathViewComponentModel
+    {
+        public string ApplicationPath { get; set; }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpApplicationPath/Default.cshtml

@@ -0,0 +1,4 @@
+@model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpApplicationPath.AbpApplicationPathViewComponentModel
+<script type="text/javascript">
+   var abp = abp || {}; abp.appPath = '@Model.ApplicationPath';
+</script>

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Authentication/ChallengeAccountController.cs

@@ -86,7 +86,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Authentication
 
         protected virtual string GetAppHomeUrl()
         {
-            return "/";
+            return "~/";
         }
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Localization/AbpLanguagesController.cs

@@ -32,14 +32,14 @@ namespace Volo.Abp.AspNetCore.Mvc.Localization
                 return Redirect(GetRedirectUrl(returnUrl));
             }
 
-            return Redirect("/");
+            return Redirect("~/");
         }
 
         private string GetRedirectUrl(string returnUrl)
         {
             if (returnUrl.IsNullOrEmpty())
             {
-                return "/";
+                return "~/";
             }
 
             if (Url.IsLocalUrl(returnUrl))
@@ -47,7 +47,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Localization
                 return returnUrl;
             }
 
-            return "/";
+            return "~/";
         }
     }
 }

framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
@@ -101,7 +102,7 @@ namespace Volo.Abp.UI.Navigation
 
             Name = name;
             DisplayName = displayName;
-            Url = url;
+            Url = url?.EnsureStartsWith('~');
             Icon = icon;
             Order = order;
             CustomData = customData;
@@ -133,4 +134,4 @@ namespace Volo.Abp.UI.Navigation
             return $"[ApplicationMenuItem] Name = {Name}";
         }
     }
-}
+}

modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/Default.cshtml

@@ -1,4 +1,4 @@
 @using Localization.Resources.AbpUi
 @using Microsoft.AspNetCore.Mvc.Localization
 @inject IHtmlLocalizer<AbpUiResource> L
-<a href="/Account/Login">@L["Login"]</a>
+<a href="~/Account/Login">@L["Login"]</a>

modules/account/src/Volo.Abp.Account.Web/Pages/Account/AccountPageModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.Account.Localization;
@@ -73,7 +74,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         protected virtual string GetAppHomeUrl()
         {
-            return "/"; //TODO: ???
+            return "~/"; //TODO: ???
         }
     }
 }

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs

@@ -59,7 +59,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             await SignInManager.SignInAsync(user, isPersistent: false);
 
-            return Redirect(ReturnUrl ?? "/"); //TODO: How to ensure safety? IdentityServer requires it however it should be checked somehow!
+            return Redirect(ReturnUrl ?? "~/"); //TODO: How to ensure safety? IdentityServer requires it however it should be checked somehow!
         }
 
         protected virtual async Task CheckSelfRegistrationAsync()

modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Web/Pages/VirtualFileExplorer/Index.cshtml.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.FileProviders;
 using NUglify.Helpers;
@@ -42,7 +43,7 @@ namespace Volo.Abp.VirtualFileExplorer.Web.Pages.VirtualFileExplorer
                 .Where(d => VirtualFileExplorerConsts.AllowFileInfoTypes.Contains(d.GetType().Name))
                 .OrderByDescending(f => f.IsDirectory).ToList();
 
-            PagerModel = new PagerModel(query.Count, PageSize, CurrentPage, PageSize, $"/VirtualFileExplorer?Path={Path}&PageSize={PageSize}");
+            PagerModel = new PagerModel(query.Count, PageSize, CurrentPage, PageSize, $"{Url.Content("~/")}VirtualFileExplorer?Path={Path}&PageSize={PageSize}");
 
             SetViewModel(query.Skip((CurrentPage - 1) * PageSize).Take(PageSize));
             SetPathNavigation();
@@ -71,7 +72,7 @@ namespace Volo.Abp.VirtualFileExplorer.Web.Pages.VirtualFileExplorer
                     fileInfoViewModel.Icon = "fas fa-folder";
                     fileInfoViewModel.FileType = "folder";
                     fileInfoViewModel.Length = "/";
-                    fileInfoViewModel.FileName =$"<a href='/VirtualFileExplorer?path={fileInfo.PhysicalPath}'>{fileInfo.Name}</a>";
+                    fileInfoViewModel.FileName =$"<a href='{Url.Content("~/")}VirtualFileExplorer?path={fileInfo.PhysicalPath}'>{fileInfo.Name}</a>";
                 }
                 else
                 {
@@ -86,7 +87,7 @@ namespace Volo.Abp.VirtualFileExplorer.Web.Pages.VirtualFileExplorer
         {
             var navigationBuild = new StringBuilder();
             var pathArray = Path.Split('/').Where(p => !p.IsNullOrWhiteSpace());
-            var href = "/VirtualFileExplorer?path=";
+            var href = $"{Url.Content("~/")}VirtualFileExplorer?path=";
 
             navigationBuild.Append($"<nav aria-label='breadcrumb'>" +
                                    $" <ol class='breadcrumb'>" +

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs

@@ -7,7 +7,7 @@ namespace MyCompanyName.MyProjectName.Controllers
     {
         public ActionResult Index()
         {
-            return Redirect("/swagger");
+            return Redirect("~/swagger");
         }
     }
 }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Controllers/HomeController.cs

@@ -7,7 +7,7 @@ namespace MyCompanyName.MyProjectName.Controllers
     {
         public ActionResult Index()
         {
-            return Redirect("/swagger");
+            return Redirect("~/swagger");
         }
     }
 }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml

@@ -26,6 +26,6 @@
     <a href="https://abp.io?ref=tmpl" target="_blank" class="btn btn-primary px-4">abp.io</a>
     @if (!CurrentUser.IsAuthenticated)
     {
-        <a abp-button="Primary" href="/Account/Login" class="px-4"><i class="fa fa-sign-in"></i> @L["Login"]</a>
+        <a abp-button="Primary" href="~/Account/Login" class="px-4"><i class="fa fa-sign-in"></i> @L["Login"]</a>
     }
 </div>

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs

@@ -7,7 +7,7 @@ namespace MyCompanyName.MyProjectName.Controllers
     {
         public ActionResult Index()
         {
-            return Redirect("/swagger");
+            return Redirect("~/swagger");
         }
     }
 }

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Pages/Index.cshtml

@@ -4,4 +4,4 @@
 @using MyCompanyName.MyProjectName.Pages
 @model IndexModel
 @inject IStringLocalizer<AbpUiResource> Localizer
-<a href="/Account/Login">@Localizer["Login"]</a>
+<a href="~/Account/Login">@Localizer["Login"]</a>