Merge pull request #186 from colinin/4.0

configuring JSON serialization
5 years ago · ce5e70843d
7 changed files with 102 additions and 2 deletions
--- a/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs
+++ b/aspnet-core/services/account/AuthServer.Host/AuthIdentityServerModule.cs
@ -21,6 +21,8 @@ using StackExchange.Redis;
 using System;
 using System.Linq;
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Localization;
@ -40,6 +42,8 @@ using Volo.Abp.EntityFrameworkCore.MySQL;
 using Volo.Abp.FeatureManagement.EntityFrameworkCore;
 using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer.Jwt;
+using Volo.Abp.Json;
+using Volo.Abp.Json.SystemTextJson;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
@ -117,6 +121,17 @@ namespace AuthServer.Host
                options.UseMySQL();
            });

+            // 解决某些不支持类型的序列化
+            Configure<AbpJsonOptions>(options =>
+            {
+                options.UseHybridSerializer = true;
+            });
+            // 中文序列化的编码问题
+            Configure<AbpSystemTextJsonSerializerOptions>(options =>
+            {
+                options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+            });
+
            // 加解密
            Configure<AbpStringEncryptionOptions>(options =>
            {
--- a/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs
+++ b/aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/BackendAdminHostModule.cs
@ -25,6 +25,8 @@ using Microsoft.OpenApi.Models;
 using StackExchange.Redis;
 using System;
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
@ -44,6 +46,8 @@ using Volo.Abp.FeatureManagement.EntityFrameworkCore;
 using Volo.Abp.Identity.EntityFrameworkCore;
 using Volo.Abp.Identity.Localization;
 using Volo.Abp.IdentityServer.EntityFrameworkCore;
+using Volo.Abp.Json;
+using Volo.Abp.Json.SystemTextJson;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
@ -136,6 +140,17 @@ namespace LINGYUN.Abp.BackendAdmin
                options.UseMySQL();
            });

+            // 解决某些不支持类型的序列化
+            Configure<AbpJsonOptions>(options =>
+            {
+                options.UseHybridSerializer = true;
+            });
+            // 中文序列化的编码问题
+            Configure<AbpSystemTextJsonSerializerOptions>(options =>
+            {
+                options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+            });
+
            // 加解密
            Configure<AbpStringEncryptionOptions>(options =>
            {
--- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/ApiGatewayHostModule.cs
+++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/ApiGatewayHostModule.cs
@ -20,6 +20,8 @@ using Ocelot.Provider.Polly;
 using StackExchange.Redis;
 using System;
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;
 using Volo.Abp;
 using Volo.Abp.AspNetCore;
 using Volo.Abp.AspNetCore.Security.Claims;
@ -29,6 +31,8 @@ using Volo.Abp.Caching;
 using Volo.Abp.Caching.StackExchangeRedis;
 using Volo.Abp.Http.Client.IdentityModel;
 using Volo.Abp.IdentityModel;
+using Volo.Abp.Json;
+using Volo.Abp.Json.SystemTextJson;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.Security.Claims;
@ -82,9 +86,15 @@ namespace LINGYUN.ApiGateway

            Configure<ApiGatewayOptions>(configuration.GetSection("ApiGateway"));

-            Configure<AbpClaimsMapOptions>(options =>
+            // 解决某些不支持类型的序列化
+            Configure<AbpJsonOptions>(options =>
            {
-                options.Maps.TryAdd("name", () => AbpClaimTypes.UserName);
+                options.UseHybridSerializer = true;
+            });
+            // 中文序列化的编码问题
+            Configure<AbpSystemTextJsonSerializerOptions>(options =>
+            {
+                options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
            });

            context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
--- a/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.cs
+++ b/aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/ApiGatewayHttpApiHostModule.cs
@ -34,6 +34,10 @@ using Volo.Abp.Security.Encryption;
 using Volo.Abp.SettingManagement.EntityFrameworkCore;
 using Volo.Abp.TenantManagement.EntityFrameworkCore;
 using Volo.Abp.Threading;
+using Volo.Abp.Json;
+using Volo.Abp.Json.SystemTextJson;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;

 namespace LINGYUN.ApiGateway
 {
@ -88,6 +92,17 @@ namespace LINGYUN.ApiGateway
                options.UseMySQL();
            });

+            // 解决某些不支持类型的序列化
+            Configure<AbpJsonOptions>(options =>
+            {
+                options.UseHybridSerializer = true;
+            });
+            // 中文序列化的编码问题
+            Configure<AbpSystemTextJsonSerializerOptions>(options =>
+            {
+                options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+            });
+
            // 加解密
            Configure<AbpStringEncryptionOptions>(options =>
            {
--- a/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs
+++ b/aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/AbpIdentityServerAdminHttpApiHostModule.cs
@ -17,6 +17,8 @@ using Microsoft.OpenApi.Models;
 using StackExchange.Redis;
 using System;
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
@ -31,6 +33,8 @@ using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.MySQL;
 using Volo.Abp.Identity.Localization;
+using Volo.Abp.Json;
+using Volo.Abp.Json.SystemTextJson;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
@ -118,6 +122,17 @@ namespace LINGYUN.Abp.IdentityServer4
                //}
            });

+            // 解决某些不支持类型的序列化
+            Configure<AbpJsonOptions>(options =>
+            {
+                options.UseHybridSerializer = true;
+            });
+            // 中文序列化的编码问题
+            Configure<AbpSystemTextJsonSerializerOptions>(options =>
+            {
+                options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+            });
+
            // 加解密
            Configure<AbpStringEncryptionOptions>(options =>
            {
--- a/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.cs
+++ b/aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/AbpMessageServiceHttpApiHostModule.cs
@ -28,6 +28,8 @@ using StackExchange.Redis;
 using System;
 using System.Linq;
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
 using Volo.Abp.AspNetCore.MultiTenancy;
@ -36,6 +38,8 @@ using Volo.Abp.Autofac;
 using Volo.Abp.Caching;
 using Volo.Abp.Caching.StackExchangeRedis;
 using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Json;
+using Volo.Abp.Json.SystemTextJson;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
@ -110,6 +114,17 @@ namespace LINGYUN.Abp.MessageService
                options.UseMySQL();
            });

+            // 解决某些不支持类型的序列化
+            Configure<AbpJsonOptions>(options =>
+            {
+                options.UseHybridSerializer = true;
+            });
+            // 中文序列化的编码问题
+            Configure<AbpSystemTextJsonSerializerOptions>(options =>
+            {
+                options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+            });
+
            // 加解密
            Configure<AbpStringEncryptionOptions>(options =>
            {
--- a/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.cs
+++ b/aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/AppPlatformHttpApiHostModule.cs
@ -47,6 +47,10 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore;
 using Volo.Abp.Threading;
 using Volo.Abp.VirtualFileSystem;
 using Volo.Abp.Http.Client.IdentityModel.Web;
+using Volo.Abp.Json;
+using Volo.Abp.Json.SystemTextJson;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;

 namespace LINGYUN.Platform
 {
@ -111,6 +115,17 @@ namespace LINGYUN.Platform
                options.UseMySQL();
            });

+            // 解决某些不支持类型的序列化
+            Configure<AbpJsonOptions>(options =>
+            {
+                options.UseHybridSerializer = true;
+            });
+            // 中文序列化的编码问题
+            Configure<AbpSystemTextJsonSerializerOptions>(options =>
+            {
+                options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+            });
+
            Configure<KestrelServerOptions>(options =>
            {
                options.Limits.MaxRequestBodySize = null;