Browse Source

Merge pull request #974 from colinin/fix-968

fix(seed-menu): fixed #968
pull/988/head
yx lin 1 year ago
committed by GitHub
parent
commit
c8f5943b00
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 167
      aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN/Abp/UI/Navigation/VueVbenAdmin/AbpUINavigationVueVbenAdminNavigationDefinitionProvider.cs

167
aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN/Abp/UI/Navigation/VueVbenAdmin/AbpUINavigationVueVbenAdminNavigationDefinitionProvider.cs

@ -212,21 +212,7 @@ public class AbpUINavigationVueVbenAdminNavigationDefinitionProvider : Navigatio
description: "通知定义", description: "通知定义",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
var removedIdsVersion = false; var identityServer = manage.AddItem(
var assembly = typeof(AbpUINavigationVueVbenAdminNavigationDefinitionProvider).Assembly;
var versionAttr = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>();
if (versionAttr != null)
{
if (Version.TryParse(versionAttr.Version, out var version))
{
var version6 = new Version("6.0.0");
removedIdsVersion = version6 >= version;
}
}
if (!removedIdsVersion)
{
var identityServer = manage.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "IdentityServer", name: "IdentityServer",
displayName: "身份认证服务器", displayName: "身份认证服务器",
@ -234,50 +220,48 @@ public class AbpUINavigationVueVbenAdminNavigationDefinitionProvider : Navigatio
component: "", component: "",
description: "身份认证服务器", description: "身份认证服务器",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
identityServer.AddItem( identityServer.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "Clients", name: "Clients",
displayName: "客户端", displayName: "客户端",
url: "/manage/identity-server/clients", url: "/manage/identity-server/clients",
component: "/identity-server/clients/index", component: "/identity-server/clients/index",
description: "客户端", description: "客户端",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
identityServer.AddItem( identityServer.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "ApiResources", name: "ApiResources",
displayName: "Api 资源", displayName: "Api 资源",
url: "/manage/identity-server/api-resources", url: "/manage/identity-server/api-resources",
component: "/identity-server/api-resources/index", component: "/identity-server/api-resources/index",
description: "Api 资源", description: "Api 资源",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
identityServer.AddItem( identityServer.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "IdentityResources", name: "IdentityResources",
displayName: "身份资源", displayName: "身份资源",
url: "/manage/identity-server/identity-resources", url: "/manage/identity-server/identity-resources",
component: "/identity-server/identity-resources/index", component: "/identity-server/identity-resources/index",
description: "身份资源", description: "身份资源",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
identityServer.AddItem( identityServer.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "ApiScopes", name: "ApiScopes",
displayName: "Api 范围", displayName: "Api 范围",
url: "/manage/identity-server/api-scopes", url: "/manage/identity-server/api-scopes",
component: "/identity-server/api-scopes/index", component: "/identity-server/api-scopes/index",
description: "Api 范围", description: "Api 范围",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
identityServer.AddItem( identityServer.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "PersistedGrants", name: "PersistedGrants",
displayName: "持久授权", displayName: "持久授权",
url: "/manage/identity-server/persisted-grants", url: "/manage/identity-server/persisted-grants",
component: "/identity-server/persisted-grants/index", component: "/identity-server/persisted-grants/index",
description: "持久授权", description: "持久授权",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
}
else var openIddict = manage.AddItem(
{
var openIddict = manage.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "OpenIddict", name: "OpenIddict",
displayName: "身份认证服务器", displayName: "身份认证服务器",
@ -285,39 +269,38 @@ public class AbpUINavigationVueVbenAdminNavigationDefinitionProvider : Navigatio
component: "LAYOUT", component: "LAYOUT",
description: "身份认证服务器(OpenIddict)", description: "身份认证服务器(OpenIddict)",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
openIddict.AddItem( openIddict.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "OpenIddictApplications", name: "OpenIddictApplications",
displayName: "应用管理", displayName: "应用管理",
url: "/manage/openiddict/applications", url: "/manage/openiddict/applications",
component: "/openiddict/applications/index", component: "/openiddict/applications/index",
description: "应用管理", description: "应用管理",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
openIddict.AddItem( openIddict.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "OpenIddictAuthorizations", name: "OpenIddictAuthorizations",
displayName: "授权管理", displayName: "授权管理",
url: "/manage/openiddict/authorizations", url: "/manage/openiddict/authorizations",
component: "/openiddict/authorizations/index", component: "/openiddict/authorizations/index",
description: "授权管理", description: "授权管理",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
openIddict.AddItem( openIddict.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "OpenIddictScopes", name: "OpenIddictScopes",
displayName: "Api 范围", displayName: "Api 范围",
url: "/manage/openiddict/scopes", url: "/manage/openiddict/scopes",
component: "/openiddict/scopes/index", component: "/openiddict/scopes/index",
description: "Api 范围", description: "Api 范围",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
openIddict.AddItem( openIddict.AddItem(
new ApplicationMenu( new ApplicationMenu(
name: "OpenIddictTokens", name: "OpenIddictTokens",
displayName: "授权令牌", displayName: "授权令牌",
url: "/manage/openiddict/tokens", url: "/manage/openiddict/tokens",
component: "/openiddict/tokens/index", component: "/openiddict/tokens/index",
description: "授权令牌", description: "授权令牌",
multiTenancySides: MultiTenancySides.Host)); multiTenancySides: MultiTenancySides.Host));
}
manage.AddItem( manage.AddItem(
new ApplicationMenu( new ApplicationMenu(

Loading…
Cancel
Save