From 36450d0d6fd13a5ae80db64914f80c1022eba512 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Wed, 9 Apr 2025 17:43:47 +0800
Subject: [PATCH] update

---
 app/api/v1/clothing.py            | 4 ++--
 app/models/person_images.py       | 6 +++++-
 app/models/users.py               | 3 ++-
 app/services/clothing.py          | 2 +-
 app/services/dashscope_service.py | 5 ++---
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/api/v1/clothing.py b/app/api/v1/clothing.py
index c5d7bbf..c57c5b5 100644
--- a/app/api/v1/clothing.py
+++ b/app/api/v1/clothing.py
@@ -100,7 +100,7 @@ async def delete_category(
     return StandardResponse(code=200, data=db_category)
 
 # 衣服API
-@router.post("/", tags=["clothing"])
+@router.post("", tags=["clothing"])
 async def create_clothing(
     clothing: ClothingCreate,
     db: AsyncSession = Depends(get_db),
@@ -121,7 +121,7 @@ async def create_clothing(
     # 手动返回标准响应格式
     return StandardResponse(code=200, data=result)
 
-@router.get("/", tags=["clothing"])
+@router.get("", tags=["clothing"])
 async def read_clothes(
     skip: int = Query(0, ge=0),
     limit: int = Query(100, ge=1, le=100),
diff --git a/app/models/person_images.py b/app/models/person_images.py
index 616c0db..fdab9ff 100644
--- a/app/models/person_images.py
+++ b/app/models/person_images.py
@@ -1,4 +1,5 @@
 from sqlalchemy import Column, Integer, String, Boolean, DateTime, ForeignKey
+from sqlalchemy.orm import relationship
 from sqlalchemy.sql import func
 from app.db.database import Base
 
@@ -10,4 +11,7 @@ class PersonImage(Base):
     user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
     image_url = Column(String(255), nullable=False)
     is_default = Column(Boolean, default=False)
-    create_time = Column(DateTime(timezone=True), server_default=func.now()) 
\ No newline at end of file
+    create_time = Column(DateTime, default=func.now(), comment="创建时间")
+
+    # 关系
+    user = relationship("User", back_populates="person_images") 
\ No newline at end of file
diff --git a/app/models/users.py b/app/models/users.py
index 93ee79e..72ea699 100644
--- a/app/models/users.py
+++ b/app/models/users.py
@@ -4,6 +4,7 @@ from sqlalchemy.orm import relationship
 from app.db.database import Base
 
 class User(Base):
+    """用户数据模型"""
     __tablename__ = "users"
     
     id = Column(Integer, primary_key=True, autoincrement=True, index=True)
@@ -14,7 +15,7 @@ class User(Base):
     create_time = Column(DateTime, default=func.now(), comment="创建时间")
     
     # 关系
-    images = relationship("UserImage", back_populates="user", cascade="all, delete-orphan")
+    person_images = relationship("PersonImage", back_populates="user", cascade="all, delete-orphan")
     
     def __repr__(self):
         return f"<User(id={self.id}, nickname={self.nickname})>" 
\ No newline at end of file
diff --git a/app/services/clothing.py b/app/services/clothing.py
index 838692b..9da3df1 100644
--- a/app/services/clothing.py
+++ b/app/services/clothing.py
@@ -1,6 +1,6 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
-from sqlalchemy import update, delete
+from sqlalchemy import update, delete, func
 from typing import List, Optional
 
 from app.models.clothing import Clothing, ClothingCategory
diff --git a/app/services/dashscope_service.py b/app/services/dashscope_service.py
index 3d5877c..6f5ae20 100644
--- a/app/services/dashscope_service.py
+++ b/app/services/dashscope_service.py
@@ -6,7 +6,7 @@ from dashscope import Generation
 from typing import List, Dict, Any, Optional
 import asyncio
 import httpx
-from app.utils.config import get_settings
+from app.core.config import settings
 
 logger = logging.getLogger(__name__)
 
@@ -14,8 +14,7 @@ class DashScopeService:
     """DashScope服务类，提供对DashScope API的调用封装"""
     
     def __init__(self):
-        settings = get_settings()
-        self.api_key = settings.dashscope_api_key
+        self.api_key = settings.DASHSCOPE_API_KEY
         # 配置DashScope
         dashscope.api_key = self.api_key
         # 配置API URL