deliveryman/deliveryman-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
aaron 2025-02-15 21:37:07 +08:00
parent fac11ca3a0
commit ca1b990b0b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/api/endpoints/user.py
View File

@ -302,17 +302,18 @@ async def password_login(
if not verify_password(login_data.password, user.password): if not verify_password(login_data.password, user.password):
return error_response(code=401, message="密码错误") return error_response(code=401, message="密码错误")
if user.roles not in [UserRole.DELIVERYMAN, UserRole.MERCHANT, UserRole.ADMIN]:
return error_response(code=401, message="只有配送员、商家和管理员可以登录")
if user.roles == UserRole.MERCHANT: if login_data.is_admin:
if UserRole.ADMIN not in user.roles:
return error_response(code=401, message="管理员账户，请先设置管理员角色")
if UserRole.MERCHANT in user.roles:
# 检查是否有商家设置了当前用户 id # 检查是否有商家设置了当前用户 id
merchant = db.query(MerchantDB).filter(MerchantDB.user_id == user.userid).first() merchant = db.query(MerchantDB).filter(MerchantDB.user_id == user.userid).first()
if not merchant: if not merchant:
return error_response(code=401, message="商家账户，请先关联商家") return error_response(code=401, message="商家账户，请先关联商 家")
if user.roles == UserRole.DELIVERYMAN and not user.community_id: if UserRole.DELIVERYMAN in user.roles and not user.community_id:
return error_response(code=401, message="配送员账户，请先设置归属小区") return error_response(code=401, message="配送员账户，请先设置归属小区")
# 生成访问令牌 # 生成访问令牌

3
app/models/user.py
View File

@ -92,7 +92,8 @@ class UserUpdate(BaseModel):
class UserPasswordLogin(BaseModel): class UserPasswordLogin(BaseModel):
phone: str = Field(..., pattern="^1[3-9]\d{9}$") phone: str = Field(..., pattern="^1[3-9]\d{9}$")
password: str = Field(..., min_length=6, max_length=20) password: str = Field(..., min_length=6, max_length=20)
is_admin: bool = Field(default=False)
class ChangePasswordRequest(BaseModel): class ChangePasswordRequest(BaseModel):
verify_code: str = Field(..., min_length=6, max_length=6) verify_code: str = Field(..., min_length=6, max_length=6)