Browse Source

webhook: the event publication data is changed to string

pull/729/head
cKey 3 years ago
parent
commit
fc0128d805
  1. 9
      aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.EventBus/LINGYUN/Abp/Webhooks/EventBus/DistributedEventBusWebhookPublisher.cs
  2. 4
      aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.EventBus/LINGYUN/Abp/Webhooks/EventBus/WebhooksEventData.cs
  3. 7
      aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/EventBus/Handlers/WebhooksEventHandler.cs

9
aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.EventBus/LINGYUN/Abp/Webhooks/EventBus/DistributedEventBusWebhookPublisher.cs

@ -1,4 +1,5 @@
using System; using Newtonsoft.Json;
using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.EventBus.Distributed; using Volo.Abp.EventBus.Distributed;
@ -23,7 +24,7 @@ public class DistributedEventBusWebhookPublisher : IWebhookPublisher, ITransient
{ {
var eventData = new WebhooksEventData( var eventData = new WebhooksEventData(
webhookName, webhookName,
data, JsonConvert.SerializeObject(data),
sendExactSameData, sendExactSameData,
headers); headers);
@ -39,7 +40,7 @@ public class DistributedEventBusWebhookPublisher : IWebhookPublisher, ITransient
{ {
var eventData = new WebhooksEventData( var eventData = new WebhooksEventData(
webhookName, webhookName,
data, JsonConvert.SerializeObject(data),
sendExactSameData, sendExactSameData,
headers, headers,
new Guid?[] { tenantId }); new Guid?[] { tenantId });
@ -56,7 +57,7 @@ public class DistributedEventBusWebhookPublisher : IWebhookPublisher, ITransient
{ {
var eventData = new WebhooksEventData( var eventData = new WebhooksEventData(
webhookName, webhookName,
data, JsonConvert.SerializeObject(data),
sendExactSameData, sendExactSameData,
headers, headers,
tenantIds); tenantIds);

4
aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.EventBus/LINGYUN/Abp/Webhooks/EventBus/WebhooksEventData.cs

@ -11,7 +11,7 @@ public class WebhooksEventData
public string WebhookName { get; set; } public string WebhookName { get; set; }
public object Data { get; set; } public string Data { get; set; }
public bool SendExactSameData { get; set; } public bool SendExactSameData { get; set; }
@ -25,7 +25,7 @@ public class WebhooksEventData
public WebhooksEventData( public WebhooksEventData(
string webhookName, string webhookName,
object data, string data,
bool sendExactSameData = false, bool sendExactSameData = false,
WebhookHeader headers = null, WebhookHeader headers = null,
Guid?[] tenantIds = null) Guid?[] tenantIds = null)

7
aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/EventBus/Handlers/WebhooksEventHandler.cs

@ -1,6 +1,5 @@
using LINGYUN.Abp.Webhooks; using LINGYUN.Abp.Webhooks;
using LINGYUN.Abp.Webhooks.EventBus; using LINGYUN.Abp.Webhooks.EventBus;
using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -46,7 +45,7 @@ public class WebhooksEventHandler :
protected async virtual Task PublishAsync( protected async virtual Task PublishAsync(
string webhookName, string webhookName,
object data, string data,
List<WebhookSubscriptionInfo> webhookSubscriptions, List<WebhookSubscriptionInfo> webhookSubscriptions,
bool sendExactSameData = false, bool sendExactSameData = false,
WebhookHeader headers = null) WebhookHeader headers = null)
@ -100,12 +99,12 @@ public class WebhooksEventHandler :
protected async virtual Task<WebhookEvent> SaveAndGetWebhookAsync( protected async virtual Task<WebhookEvent> SaveAndGetWebhookAsync(
Guid? tenantId, Guid? tenantId,
string webhookName, string webhookName,
object data) string data)
{ {
var webhookInfo = new WebhookEvent var webhookInfo = new WebhookEvent
{ {
WebhookName = webhookName, WebhookName = webhookName,
Data = JsonConvert.SerializeObject(data), Data = data,
TenantId = tenantId TenantId = tenantId
}; };

Loading…
Cancel
Save