From d78af84c66cdbac6148f0ef129b7a008f5965b27 Mon Sep 17 00:00:00 2001 From: carry <2641257231@qq.com> Date: Wed, 19 Feb 2025 14:41:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E8=8B=A5=E5=B9=B2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/Dockerfile | 4 ++-- backend/requirements.txt | 3 +++ backend/schemas/user.py | 4 ++-- frontend/Dockerfile | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 5cb7d1e..47f904a 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ # 使用Python官方镜像 -FROM python:3.9-slim +FROM python:3.11-slim # 设置工作目录 WORKDIR /app @@ -8,7 +8,7 @@ WORKDIR /app COPY requirements.txt . # 安装依赖 -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --no-cache-dir -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple # 复制项目文件 COPY . . diff --git a/backend/requirements.txt b/backend/requirements.txt index acec49f..eb32115 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,3 +1,5 @@ +pydantic<2.0 +asyncmy>=0.2.10 fastapi>=0.95.2 python-dotenv>=1.0.0 sqlalchemy>=2.0.15 @@ -6,4 +8,5 @@ bcrypt>=4.0.1 pyjwt>=2.6.0 pytest>=7.3.1 requests>=2.28.2 +cryptography>=42.0.2 uvicorn[standard]>=0.21.1 diff --git a/backend/schemas/user.py b/backend/schemas/user.py index f837b7a..46dc5f3 100644 --- a/backend/schemas/user.py +++ b/backend/schemas/user.py @@ -1,6 +1,6 @@ from datetime import datetime from enum import Enum -from pydantic import BaseModel, Field, model_validator +from pydantic import BaseModel, Field, root_validator from typing import Optional # 用户角色枚举 @@ -27,7 +27,7 @@ class UserUpdate(BaseModel): description: Optional[str] = Field(None, max_length=255, description="用户描述") # 可选:确保至少更新一个字段 - @model_validator(mode='before') + @root_validator def validate_at_least_one_field(cls, values): if not any(values.values()): raise ValueError("至少需要更新一个字段") diff --git a/frontend/Dockerfile b/frontend/Dockerfile index db251a7..263d0b6 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -8,7 +8,8 @@ WORKDIR /app COPY package*.json ./ # 安装依赖 -RUN npm install +RUN npm config set registry https://registry.npmmirror.com && \ + npm install # 复制项目文件 COPY . .