Merge pull request #95 from EasyAbp/improve-string-content

Specify the encoding and media type of StringContent
EasyAbp · Aug 10, 2023 · a8ccefc · a8ccefc
2 parents ce08db0 + dd29b69
commit a8ccefc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <LangVersion>latest</LangVersion>
-        <Version>3.0.0-preview.5</Version>
+        <Version>3.0.0-preview.6</Version>
         <NoWarn>$(NoWarn);CS1591</NoWarn>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Authors>EasyAbp Team</Authors>

diff --git a/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram/Models/MiniProgramCommonRequest.cs b/src/MiniProgram/EasyAbp.Abp.WeChat.MiniProgram/Models/MiniProgramCommonRequest.cs
@@ -1,4 +1,5 @@
 using System.Net.Http;
+using System.Text;
 using Newtonsoft.Json;
 
 namespace EasyAbp.Abp.WeChat.MiniProgram.Models
@@ -7,8 +8,11 @@ public abstract class MiniProgramCommonRequest : IMiniProgramRequest
     {
         public virtual StringContent ToStringContent()
         {
-            return new StringContent(JsonConvert.SerializeObject(this,
-                new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }));
+            return new StringContent(
+                JsonConvert.SerializeObject(this,
+                    new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
+                Encoding.UTF8,
+                "application/json");
         }
     }
 }
diff --git a/src/Official/EasyAbp.Abp.WeChat.Official/Models/OfficialCommonRequest.cs b/src/Official/EasyAbp.Abp.WeChat.Official/Models/OfficialCommonRequest.cs
@@ -1,4 +1,5 @@
 using System.Net.Http;
+using System.Text;
 using Newtonsoft.Json;
 
 namespace EasyAbp.Abp.WeChat.Official.Models
@@ -7,8 +8,11 @@ public abstract class OfficialCommonRequest : IOfficialRequest
     {
         public virtual StringContent ToStringContent()
         {
-            return new StringContent(JsonConvert.SerializeObject(this,
-                new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }));
+            return new StringContent(
+                JsonConvert.SerializeObject(this,
+                    new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
+                Encoding.UTF8,
+                "application/json");
         }
     }
 }
diff --git a/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform/Shared/Models/OpenPlatformCommonRequest.cs b/src/OpenPlatform/EasyAbp.Abp.WeChat.OpenPlatform/Shared/Models/OpenPlatformCommonRequest.cs
@@ -1,4 +1,5 @@
 using System.Net.Http;
+using System.Text;
 using Newtonsoft.Json;
 
 namespace EasyAbp.Abp.WeChat.OpenPlatform.Shared.Models;
@@ -7,7 +8,10 @@ public abstract class OpenPlatformCommonRequest : IOpenPlatformRequest
 {
     public virtual StringContent ToStringContent()
     {
-        return new StringContent(JsonConvert.SerializeObject(this,
-            new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }));
+        return new StringContent(
+            JsonConvert.SerializeObject(this,
+                new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
+            Encoding.UTF8,
+            "application/json");
     }
 }