From 1e22bc4587b684022f0c009c6bd00f666f552469 Mon Sep 17 00:00:00 2001 From: aaron <> Date: Mon, 20 Jan 2025 22:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20username=20=E4=B8=BA=20nic?= =?UTF-8?q?kname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/endpoints/merchant.py | 12 ++++++------ app/api/endpoints/user.py | 10 +++++----- app/api/endpoints/wechat.py | 2 +- app/models/merchant.py | 2 +- app/models/user.py | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/api/endpoints/merchant.py b/app/api/endpoints/merchant.py index 536ed85..2f427be 100644 --- a/app/api/endpoints/merchant.py +++ b/app/api/endpoints/merchant.py @@ -100,7 +100,7 @@ async def update_merchant( updated_merchant = db.query( MerchantDB, UserDB.phone.label('user_phone'), - UserDB.username.label('user_username') + UserDB.nickname.label('user_nickname') ).join( UserDB, MerchantDB.user_id == UserDB.userid @@ -113,7 +113,7 @@ async def update_merchant( merchant_data = merchant_info.model_dump() merchant_data.update({ 'user_phone': updated_merchant.user_phone, - 'user_username': updated_merchant.user_username + 'user_nickname': updated_merchant.user_nickname }) return success_response(data=merchant_data) @@ -130,7 +130,7 @@ async def get_merchant( merchant = db.query( MerchantDB, UserDB.phone.label('user_phone'), - UserDB.username.label('user_username') + UserDB.nickname.label('user_nickname') ).join( UserDB, MerchantDB.user_id == UserDB.userid @@ -146,7 +146,7 @@ async def get_merchant( merchant_data = merchant_info.model_dump() merchant_data.update({ 'user_phone': merchant.user_phone, - 'user_username': merchant.user_username + 'user_nickname': merchant.user_nickname }) return success_response(data=merchant_data) @@ -165,7 +165,7 @@ async def list_merchants( MerchantDB, MerchantCategoryDB.name.label('category_name'), UserDB.phone.label('user_phone'), - UserDB.username.label('user_username') + UserDB.nickname.label('user_nickname') ).outerjoin( MerchantCategoryDB, MerchantDB.category_id == MerchantCategoryDB.id @@ -193,7 +193,7 @@ async def list_merchants( **MerchantInfo.model_validate(m[0]).model_dump(), "category_name": m[1], "user_phone": m[2], - "user_username": m[3], + "user_nickname": m[3], "distance": round(m[4]) if longitude is not None and latitude is not None else None } for m in merchants] diff --git a/app/api/endpoints/user.py b/app/api/endpoints/user.py index 8c273b6..1df04e0 100644 --- a/app/api/endpoints/user.py +++ b/app/api/endpoints/user.py @@ -98,7 +98,7 @@ async def login( user_code = generate_user_code(db) user = UserDB( - username=f"user_{phone[-4:]}", + nickname=f"user_{phone[-4:]}", phone=phone, user_code=user_code, referral_code=user_login.referral_code, @@ -166,7 +166,7 @@ async def phone_login( user_code = generate_user_code(db) user = UserDB( - username=f"user_{request.phone[-4:]}", + nickname=f"user_{request.phone[-4:]}", phone=request.phone, user_code=user_code, referral_code=request.referral_code, @@ -316,7 +316,7 @@ async def get_referral_users( return success_response(data=[ ReferralUserInfo( - username=user.username, + nickname=user.nickname, phone=mask_phone(user.phone), create_time=user.create_time ) for user in referral_users @@ -422,7 +422,7 @@ async def reset_password( message="密码重置成功", data={ "userid": user.userid, - "username": user.username, + "nickname": user.nickname, "phone": f"{user.phone[:3]}****{user.phone[7:]}" # 手机号脱敏 } ) @@ -493,4 +493,4 @@ async def change_password( return success_response(message="密码修改成功") except Exception as e: db.rollback() - return error_response(code=500, message=f"修改密码失败: {str(e)}") \ No newline at end of file + return error_response(code=500, message=f"修改密码失败: {str(e)}") diff --git a/app/api/endpoints/wechat.py b/app/api/endpoints/wechat.py index 47e7966..7e8b88b 100644 --- a/app/api/endpoints/wechat.py +++ b/app/api/endpoints/wechat.py @@ -4,7 +4,7 @@ from app.models.database import get_db from app.models.user import UserInfo,UserDB, PhoneLoginRequest, generate_user_code from app.models.order import ShippingOrderDB, OrderStatus from app.core.response import success_response, error_response, ResponseModel -from app.core.wechat import WeChatClient +from app.core.wechat import WeChatClient,generate_random_string from app.core.security import create_access_token, set_jwt_cookie from pydantic import BaseModel import json diff --git a/app/models/merchant.py b/app/models/merchant.py index d040919..3105e0e 100644 --- a/app/models/merchant.py +++ b/app/models/merchant.py @@ -75,7 +75,7 @@ class MerchantInfo(BaseModel): id: int user_id: int user_phone: Optional[str] = None - user_username: Optional[str] = None + user_nickname: Optional[str] = None name: str business_hours: str address: str diff --git a/app/models/user.py b/app/models/user.py index 937a7c1..e533bc1 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -26,7 +26,7 @@ class UserDB(Base): userid = Column(Integer, primary_key=True,autoincrement=True, index=True) openid = Column(String(64), unique=True, nullable=True) - username = Column(String(50)) + nickname = Column(String(50)) phone = Column(String(11), unique=True, index=True) user_code = Column(String(6), unique=True, nullable=False) referral_code = Column(String(6), ForeignKey("users.user_code"), nullable=True) @@ -48,7 +48,7 @@ class UserLogin(BaseModel): class UserInfo(BaseModel): userid: int openid: Optional[str] = None - username: str + nickname: str phone: str user_code: str referral_code: Optional[str] = None @@ -76,7 +76,7 @@ class VerifyCodeRequest(BaseModel): phone: str = Field(..., pattern="^1[3-9]\d{9}$") class UserUpdate(BaseModel): - username: Optional[str] = Field(None, min_length=2, max_length=50) + nickname: Optional[str] = Field(None, min_length=2, max_length=50) avatar: Optional[str] = Field(None, max_length=200) gender: Optional[Gender] = None @@ -106,7 +106,7 @@ def generate_user_code(db=None) -> str: return code class ReferralUserInfo(BaseModel): - username: str + nickname: str phone: str # 会在API中处理脱敏 create_time: datetime