This commit is contained in:
2026-08-25 19:46:38 +08:00
parent e1416994bc
commit 4cf6b1ffbc
15 changed files with 719 additions and 108 deletions
+62 -30
View File
@@ -1,59 +1,91 @@
"""
客户端注册 / 登录状态 / 用户信息路由
账号注册 / 登录 / 用户状态路由
"""
from datetime import datetime
from fastapi import APIRouter, Depends, HTTPException
from sqlalchemy.orm import Session
from ..auth import create_access_token, get_current_user
from ..auth import (
create_access_token, get_current_user, hash_password, verify_password,
)
from ..database import get_db
from ..models import User
from ..online import is_online, touch, require_online_user
from ..schemas import (
RegisterRequest, RegisterResponse, UserInfo, LoginStatusUpdate, Message,
RegisterRequest, LoginRequest, AuthResponse,
UserInfo, LoginStatusUpdate, Message,
)
router = APIRouter(prefix="/api/auth", tags=["认证与用户"])
@router.post("/register", response_model=RegisterResponse)
@router.post("/register", response_model=AuthResponse)
def register(req: RegisterRequest, db: Session = Depends(get_db)):
"""
客户端注册/登录。
以机器硬件指纹 client_code 作为唯一标识:
- 已存在 → 直接返回 token(视为登录)
- 不存在 → 创建新用户
"""
user = db.query(User).filter(User.client_code == req.client_code).first()
is_new = user is None
"""注册新账号(用户名 + 密码)"""
exists = db.query(User).filter(User.username == req.username).first()
if exists:
raise HTTPException(status_code=409, detail="用户名已存在")
if is_new:
user = User(client_code=req.client_code, nickname=req.nickname)
db.add(user)
db.commit()
db.refresh(user)
user = User(
username=req.username,
password_hash=hash_password(req.password),
nickname=req.nickname,
)
db.add(user)
db.commit()
db.refresh(user)
# 更新最后活跃时间
token = create_access_token(user.id, user.username)
return AuthResponse(user_id=user.id, username=user.username, token=token)
@router.post("/login", response_model=AuthResponse)
def login(req: LoginRequest, db: Session = Depends(get_db)):
"""账号密码登录,返回 JWT token"""
user = db.query(User).filter(User.username == req.username).first()
if user is None or not verify_password(req.password, user.password_hash):
raise HTTPException(status_code=401, detail="用户名或密码错误")
if not user.is_active:
raise HTTPException(status_code=403, detail="账号已被禁用")
# 记录登录设备与活跃时间(client_code 仅作审计)
if req.client_code:
user.client_code = req.client_code
user.last_seen_at = datetime.utcnow()
db.commit()
token = create_access_token(user.id, user.client_code)
return RegisterResponse(
user_id=user.id,
token=token,
client_code=user.client_code,
is_new=is_new,
)
token = create_access_token(user.id, user.username)
return AuthResponse(user_id=user.id, username=user.username, token=token)
@router.post("/heartbeat", response_model=Message)
def heartbeat(
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""客户端心跳:刷新 last_seen_at,用于在线判定(统一走 online.touch)"""
touch(current_user, db)
return Message(msg="ok")
@router.get("/me", response_model=UserInfo)
def get_me(current_user: User = Depends(get_current_user)):
"""获取当前用户信息"""
def get_me(
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""获取当前用户信息(含 RPA 在线状态)"""
online = is_online(current_user)
# 懒清理:客户端已离线却仍停留在“登录中”,说明登录轮询已中断,重置为未登录
if not online and current_user.login_status == "logging_in":
current_user.login_status = "not_login"
db.commit()
return UserInfo(
id=current_user.id,
client_code=current_user.client_code,
username=current_user.username,
nickname=current_user.nickname,
boss_account=current_user.boss_account,
login_status=current_user.login_status,
is_online=online,
created_at=current_user.created_at,
)
@@ -61,10 +93,10 @@ def get_me(current_user: User = Depends(get_current_user)):
@router.put("/login-status", response_model=Message)
def update_login_status(
req: LoginStatusUpdate,
current_user: User = Depends(get_current_user),
current_user: User = Depends(require_online_user),
db: Session = Depends(get_db),
):
"""更新 Boss直聘 登录状态"""
"""更新 Boss直聘 登录状态(前置校验:RPA 必须在线)"""
valid_status = {"not_login", "logging_in", "logged_in"}
if req.login_status not in valid_status:
raise HTTPException(status_code=400, detail=f"登录状态必须是 {valid_status} 之一")