瀏覽代碼

https证书

懒得勤快 6 年之前
父節點
當前提交
9aa1df8af3

+ 0 - 6
src/Masuit.MyBlogs.Core.sln

@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.Tools.Core", "..\Mas
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.MyBlogs.Core", "Masuit.MyBlogs.Core\Masuit.MyBlogs.Core.csproj", "{51A09BD3-AB54-4DF9-AB8B-C68DF0672C39}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masuit.HardwareMonitor.Dashboard", "Masuit.HardwareMonitor.Dashboard\Masuit.HardwareMonitor.Dashboard.csproj", "{EC5FA67A-56DC-42A7-9A03-777461D6DA11}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
 		{51A09BD3-AB54-4DF9-AB8B-C68DF0672C39}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{51A09BD3-AB54-4DF9-AB8B-C68DF0672C39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{51A09BD3-AB54-4DF9-AB8B-C68DF0672C39}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC5FA67A-56DC-42A7-9A03-777461D6DA11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC5FA67A-56DC-42A7-9A03-777461D6DA11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC5FA67A-56DC-42A7-9A03-777461D6DA11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC5FA67A-56DC-42A7-9A03-777461D6DA11}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 2 - 2
src/Masuit.MyBlogs.Core/Program.cs

@@ -25,7 +25,7 @@ namespace Masuit.MyBlogs.Core
             var config = builder.Build();
 #if DEBUG
             var port = config["port"] ?? Environment.GetEnvironmentVariable("port") ?? "5000";
-            var sslport = config["sslport"] ?? Environment.GetEnvironmentVariable("sslport") ?? "5001"; 
+            var sslport = config["sslport"] ?? Environment.GetEnvironmentVariable("sslport") ?? "5001";
 #else
             var port = config["port"] ?? Environment.GetEnvironmentVariable("port") ?? "80";
             var sslport = config["sslport"] ?? Environment.GetEnvironmentVariable("sslport") ?? "443";
@@ -35,7 +35,7 @@ namespace Masuit.MyBlogs.Core
                 opt.ListenAnyIP(port.ToInt32());
                 opt.ListenAnyIP(sslport.ToInt32(), s =>
                 {
-                    s.UseHttps(AppContext.BaseDirectory + config["cert"], "cEHlnUGu");
+                    s.UseHttps(AppContext.BaseDirectory + config["cert:path"], config["cert:password"]);
                 });
                 opt.Limits.MaxRequestBodySize = null;
             }).UseIISIntegration().UseStartup<Startup>();

+ 6 - 1
src/Masuit.MyBlogs.Core/Startup.cs

@@ -26,6 +26,7 @@ using Microsoft.AspNetCore.WebSockets;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.WebEncoders;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Swashbuckle.AspNetCore.Swagger;
@@ -124,7 +125,11 @@ namespace Masuit.MyBlogs.Core
                 //opt.SerializerSettings.NullValueHandling = NullValueHandling.Ignore;
                 opt.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
             }).SetCompatibilityVersion(CompatibilityVersion.Version_2_2).AddControllersAsServices();
-            services.AddSingleton(HtmlEncoder.Create(UnicodeRanges.All)); //解决razor视图中中文被编码的问题
+
+            services.Configure<WebEncoderOptions>(options =>
+            {
+                options.TextEncoderSettings = new TextEncoderSettings(UnicodeRanges.All);
+            });//解决razor视图中中文被编码的问题
 
             ContainerBuilder builder = new ContainerBuilder();
             builder.Populate(services);

+ 4 - 1
src/Masuit.MyBlogs.Core/appsettings.json

@@ -5,7 +5,10 @@
 		}
 	},
 	"AllowedHosts": "*",
-	"cert": "App_Data/cert/server.pfx",
+	"cert": {
+		"path": "App_Data/cert/server.pfx",
+		"password": "cEHlnUGu"
+	},
 	//"ConnString": "Server=127.0.0.1;Port=3306;Database=MyBlogs;Uid=root;Pwd=;Charset=utf8mb4",
 	"ConnString": "Data Source=.;Initial Catalog=MyBlogs;Integrated Security=True",
 	"BaiduAK": "ÄúµÄ°Ù¶ÈAK",