From 802d66135cb7abfd9bbd6a848d1a456dde10c0f4 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sat, 26 Dec 2020 14:40:12 +0800 Subject: [PATCH 1/2] The preset gateway menu code is repeated --- .../LINGYUN/Platform/PlatformDataSeedContributor.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/PlatformDataSeedContributor.cs b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/PlatformDataSeedContributor.cs index 491925525..39552529f 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/PlatformDataSeedContributor.cs +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/PlatformDataSeedContributor.cs @@ -668,7 +668,7 @@ namespace LINGYUN.Platform data, "global", "global", - CodeNumberGenerator.AppendCode(apiGatewayMenu.Code, CodeNumberGenerator.CreateCode(1)), + CodeNumberGenerator.AppendCode(apiGatewayMenu.Code, CodeNumberGenerator.CreateCode(2)), "views/admin/apigateway/global.vue", "Manage Globals", "", @@ -687,7 +687,7 @@ namespace LINGYUN.Platform data, "route", "route", - CodeNumberGenerator.AppendCode(apiGatewayMenu.Code, CodeNumberGenerator.CreateCode(1)), + CodeNumberGenerator.AppendCode(apiGatewayMenu.Code, CodeNumberGenerator.CreateCode(3)), "views/admin/apigateway/route.vue", "Manage Routes", "", @@ -706,7 +706,7 @@ namespace LINGYUN.Platform data, "aggregate-route", "aggregate-route", - CodeNumberGenerator.AppendCode(apiGatewayMenu.Code, CodeNumberGenerator.CreateCode(1)), + CodeNumberGenerator.AppendCode(apiGatewayMenu.Code, CodeNumberGenerator.CreateCode(4)), "views/admin/apigateway/aggregateRoute.vue", "Manage Aggregate Routes", "", From 62dedde910fff3b40f2004ae46400099e5bc7d24 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sat, 26 Dec 2020 14:41:44 +0800 Subject: [PATCH 2/2] Use the latest version of the mysql language --- .../account/AuthServer.Host/identity-server-upgrate-4.1.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aspnet-core/services/account/AuthServer.Host/identity-server-upgrate-4.1.sql b/aspnet-core/services/account/AuthServer.Host/identity-server-upgrate-4.1.sql index 036e085aa..f2b11f366 100644 --- a/aspnet-core/services/account/AuthServer.Host/identity-server-upgrate-4.1.sql +++ b/aspnet-core/services/account/AuthServer.Host/identity-server-upgrate-4.1.sql @@ -177,9 +177,9 @@ CALL PROC_DROP_COLUMN('IdentityServerApiResources', 'Properties'); ALTER TABLE `IdentityServerApiClaims` RENAME `IdentityServerApiResourceClaims`; -ALTER TABLE `IdentityServerApiScopes` RENAME COLUMN `ApiResourceId` TO `Id`; +ALTER TABLE `IdentityServerApiScopes` CHANGE COLUMN `ApiResourceId` `Id` CHAR(36); -ALTER TABLE `IdentityServerApiScopeClaims` RENAME COLUMN `ApiResourceId` TO `ApiScopeId`; +ALTER TABLE `IdentityServerApiScopeClaims` CHANGE COLUMN `ApiResourceId` `ApiScopeId` CHAR(36); -- 将要删除此表的所有数据，请注意 TRUNCATE TABLE `IdentityServerApiScopeClaims`;