Merge pull request #164 from colinin/4.0

Deal with some problems

aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN/Platform/Localization/ApplicationContracts/zh-Hans.json

@@ -22,8 +22,8 @@
     "Permission:Layout": "布局管理",
     "Permission:Menu": "菜单管理",
     "Permission:Create": "新增",
-    "Permission:Update": "新增",
-    "Permission:Delete": "新增",
+    "Permission:Update": "编辑",
+    "Permission:Delete": "删除",
     "Permission:ManageItems": "管理项目",
     "Permission:ManageRoleMenus": "管理角色菜单",
     "Permission:ManageUserMenus": "管理用户菜单"

aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/PlatformDataSeedContributor.cs

@@ -415,7 +415,7 @@ namespace LINGYUN.Platform
                     { "title", "identity-server" },
                     { "icon", "identity-server" },
                     { "alwaysShow", true },
-                    { "roles", new string[]{ "AbpIdentityServer.Clients", "AbpIdentityServer.ApiResources", "AbpIdentityServer.IdentityResources" } }
+                    { "roles", new string[]{ "AbpIdentityServer.Clients", "AbpIdentityServer.ApiResources", "AbpIdentityServer.IdentityResources", "AbpIdentityServer.ApiScopes" } }
                 },
                 new string[] { "admin" });
 
@@ -434,7 +434,7 @@ namespace LINGYUN.Platform
                 new Dictionary<string, object>()
                 {
                     { "title", "clients" },
-                    { "icon", "clients" },
+                    { "icon", "client" },
                     { "roles", new string[]{ "AbpIdentityServer.Clients" } }
                 },
                 new string[] { "admin" });
@@ -462,7 +462,7 @@ namespace LINGYUN.Platform
                 data,
                 "identity-resources",
                 "identity-resources",
-                CodeNumberGenerator.AppendCode(identityServerMenu.Code, CodeNumberGenerator.CreateCode(2)),
+                CodeNumberGenerator.AppendCode(identityServerMenu.Code, CodeNumberGenerator.CreateCode(3)),
                 "views/admin/identityServer/identity-resources/index.vue",
                 "Manage Identity Resources",
                 "",
@@ -476,6 +476,25 @@ namespace LINGYUN.Platform
                     { "roles", new string[]{ "AbpIdentityServer.IdentityResources" } }
                 },
                 new string[] { "admin" });
+            await SeedMenuAsync(
+                layout,
+                data,
+                "api-scopes",
+                "api-scopes",
+                CodeNumberGenerator.AppendCode(identityServerMenu.Code, CodeNumberGenerator.CreateCode(4)),
+                "views/admin/identityServer/api-scopes/index.vue",
+                "Manage Api Scopes",
+                "",
+                "Manage Api Scopes",
+                identityServerMenu.Id,
+                layout.TenantId,
+                new Dictionary<string, object>()
+                {
+                    { "title", "api-scopes" },
+                    { "icon", "api-scopes" },
+                    { "roles", new string[]{ "AbpIdentityServer.ApiScopes" } }
+                },
+                new string[] { "admin" });
         }
 
         private async Task SeedAuditingMenuAsync(Layout layout, Data data)

vueJs/debug.log

@@ -6,3 +6,4 @@
 [1221/155401.113:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1222/155401.133:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1223/145638.708:ERROR:filesystem_win.cc(148)] DeleteFile C:\Users\iVarKey\AppData\Local\Google\Chrome\User Data\Crashpad\reports\0106539b-a680-4c00-8e38-5a7a621345b9.dmp: 另一个程序正在使用此文件，进程无法访问。 (0x20)
+[1225/102752.308:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

vueJs/src/api/api-resources.ts

@@ -95,7 +95,7 @@ export class ApiResourceCreateOrUpdate {
   allowedAccessTokenSigningAlgorithms?: string = ''
   userClaims = new Array<ApiResourceClaim>()
   scopes = new Array<ApiResourceScope>()
-  secrets = new Array<ApiResourceSecretCreate>()
+  secrets = new Array<ApiResourceSecret>()
   properties = new Array<ApiResourceProperty>()
 }
 

vueJs/src/api/clients.ts

@@ -258,7 +258,7 @@ export class ClientUpdate extends ClientCreateOrUpdate {
     this.postLogoutRedirectUris = client.postLogoutRedirectUris
     this.identityProviderRestrictions = client.identityProviderRestrictions
     this.allowedScopes = client.allowedScopes
-    this.secrets = client.clientSecrets
+    this.clientSecrets = client.clientSecrets
     this.claims = client.claims
     this.properties = client.properties
   }

vueJs/src/api/identity-server4.ts

@@ -1,4 +1,5 @@
 import ApiService from './serviceBase'
+import { getOrDefault } from '@/utils/localStorage'
 
 const openIdConfigurationUrl = '/.well-known/openid-configuration'
 

vueJs/src/views/container/menus/components/CreateOrUpdateMenuDialog.vue

@@ -278,10 +278,10 @@ export default class CreateOrUpdateMenuDialog extends Vue {
     if (layout) {
       if (!this.isEdit) {
         this.menu.meta = {}
-      }
-      if (!this.parentId) {
-        // 对于根菜单,自动设置组件路径为布局路径
-        this.menu.component = layout.path
+        if (!this.parentId) {
+          // 对于根菜单,自动设置组件路径为布局路径
+          this.menu.component = layout.path
+        }
       }
       DataService
         .get(layout.dataId)