Merge branch 'develop' of http://47.106.207.27:3000/AI260626/Mutual_Fund into develop_feat_apizyc
# Conflicts: # api/router.py # logs/error.log # logs/info.log # model/fin_customer_profile.py # requirements.txt
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
"""
|
||||
from fastapi import APIRouter
|
||||
|
||||
from api.routers import auth, product, questionnaire
|
||||
from api.routers import account, auth, holdings, purchase, redeem
|
||||
|
||||
api_router = APIRouter()
|
||||
@@ -11,3 +12,5 @@ api_router.include_router(account.router, prefix="/api", tags=["资金账户"])
|
||||
api_router.include_router(holdings.router, prefix="/api", tags=["持仓"])
|
||||
api_router.include_router(purchase.router, prefix="/api", tags=["交易"])
|
||||
api_router.include_router(redeem.router, prefix="/api", tags=["交易"])
|
||||
api_router.include_router(product.router, prefix="/api", tags=["产品"])
|
||||
api_router.include_router(questionnaire.router, prefix="/api", tags=["问卷"])
|
||||
|
||||
+11
-3
@@ -1,12 +1,13 @@
|
||||
"""认证路由:登录 + 当前用户(业务在 service/auth.py,路由只做编排)。"""
|
||||
"""认证路由:登录 + 注册 + 当前用户(业务在 service/auth.py,路由只做编排)。"""
|
||||
from fastapi import APIRouter, Depends
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from api.deps import get_current_user
|
||||
from config.deps import get_db
|
||||
from model.sys_user import SysUser
|
||||
from schemas.auth import LoginReq
|
||||
from schemas.auth import LoginReq, RegisterReq
|
||||
from service.auth import login as auth_login
|
||||
from service.auth import register as auth_register
|
||||
from service.auth import user_payload
|
||||
from utils.response import success
|
||||
|
||||
@@ -18,7 +19,14 @@ async def login(body: LoginReq, db: AsyncSession = Depends(get_db)):
|
||||
return success(await auth_login(db, body.username, body.password))
|
||||
|
||||
|
||||
@router.post("/auth/register")
|
||||
async def register(body: RegisterReq, db: AsyncSession = Depends(get_db)):
|
||||
return success(
|
||||
await auth_register(db, body.username, body.password, body.phone, body.real_name)
|
||||
)
|
||||
|
||||
|
||||
@router.get("/auth/me")
|
||||
async def me(user: SysUser = Depends(get_current_user)):
|
||||
"""受保护示例路由:任意接口加 Depends(get_current_user) 即获得当前用户。"""
|
||||
return success({"user": user_payload(user)})
|
||||
return success({"user": user_payload(user)})
|
||||
|
||||
Reference in New Issue
Block a user