From f96ee789ad18bb22b1fb8490950a7c3ccab3bdeb Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 22 Aug 2022 15:35:51 +0800 Subject: [PATCH] Update package name. --- framework/Volo.Abp.sln | 4 +-- .../AbpAspNetCoreDaprEventBusOptions.cs | 11 -------- ...oreDaprPubSubProviderContributorContext.cs | 16 ----------- ...AspNetCoreDaprPubSubProviderContributor.cs | 6 ---- .../AbpAspNetCoreDaprSubscriptionRequest.cs | 8 ------ ...AbpAspNetCoreDaprPubSubJsonNamingPolicy.cs | 11 -------- ...CoreDaprSubscriptionDefinitionConverter.cs | 25 ----------------- .../Dapr/AbpAspNetCoreDaprModule.cs | 12 -------- .../FodyWeavers.xml | 0 .../FodyWeavers.xsd | 0 ...o.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj} | 3 +- .../AbpAspNetCoreMvcDaprEventBusModule.cs} | 18 ++++++------ .../AbpAspNetCoreMvcDaprEventBusOptions.cs | 11 ++++++++ .../AbpAspNetCoreMvcDaprPubSubConsts.cs} | 4 +-- .../AbpAspNetCoreMvcDaprPubSubProvider.cs} | 28 +++++++++---------- ...MvcDaprPubSubProviderContributorContext.cs | 16 +++++++++++ .../AbpAspNetCoreMvcDaprPubSubController.cs} | 17 ++++++----- ...NetCoreMvcDaprPubSubProviderContributor.cs | 6 ++++ ...spNetCoreMvcDaprSubscriptionDefinition.cs} | 4 +-- ...AbpAspNetCoreMvcDaprSubscriptionRequest.cs | 8 ++++++ ...AspNetCoreMvcDaprPubSubJsonNamingPolicy.cs | 11 ++++++++ ...eMvcDaprSubscriptionDefinitionConverter.cs | 25 +++++++++++++++++ .../FodyWeavers.xml | 0 .../FodyWeavers.xsd | 0 .../Volo.Abp.AspNetCore.Mvc.Dapr.csproj} | 1 + .../Mvc/Dapr/AbpAspNetCoreMvcDaprModule.cs | 13 +++++++++ .../src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj | 5 ++-- nupkg/common.ps1 | 4 +-- 28 files changed, 133 insertions(+), 134 deletions(-) delete mode 100644 framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprEventBusOptions.cs delete mode 100644 framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubProviderContributorContext.cs delete mode 100644 framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/IAbpAspNetCoreDaprPubSubProviderContributor.cs delete mode 100644 framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Models/AbpAspNetCoreDaprSubscriptionRequest.cs delete mode 100644 framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/SystemTextJson/AbpAspNetCoreDaprPubSubJsonNamingPolicy.cs delete mode 100644 framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/SystemTextJson/AbpAspNetCoreDaprSubscriptionDefinitionConverter.cs delete mode 100644 framework/src/Volo.Abp.AspNetCore.Dapr/Volo/Abp/AspNetCore/Dapr/AbpAspNetCoreDaprModule.cs rename framework/src/{Volo.Abp.AspNetCore.Dapr.EventBus => Volo.Abp.AspNetCore.Mvc.Dapr.EventBus}/FodyWeavers.xml (100%) rename framework/src/{Volo.Abp.AspNetCore.Dapr.EventBus => Volo.Abp.AspNetCore.Mvc.Dapr.EventBus}/FodyWeavers.xsd (100%) rename framework/src/{Volo.Abp.AspNetCore.Dapr.EventBus/Volo.Abp.AspNetCore.Dapr.EventBus.csproj => Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj} (81%) rename framework/src/{Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprEventBusModule.cs => Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprEventBusModule.cs} (61%) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprEventBusOptions.cs rename framework/src/{Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubConsts.cs => Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubConsts.cs} (58%) rename framework/src/{Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubProvider.cs => Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubProvider.cs} (59%) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubProviderContributorContext.cs rename framework/src/{Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Controllers/AbpAspNetCoreDaprPubSubController.cs => Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Controllers/AbpAspNetCoreMvcDaprPubSubController.cs} (64%) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/IAbpAspNetCoreMvcDaprPubSubProviderContributor.cs rename framework/src/{Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Models/AbpAspNetCoreDaprSubscriptionDefinition.cs => Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Models/AbpAspNetCoreMvcDaprSubscriptionDefinition.cs} (52%) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Models/AbpAspNetCoreMvcDaprSubscriptionRequest.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/SystemTextJson/AbpAspNetCoreMvcDaprPubSubJsonNamingPolicy.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/SystemTextJson/AbpAspNetCoreMvcDaprSubscriptionDefinitionConverter.cs rename framework/src/{Volo.Abp.AspNetCore.Dapr => Volo.Abp.AspNetCore.Mvc.Dapr}/FodyWeavers.xml (100%) rename framework/src/{Volo.Abp.AspNetCore.Dapr => Volo.Abp.AspNetCore.Mvc.Dapr}/FodyWeavers.xsd (100%) rename framework/src/{Volo.Abp.AspNetCore.Dapr/Volo.Abp.AspNetCore.Dapr.csproj => Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.csproj} (99%) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo/Abp/AspNetCore/Mvc/Dapr/AbpAspNetCoreMvcDaprModule.cs diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index f6eba4386d..4ce47bdbc8 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -415,9 +415,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Dapr", "s EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Client.Dapr", "src\Volo.Abp.Http.Client.Dapr\Volo.Abp.Http.Client.Dapr.csproj", "{18B796D2-D45D-41AE-9A42-75C9B14B20DF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Dapr", "src\Volo.Abp.AspNetCore.Dapr\Volo.Abp.AspNetCore.Dapr.csproj", "{5EED625D-8D86-492A-BCB8-F6C8CD8D4AA1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.Dapr", "src\Volo.Abp.AspNetCore.Mvc.Dapr\Volo.Abp.AspNetCore.Mvc.Dapr.csproj", "{5EED625D-8D86-492A-BCB8-F6C8CD8D4AA1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Dapr.EventBus", "src\Volo.Abp.AspNetCore.Dapr.EventBus\Volo.Abp.AspNetCore.Dapr.EventBus.csproj", "{B02EF042-C39E-45C4-A92D-BF7554E1889D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.Dapr.EventBus", "src\Volo.Abp.AspNetCore.Mvc.Dapr.EventBus\Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj", "{B02EF042-C39E-45C4-A92D-BF7554E1889D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.DistributedLocking.Dapr", "src\Volo.Abp.DistributedLocking.Dapr\Volo.Abp.DistributedLocking.Dapr.csproj", "{CAE48068-233C-47A9-BEAB-DDF521730E7A}" EndProject diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprEventBusOptions.cs b/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprEventBusOptions.cs deleted file mode 100644 index be65464428..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprEventBusOptions.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Volo.Abp.AspNetCore.Dapr; - -public class AbpAspNetCoreDaprEventBusOptions -{ - public List Contributors { get; } - - public AbpAspNetCoreDaprEventBusOptions() - { - Contributors = new List(); - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubProviderContributorContext.cs b/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubProviderContributorContext.cs deleted file mode 100644 index 93cb43b0bf..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubProviderContributorContext.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Volo.Abp.AspNetCore.Dapr.Models; - -namespace Volo.Abp.AspNetCore.Dapr; - -public class AbpAspNetCoreDaprPubSubProviderContributorContext -{ - public IServiceProvider ServiceProvider { get; } - - public List Subscriptions { get; } - - public AbpAspNetCoreDaprPubSubProviderContributorContext(IServiceProvider serviceProvider, List daprSubscriptionModels) - { - ServiceProvider = serviceProvider; - Subscriptions = daprSubscriptionModels; - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/IAbpAspNetCoreDaprPubSubProviderContributor.cs b/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/IAbpAspNetCoreDaprPubSubProviderContributor.cs deleted file mode 100644 index da9f7564de..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/IAbpAspNetCoreDaprPubSubProviderContributor.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Volo.Abp.AspNetCore.Dapr; - -public interface IAbpAspNetCoreDaprPubSubProviderContributor -{ - Task ContributeAsync(AbpAspNetCoreDaprPubSubProviderContributorContext context); -} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Models/AbpAspNetCoreDaprSubscriptionRequest.cs b/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Models/AbpAspNetCoreDaprSubscriptionRequest.cs deleted file mode 100644 index 1dd88b1015..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Models/AbpAspNetCoreDaprSubscriptionRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Volo.Abp.AspNetCore.Dapr.Models; - -public class AbpAspNetCoreDaprSubscriptionRequest -{ - public string PubSubName { get; set; } - - public string Topic { get; set; } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/SystemTextJson/AbpAspNetCoreDaprPubSubJsonNamingPolicy.cs b/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/SystemTextJson/AbpAspNetCoreDaprPubSubJsonNamingPolicy.cs deleted file mode 100644 index f6d4605ff2..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/SystemTextJson/AbpAspNetCoreDaprPubSubJsonNamingPolicy.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Text.Json; - -namespace Volo.Abp.AspNetCore.Dapr.SystemTextJson; - -public class AbpAspNetCoreDaprPubSubJsonNamingPolicy : JsonNamingPolicy -{ - public override string ConvertName(string name) - { - return name.ToLower(); - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/SystemTextJson/AbpAspNetCoreDaprSubscriptionDefinitionConverter.cs b/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/SystemTextJson/AbpAspNetCoreDaprSubscriptionDefinitionConverter.cs deleted file mode 100644 index c0699ece43..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/SystemTextJson/AbpAspNetCoreDaprSubscriptionDefinitionConverter.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Text.Json; -using System.Text.Json.Serialization; -using Volo.Abp.AspNetCore.Dapr.Models; - -namespace Volo.Abp.AspNetCore.Dapr.SystemTextJson; - -public class AbpAspNetCoreDaprSubscriptionDefinitionConverter : JsonConverter -{ - private JsonSerializerOptions _writeJsonSerializerOptions; - - public override AbpAspNetCoreDaprSubscriptionDefinition Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - throw new NotSupportedException(); - } - - public override void Write(Utf8JsonWriter writer, AbpAspNetCoreDaprSubscriptionDefinition value, JsonSerializerOptions options) - { - _writeJsonSerializerOptions ??= JsonSerializerOptionsHelper.Create(new JsonSerializerOptions(options) - { - PropertyNamingPolicy = new AbpAspNetCoreDaprPubSubJsonNamingPolicy() - }, x => x == this); - - JsonSerializer.Serialize(writer, value, _writeJsonSerializerOptions); - } -} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr/Volo/Abp/AspNetCore/Dapr/AbpAspNetCoreDaprModule.cs b/framework/src/Volo.Abp.AspNetCore.Dapr/Volo/Abp/AspNetCore/Dapr/AbpAspNetCoreDaprModule.cs deleted file mode 100644 index 1650efa667..0000000000 --- a/framework/src/Volo.Abp.AspNetCore.Dapr/Volo/Abp/AspNetCore/Dapr/AbpAspNetCoreDaprModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.Modularity; - -namespace Volo.Abp.AspNetCore.Dapr; - -[DependsOn( - typeof(AbpAspNetCoreMvcModule) -)] -public class AbpAspNetCoreDaprModule : AbpModule -{ - -} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/FodyWeavers.xml b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/FodyWeavers.xml similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/FodyWeavers.xml rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/FodyWeavers.xml diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/FodyWeavers.xsd b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/FodyWeavers.xsd similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/FodyWeavers.xsd rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/FodyWeavers.xsd diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo.Abp.AspNetCore.Dapr.EventBus.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj similarity index 81% rename from framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo.Abp.AspNetCore.Dapr.EventBus.csproj rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj index 0c9280a27e..78b46cad27 100644 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo.Abp.AspNetCore.Dapr.EventBus.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj @@ -11,7 +11,8 @@ - + + diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprEventBusModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprEventBusModule.cs similarity index 61% rename from framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprEventBusModule.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprEventBusModule.cs index b4fd636e76..333a5aae9a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprEventBusModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprEventBusModule.cs @@ -1,18 +1,16 @@ using Microsoft.AspNetCore.Http.Json; -using Volo.Abp.AspNetCore.Dapr.SystemTextJson; +using Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.SystemTextJson; using Volo.Abp.EventBus.Dapr; -using Volo.Abp.Json; using Volo.Abp.Json.SystemTextJson; using Volo.Abp.Modularity; -namespace Volo.Abp.AspNetCore.Dapr; +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus; [DependsOn( - typeof(AbpAspNetCoreDaprModule), - typeof(AbpEventBusDaprModule), - typeof(AbpJsonModule) - )] -public class AbpAspNetCoreDaprEventBusModule : AbpModule + typeof(AbpAspNetCoreMvcDaprModule), + typeof(AbpEventBusDaprModule) +)] +public class AbpAspNetCoreMvcDaprEventBusModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { @@ -20,12 +18,12 @@ public class AbpAspNetCoreDaprEventBusModule : AbpModule Configure(options => { - options.SerializerOptions.Converters.Add(new AbpAspNetCoreDaprSubscriptionDefinitionConverter()); + options.SerializerOptions.Converters.Add(new AbpAspNetCoreMvcDaprSubscriptionDefinitionConverter()); }); Configure(options => { - options.JsonSerializerOptions.Converters.Add(new AbpAspNetCoreDaprSubscriptionDefinitionConverter()); + options.JsonSerializerOptions.Converters.Add(new AbpAspNetCoreMvcDaprSubscriptionDefinitionConverter()); }); } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprEventBusOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprEventBusOptions.cs new file mode 100644 index 0000000000..02ca4c8e22 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprEventBusOptions.cs @@ -0,0 +1,11 @@ +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus; + +public class AbpAspNetCoreMvcDaprEventBusOptions +{ + public List Contributors { get; } + + public AbpAspNetCoreMvcDaprEventBusOptions() + { + Contributors = new List(); + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubConsts.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubConsts.cs similarity index 58% rename from framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubConsts.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubConsts.cs index c0cfb9d5cc..e785f2e737 100644 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubConsts.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubConsts.cs @@ -1,6 +1,6 @@ -namespace Volo.Abp.AspNetCore.Dapr; +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus; -public class AbpAspNetCoreDaprPubSubConsts +public class AbpAspNetCoreMvcDaprPubSubConsts { public const string DaprSubscribeUrl = "dapr/subscribe"; diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubProvider.cs similarity index 59% rename from framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubProvider.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubProvider.cs index 0affd70bba..e797bd2fc0 100644 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/AbpAspNetCoreDaprPubSubProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubProvider.cs @@ -1,35 +1,35 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Volo.Abp.AspNetCore.Dapr.Models; +using Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.Models; using Volo.Abp.DependencyInjection; using Volo.Abp.EventBus; using Volo.Abp.EventBus.Dapr; using Volo.Abp.EventBus.Distributed; -namespace Volo.Abp.AspNetCore.Dapr; +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus; -public class AbpAspNetCoreDaprPubSubProvider : ITransientDependency +public class AbpAspNetCoreMvcDaprPubSubProvider : ITransientDependency { protected IServiceProvider ServiceProvider { get; } - protected AbpAspNetCoreDaprEventBusOptions AspNetCoreDaprEventBusOptions { get; } + protected AbpAspNetCoreMvcDaprEventBusOptions AspNetCoreMvcDaprEventBusOptions { get; } protected AbpDaprEventBusOptions DaprEventBusOptions { get; } protected AbpDistributedEventBusOptions DistributedEventBusOptions { get; } - public AbpAspNetCoreDaprPubSubProvider( + public AbpAspNetCoreMvcDaprPubSubProvider( IServiceProvider serviceProvider, - IOptions aspNetCoreDaprEventBusOptions, + IOptions aspNetCoreDaprEventBusOptions, IOptions daprEventBusOptions, IOptions distributedEventBusOptions) { ServiceProvider = serviceProvider; - AspNetCoreDaprEventBusOptions = aspNetCoreDaprEventBusOptions.Value; + AspNetCoreMvcDaprEventBusOptions = aspNetCoreDaprEventBusOptions.Value; DaprEventBusOptions = daprEventBusOptions.Value; DistributedEventBusOptions = distributedEventBusOptions.Value; } - public virtual async Task> GetSubscriptionsAsync() + public virtual async Task> GetSubscriptionsAsync() { - var subscriptions = new List(); + var subscriptions = new List(); foreach (var handler in DistributedEventBusOptions.Handlers) { foreach (var @interface in handler.GetInterfaces().Where(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IDistributedEventHandler<>))) @@ -37,21 +37,21 @@ public class AbpAspNetCoreDaprPubSubProvider : ITransientDependency var eventType = @interface.GetGenericArguments()[0]; var eventName = EventNameAttribute.GetNameOrDefault(eventType); - subscriptions.Add(new AbpAspNetCoreDaprSubscriptionDefinition() + subscriptions.Add(new AbpAspNetCoreMvcDaprSubscriptionDefinition() { PubSubName = DaprEventBusOptions.PubSubName, Topic = eventName, - Route = AbpAspNetCoreDaprPubSubConsts.DaprEventCallbackUrl + Route = AbpAspNetCoreMvcDaprPubSubConsts.DaprEventCallbackUrl }); } } - if (AspNetCoreDaprEventBusOptions.Contributors.Any()) + if (AspNetCoreMvcDaprEventBusOptions.Contributors.Any()) { using (var scope = ServiceProvider.CreateScope()) { - var context = new AbpAspNetCoreDaprPubSubProviderContributorContext(scope.ServiceProvider, subscriptions); - foreach (var contributor in AspNetCoreDaprEventBusOptions.Contributors) + var context = new AbpAspNetCoreMvcDaprPubSubProviderContributorContext(scope.ServiceProvider, subscriptions); + foreach (var contributor in AspNetCoreMvcDaprEventBusOptions.Contributors) { await contributor.ContributeAsync(context); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubProviderContributorContext.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubProviderContributorContext.cs new file mode 100644 index 0000000000..564b541dec --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/AbpAspNetCoreMvcDaprPubSubProviderContributorContext.cs @@ -0,0 +1,16 @@ +using Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.Models; + +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus; + +public class AbpAspNetCoreMvcDaprPubSubProviderContributorContext +{ + public IServiceProvider ServiceProvider { get; } + + public List Subscriptions { get; } + + public AbpAspNetCoreMvcDaprPubSubProviderContributorContext(IServiceProvider serviceProvider, List daprSubscriptionModels) + { + ServiceProvider = serviceProvider; + Subscriptions = daprSubscriptionModels; + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Controllers/AbpAspNetCoreDaprPubSubController.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Controllers/AbpAspNetCoreMvcDaprPubSubController.cs similarity index 64% rename from framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Controllers/AbpAspNetCoreDaprPubSubController.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Controllers/AbpAspNetCoreMvcDaprPubSubController.cs index e2440d90ce..c97e793b53 100644 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Controllers/AbpAspNetCoreDaprPubSubController.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Controllers/AbpAspNetCoreMvcDaprPubSubController.cs @@ -2,28 +2,27 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Volo.Abp.AspNetCore.Dapr.Models; -using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.Models; using Volo.Abp.Dapr; using Volo.Abp.EventBus.Dapr; -namespace Volo.Abp.AspNetCore.Dapr.Controllers; +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.Controllers; [Area("abp")] [RemoteService(Name = "abp")] -public class AbpAspNetCoreDaprPubSubController : AbpController +public class AbpAspNetCoreMvcDaprPubSubController : AbpController { - [HttpGet(AbpAspNetCoreDaprPubSubConsts.DaprSubscribeUrl)] - public virtual async Task> SubscribeAsync() + [HttpGet(AbpAspNetCoreMvcDaprPubSubConsts.DaprSubscribeUrl)] + public virtual async Task> SubscribeAsync() { - return await HttpContext.RequestServices.GetRequiredService().GetSubscriptionsAsync(); + return await HttpContext.RequestServices.GetRequiredService().GetSubscriptionsAsync(); } - [HttpPost(AbpAspNetCoreDaprPubSubConsts.DaprEventCallbackUrl)] + [HttpPost(AbpAspNetCoreMvcDaprPubSubConsts.DaprEventCallbackUrl)] public virtual async Task EventsAsync() { var bodyJsonDocument = await JsonDocument.ParseAsync(HttpContext.Request.Body); - var request = JsonSerializer.Deserialize(bodyJsonDocument.RootElement.GetRawText(), + var request = JsonSerializer.Deserialize(bodyJsonDocument.RootElement.GetRawText(), HttpContext.RequestServices.GetRequiredService>().Value.JsonSerializerOptions); var distributedEventBus = HttpContext.RequestServices.GetRequiredService(); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/IAbpAspNetCoreMvcDaprPubSubProviderContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/IAbpAspNetCoreMvcDaprPubSubProviderContributor.cs new file mode 100644 index 0000000000..87047cd7ec --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/IAbpAspNetCoreMvcDaprPubSubProviderContributor.cs @@ -0,0 +1,6 @@ +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus; + +public interface IAbpAspNetCoreMvcDaprPubSubProviderContributor +{ + Task ContributeAsync(AbpAspNetCoreMvcDaprPubSubProviderContributorContext context); +} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Models/AbpAspNetCoreDaprSubscriptionDefinition.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Models/AbpAspNetCoreMvcDaprSubscriptionDefinition.cs similarity index 52% rename from framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Models/AbpAspNetCoreDaprSubscriptionDefinition.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Models/AbpAspNetCoreMvcDaprSubscriptionDefinition.cs index 414a69fbf1..287e78e01a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Dapr.EventBus/Volo/Abp/AspNetCore/Dapr/EventBus/Models/AbpAspNetCoreDaprSubscriptionDefinition.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Models/AbpAspNetCoreMvcDaprSubscriptionDefinition.cs @@ -1,6 +1,6 @@ -namespace Volo.Abp.AspNetCore.Dapr.Models; +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.Models; -public class AbpAspNetCoreDaprSubscriptionDefinition +public class AbpAspNetCoreMvcDaprSubscriptionDefinition { public string PubSubName { get; set; } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Models/AbpAspNetCoreMvcDaprSubscriptionRequest.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Models/AbpAspNetCoreMvcDaprSubscriptionRequest.cs new file mode 100644 index 0000000000..46c04b5a44 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/Models/AbpAspNetCoreMvcDaprSubscriptionRequest.cs @@ -0,0 +1,8 @@ +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.Models; + +public class AbpAspNetCoreMvcDaprSubscriptionRequest +{ + public string PubSubName { get; set; } + + public string Topic { get; set; } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/SystemTextJson/AbpAspNetCoreMvcDaprPubSubJsonNamingPolicy.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/SystemTextJson/AbpAspNetCoreMvcDaprPubSubJsonNamingPolicy.cs new file mode 100644 index 0000000000..0aa6bd4f7c --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/SystemTextJson/AbpAspNetCoreMvcDaprPubSubJsonNamingPolicy.cs @@ -0,0 +1,11 @@ +using System.Text.Json; + +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.SystemTextJson; + +public class AbpAspNetCoreMvcDaprPubSubJsonNamingPolicy : JsonNamingPolicy +{ + public override string ConvertName(string name) + { + return name.ToLower(); + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/SystemTextJson/AbpAspNetCoreMvcDaprSubscriptionDefinitionConverter.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/SystemTextJson/AbpAspNetCoreMvcDaprSubscriptionDefinitionConverter.cs new file mode 100644 index 0000000000..fa26d35ca6 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo/Abp/AspNetCore/Mvc/Dapr/EventBus/SystemTextJson/AbpAspNetCoreMvcDaprSubscriptionDefinitionConverter.cs @@ -0,0 +1,25 @@ +using System.Text.Json; +using System.Text.Json.Serialization; +using Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.Models; + +namespace Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.SystemTextJson; + +public class AbpAspNetCoreMvcDaprSubscriptionDefinitionConverter : JsonConverter +{ + private JsonSerializerOptions _writeJsonSerializerOptions; + + public override AbpAspNetCoreMvcDaprSubscriptionDefinition Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + throw new NotSupportedException(); + } + + public override void Write(Utf8JsonWriter writer, AbpAspNetCoreMvcDaprSubscriptionDefinition value, JsonSerializerOptions options) + { + _writeJsonSerializerOptions ??= JsonSerializerOptionsHelper.Create(new JsonSerializerOptions(options) + { + PropertyNamingPolicy = new AbpAspNetCoreMvcDaprPubSubJsonNamingPolicy() + }, x => x == this); + + JsonSerializer.Serialize(writer, value, _writeJsonSerializerOptions); + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr/FodyWeavers.xml b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/FodyWeavers.xml similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Dapr/FodyWeavers.xml rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/FodyWeavers.xml diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr/FodyWeavers.xsd b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/FodyWeavers.xsd similarity index 100% rename from framework/src/Volo.Abp.AspNetCore.Dapr/FodyWeavers.xsd rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/FodyWeavers.xsd diff --git a/framework/src/Volo.Abp.AspNetCore.Dapr/Volo.Abp.AspNetCore.Dapr.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.csproj similarity index 99% rename from framework/src/Volo.Abp.AspNetCore.Dapr/Volo.Abp.AspNetCore.Dapr.csproj rename to framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.csproj index 51c2a097b9..d792a30b24 100644 --- a/framework/src/Volo.Abp.AspNetCore.Dapr/Volo.Abp.AspNetCore.Dapr.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.csproj @@ -18,4 +18,5 @@ + diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo/Abp/AspNetCore/Mvc/Dapr/AbpAspNetCoreMvcDaprModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo/Abp/AspNetCore/Mvc/Dapr/AbpAspNetCoreMvcDaprModule.cs new file mode 100644 index 0000000000..f8ba3fcfc2 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo/Abp/AspNetCore/Mvc/Dapr/AbpAspNetCoreMvcDaprModule.cs @@ -0,0 +1,13 @@ +using Volo.Abp.Dapr; +using Volo.Abp.Modularity; + +namespace Volo.Abp.AspNetCore.Mvc.Dapr; + +[DependsOn( + typeof(AbpAspNetCoreMvcModule), + typeof(AbpDaprModule) +)] +public class AbpAspNetCoreMvcDaprModule : AbpModule +{ + +} diff --git a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj index 8c8b53ed91..d3a8651086 100644 --- a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj +++ b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj @@ -2,7 +2,7 @@ - + net6.0 enable @@ -11,12 +11,11 @@ - - + diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index 65e2d46324..6762cbce07 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -99,8 +99,8 @@ $projects = ( "framework/src/Volo.Abp.AspNetCore.Authentication.OAuth", "framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect", "framework/src/Volo.Abp.AspNetCore", - "framework/src/Volo.Abp.AspNetCore.Dapr", - "framework/src/Volo.Abp.AspNetCore.Dapr.EventBus", + "framework/src/Volo.Abp.AspNetCore.Mvc.Dapr", + "framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus", "framework/src/Volo.Abp.AspNetCore.Components", "framework/src/Volo.Abp.AspNetCore.Components.Server", "framework/src/Volo.Abp.AspNetCore.Components.Web",