From 073cab5a85d9bd2b42ef9e55d67bf0679ce2a3a0 Mon Sep 17 00:00:00 2001
From: AkashiCoin <l1040186796@gmail.com>
Date: Mon, 26 Aug 2024 12:09:04 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=90=9B=20WebUI=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=20(#1574?=
 =?UTF-8?q?)"=20(#1577)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 65a6f608e677dd0a7f8fb1a057641cc5b7eb3a45.
---
 zhenxun/builtin_plugins/web_ui/__init__.py |  9 ---------
 zhenxun/builtin_plugins/web_ui/config.py   | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/zhenxun/builtin_plugins/web_ui/__init__.py b/zhenxun/builtin_plugins/web_ui/__init__.py
index 0f85c6e4..d05e55f9 100644
--- a/zhenxun/builtin_plugins/web_ui/__init__.py
+++ b/zhenxun/builtin_plugins/web_ui/__init__.py
@@ -2,7 +2,6 @@ import asyncio
 
 import nonebot
 from fastapi import APIRouter, FastAPI
-from fastapi.middleware.cors import CORSMiddleware
 from nonebot.log import default_filter, default_format
 from nonebot.plugin import PluginMetadata
 
@@ -22,7 +21,6 @@ from .api.tabs.plugin_manage import router as plugin_router
 from .api.tabs.system import router as system_router
 from .auth import router as auth_router
 from .public import init_public
-from .config import origins
 
 __plugin_meta__ = PluginMetadata(
     name="WebUi",
@@ -81,13 +79,6 @@ async def _():
         )
 
         app: FastAPI = nonebot.get_app()
-        app.add_middleware(
-            CORSMiddleware,
-            allow_origins=origins,
-            allow_credentials=True,
-            allow_methods=["*"],
-            allow_headers=["*"],
-        )
         app.include_router(BaseApiRouter)
         app.include_router(WsApiRouter)
         await init_public(app)
diff --git a/zhenxun/builtin_plugins/web_ui/config.py b/zhenxun/builtin_plugins/web_ui/config.py
index 9919f747..0f16949a 100644
--- a/zhenxun/builtin_plugins/web_ui/config.py
+++ b/zhenxun/builtin_plugins/web_ui/config.py
@@ -1,7 +1,21 @@
+import nonebot
+from fastapi.middleware.cors import CORSMiddleware
+from pydantic import BaseModel
 from strenum import StrEnum
 
+app = nonebot.get_app()
+
 origins = ["*"]
 
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=origins,
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+
 AVA_URL = "http://q1.qlogo.cn/g?b=qq&nk={}&s=160"
 
 GROUP_AVA_URL = "http://p.qlogo.cn/gh/{}/{}/640/"