diff --git a/README.en.md b/README.en.md index 6b7ce0eff..2f0ef46d3 100644 --- a/README.en.md +++ b/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) diff --git a/README.md b/README.md index 367dc3d02..10db7f732 100644 --- a/README.md +++ b/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) diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index e2b057f9b..948f77631 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -1,10 +1,10 @@  - 5.2.0 - 5.2.0 + 5.2.1 + 5.2.1 1.7.0 1.0.1 - 6.0.0 + 6.0.1 1.5.10 2.13.0 3.0.434 diff --git a/aspnet-core/common.props b/aspnet-core/common.props index b869cbcb5..5e78413ac 100644 --- a/aspnet-core/common.props +++ b/aspnet-core/common.props @@ -1,13 +1,13 @@ latest - 5.2.0 + 5.2.1 colin $(NoWarn);CS1591;CS0436 - https://github.com/colinin/abp-vue-admin-element-typescript/ + https://github.com/colinin/abp-next-admin MIT git - https://github.com/colinin/abp-vue-admin-element-typescript/ + https://github.com/colinin/abp-next-admin true diff --git a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/System/TypeExtensions.cs b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/System/TypeExtensions.cs index bbc95f608..32533e1b6 100644 --- a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/System/TypeExtensions.cs +++ b/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 && diff --git a/aspnet-core/services/LY.MicroService.identityServer/package.json b/aspnet-core/services/LY.MicroService.identityServer/package.json index dbade3a46..3b24a3990 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.2.0" + "@abp/aspnetcore.mvc.ui.theme.basic": "5.2.1" } } \ No newline at end of file diff --git a/common.props b/common.props index 2949e934f..5dfa29eb8 100644 --- a/common.props +++ b/common.props @@ -1,13 +1,13 @@ latest - 5.2.0 + 5.2.1 LINGYUN $(NoWarn);CS1591;CS0436 - https://github.com/colinin/abp-vue-admin-element-typescript/ + https://github.com/colinin/abp-next-admin MIT git - https://github.com/colinin/abp-vue-admin-element-typescript/ + https://github.com/colinin/abp-next-admin true diff --git a/gateways/Directory.Build.props b/gateways/Directory.Build.props index a7cad8131..829c1c921 100644 --- a/gateways/Directory.Build.props +++ b/gateways/Directory.Build.props @@ -1,9 +1,9 @@  - 5.2.0 - 5.2.0 + 5.2.1 + 5.2.1 1.6.0 - 6.0.0 + 6.0.1 1.5.10 2.13.0 1.2.1.5 diff --git a/gateways/common.props b/gateways/common.props index 53337617f..879ec6740 100644 --- a/gateways/common.props +++ b/gateways/common.props @@ -1,7 +1,7 @@ latest - 5.2.0 + 5.2.1 $(NoWarn);CS1591;CS0436 \ No newline at end of file diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json index 27ff41a01..53d532aec 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json +++ b/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" } ] }, diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json index 1905a72c9..173b8d1e4 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/ocelot.Development.json +++ b/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",