Merge commit 'e6f36da1841d7e793b2c412f52bb12cd7767727f'

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 . .

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

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("至少需要更新一个字段")

docker-compose.yml

@@ -25,11 +25,9 @@ services:
       - app-network
 
   nginx:
-    image: nginx:stable-alpine
+    build: ./nginx
     ports:
       - "80:80"
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf
     depends_on:
       - frontend
       - backend

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 . .
@@ -22,6 +23,9 @@ FROM nginx:stable-alpine as production-stage
 # 复制构建好的文件到Nginx目录
 COPY --from=build-stage /app/dist /usr/share/nginx/html
 
+# 复制Nginx配置文件
+COPY nginx.conf /etc/nginx/nginx.conf
+
 # 暴露80端口
 EXPOSE 80
 

frontend/nginx.conf

@@ -0,0 +1,21 @@
+# 用户连接数
+worker_processes 1;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    server {
+        listen 80;
+
+        # 设置根目录
+        root /usr/share/nginx/html;
+        index index.html;
+
+        # 处理SPA路由
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
+    }
+}

frontend/src/components/EditUserDialog.vue

@@ -82,6 +82,9 @@ const handleConfirm = async () => {
       if (!createData.password) {
         throw new Error('密码不能为空')
       }
+      if (!/^\d{6,}$/.test(createData.password)) {
+        throw new Error('密码必须为6位或以上的数字')
+      }
       await userService.createUser({
         username: createData.username,
         password: createData.password,

nginx/Dockerfile

@@ -0,0 +1,11 @@
+# 使用Nginx作为基础镜像
+FROM nginx:stable-alpine
+
+# 复制Nginx配置文件
+COPY nginx.conf /etc/nginx/nginx.conf
+
+# 暴露80端口
+EXPOSE 80
+
+# 启动Nginx
+CMD ["nginx", "-g", "daemon off;"]

nginx/nginx.conf

@@ -9,7 +9,7 @@ http {
         listen 80;
 
         location /api/ {
-            proxy_pass http://backend:8000/;
+            proxy_pass http://backend:8000;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;