From 6157442567100d12285a1959b307b8f18fc8edd7 Mon Sep 17 00:00:00 2001 From: moraxs <2237670756@qq.com> Date: Sun, 14 Jul 2024 22:25:20 +0800 Subject: [PATCH 1/3] update --- WebServer/Controllers/DispatchRoutes.cs | 3 +- WebServer/Controllers/MuipServerRoutes.cs | 2 + WebServer/WebProgram.cs | 46 +++++++++++++++-------- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/WebServer/Controllers/DispatchRoutes.cs b/WebServer/Controllers/DispatchRoutes.cs index 5d515b13..ca64177c 100644 --- a/WebServer/Controllers/DispatchRoutes.cs +++ b/WebServer/Controllers/DispatchRoutes.cs @@ -6,10 +6,11 @@ using EggLink.DanhengServer.WebServer.Objects; using Google.Protobuf; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; - +using Microsoft.AspNetCore.Cors; namespace EggLink.DanhengServer.WebServer.Controllers { [ApiController] + [EnableCors("AllowAll")] [Route("/")] public class DispatchRoutes { diff --git a/WebServer/Controllers/MuipServerRoutes.cs b/WebServer/Controllers/MuipServerRoutes.cs index 06a7ac89..b58829b2 100644 --- a/WebServer/Controllers/MuipServerRoutes.cs +++ b/WebServer/Controllers/MuipServerRoutes.cs @@ -4,9 +4,11 @@ using EggLink.DanhengServer.WebServer.Response; using EggLink.DanhengServer.WebServer.Server; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Cors; namespace EggLink.DanhengServer.WebServer.Controllers { [ApiController] + [EnableCors("AllowAll")] [Route("/")] public class MuipServerRoutes { diff --git a/WebServer/WebProgram.cs b/WebServer/WebProgram.cs index ee8eab74..cd6f3271 100644 --- a/WebServer/WebProgram.cs +++ b/WebServer/WebProgram.cs @@ -1,9 +1,12 @@ using EggLink.DanhengServer.Util; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.AspNetCore.Server.Kestrel.Core; +using System.IO; using System.Net; -using System.Diagnostics; namespace EggLink.DanhengServer.WebServer { @@ -11,12 +14,12 @@ namespace EggLink.DanhengServer.WebServer { public static void Main(string[] args, int port, string address) { - BuildWebHost(args, port, address).Start(); + BuildWebHost(args, port, address).Run(); } public static IWebHost BuildWebHost(string[] args, int port, string address) { - var b = WebHost.CreateDefaultBuilder(args) + var builder = WebHost.CreateDefaultBuilder(args) .UseStartup() .ConfigureLogging((hostingContext, logging) => { @@ -26,19 +29,19 @@ namespace EggLink.DanhengServer.WebServer if (ConfigManager.Config.HttpServer.UseSSL) { - b.UseKestrel(options => - { - options.Listen(IPAddress.Any, port, listenOptions => - { - listenOptions.UseHttps( - ConfigManager.Config.KeyStore.KeyStorePath, - ConfigManager.Config.KeyStore.KeyStorePassword - ); - }); - }); + builder.UseKestrel(options => + { + options.Listen(IPAddress.Any, port, listenOptions => + { + listenOptions.UseHttps( + ConfigManager.Config.KeyStore.KeyStorePath, + ConfigManager.Config.KeyStore.KeyStorePassword + ); + }); + }); } - return b.Build(); + return builder.Build(); } } @@ -47,6 +50,16 @@ namespace EggLink.DanhengServer.WebServer public void ConfigureServices(IServiceCollection services) { services.AddControllers(); + + // Configure CORS + services.AddCors(options => + { + options.AddPolicy("AllowAll", + builder => builder + .AllowAnyOrigin() // Allow any origin + .AllowAnyMethod() // Allow any method (GET, POST, PUT, DELETE, etc.) + .AllowAnyHeader()); // Allow any headers + }); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env) @@ -76,6 +89,9 @@ namespace EggLink.DanhengServer.WebServer app.UseRouting(); + + app.UseCors("AllowAll"); + app.UseAuthorization(); app.UseEndpoints(endpoints => From 755d14a2fc7c11a6f2b7fe4aa553b6b517a8d871 Mon Sep 17 00:00:00 2001 From: moraxs <2237670756@qq.com> Date: Sun, 14 Jul 2024 22:38:18 +0800 Subject: [PATCH 2/3] update --- WebServer/WebProgram.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebServer/WebProgram.cs b/WebServer/WebProgram.cs index cd6f3271..532d5878 100644 --- a/WebServer/WebProgram.cs +++ b/WebServer/WebProgram.cs @@ -89,7 +89,7 @@ namespace EggLink.DanhengServer.WebServer app.UseRouting(); - + // Enable CORS globally app.UseCors("AllowAll"); app.UseAuthorization(); From 9bcc448beeb26413348fdf50977077160ec2b374 Mon Sep 17 00:00:00 2001 From: moraxs <2237670756@qq.com> Date: Sun, 14 Jul 2024 22:44:22 +0800 Subject: [PATCH 3/3] update --- WebServer/WebProgram.cs | 55 ++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/WebServer/WebProgram.cs b/WebServer/WebProgram.cs index 532d5878..ce76d70e 100644 --- a/WebServer/WebProgram.cs +++ b/WebServer/WebProgram.cs @@ -1,12 +1,15 @@ using EggLink.DanhengServer.Util; -using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Server.Kestrel.Core; -using System.IO; using System.Net; +using System.Diagnostics; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Hosting; +using System.IO; namespace EggLink.DanhengServer.WebServer { @@ -14,12 +17,12 @@ namespace EggLink.DanhengServer.WebServer { public static void Main(string[] args, int port, string address) { - BuildWebHost(args, port, address).Run(); + BuildWebHost(args, port, address).Start(); } public static IWebHost BuildWebHost(string[] args, int port, string address) { - var builder = WebHost.CreateDefaultBuilder(args) + var b = WebHost.CreateDefaultBuilder(args) .UseStartup() .ConfigureLogging((hostingContext, logging) => { @@ -29,19 +32,19 @@ namespace EggLink.DanhengServer.WebServer if (ConfigManager.Config.HttpServer.UseSSL) { - builder.UseKestrel(options => - { - options.Listen(IPAddress.Any, port, listenOptions => - { - listenOptions.UseHttps( - ConfigManager.Config.KeyStore.KeyStorePath, - ConfigManager.Config.KeyStore.KeyStorePassword - ); - }); - }); + b.UseKestrel(options => + { + options.Listen(IPAddress.Any, port, listenOptions => + { + listenOptions.UseHttps( + ConfigManager.Config.KeyStore.KeyStorePath, + ConfigManager.Config.KeyStore.KeyStorePassword + ); + }); + }); } - return builder.Build(); + return b.Build(); } } @@ -49,17 +52,18 @@ namespace EggLink.DanhengServer.WebServer { public void ConfigureServices(IServiceCollection services) { - services.AddControllers(); - - // Configure CORS services.AddCors(options => { options.AddPolicy("AllowAll", - builder => builder - .AllowAnyOrigin() // Allow any origin - .AllowAnyMethod() // Allow any method (GET, POST, PUT, DELETE, etc.) - .AllowAnyHeader()); // Allow any headers + builder => + { + builder.AllowAnyOrigin() + .AllowAnyMethod() + .AllowAnyHeader(); + }); }); + + services.AddControllers(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env) @@ -89,7 +93,6 @@ namespace EggLink.DanhengServer.WebServer app.UseRouting(); - // Enable CORS globally app.UseCors("AllowAll"); app.UseAuthorization();