From c54d1a818e59626905bbfc6f9e1881f5d91a8296 Mon Sep 17 00:00:00 2001
From: xueyinfei <1207092115@qq.com>
Date: Fri, 9 Jan 2026 10:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue-fastapi-backend/app.py                            |  2 +-
 vue-fastapi-backend/config/env.py                     | 11 +++++++++--
 .../module_admin/service/captcha_service.py           |  4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/vue-fastapi-backend/app.py b/vue-fastapi-backend/app.py
index 1ee7695..8906b3b 100644
--- a/vue-fastapi-backend/app.py
+++ b/vue-fastapi-backend/app.py
@@ -4,7 +4,7 @@ from server import app, AppConfig  # noqa: F401
 
 if __name__ == '__main__':
     uvicorn.run(
-        app='app:app',
+        app=app,
         host=AppConfig.app_host,
         port=AppConfig.app_port,
         root_path=AppConfig.app_root_path,
diff --git a/vue-fastapi-backend/config/env.py b/vue-fastapi-backend/config/env.py
index 1401c1b..d2fc925 100644
--- a/vue-fastapi-backend/config/env.py
+++ b/vue-fastapi-backend/config/env.py
@@ -1,6 +1,8 @@
 import argparse
 import os
 import sys
+from pathlib import Path
+
 from dotenv import load_dotenv
 from functools import lru_cache
 from pydantic_settings import BaseSettings
@@ -23,6 +25,8 @@ class AppSettings(BaseSettings):
     app_same_time_login: bool = True
     ds_server_url: str = 'http://47.121.207.11:12345'
     ds_task_id: str = '15081964614112'
+
+
 class JwtSettings(BaseSettings):
     """
     Jwt配置
@@ -199,14 +203,17 @@ class GetConfig:
             # 解析命令行参数
             args = parser.parse_args()
             # 设置环境变量，如果未设置命令行参数，默认APP_ENV为dev
-            os.environ['APP_ENV'] = args.env if args.env else 'dev'
+            os.environ['APP_ENV'] = args.env if args.env else ''
         # 读取运行环境
         run_env = os.environ.get('APP_ENV', '')
         # 运行环境未指定时默认加载.env.dev
-        env_file = '.env.dev'
+        env_file = os.path.join(Path(__file__).parent.parent.parent, '.env.prod')
         # 运行环境不为空时按命令行参数加载对应.env文件
         if run_env != '':
             env_file = f'.env.{run_env}'
+        else:
+            if not Path(env_file).exists():
+                env_file = f'.env.dev'
         # 加载配置
         load_dotenv(env_file)
 
diff --git a/vue-fastapi-backend/module_admin/service/captcha_service.py b/vue-fastapi-backend/module_admin/service/captcha_service.py
index 1be8ffb..3e75d77 100644
--- a/vue-fastapi-backend/module_admin/service/captcha_service.py
+++ b/vue-fastapi-backend/module_admin/service/captcha_service.py
@@ -2,6 +2,8 @@ import base64
 import io
 import os
 import random
+from pathlib import Path
+
 from PIL import Image, ImageDraw, ImageFont
 
 
@@ -19,7 +21,7 @@ class CaptchaService:
         draw = ImageDraw.Draw(image)
 
         # 设置字体
-        font = ImageFont.truetype(os.path.join(os.path.abspath(os.getcwd()), 'assets', 'font', 'Arial.ttf'), size=30)
+        font = ImageFont.truetype(os.path.join(Path(__file__).parent.parent.parent, 'assets', 'font', 'Arial.ttf'), size=30)
 
         # 生成两个0-9之间的随机整数
         num1 = random.randint(0, 9)