Merge pull request #45 from ojdev/dev

Dev
ojdev · Jan 7, 2020 · 2ca59c6 · 2ca59c6
2 parents ead3097 + 768c98f
commit 2ca59c6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,6 @@
 # RabbitMQ.EventBus.AspNetCore 　　　　　　　　　　[Wiki](https://github.com/ojdev/RabbitMQ.EventBus.AspNetCore/wiki)
 [![DNC](https://img.shields.io/badge/.netcore-%3E%3D3.0-green.svg)](#)
 [![CodeFactor](https://www.codefactor.io/repository/github/ojdev/rabbitmq.eventbus.aspnetcore/badge)](https://www.codefactor.io/repository/github/ojdev/rabbitmq.eventbus.aspnetcore)
-[![AppVeyor](https://img.shields.io/appveyor/ci/ojdev/rabbitmq-eventbus-aspnetcore.svg?style=popout)](https://ci.appveyor.com/project/ojdev/rabbitmq-eventbus-aspnetcore)
 [![NuGet](https://img.shields.io/nuget/v/RabbitMQ.EventBus.AspNetCore.svg?style=popout)](https://www.nuget.org/packages/RabbitMQ.EventBus.AspNetCore)
 [![NuGet](https://img.shields.io/nuget/dt/RabbitMQ.EventBus.AspNetCore.svg?style=popout)](https://www.nuget.org/packages/RabbitMQ.EventBus.AspNetCore)
 [![GitHub license](https://img.shields.io/github/license/ojdev/RabbitMQ.EventBus.AspNetCore.svg)](https://github.com/ojdev/RabbitMQ.EventBus.AspNetCore/blob/master/LICENSE)

diff --git a/src/RabbitMQ.EventBus.AspNetCore/Events/EventHandlerArgs.cs b/src/RabbitMQ.EventBus.AspNetCore/Events/EventHandlerArgs.cs
@@ -1,7 +1,9 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.ComponentModel;
+using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Text.Unicode;
 
 namespace RabbitMQ.EventBus.AspNetCore.Events
 {
@@ -57,7 +59,8 @@ public TEvent Event
                     {
                         _event = JsonSerializer.Deserialize<TEvent>(Original, new JsonSerializerOptions
                         {
-                            PropertyNameCaseInsensitive = true
+                            PropertyNameCaseInsensitive = true,
+                            Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
                         });
                     }
                     catch

diff --git a/src/RabbitMQ.EventBus.AspNetCore/Extensions/DynamicExtensions.cs b/src/RabbitMQ.EventBus.AspNetCore/Extensions/DynamicExtensions.cs
@@ -1,5 +1,7 @@
 using System.Text;
+using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Text.Unicode;
 
 namespace System
 {
@@ -16,7 +18,11 @@ internal static class DynamicExtensions
         /// <returns></returns>
         public static string Serialize<TMessage>(this TMessage message)
         {
-            return JsonSerializer.Serialize(message);
+            return JsonSerializer.Serialize(message, new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true,
+                Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+            });
         }
         /// <summary>
         ///