Sfoglia il codice sorgente

更换简繁转换组件

懒得勤快 4 anni fa
parent
commit
ccce7fa25c

+ 2 - 2
src/Masuit.MyBlogs.Core/Controllers/SearchController.cs

@@ -7,9 +7,9 @@ using Masuit.MyBlogs.Core.Models.Entity;
 using Masuit.MyBlogs.Core.Models.Enum;
 using Masuit.MyBlogs.Core.Models.ViewModel;
 using Masuit.Tools;
-using Masuit.Tools.Core;
 using Masuit.Tools.Core.Net;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.International.Converters.TraditionalChineseToSimplifiedConverter;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -38,7 +38,7 @@ namespace Masuit.MyBlogs.Core.Controllers
         [Route("search"), Route("search/{**wd}", Order = 1), Route("s", Order = 2), Route("s/{**wd}", Order = 3)]
         public async Task<ActionResult> Search([FromServices] IPostService postService, string wd = "", [Range(1, int.MaxValue, ErrorMessage = "页码必须大于0")] int page = 1, [Range(1, 50, ErrorMessage = "页大小必须在0到50之间")] int size = 15)
         {
-            wd = wd?.Trim().ToSimplified();
+            wd = ChineseConverter.Convert(wd?.Trim(), ChineseConversionDirection.TraditionalToSimplified);
             ViewBag.PageSize = size;
             ViewBag.Keyword = wd;
             string key = "Search:" + ClientIP;

+ 2 - 2
src/Masuit.MyBlogs.Core/Extensions/TranslateMiddleware.cs

@@ -1,7 +1,7 @@
 using Masuit.MyBlogs.Core.Common;
 using Masuit.Tools;
-using Masuit.Tools.Core;
 using Microsoft.AspNetCore.Http;
+using Microsoft.International.Converters.TraditionalChineseToSimplifiedConverter;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
@@ -64,7 +64,7 @@ namespace Masuit.MyBlogs.Core.Extensions
             memStream.Position = 0;
             var responseReader = new StreamReader(memStream, Encoding.UTF8);
             var responseBody = await responseReader.ReadToEndAsync();
-            memStream = new MemoryStream(Encoding.UTF8.GetBytes(responseBody.ToTraditional()));
+            memStream = new MemoryStream(Encoding.UTF8.GetBytes(ChineseConverter.Convert(responseBody, ChineseConversionDirection.SimplifiedToTraditional)));
             await memStream.CopyToAsync(responseOriginalBody);
             context.Response.Body = responseOriginalBody;
         }

+ 6 - 5
src/Masuit.MyBlogs.Core/Masuit.MyBlogs.Core.csproj

@@ -38,6 +38,7 @@
         <PackageReference Include="CacheManager.Microsoft.Extensions.Caching.Memory" Version="2.0.0-beta-1629" />
         <PackageReference Include="CacheManager.Serialization.Json" Version="2.0.0-beta-1629" />
         <PackageReference Include="CacheManager.StackExchange.Redis" Version="1.2.0" />
+        <PackageReference Include="CHTCHSConv" Version="1.0.0" />
         <PackageReference Include="CLRStats" Version="1.0.0" />
         <PackageReference Include="CSRedisCore" Version="3.6.6" />
         <PackageReference Include="Hangfire" Version="1.7.20" />
@@ -47,12 +48,12 @@
         <PackageReference Include="IP2Region" Version="1.2.0" />
         <PackageReference Include="Karambolo.AspNetCore.Bundling.NUglify" Version="3.4.1" />
         <PackageReference Include="MaxMind.GeoIP2" Version="4.0.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.4" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.5" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.5" />
         <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.1" />
-        <PackageReference Include="Microsoft.Graph" Version="3.28.0" />
+        <PackageReference Include="Microsoft.Graph" Version="3.29.0" />
         <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.6" />
         <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
         <PackageReference Include="OpenXmlPowerTools-NetStandard" Version="4.4.21" />