From 591f5bf770d3c707c84e1040563eec89ee87f8db Mon Sep 17 00:00:00 2001
From: Miyamizu-MitsuhaSang <2510681107@qq.com>
Date: Thu, 21 Aug 2025 10:43:04 +0800
Subject: [PATCH] =?UTF-8?q?dict.py:=20-=E6=96=B0=E5=A2=9E=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E4=B8=8A=E4=BC=A0xlsx=E8=A1=A8=E6=A0=BC=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=9B=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dataSources.xml | 7 +++++++
 app/api/admin/dict.py | 2 +-
 main.py               | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 224b18d..91f0ed8 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -8,5 +8,12 @@
       <jdbc-url>jdbc:mysql://localhost:3306/dict</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
+    <data-source source="LOCAL" name="test_db@124.221.145.135" uuid="a23b927c-ada0-4708-ba6e-4db2b9dab6c1">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://124.221.145.135:3306/test_db</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/api/admin/dict.py b/app/api/admin/dict.py
index 7e97ba1..1d77ae4 100644
--- a/app/api/admin/dict.py
+++ b/app/api/admin/dict.py
@@ -226,7 +226,7 @@ async def update_by_xlsx(
             await import_wordlist_fr(path=tmp_path)
             await import_def_fr(path=tmp_path)
     except Exception as e:
+        # Tortoise ORM 会自动回滚事务，所以无需手动删除已添加内容
         raise HTTPException(status_code=500, detail=f"导入失败：{str(e)}")
-        #TODO: 导入失败后的回滚（删除本次已经添加的内容）
 
     return {"message": "导入成功"}
diff --git a/main.py b/main.py
index f85d4c6..b386793 100644
--- a/main.py
+++ b/main.py
@@ -5,6 +5,7 @@ from fastapi.middleware.cors import CORSMiddleware
 import uvicorn
 from tortoise.contrib.fastapi import register_tortoise
 
+from app.utils import redis_client
 from settings import TORTOISE_ORM
 from app.api.users import users_router
 from app.api.admin.router import admin_router
@@ -17,7 +18,7 @@ import app.models.signals
 async def lifespan(app: FastAPI):
     await init_redis_pool()
     yield
-    # 可以加 await redis_client.close() 清理资源
+    await redis_client.close() # 清理资源
 
 
 app = FastAPI(lifespan=lifespan)