upgrade: upgrade abp framework to 5.2.0

4 years ago · 3a1e6c243c
24 changed files with 78 additions and 42 deletions
--- 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<ApiResourcePagedResult>({
    url: Api.GetList,
-    data: input,
+    params: input,
  });
 };
--- 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<ApiScopePagedResult>({
    url: Api.GetList,
-    data: input,
+    params: input,
  });
 };
--- 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<ClientPagedResult>({
    url: Api.GetList,
-    data: input,
+    params: input,
  });
 };

--- 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<IdentityResourcePagedResult>({
    url: Api.GetList,
-    data: input,
+    params: input,
  });
 };
--- 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<void>({
    url: Api.BulkDeleteObject,
-    params: input,
+    data: input,
  });
 }

--- a/aspnet-core/Directory.Build.props
+++ b/aspnet-core/Directory.Build.props
@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>5.1.4</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.1.4</LINGYUNAbpPackageVersion>
+		<VoloAbpPackageVersion>5.2.0</VoloAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>5.2.0</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.6.0</DaprPackageVersion>
 		<DistributedLockRedisPackageVersion>1.0.1</DistributedLockRedisPackageVersion>
 		<DotNetCoreCAPPackageVersion>6.0.0</DotNetCoreCAPPackageVersion>
--- a/aspnet-core/common.props
+++ b/aspnet-core/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>5.1.4</Version>
+    <Version>5.2.0</Version>
    <Authors>colin</Authors>
    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
    <PackageProjectUrl>https://github.com/colinin/abp-vue-admin-element-typescript/</PackageProjectUrl>
--- 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 @@
    <PropertyGroup>
      <OutputType>Exe</OutputType>
      <TargetFramework>net6.0</TargetFramework>
-			<Version>5.1.4</Version>
+			<Version>5.2.0</Version>
 			<Copyright>colin</Copyright>
 			<Description>Use LINGYUN.MicroService.Templates command line</Description>
 			<PackAsTool>true</PackAsTool>
--- 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\"");
--- 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 @@
 	<Import Project="..\..\..\common.props" />

 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace />
 		<OutputType>Library</OutputType>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
--- 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 @@
 	<Import Project="..\..\..\common.props" />

 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>

--- 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 @@
 	<Import Project="..\..\..\common.props" />

 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>

--- 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 @@
 	<Import Project="..\..\..\common.props" />

 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>

--- 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 @@
 	<Import Project="..\..\..\common.props" />

 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>

--- 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 @@
 	<Import Project="..\..\..\common.props" />

 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+		<TargetFramework>net6.0</TargetFramework>
 		<RootNamespace />
 	</PropertyGroup>

--- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xml
+++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xml
@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
--- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xsd
+++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/FodyWeavers.xsd
@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
--- 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
--- 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 @@
 		<PackageReference Include="DotNetCore.CAP.MySql" Version="$(DotNetCoreCAPPackageVersion)" />
 		<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="$(DotNetCoreCAPPackageVersion)" />
 		<PackageReference Include="DotNetCore.CAP.OpenTelemetry" Version="$(DotNetCoreCAPPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.AspNetCore.Mvc.Wrapper" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.Dapr.Client.Wrapper" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.EventBus.CAP" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.ExceptionHandling.Emailing" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.Saas.EntityFrameworkCore" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.AuditLogging.Elasticsearch" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.Data.DbMigrator" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.Serilog.Enrichers.Application" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.Serilog.Enrichers.UniqueId" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.MultiTenancy" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.Localization.CultureMap" Version="$(LINGYUNAbpPackageVersion)" />
-		<PackageReference Include="LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore" Version="$(LINGYUNAbpPackageVersion)" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftPackageVersion)">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@ -66,6 +54,18 @@
 		<ProjectReference Include="..\..\modules\task-management\LINGYUN.Abp.BackgroundTasks.Quartz\LINGYUN.Abp.BackgroundTasks.Quartz.csproj" />
 		<ProjectReference Include="..\..\modules\task-management\LINGYUN.Abp.BackgroundTasks.ExceptionHandling\LINGYUN.Abp.BackgroundTasks.ExceptionHandling.csproj" />
 		<ProjectReference Include="..\..\modules\task-management\LINGYUN.Abp.TaskManagement.EntityFrameworkCore\LINGYUN.Abp.TaskManagement.EntityFrameworkCore.csproj" />
+		<ProjectReference Include="..\..\modules\mvc\LINGYUN.Abp.AspNetCore.Mvc.Wrapper\LINGYUN.Abp.AspNetCore.Mvc.Wrapper.csproj" />
+		<ProjectReference Include="..\..\modules\dapr\LINGYUN.Abp.Dapr.Client.Wrapper\LINGYUN.Abp.Dapr.Client.Wrapper.csproj" />
+		<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.csproj" />
+		<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.ExceptionHandling.Emailing\LINGYUN.Abp.ExceptionHandling.Emailing.csproj" />
+		<ProjectReference Include="..\..\modules\saas\LINGYUN.Abp.Saas.EntityFrameworkCore\LINGYUN.Abp.Saas.EntityFrameworkCore.csproj" />
+		<ProjectReference Include="..\..\modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj" />
+		<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.Data.DbMigrator\LINGYUN.Abp.Data.DbMigrator.csproj" />
+		<ProjectReference Include="..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
+		<ProjectReference Include="..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.UniqueId\LINGYUN.Abp.Serilog.Enrichers.UniqueId.csproj" />
+		<ProjectReference Include="..\..\modules\tenants\LINGYUN.Abp.MultiTenancy\LINGYUN.Abp.MultiTenancy.csproj" />
+		<ProjectReference Include="..\..\modules\localization\LINGYUN.Abp.Localization.CultureMap\LINGYUN.Abp.Localization.CultureMap.csproj" />
+		<ProjectReference Include="..\..\modules\lt\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj" />
 	</ItemGroup>

 </Project>
--- 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"
    }
  }
--- 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"
  }
 }
--- a/common.props
+++ b/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>5.1.4</Version>
+    <Version>5.2.0</Version>
    <Authors>LINGYUN</Authors>
    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
    <PackageProjectUrl>https://github.com/colinin/abp-vue-admin-element-typescript/</PackageProjectUrl>
--- a/gateways/Directory.Build.props
+++ b/gateways/Directory.Build.props
@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>5.1.4</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.1.4</LINGYUNAbpPackageVersion>
+		<VoloAbpPackageVersion>5.2.0</VoloAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>5.2.0</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.6.0</DaprPackageVersion>
 		<DotNetCoreCAPPackageVersion>6.0.0</DotNetCoreCAPPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
--- a/gateways/common.props
+++ b/gateways/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>5.1.4</Version>
+    <Version>5.2.0</Version>
    <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
  </PropertyGroup>
 </Project>