From f10c24f9788250b34ed347566567e1a4428c09f9 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Sat, 18 Jan 2025 15:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E8=BD=BD=E9=A1=B9?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FunGame.Server/Main.cs                        |  6 +++---
 FunGame.Server/Others/FunGameSystem.cs        | 10 ++++-----
 FunGame.WebAPI/Program.cs                     | 21 +++++++++++--------
 .../Services/CustomConsoleFormatter.cs        |  3 +--
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/FunGame.Server/Main.cs b/FunGame.Server/Main.cs
index c238d06..64f6d8f 100644
--- a/FunGame.Server/Main.cs
+++ b/FunGame.Server/Main.cs
@@ -94,15 +94,15 @@ void StartServer()
             // 初始化MailSender
             FunGameSystem.InitMailSender();
 
+            // 读取Server插件
+            FunGameSystem.GetServerPlugins();
+
             // 读取游戏模组
             if (!FunGameSystem.GetGameModuleList())
             {
                 ServerHelper.WriteLine("服务器似乎未安装任何游戏模组，请检查是否正确安装它们。");
             }
 
-            // 读取Server插件
-            FunGameSystem.GetServerPlugins();
-
             ServerHelper.WriteLine("请输入 help 来获取帮助，按下 Ctrl+C 关闭服务器。");
 
             ServerHelper.PrintFunGameTitle();
diff --git a/FunGame.Server/Others/FunGameSystem.cs b/FunGame.Server/Others/FunGameSystem.cs
index 6f8b879..dcfc93d 100644
--- a/FunGame.Server/Others/FunGameSystem.cs
+++ b/FunGame.Server/Others/FunGameSystem.cs
@@ -113,7 +113,7 @@ namespace Milimoe.FunGame.Server.Others
                         if (check)
                         {
                             if (!module.IsAnonymous) supported.Add(module.Name);
-                            ServerHelper.WriteLine("Loaded: " + module.Name, InvokeMessageType.GameModule);
+                            ServerHelper.WriteLine("GameModule Loaded -> " + module.Name, InvokeMessageType.Core);
                         }
                     }
                     catch (Exception e)
@@ -146,7 +146,7 @@ namespace Milimoe.FunGame.Server.Others
                 Config.ServerPluginLoader = ServerPluginLoader.LoadPlugins(delegates);
                 foreach (ServerPlugin plugin in Config.ServerPluginLoader.Plugins.Values)
                 {
-                    ServerHelper.WriteLine("Loaded: " + plugin.Name, InvokeMessageType.Plugin);
+                    ServerHelper.WriteLine("Plugin Loaded -> " + plugin.Name, InvokeMessageType.Core);
                 }
             }
             catch (Exception e)
@@ -158,7 +158,7 @@ namespace Milimoe.FunGame.Server.Others
         /// <summary>
         /// 加载 Web API 插件
         /// </summary>
-        public static void GetWebAPIPlugins()
+        public static void GetWebAPIPlugins(params object[] otherobjs)
         {
             Dictionary<string, object> delegates = [];
             delegates.Add("WriteLine", new Action<string, string, LogLevel, bool>((name, msg, level, useLevel) => ServerHelper.WriteLine_Addons(name, msg, InvokeMessageType.Plugin, level, useLevel)));
@@ -166,10 +166,10 @@ namespace Milimoe.FunGame.Server.Others
             try
             {
                 // 读取plugins目录下的插件
-                Config.WebAPIPluginLoader = WebAPIPluginLoader.LoadPlugins(delegates);
+                Config.WebAPIPluginLoader = WebAPIPluginLoader.LoadPlugins(delegates, otherobjs);
                 foreach (WebAPIPlugin plugin in Config.WebAPIPluginLoader.Plugins.Values)
                 {
-                    ServerHelper.WriteLine("Loaded: " + plugin.Name, InvokeMessageType.Plugin);
+                    ServerHelper.WriteLine("Plugin Loaded -> " + plugin.Name, InvokeMessageType.Core);
                 }
             }
             catch (Exception e)
diff --git a/FunGame.WebAPI/Program.cs b/FunGame.WebAPI/Program.cs
index f06548d..2ab8916 100644
--- a/FunGame.WebAPI/Program.cs
+++ b/FunGame.WebAPI/Program.cs
@@ -55,18 +55,22 @@ try
     // ��ʼ��MailSender
     FunGameSystem.InitMailSender();
 
+    // ��ȡServer���
+    FunGameSystem.GetServerPlugins();
+
+    // Add services to the container.
+    WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+    // ��ȡWeb API���
+    object[] otherobjs = [builder];
+    FunGameSystem.GetWebAPIPlugins(otherobjs);
+
     // ��ȡ��Ϸģ��
     if (!FunGameSystem.GetGameModuleList())
     {
         ServerHelper.WriteLine("�������ƺ�δ��װ�κ���Ϸģ�飬�����Ƿ���ȷ��װ���ǡ�");
     }
 
-    // ��ȡServer���
-    FunGameSystem.GetServerPlugins();
-
-    // ��ȡWeb API���
-    FunGameSystem.GetWebAPIPlugins();
-
     // ��������
     RESTfulAPIListener apiListener = new();
     RESTfulAPIListener.Instance = apiListener;
@@ -83,9 +87,6 @@ try
     ServerHelper.WriteLine("�������� Web API ���� . . .");
     Console.WriteLine("\r ");
 
-    WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
-
-    // Add services to the container.
     // ��ȡ��չ������
     if (Config.WebAPIPluginLoader != null)
     {
@@ -100,6 +101,7 @@ try
             }
         }
     }
+
     // ���� JSON ת����
     builder.Services.AddControllers().AddJsonOptions(options =>
     {
@@ -173,6 +175,7 @@ try
         options.FormatterName = "CustomFormatter";
     });
     builder.Services.AddSingleton<ConsoleFormatter, CustomConsoleFormatter>();
+    builder.Services.AddHttpClient();
 
     WebApplication app = builder.Build();
 
diff --git a/FunGame.WebAPI/Services/CustomConsoleFormatter.cs b/FunGame.WebAPI/Services/CustomConsoleFormatter.cs
index fda8e46..451b8f4 100644
--- a/FunGame.WebAPI/Services/CustomConsoleFormatter.cs
+++ b/FunGame.WebAPI/Services/CustomConsoleFormatter.cs
@@ -27,8 +27,7 @@ namespace Milimoe.FunGame.WebAPI.Services
             return logLevel switch
             {
                 LogLevel.Trace => "\x1b[37m", // 灰色 ConsoleColor.Gray
-                LogLevel.Debug => "\x1b[34m", // 蓝色 ConsoleColor.Blue
-                LogLevel.Information => "\x1b[32m", // 绿色 ConsoleColor.Green
+                LogLevel.Debug => "\x1b[32m", // 绿色 ConsoleColor.Green
                 LogLevel.Warning => "\x1b[33m", // 黄色 ConsoleColor.Yellow
                 LogLevel.Error => "\x1b[31m", // 红色 ConsoleColor.Red
                 LogLevel.Critical => "\x1b[31m", // 红色 ConsoleColor.Red