perf(#I12XQJ): 移除 Json.net 全面使用 System.Text.Json
#Issue close #I12XQJ
This commit is contained in:
parent
77e1b847da
commit
0b69f5d51d
|
@ -13,16 +13,12 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" />
|
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" />
|
||||||
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1-beta5" />
|
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1-beta5" />
|
||||||
<PackageReference Include="Longbow" Version="3.0.0-beta1" />
|
|
||||||
<PackageReference Include="Longbow.Configuration" Version="2.2.7" />
|
<PackageReference Include="Longbow.Configuration" Version="2.2.7" />
|
||||||
<PackageReference Include="Longbow.Logging" Version="3.0.0" />
|
<PackageReference Include="Longbow.Logging" Version="3.0.0" />
|
||||||
<PackageReference Include="Longbow.Tasks" Version="2.2.24" />
|
<PackageReference Include="Longbow.Tasks" Version="2.2.24" />
|
||||||
<PackageReference Include="Longbow.Web" Version="3.0.0-beta1" />
|
<PackageReference Include="Longbow.Web" Version="3.0.0-beta1" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.0.0-preview8.19405.7" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.0.0-preview8.19405.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.0.0" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
|
|
||||||
<PackageReference Include="Sentry.AspNetCore" Version="2.0.0-beta4" />
|
<PackageReference Include="Sentry.AspNetCore" Version="2.0.0-beta4" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
|
||||||
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
|
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
|
||||||
|
|
|
@ -11,8 +11,6 @@ using Microsoft.AspNetCore.Mvc.Versioning;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
using Newtonsoft.Json;
|
|
||||||
using Newtonsoft.Json.Serialization;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Text.Encodings.Web;
|
using System.Text.Encodings.Web;
|
||||||
using System.Text.Unicode;
|
using System.Text.Unicode;
|
||||||
|
@ -59,11 +57,7 @@ namespace Bootstrap.Admin
|
||||||
services.AddDbAdapter();
|
services.AddDbAdapter();
|
||||||
services.AddIPLocator(DictHelper.ConfigIPLocator);
|
services.AddIPLocator(DictHelper.ConfigIPLocator);
|
||||||
services.AddOnlineUsers();
|
services.AddOnlineUsers();
|
||||||
services.AddSignalR().AddNewtonsoftJsonProtocol(op =>
|
services.AddSignalR().AddJsonProtocol(op => op.PayloadSerializerOptions.Configure());
|
||||||
{
|
|
||||||
op.PayloadSerializerSettings.ContractResolver = new DefaultContractResolver();
|
|
||||||
op.PayloadSerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
|
|
||||||
});
|
|
||||||
services.AddSignalRExceptionFilterHandler<SignalRHub>(async (client, ex) => await client.SendMessageBody(ex).ConfigureAwait(false));
|
services.AddSignalRExceptionFilterHandler<SignalRHub>(async (client, ex) => await client.SendMessageBody(ex).ConfigureAwait(false));
|
||||||
services.AddResponseCompression();
|
services.AddResponseCompression();
|
||||||
services.AddBootstrapAdminAuthentication().AddGitee(OAuthHelper.Configure).AddGitHub(OAuthHelper.Configure);
|
services.AddBootstrapAdminAuthentication().AddGitee(OAuthHelper.Configure).AddGitHub(OAuthHelper.Configure);
|
||||||
|
@ -77,12 +71,7 @@ namespace Bootstrap.Admin
|
||||||
{
|
{
|
||||||
options.Filters.Add<ExceptionFilter>();
|
options.Filters.Add<ExceptionFilter>();
|
||||||
options.Filters.Add<SignalRExceptionFilter<SignalRHub>>();
|
options.Filters.Add<SignalRExceptionFilter<SignalRHub>>();
|
||||||
}).AddNewtonsoftJson(op =>
|
}).AddJsonOptions(op => op.JsonSerializerOptions.Configure());
|
||||||
{
|
|
||||||
op.SerializerSettings.ContractResolver = new DefaultContractResolver();
|
|
||||||
op.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
|
|
||||||
JsonConvert.DefaultSettings = () => op.SerializerSettings;
|
|
||||||
});
|
|
||||||
services.AddApiVersioning(option =>
|
services.AddApiVersioning(option =>
|
||||||
{
|
{
|
||||||
option.DefaultApiVersion = new ApiVersion(1, 0);
|
option.DefaultApiVersion = new ApiVersion(1, 0);
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" />
|
<PackageReference Include="Bootstrap.Security.DataAccess" Version="2.2.21" />
|
||||||
<PackageReference Include="Longbow" Version="3.0.0-beta1" />
|
<PackageReference Include="Longbow" Version="3.0.0-beta2" />
|
||||||
<PackageReference Include="Longbow.Configuration" Version="2.2.7" />
|
<PackageReference Include="Longbow.Configuration" Version="2.2.7" />
|
||||||
<PackageReference Include="Longbow.Data" Version="2.3.8" />
|
<PackageReference Include="Longbow.Data" Version="2.3.8" />
|
||||||
<PackageReference Include="Longbow.GiteeAuth" Version="2.2.0" />
|
<PackageReference Include="Longbow.GiteeAuth" Version="2.2.0" />
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
using Microsoft.AspNetCore.WebUtilities;
|
using Microsoft.AspNetCore.WebUtilities;
|
||||||
using Newtonsoft.Json;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
@ -8,6 +7,12 @@ using System.Net.Http;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
#if NETCOREAPP3_0
|
||||||
|
using System.Text.Json;
|
||||||
|
#else
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using Newtonsoft.Json.Serialization;
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Bootstrap.DataAccess
|
namespace Bootstrap.DataAccess
|
||||||
{
|
{
|
||||||
|
@ -38,7 +43,14 @@ namespace Bootstrap.DataAccess
|
||||||
var url = QueryHelpers.AddQueryString("http://open.bluegoon.com/api/sms/sendcode", requestParameters);
|
var url = QueryHelpers.AddQueryString("http://open.bluegoon.com/api/sms/sendcode", requestParameters);
|
||||||
var req = await client.GetAsync(url);
|
var req = await client.GetAsync(url);
|
||||||
var content = await req.Content.ReadAsStringAsync();
|
var content = await req.Content.ReadAsStringAsync();
|
||||||
var result = JsonConvert.DeserializeObject<SMSResult>(content);
|
#if NETCOREAPP3_0
|
||||||
|
var result = JsonSerializer.Deserialize<SMSResult>(content, new JsonSerializerOptions()
|
||||||
|
{
|
||||||
|
PropertyNameCaseInsensitive = true
|
||||||
|
});
|
||||||
|
#else
|
||||||
|
var result = JsonConvert.DeserializeObject<SMSResult>(content, new JsonSerializerSettings() { ContractResolver = new DefaultContractResolver() });
|
||||||
|
#endif
|
||||||
var ret = false;
|
var ret = false;
|
||||||
if (result.Code == "1")
|
if (result.Code == "1")
|
||||||
{
|
{
|
||||||
|
|
|
@ -9,8 +9,6 @@ using Microsoft.AspNetCore.HttpOverrides;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
using Newtonsoft.Json;
|
|
||||||
using Newtonsoft.Json.Serialization;
|
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace Bootstrap.Client
|
namespace Bootstrap.Client
|
||||||
|
@ -62,12 +60,7 @@ namespace Bootstrap.Client
|
||||||
{
|
{
|
||||||
options.Filters.Add<ExceptionFilter>();
|
options.Filters.Add<ExceptionFilter>();
|
||||||
options.Filters.Add<SignalRExceptionFilter<SignalRHub>>();
|
options.Filters.Add<SignalRExceptionFilter<SignalRHub>>();
|
||||||
}).AddNewtonsoftJson(op =>
|
}).AddJsonOptions(op => op.JsonSerializerOptions.Configure());
|
||||||
{
|
|
||||||
op.SerializerSettings.ContractResolver = new DefaultContractResolver();
|
|
||||||
op.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
|
|
||||||
JsonConvert.DefaultSettings = () => op.SerializerSettings;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
|
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
|
||||||
|
|
Loading…
Reference in New Issue