From 51d0d219d05a19a8ed7181aa9034217883d9947b Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Mon, 7 Dec 2020 15:53:19 +0800
Subject: [PATCH] Support sub-application deployment

---
 .../Themes/Basic/Branding.razor                               | 2 +-
 .../AbpIdentityWebMainMenuContributor.cs                      | 4 ++--
 .../Menus/SettingManagementMenuContributor.cs                 | 2 +-
 .../Navigation/TenantManagementBlazorMenuContributor.cs       | 2 +-
 .../Menus/MyProjectNameMenuContributor.cs                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor
index 4810320664..ac629423ce 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/Branding.razor
@@ -1,3 +1,3 @@
 @using Volo.Abp.Ui.Branding
 @inject IBrandingProvider BrandingProvider
-<a class="navbar-brand" href="/">@BrandingProvider.AppName</a>
+<a class="navbar-brand" href="">@BrandingProvider.AppName</a>
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs
index 3198e1335d..5e5714a851 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityWebMainMenuContributor.cs
@@ -27,12 +27,12 @@ namespace Volo.Abp.Identity.Blazor
 
                 if (hasRolePermission)
                 {
-                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Roles, l["Roles"], url: "/identity/roles"));
+                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Roles, l["Roles"], url: "identity/roles"));
                 }
 
                 if (hasUserPermission)
                 {
-                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Users, l["Users"], url: "/identity/users"));
+                    identityMenuItem.AddItem(new ApplicationMenuItem(IdentityMenuNames.Users, l["Users"], url: "identity/users"));
                 }
             }
         }
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Menus/SettingManagementMenuContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Menus/SettingManagementMenuContributor.cs
index 44343e0498..531613b77c 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Menus/SettingManagementMenuContributor.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Menus/SettingManagementMenuContributor.cs
@@ -37,7 +37,7 @@ namespace Volo.Abp.SettingManagement.Blazor.Menus
                     new ApplicationMenuItem(
                         SettingManagementMenus.GroupName,
                         l["Settings"],
-                        "/setting-management",
+                        "setting-management",
                         icon: "fa fa-cog"
                     )
                 );
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Navigation/TenantManagementBlazorMenuContributor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Navigation/TenantManagementBlazorMenuContributor.cs
index c1d6e9ac7a..03bfd6b2d2 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Navigation/TenantManagementBlazorMenuContributor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Navigation/TenantManagementBlazorMenuContributor.cs
@@ -22,7 +22,7 @@ namespace Volo.Abp.TenantManagement.Blazor.Navigation
 
             if (await context.IsGrantedAsync(TenantManagementPermissions.Tenants.Default))
             {
-                tenantManagementMenuItem.AddItem(new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "/tenant-management/tenants"));
+                tenantManagementMenuItem.AddItem(new ApplicationMenuItem(TenantManagementMenuNames.Tenants, l["Tenants"], url: "tenant-management/tenants"));
             }
         }
     }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
index 8b5aebacce..7f8964d6cd 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
@@ -39,7 +39,7 @@ namespace MyCompanyName.MyProjectName.Blazor.Menus
                 new ApplicationMenuItem(
                     MyProjectNameMenus.Home,
                     l["Menu:Home"],
-                    "/",
+                    "",
                     icon: "fas fa-home"
                 )
             );