Merge pull request #585 from colinin/5.2.1

upgrade abp framework to 5.2.1

README.en.md

@@ -11,13 +11,13 @@ This is a [vue-vben-admin](https://github.com/anncwb/vue-vben-admin) -based Abp
 ### 1、Install cli
 
 ```shell
-  dotnet tool install --global LINGYUN.Abp.Cli --version 5.2.0
+  dotnet tool install --global LINGYUN.Abp.Cli --version 5.2.1
 ```
 
 ### 2、Install .NET Template
 
 ```shell
-  dotnet new --install LINGYUN.Abp.MicroService.Templates::5.2.0
+  dotnet new --install LINGYUN.Abp.MicroService.Templates::5.2.1
 ```
 
 ### 3、Use cli create new project
@@ -75,6 +75,8 @@ This is a [vue-vben-admin](https://github.com/anncwb/vue-vben-admin) -based Abp
 
 [EasyAbp/Cap](https://github.com/EasyAbp/Abp.EventBus.CAP) (EasyAbp)
 
+[DotNetCore/CAP](https://github.com/dotnetcore/CAP) (CAP)
+
 Javascript version:
 
 [vue-vben-admin](https://github.com/anncwb/vue-vben-admin.git) (vue-vben-admin)

README.md

@@ -13,13 +13,13 @@
 ### 1、安装dotnet工具
 
 ```shell
-  dotnet tool install --global LINGYUN.Abp.Cli --version 5.2.0
+  dotnet tool install --global LINGYUN.Abp.Cli --version 5.2.1
 ```
 
 ### 2、安装.NET模板
 
 ```shell
-  dotnet new --install LINGYUN.Abp.MicroService.Templates::5.2.0
+  dotnet new --install LINGYUN.Abp.MicroService.Templates::5.2.1
 ```
 
 ### 3、使用cli创建一个项目
@@ -79,6 +79,8 @@
 
 [EasyAbp/Cap](https://github.com/EasyAbp/Abp.EventBus.CAP) (EasyAbp)
 
+[DotNetCore/CAP](https://github.com/dotnetcore/CAP) (CAP)
+
 前端项目
 
 [vue-vben-admin](https://github.com/anncwb/vue-vben-admin.git) (vue-vben-admin)

aspnet-core/Directory.Build.props

@@ -1,10 +1,10 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>5.2.0</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.2.0</LINGYUNAbpPackageVersion>
+		<VoloAbpPackageVersion>5.2.1</VoloAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>5.2.1</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.7.0</DaprPackageVersion>
 		<DistributedLockRedisPackageVersion>1.0.1</DistributedLockRedisPackageVersion>
-		<DotNetCoreCAPPackageVersion>6.0.0</DotNetCoreCAPPackageVersion>
+		<DotNetCoreCAPPackageVersion>6.0.1</DotNetCoreCAPPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
 		<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
 		<TencentCloudSDKPackageVersion>3.0.434</TencentCloudSDKPackageVersion>

aspnet-core/common.props

@@ -1,13 +1,13 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.2.0</Version>
+    <Version>5.2.1</Version>
     <Authors>colin</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
-    <PackageProjectUrl>https://github.com/colinin/abp-vue-admin-element-typescript/</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/colinin/abp-vue-admin-element-typescript/</RepositoryUrl>
+    <RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 

aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/System/TypeExtensions.cs

@@ -83,7 +83,7 @@ namespace System
                     nameof(actorType));
             }
 
-            var actorTypeInfo = ActorTypeInformation.Get(actorType);
+            var actorTypeInfo = ActorTypeInformation.Get(actorType, null);
 
             var remoteServiceAttr = actorType.GetRemoteServiceAttribute();
             if (remoteServiceAttr != null && 

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.2.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "5.2.1"
   }
 }

common.props

@@ -1,13 +1,13 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.2.0</Version>
+    <Version>5.2.1</Version>
     <Authors>LINGYUN</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
-    <PackageProjectUrl>https://github.com/colinin/abp-vue-admin-element-typescript/</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/colinin/abp-vue-admin-element-typescript/</RepositoryUrl>
+    <RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 

gateways/Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>5.2.0</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.2.0</LINGYUNAbpPackageVersion>
+		<VoloAbpPackageVersion>5.2.1</VoloAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>5.2.1</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.6.0</DaprPackageVersion>
-		<DotNetCoreCAPPackageVersion>6.0.0</DotNetCoreCAPPackageVersion>
+		<DotNetCoreCAPPackageVersion>6.0.1</DotNetCoreCAPPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
 		<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
 		<AgileConfigClientPackageVersion>1.2.1.5</AgileConfigClientPackageVersion>

gateways/common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.2.0</Version>
+    <Version>5.2.1</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>

gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json

@@ -36,6 +36,10 @@
       {
         "Name": "IdentityServer Admin API",
         "EndPoint": "/ids-admin/v1/swagger.json"
+      },
+      {
+        "Name": "Webhooks API",
+        "EndPoint": "/webhooks/v1/swagger.json"
       }
     ]
   },

gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json

@@ -1654,6 +1654,38 @@
       },
       "Key": "webhook-api-definition"
     },
+    {
+      "DownstreamPathTemplate": "/swagger/v1/swagger.json",
+      "DownstreamScheme": "http",
+      "DownstreamHostAndPorts": [
+        {
+          "Host": "127.0.0.1",
+          "Port": 30045
+        }
+      ],
+      "UpstreamPathTemplate": "/webhooks/v1/swagger.json",
+      "UpstreamHttpMethod": [
+        "GET"
+      ],
+      "LoadBalancerOptions": {
+        "Type": "RoundRobin"
+      },
+      "RateLimitOptions": {
+        "ClientWhitelist": [],
+        "EnableRateLimiting": true,
+        "Period": "1s",
+        "PeriodTimespan": 1,
+        "Limit": 5
+      },
+      "QoSOptions": {
+        "ExceptionsAllowedBeforeBreaking": 10,
+        "DurationOfBreak": 1000,
+        "TimeoutValue": 10000
+      },
+      "HttpHandlerOptions": {
+        "UseTracing": true
+      }
+    },
     {
       "DownstreamPathTemplate": "/api/webhooks/{everything}",
       "DownstreamScheme": "http",