From 3a1e6c243cc105ff8749d4105b46f7c23b3a4c51 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Thu, 7 Apr 2022 18:13:50 +0800 Subject: [PATCH] upgrade: upgrade abp framework to 5.2.0 --- .../src/api/identity-server/apiResources.ts | 2 +- apps/vue/src/api/identity-server/apiScopes.ts | 2 +- apps/vue/src/api/identity-server/clients.ts | 2 +- .../api/identity-server/identityResources.ts | 2 +- apps/vue/src/api/oss-management/oss.ts | 8 +++-- aspnet-core/Directory.Build.props | 4 +-- aspnet-core/common.props | 2 +- .../LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj | 2 +- .../LINGYUN/Abp/Cli/Commands/CreateCommand.cs | 2 +- .../LINGYUN.Abp.AspNetCore.Mvc.Client.csproj | 2 +- .../LINGYUN.Abp.HttpClient.Wrapper.csproj | 2 +- .../LINGYUN.Abp.Dapr.Actors.csproj | 2 +- .../LINGYUN.Abp.Dapr.Client.Wrapper.csproj | 2 +- .../LINGYUN.Abp.Dapr.Client.csproj | 2 +- .../LINGYUN.Abp.Dapr/LINGYUN.Abp.Dapr.csproj | 2 +- .../FodyWeavers.xml | 3 ++ .../FodyWeavers.xsd | 30 +++++++++++++++++++ .../BackendAdminHttpApiHostModule.cs | 13 ++++---- ...ice.WebhooksManagement.HttpApi.Host.csproj | 24 +++++++-------- .../Properties/launchSettings.json | 2 +- .../package.json | 2 +- common.props | 2 +- gateways/Directory.Build.props | 4 +-- gateways/common.props | 2 +- 24 files changed, 78 insertions(+), 42 deletions(-) create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xml create mode 100644 aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xsd diff --git a/apps/vue/src/api/identity-server/apiResources.ts b/apps/vue/src/api/identity-server/apiResources.ts index dd463cfde..60c3a3712 100644 --- a/apps/vue/src/api/identity-server/apiResources.ts +++ b/apps/vue/src/api/identity-server/apiResources.ts @@ -44,6 +44,6 @@ export const get = (id: string) => { export const getList = (input: GetApiResourcePagedRequest) => { return defAbpHttp.get({ url: Api.GetList, - data: input, + params: input, }); }; diff --git a/apps/vue/src/api/identity-server/apiScopes.ts b/apps/vue/src/api/identity-server/apiScopes.ts index 1bbc68cab..c27fe97cd 100644 --- a/apps/vue/src/api/identity-server/apiScopes.ts +++ b/apps/vue/src/api/identity-server/apiScopes.ts @@ -44,6 +44,6 @@ export const get = (id: string) => { export const getList = (input: GetApiScopePagedRequest) => { return defAbpHttp.get({ url: Api.GetList, - data: input, + params: input, }); }; diff --git a/apps/vue/src/api/identity-server/clients.ts b/apps/vue/src/api/identity-server/clients.ts index 95d95feab..4288bce2a 100644 --- a/apps/vue/src/api/identity-server/clients.ts +++ b/apps/vue/src/api/identity-server/clients.ts @@ -57,7 +57,7 @@ export const get = (id: string) => { export const getList = (input: GetClientPagedRequest) => { return defAbpHttp.get({ url: Api.GetList, - data: input, + params: input, }); }; diff --git a/apps/vue/src/api/identity-server/identityResources.ts b/apps/vue/src/api/identity-server/identityResources.ts index c7cd6f5ba..2b7d8d8cd 100644 --- a/apps/vue/src/api/identity-server/identityResources.ts +++ b/apps/vue/src/api/identity-server/identityResources.ts @@ -44,6 +44,6 @@ export const get = (id: string) => { export const getList = (input: GetIdentityResourcePagedRequest) => { return defAbpHttp.get({ url: Api.GetList, - data: input, + params: input, }); }; diff --git a/apps/vue/src/api/oss-management/oss.ts b/apps/vue/src/api/oss-management/oss.ts index a95e6eb41..21f45ac4a 100644 --- a/apps/vue/src/api/oss-management/oss.ts +++ b/apps/vue/src/api/oss-management/oss.ts @@ -14,7 +14,6 @@ import { format } from '/@/utils/strings'; import { AxiosResponse } from 'axios'; import { isFunction } from '/@/utils/is'; import { UploadFileParams } from '/#/axios'; -import { deepMerge } from '/@/utils'; enum Api { CreateObject = '/api/oss-management/objects', @@ -84,6 +83,11 @@ export const uploadObject = (params: UploadFileParams, event: any) => { }); } if (progress === totalSize) { + if (!res.data) { + res.data = { + url: format('/api/files/static/{bucket}/p/{path}/{name}', { bucket: params.data?.bucket, path: params.data?.path, name: fileName }), + }; + } resolve(res); } } @@ -194,7 +198,7 @@ export const deleteObject = (input: GetOssObjectRequest) => { export const bulkDeleteObject = (input: OssObjectBulkDelete) => { return defAbpHttp.post({ url: Api.BulkDeleteObject, - params: input, + data: input, }); } diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index 9f9403ebe..3f0dc92ce 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -1,7 +1,7 @@  - 5.1.4 - 5.1.4 + 5.2.0 + 5.2.0 1.6.0 1.0.1 6.0.0 diff --git a/aspnet-core/common.props b/aspnet-core/common.props index 2499520c2..b869cbcb5 100644 --- a/aspnet-core/common.props +++ b/aspnet-core/common.props @@ -1,7 +1,7 @@ latest - 5.1.4 + 5.2.0 colin $(NoWarn);CS1591;CS0436 https://github.com/colinin/abp-vue-admin-element-typescript/ diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj index 53882abeb..3eef3841c 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj @@ -5,7 +5,7 @@ Exe net6.0 - 5.1.4 + 5.2.0 colin Use LINGYUN.MicroService.Templates command line true diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateCommand.cs b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateCommand.cs index 6a5f3eed2..fff109ddf 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateCommand.cs +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/CreateCommand.cs @@ -198,7 +198,7 @@ namespace LINGYUN.Abp.Cli.Commands sb.AppendLine("Examples:"); sb.AppendLine(""); sb.AppendLine(" labp create Acme.BookStore"); - sb.AppendLine(" labp create Acme.BookStore -p Com"); + sb.AppendLine(" labp create Acme.BookStore -pk Com"); sb.AppendLine(" labp create Acme.BookStore -d mongodb"); sb.AppendLine(" labp create Acme.BookStore -d mongodb -o d:\\my-project"); sb.AppendLine(" labp create Acme.BookStore -ts \"D:\\localTemplate\\abp\""); diff --git a/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj b/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj index 1c66e22bc..fd82b5f86 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0 + net6.0 Library false diff --git a/aspnet-core/modules/common/LINGYUN.Abp.HttpClient.Wrapper/LINGYUN.Abp.HttpClient.Wrapper.csproj b/aspnet-core/modules/common/LINGYUN.Abp.HttpClient.Wrapper/LINGYUN.Abp.HttpClient.Wrapper.csproj index 5191eca19..40f24499c 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.HttpClient.Wrapper/LINGYUN.Abp.HttpClient.Wrapper.csproj +++ b/aspnet-core/modules/common/LINGYUN.Abp.HttpClient.Wrapper/LINGYUN.Abp.HttpClient.Wrapper.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0 + net6.0 diff --git a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj index 78a397e8d..933136019 100644 --- a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj +++ b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0 + net6.0 diff --git a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client.Wrapper/LINGYUN.Abp.Dapr.Client.Wrapper.csproj b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client.Wrapper/LINGYUN.Abp.Dapr.Client.Wrapper.csproj index 28ce84e11..3d1444b92 100644 --- a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client.Wrapper/LINGYUN.Abp.Dapr.Client.Wrapper.csproj +++ b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client.Wrapper/LINGYUN.Abp.Dapr.Client.Wrapper.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0 + net6.0 diff --git a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj index 2bbe9617d..6219fe71d 100644 --- a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj +++ b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0 + net6.0 diff --git a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr/LINGYUN.Abp.Dapr.csproj b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr/LINGYUN.Abp.Dapr.csproj index 53b1e72f8..c33dd8b33 100644 --- a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr/LINGYUN.Abp.Dapr.csproj +++ b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr/LINGYUN.Abp.Dapr.csproj @@ -4,7 +4,7 @@ - net5.0;net6.0 + net6.0 diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xml b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xml new file mode 100644 index 000000000..17d32672d --- /dev/null +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xsd b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xsd new file mode 100644 index 000000000..11da52550 --- /dev/null +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs index 590950201..1a0c38792 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/BackendAdminHttpApiHostModule.cs @@ -1,4 +1,5 @@ -using LINGYUN.Abp.AspNetCore.HttpOverrides; +using DotNetCore.CAP; +using LINGYUN.Abp.AspNetCore.HttpOverrides; using LINGYUN.Abp.Auditing; using LINGYUN.Abp.AuditLogging.Elasticsearch; using LINGYUN.Abp.Data.DbMigrator; @@ -9,11 +10,12 @@ using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore; using LINGYUN.Abp.Logging.Serilog.Elasticsearch; using LINGYUN.Abp.PermissionManagement.Identity; +using LINGYUN.Abp.Saas; +using LINGYUN.Abp.Saas.EntityFrameworkCore; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using LINGYUN.Abp.SettingManagement; using LINGYUN.Abp.Sms.Aliyun; -using LINGYUN.Abp.Saas; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; @@ -35,8 +37,6 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.PermissionManagement.HttpApi; using Volo.Abp.PermissionManagement.IdentityServer; using Volo.Abp.SettingManagement.EntityFrameworkCore; -using LINGYUN.Abp.Saas.EntityFrameworkCore; -using DotNetCore.CAP; namespace LY.MicroService.BackendAdmin; @@ -73,7 +73,6 @@ namespace LY.MicroService.BackendAdmin; typeof(AbpEmailingExceptionHandlingModule), typeof(AbpCAPEventBusModule), typeof(AbpAliyunSmsModule), - //typeof(AbpDbFinderMultiTenancyModule), typeof(AbpCachingStackExchangeRedisModule), typeof(AbpAspNetCoreHttpOverridesModule), typeof(AbpLocalizationCultureMapModule), @@ -114,6 +113,8 @@ public partial class BackendAdminHttpApiHostModule : AbpModule public override void OnApplicationInitialization(ApplicationInitializationContext context) { var app = context.GetApplicationBuilder(); + // 本地化 + app.UseMapRequestLocalization(); // http调用链 app.UseCorrelationId(); // 虚拟文件系统 @@ -128,8 +129,6 @@ public partial class BackendAdminHttpApiHostModule : AbpModule app.UseJwtTokenMiddleware(); // 多租户 app.UseMultiTenancy(); - // 本地化 - app.UseMapRequestLocalization(); // 授权 app.UseAuthorization(); // Cap Dashboard diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj index a2659d4f1..e1a0c0cce 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj @@ -11,18 +11,6 @@ - - - - - - - - - - - - all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -66,6 +54,18 @@ + + + + + + + + + + + + diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Properties/launchSettings.json b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Properties/launchSettings.json index 5e6ed2ca7..7e93c505e 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Properties/launchSettings.json +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Properties/launchSettings.json @@ -14,7 +14,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://0.0.0.0:30045", + "applicationUrl": "http://127.0.0.1:30045", "dotnetRunMessages": "true" } } diff --git a/aspnet-core/services/LY.MicroService.identityServer/package.json b/aspnet-core/services/LY.MicroService.identityServer/package.json index 05e35b057..dbade3a46 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/package.json +++ b/aspnet-core/services/LY.MicroService.identityServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-identityserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "5.1.1" + "@abp/aspnetcore.mvc.ui.theme.basic": "5.2.0" } } \ No newline at end of file diff --git a/common.props b/common.props index cdc937bc8..2949e934f 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 5.1.4 + 5.2.0 LINGYUN $(NoWarn);CS1591;CS0436 https://github.com/colinin/abp-vue-admin-element-typescript/ diff --git a/gateways/Directory.Build.props b/gateways/Directory.Build.props index f1c1c1c28..a7cad8131 100644 --- a/gateways/Directory.Build.props +++ b/gateways/Directory.Build.props @@ -1,7 +1,7 @@  - 5.1.4 - 5.1.4 + 5.2.0 + 5.2.0 1.6.0 6.0.0 1.5.10 diff --git a/gateways/common.props b/gateways/common.props index adf784bd3..53337617f 100644 --- a/gateways/common.props +++ b/gateways/common.props @@ -1,7 +1,7 @@ latest - 5.1.4 + 5.2.0 $(NoWarn);CS1591;CS0436 \ No newline at end of file