Browse Source

打包优化

master
xueyinfei 3 weeks ago
parent
commit
c54d1a818e
  1. 2
      vue-fastapi-backend/app.py
  2. 11
      vue-fastapi-backend/config/env.py
  3. 4
      vue-fastapi-backend/module_admin/service/captcha_service.py

2
vue-fastapi-backend/app.py

@ -4,7 +4,7 @@ from server import app, AppConfig # noqa: F401
if __name__ == '__main__': if __name__ == '__main__':
uvicorn.run( uvicorn.run(
app='app:app', app=app,
host=AppConfig.app_host, host=AppConfig.app_host,
port=AppConfig.app_port, port=AppConfig.app_port,
root_path=AppConfig.app_root_path, root_path=AppConfig.app_root_path,

11
vue-fastapi-backend/config/env.py

@ -1,6 +1,8 @@
import argparse import argparse
import os import os
import sys import sys
from pathlib import Path
from dotenv import load_dotenv from dotenv import load_dotenv
from functools import lru_cache from functools import lru_cache
from pydantic_settings import BaseSettings from pydantic_settings import BaseSettings
@ -23,6 +25,8 @@ class AppSettings(BaseSettings):
app_same_time_login: bool = True app_same_time_login: bool = True
ds_server_url: str = 'http://47.121.207.11:12345' ds_server_url: str = 'http://47.121.207.11:12345'
ds_task_id: str = '15081964614112' ds_task_id: str = '15081964614112'
class JwtSettings(BaseSettings): class JwtSettings(BaseSettings):
""" """
Jwt配置 Jwt配置
@ -199,14 +203,17 @@ class GetConfig:
# 解析命令行参数 # 解析命令行参数
args = parser.parse_args() args = parser.parse_args()
# 设置环境变量,如果未设置命令行参数,默认APP_ENV为dev # 设置环境变量,如果未设置命令行参数,默认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', '') run_env = os.environ.get('APP_ENV', '')
# 运行环境未指定时默认加载.env.dev # 运行环境未指定时默认加载.env.dev
env_file = '.env.dev' env_file = os.path.join(Path(__file__).parent.parent.parent, '.env.prod')
# 运行环境不为空时按命令行参数加载对应.env文件 # 运行环境不为空时按命令行参数加载对应.env文件
if run_env != '': if run_env != '':
env_file = f'.env.{run_env}' env_file = f'.env.{run_env}'
else:
if not Path(env_file).exists():
env_file = f'.env.dev'
# 加载配置 # 加载配置
load_dotenv(env_file) load_dotenv(env_file)

4
vue-fastapi-backend/module_admin/service/captcha_service.py

@ -2,6 +2,8 @@ import base64
import io import io
import os import os
import random import random
from pathlib import Path
from PIL import Image, ImageDraw, ImageFont from PIL import Image, ImageDraw, ImageFont
@ -19,7 +21,7 @@ class CaptchaService:
draw = ImageDraw.Draw(image) 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之间的随机整数 # 生成两个0-9之间的随机整数
num1 = random.randint(0, 9) num1 = random.randint(0, 9)

Loading…
Cancel
Save