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<Startup>()
                 .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 =>