From d930a572a955f129eed2d7d4b14baba7d37c984b Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 22 Dec 2023 13:37:48 +0800 Subject: [PATCH] upgrade: upgrade abp framework to 8.0.0 --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 4 +- .../open-iddict-application/model/index.ts | 13 +- .../components/ApplicationModal.vue | 110 +- .../components/ApplicationScope.vue | 14 +- .../components/ApplicationSecretModal.vue | 26 +- .../components/ApplicationTable.vue | 8 +- .../components/PostLogoutRedirectUri.vue | 2 +- .../applications/components/RedirectUri.vue | 2 +- .../applications/datas/TableData.ts | 12 +- .../openiddict/applications/types/props.ts | 4 +- aspnet-core/Directory.Build.props | 50 +- aspnet-core/LINGYUN.MicroService.All.sln | 31 + .../LINGYUN.MicroService.SingleProject.sln | 17 +- aspnet-core/common.props | 2 +- aspnet-core/configureawait.props | 4 +- ...bp.AuditLogging.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.Authentication.QQ.csproj | 2 +- .../LINGYUN.Abp.Authentication.WeChat.csproj | 2 +- .../LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj | 2 +- ...INGYUN.Abp.Aliyun.SettingManagement.csproj | 2 +- ...NGYUN.Abp.Tencent.SettingManagement.csproj | 2 +- ...INGYUN.Abp.AspNetCore.HttpOverrides.csproj | 4 +- .../ForwardedHeadersOptionsExtensions.cs | 2 +- .../LINGYUN.Abp.AspNetCore.Mvc.Client.csproj | 2 +- ...NGYUN.Abp.AspNetCore.Mvc.Validation.csproj | 2 +- ...bp.AspNetCore.SignalR.Protocol.Json.csproj | 2 +- ...YUN.Abp.AspNetCore.SignalR.JwtToken.csproj | 2 +- .../LINGYUN.Abp.AspNetCore.Wrapper.csproj | 2 +- .../LINGYUN.Abp.Data.DbMigrator.csproj | 2 +- .../LINGYUN.Abp.EventBus.CAP.csproj | 2 +- .../LINGYUN.Abp.Encryption.Console.csproj | 2 +- ....Abp.Dapr.Actors.AspNetCore.Wrapper.csproj | 2 +- .../LINGYUN.Abp.Dapr.Actors.AspNetCore.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 +- ...LINGYUN.Abp.DistributedLocking.Dapr.csproj | 2 +- ....DataProtection.EntityFrameworkCore.csproj | 2 +- ...ataProtectionQueryExpressionInterceptor.cs | 48 + .../DataProtectionSaveChangesInterceptor.cs | 41 + ...NGYUN.Abp.Dynamic.Queryable.HttpApi.csproj | 2 +- ...INGYUN.Abp.EntityChange.Application.csproj | 2 +- .../LINGYUN.Abp.EntityChange.HttpApi.csproj | 2 +- ...YUN.Abp.AspNetCore.Mvc.Localization.csproj | 2 +- ...LINGYUN.Abp.Localization.CultureMap.csproj | 2 +- ...p.AspNetCore.Mvc.Idempotent.Wrapper.csproj | 2 +- ...NGYUN.Abp.AspNetCore.Mvc.Idempotent.csproj | 2 +- .../LINGYUN.Abp.AspNetCore.Mvc.Wrapper.csproj | 2 +- .../LINGYUN.Abp.OpenApi.Authorization.csproj | 2 +- ...GYUN.Abp.PushPlus.SettingManagement.csproj | 2 +- ...NGYUN.Abp.TuiJuhe.SettingManagement.csproj | 2 +- ...LINGYUN.Abp.WeChat.Official.HttpApi.csproj | 2 +- ...LINGYUN.Abp.WeChat.Official.Senparc.csproj | 2 +- ...INGYUN.Abp.WeChat.SettingManagement.csproj | 2 +- .../LINGYUN.Abp.WeChat.Work.HttpApi.csproj | 2 +- ...GYUN.Abp.WxPusher.SettingManagement.csproj | 2 +- ...vice.Applications.Single.DbMigrator.csproj | 2 +- .../DataSeeder/ClientDataSeederContributor.cs | 4 +- ...ications.Single.EntityFrameworkCore.csproj | 2 +- ...Upgrade-Abp-Framework-To-8.0.0.Designer.cs | 5324 +++++++++++++++++ ...22014501_Upgrade-Abp-Framework-To-8.0.0.cs | 94 + .../SingleMigrationsDbContextModelSnapshot.cs | 19 +- ....MicroService.AuthServer.DbMigrator.csproj | 2 +- ...vice.AuthServer.EntityFrameworkCore.csproj | 2 +- ...icroService.BackendAdmin.DbMigrator.csproj | 2 +- ...ce.BackendAdmin.EntityFrameworkCore.csproj | 2 +- ...roService.IdentityServer.DbMigrator.csproj | 2 +- ....IdentityServer.EntityFrameworkCore.csproj | 2 +- ...e.LocalizationManagement.DbMigrator.csproj | 2 +- ...ationManagement.EntityFrameworkCore.csproj | 2 +- ...LY.MicroService.Platform.DbMigrator.csproj | 2 +- ...ervice.Platform.EntityFrameworkCore.csproj | 2 +- ...oService.RealtimeMessage.DbMigrator.csproj | 2 +- ...RealtimeMessage.EntityFrameworkCore.csproj | 2 +- ...roService.TaskManagement.DbMigrator.csproj | 2 +- ....TaskManagement.EntityFrameworkCore.csproj | 2 +- ...rvice.WebhooksManagement.DbMigrator.csproj | 2 +- ...hooksManagement.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.Account.Application.csproj | 2 +- .../LINGYUN.Abp.Account.HttpApi.csproj | 2 +- .../LINGYUN.Abp.Account.Web.csproj | 2 +- .../LINGYUN.Abp.Auditing.Application.csproj | 2 +- .../LINGYUN.Abp.Auditing.HttpApi.csproj | 2 +- ...NGYUN.Abp.CachingManagement.HttpApi.csproj | 2 +- ....Abp.Elsa.EntityFrameworkCore.MySql.csproj | 2 +- ...INGYUN.Abp.Elsa.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.Elsa.Server.csproj | 2 +- ...N.Abp.FeatureManagement.Application.csproj | 2 +- ...NGYUN.Abp.FeatureManagement.HttpApi.csproj | 2 +- .../LINGYUN.Abp.Identity.Application.csproj | 2 +- ...UN.Abp.Identity.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.Identity.HttpApi.csproj | 2 +- ...GYUN.Abp.IdentityServer.Application.csproj | 2 +- .../LINGYUN.Abp.IdentityServer.Domain.csproj | 2 +- ....IdentityServer.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.IdentityServer.HttpApi.csproj | 2 +- ...LINGYUN.Abp.IdentityServer.LinkUser.csproj | 2 +- .../LINGYUN.Abp.IdentityServer.Portal.csproj | 2 +- ...YUN.Abp.IdentityServer.SmsValidator.csproj | 2 +- ...GYUN.Abp.IdentityServer.WeChat.Work.csproj | 2 +- ...ationManagement.EntityFrameworkCore.csproj | 2 +- ....Abp.LocalizationManagement.HttpApi.csproj | 2 +- .../OpenIddictApplicationCreateOrUpdateDto.cs | 7 +- .../Applications/OpenIddictApplicationDto.cs | 5 +- .../OpenIddict/Localization/Resources/en.json | 3 +- .../Localization/Resources/zh-Hans.json | 3 +- .../OpenIddictApplicationExtensions.cs | 11 +- .../LINGYUN.Abp.OpenIddict.AspNetCore.csproj | 2 +- .../LINGYUN.Abp.OpenIddict.Dapr.Client.csproj | 2 +- .../LINGYUN.Abp.OpenIddict.HttpApi.csproj | 2 +- .../LINGYUN.Abp.OpenIddict.LinkUser.csproj | 2 +- .../LINGYUN.Abp.OpenIddict.Portal.csproj | 2 +- .../LINGYUN.Abp.OpenIddict.Sms.csproj | 2 +- .../LINGYUN.Abp.OpenIddict.WeChat.Work.csproj | 2 +- .../LINGYUN.Abp.OpenIddict.WeChat.csproj | 2 +- ...NGYUN.Abp.OssManagement.Application.csproj | 2 +- ...OssManagement.FileSystem.ImageSharp.csproj | 2 +- .../ImageSharpFileSystemOssObjectProcesser.cs | 5 +- ...ement.FileSystem.Imaging.ImageSharp.csproj | 2 +- .../LINGYUN.Abp.OssManagement.HttpApi.csproj | 2 +- ...Abp.OssManagement.SettingManagement.csproj | 2 +- ...bp.PermissionManagement.Application.csproj | 2 +- ...UN.Abp.PermissionManagement.HttpApi.csproj | 2 +- ...INGYUN.Platform.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Platform.HttpApi.csproj | 2 +- ...LINGYUN.Platform.Theme.VueVbenAdmin.csproj | 2 +- .../LINGYUN.Abp.IM.SignalR.csproj | 2 +- ....MessageService.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.MessageService.HttpApi.csproj | 2 +- ...p.Notifications.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.Notifications.HttpApi.csproj | 2 +- .../LINGYUN.Abp.Notifications.SignalR.csproj | 2 +- ...ngineManagement.EntityFrameworkCore.csproj | 2 +- ...N.Abp.RulesEngineManagement.HttpApi.csproj | 2 +- .../LINGYUN.Abp.Saas.Application.csproj | 2 +- ...INGYUN.Abp.Saas.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.Saas.HttpApi.csproj | 2 +- ...NGYUN.Abp.SettingManagement.HttpApi.csproj | 2 +- ...p.BackgroundTasks.ExceptionHandling.csproj | 2 +- .../LINGYUN.Abp.BackgroundTasks.Jobs.csproj | 2 +- ....TaskManagement.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.TaskManagement.HttpApi.csproj | 2 +- ....TextTemplating.EntityFrameworkCore.csproj | 2 +- .../LINGYUN.Abp.TextTemplating.HttpApi.csproj | 2 +- ....Abp.WebhooksManagement.Dapr.Client.csproj | 2 +- ...hooksManagement.EntityFrameworkCore.csproj | 2 +- ...GYUN.Abp.WebhooksManagement.HttpApi.csproj | 2 +- .../Dockerfile | 2 +- ...LY.MicroService.Applications.Single.csproj | 2 +- ...rviceApplicationsSingleModule.Configure.cs | 2 +- .../Account/TwoFactorSupportedLoginModel.cs | 4 +- .../Program.cs | 1 + .../Dockerfile | 2 +- ...icroService.AuthServer.HttpApi.Host.csproj | 2 +- .../AuthServerDataSeedContributor.cs | 2 +- .../LY.MicroService.AuthServer/Dockerfile | 2 +- .../LY.MicroService.AuthServer.csproj | 2 +- .../Account/TwoFactorSupportedLoginModel.cs | 4 +- .../Dockerfile | 2 +- ...roService.BackendAdmin.HttpApi.Host.csproj | 2 +- .../Dockerfile | 2 +- ...Service.identityServer.HttpApi.Host.csproj | 2 +- .../LY.MicroService.IdentityServer/Dockerfile | 2 +- .../LY.MicroService.IdentityServer.csproj | 2 +- .../Account/TwoFactorSupportedLoginModel.cs | 4 +- .../PublishProfiles/FolderProfile.pubxml | 6 +- .../Dockerfile | 2 +- ...LocalizationManagement.HttpApi.Host.csproj | 2 +- .../Dockerfile | 2 +- ...ice.PlatformManagement.HttpApi.Host.csproj | 2 +- .../Dockerfile | 2 +- ...ervice.RealtimeMessage.HttpApi.Host.csproj | 2 +- ...ltimeMessageHttpApiHostModule.Configure.cs | 2 +- .../Dockerfile | 2 +- ...Service.TaskManagement.HttpApi.Host.csproj | 2 +- ...skManagementHttpApiHostModule.Configure.cs | 2 +- .../Dockerfile | 2 +- ...ice.WebhooksManagement.HttpApi.Host.csproj | 2 +- ...ksManagementHttpApiHostModule.Configure.cs | 2 +- .../Dockerfile | 2 +- ...ice.WorkflowManagement.HttpApi.Host.csproj | 2 +- ...owManagementHttpApiHostModule.Configure.cs | 2 +- .../templates/content/Directory.Build.props | 51 +- aspnet-core/templates/content/common.props | 44 +- .../templates/content/configureawait.props | 4 +- ....CompanyName.ProjectName.DbMigrator.csproj | 2 +- .../Dockerfile | 2 +- ...ompanyName.ProjectName.HttpApi.Host.csproj | 2 +- ...CompanyName.ProjectName.Dapr.Client.csproj | 2 +- ...ame.ProjectName.EntityFrameworkCore.csproj | 2 +- ...ame.CompanyName.ProjectName.HttpApi.csproj | 2 +- ...yName.ProjectName.SettingManagement.csproj | 2 +- ...yName.ProjectName.Application.Tests.csproj | 2 +- ...ompanyName.ProjectName.Domain.Tests.csproj | 2 +- ...ojectName.EntityFrameworkCore.Tests.csproj | 2 +- ...me.CompanyName.ProjectName.TestBase.csproj | 2 +- .../LINGYUN.Abp.Aliyun.Tests.csproj | 2 +- .../LINGYUN.Abp.AspNetCore.Mvc.Tests.csproj | 4 +- .../LINGYUN.Abp.AspNetCore.Tests.csproj | 4 +- ...bp.AuditLogging.Elasticsearch.Tests.csproj | 2 +- ...INGYUN.Abp.BlobStoring.Aliyun.Tests.csproj | 2 +- ...LINGYUN.Abp.BlobStoring.Nexus.Tests.csproj | 4 +- .../LINGYUN.Abp.Dapr.Actors.Tests.csproj | 4 +- ...INGYUN.Abp.Dapr.AspNetCore.TestHost.csproj | 2 +- .../LINGYUN.Abp.Dapr.Client.Tests.csproj | 4 +- .../LINGYUN.Abp.Dapr.Tests.csproj | 2 +- .../LINGYUN.Abp.DataProtection.Tests.csproj | 4 +- ...Queryable.EntityFrameworkCore.Tests.csproj | 2 +- ....Abp.Elsa.Activities.Webhooks.Tests.csproj | 4 +- .../LINGYUN.Abp.Elsa.Tests.csproj | 4 +- ...NGYUN.Abp.EntityFrameworkCore.Tests.csproj | 2 +- ...bp.ExceptionHandling.Emailing.Tests.csproj | 2 +- ...eatures.LimitValidation.Redis.Tests.csproj | 4 +- ....Abp.Features.LimitValidation.Tests.csproj | 4 +- .../LINGYUN.Abp.IdGenerator.Tests.csproj | 2 +- ...LINGYUN.Abp.Localization.Json.Tests.csproj | 2 +- .../LINGYUN.Abp.Localization.Xml.Tests.csproj | 4 +- .../LINGYUN.Abp.Location.Baidu.Tests.csproj | 4 +- .../LINGYUN.Abp.Location.Tencent.Tests.csproj | 4 +- ...YUN.Abp.MessageService.Domain.Tests.csproj | 2 +- ...geService.EntityFrameworkCore.Tests.csproj | 2 +- ...LINGYUN.Abp.Notifications.Sms.Tests.csproj | 2 +- .../LINGYUN.Abp.Notifications.Tests.csproj | 4 +- ...YUN.Abp.Notifications.TuiJuhe.Tests.csproj | 2 +- ...ifications.WeChat.MiniProgram.Tests.csproj | 4 +- ...UN.Abp.Notifications.WxPusher.Tests.csproj | 2 +- .../LINGYUN.Abp.OpenApi.Tests.csproj | 4 +- ....OssManagement.HttpApi.Client.Tests.csproj | 2 +- ...NGYUN.Abp.OssManagement.Nexus.Tests.csproj | 4 +- .../LINGYUN.Abp.PushPlus.Tests.csproj | 2 +- .../LINGYUN.Abp.Rules.NRules.Tests.csproj | 4 +- ...LINGYUN.Abp.Rules.RulesEngine.Tests.csproj | 4 +- .../LINGYUN.Abp.Sms.Aliyun.Tests.csproj | 2 +- .../LINGYUN.Abp.TestsBase.csproj | 4 +- .../LINGYUN.Abp.TuiJuhe.Tests.csproj | 2 +- .../LINGYUN.Abp.WeChat.Work.Tests.csproj | 4 +- .../LINGYUN.Abp.WorkflowCore.Tests.csproj | 2 +- .../LINGYUN.Abp.Wrapper.Tests.csproj | 2 +- .../LINGYUN.Abp.WxPusher.Tests.csproj | 2 +- ...INGYUN.Linq.Dynamic.Queryable.Tests.csproj | 2 +- .../LINGYUN.Platform.Domain.Tests.csproj | 2 +- ....Platform.EntityFrameworkCore.Tests.csproj | 2 +- common.props | 2 +- gateways/Directory.Build.props | 34 +- gateways/common.props | 2 +- gateways/configureawait.props | 4 +- .../Dockerfile | 2 +- ...UN.MicroService.Internal.ApiGateway.csproj | 2 +- .../LY.MicroService.ApiGateway.csproj | 2 +- 251 files changed, 6049 insertions(+), 442 deletions(-) create mode 100644 aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection.EntityFrameworkCore/LINGYUN/Abp/DataProtection/EntityFrameworkCore/DataProtectionQueryExpressionInterceptor.cs create mode 100644 aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection.EntityFrameworkCore/LINGYUN/Abp/DataProtection/EntityFrameworkCore/DataProtectionSaveChangesInterceptor.cs create mode 100644 aspnet-core/migrations/LY.MicroService.Applications.Single.EntityFrameworkCore/Migrations/20231222014501_Upgrade-Abp-Framework-To-8.0.0.Designer.cs create mode 100644 aspnet-core/migrations/LY.MicroService.Applications.Single.EntityFrameworkCore/Migrations/20231222014501_Upgrade-Abp-Framework-To-8.0.0.cs diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b37b09b55..10db133f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: - "**.csproj" env: - DOTNET_VERSION: "7.0.401" + DOTNET_VERSION: "8.0.100" jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9deafe45..b9e06dddb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: "Tagged Release" on: push: - branches: [ rel-7.4.0 ] + branches: [ rel-8.0.0 ] jobs: tagged-release: @@ -14,4 +14,4 @@ jobs: with: repo_token: "${{ secrets.GITHUB_TOKEN }}" prerelease: false - automatic_release_tag: "7.4.0" + automatic_release_tag: "8.0.0" diff --git a/apps/vue/src/api/openiddict/open-iddict-application/model/index.ts b/apps/vue/src/api/openiddict/open-iddict-application/model/index.ts index 09e2349a1..9e4458378 100644 --- a/apps/vue/src/api/openiddict/open-iddict-application/model/index.ts +++ b/apps/vue/src/api/openiddict/open-iddict-application/model/index.ts @@ -2,15 +2,15 @@ export interface OpenIddictApplicationGetListInput extends PagedAndSortedResultR filter?: string; } -export interface OpenIddictApplicationCreateDto extends OpenIddictApplicationCreateOrUpdateDto { -} +export type OpenIddictApplicationCreateDto = OpenIddictApplicationCreateOrUpdateDto; -export interface OpenIddictApplicationUpdateDto extends OpenIddictApplicationCreateOrUpdateDto { -} +export type OpenIddictApplicationUpdateDto = OpenIddictApplicationCreateOrUpdateDto; export interface OpenIddictApplicationDto extends ExtensibleAuditedEntityDto { clientId: string; clientSecret?: string; + clientType?: string; + applicationType?: string; consentType?: string; displayName?: string; displayNames?: Dictionary; @@ -22,7 +22,6 @@ export interface OpenIddictApplicationDto extends ExtensibleAuditedEntityDto; redirectUris?: string[]; requirements?: string[]; - type?: string; clientUri?: string; logoUri?: string; } @@ -30,6 +29,8 @@ export interface OpenIddictApplicationDto extends ExtensibleAuditedEntityDto; @@ -41,8 +42,6 @@ export interface OpenIddictApplicationCreateOrUpdateDto extends ExtensibleObject properties?: Dictionary; redirectUris?: string[]; requirements?: string[]; - type?: string; clientUri?: string; logoUri?: string; } - diff --git a/apps/vue/src/views/openiddict/applications/components/ApplicationModal.vue b/apps/vue/src/views/openiddict/applications/components/ApplicationModal.vue index bd2a8cd81..dc00e7474 100644 --- a/apps/vue/src/views/openiddict/applications/components/ApplicationModal.vue +++ b/apps/vue/src/views/openiddict/applications/components/ApplicationModal.vue @@ -18,11 +18,23 @@ + + - - @@ -39,7 +51,11 @@ :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }" > - @@ -63,14 +79,10 @@