Merge pull request #729 from colinin/6.0

webhook: the event publication data is changed to string

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 Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Distributed;
@@ -23,7 +24,7 @@ public class DistributedEventBusWebhookPublisher : IWebhookPublisher, ITransient
     {
         var eventData = new WebhooksEventData(
             webhookName,
-            data,
+            JsonConvert.SerializeObject(data),
             sendExactSameData,
             headers);
 
@@ -39,7 +40,7 @@ public class DistributedEventBusWebhookPublisher : IWebhookPublisher, ITransient
     {
         var eventData = new WebhooksEventData(
             webhookName,
-            data,
+            JsonConvert.SerializeObject(data),
             sendExactSameData,
             headers,
             new Guid?[] { tenantId });
@@ -56,7 +57,7 @@ public class DistributedEventBusWebhookPublisher : IWebhookPublisher, ITransient
     {
         var eventData = new WebhooksEventData(
             webhookName,
-            data,
+            JsonConvert.SerializeObject(data),
             sendExactSameData,
             headers,
             tenantIds);

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

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

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