哈哈

2026-02-14 16:49:44 +08:00
parent e3b17ed959
commit 0ac1e9549c
11 changed files with 295 additions and 748 deletions
--- a/server/models.py
+++ b/server/models.py
@@ -1,114 +1,83 @@
 # -*- coding: utf-8 -*-
 """
-数据模型：SQLAlchemy ORM 表模型 + Pydantic 请求/响应模型。
+数据模型：Django ORM 表模型 + Pydantic 内存模型。
 """
 from __future__ import annotations

 import time
 import uuid
-from datetime import datetime
 from typing import Any, Dict, List, Optional

+from django.db import models
 from pydantic import BaseModel, Field
-from sqlalchemy import (
-    Boolean, Column, DateTime, Integer, JSON, String, Text,
-    UniqueConstraint, func,
-)
-from sqlalchemy.orm import DeclarativeBase

 from common.protocol import TaskStatus, TaskType


 # ══════════════════════════════════════════════════════════════
-#  SQLAlchemy ORM 模型
+#  Django ORM 模型
 # ══════════════════════════════════════════════════════════════

-class Base(DeclarativeBase):
-    """SQLAlchemy 声明式基类。"""
-    pass
-
-
-class BossAccount(Base):
+class BossAccount(models.Model):
    """BOSS 账号登录状态表。"""
-    __tablename__ = "boss_account"
+    worker_id = models.CharField(max_length=64, verbose_name="Worker 标识")
+    browser_id = models.CharField(max_length=128, default="", verbose_name="比特浏览器窗口 ID")
+    browser_name = models.CharField(max_length=128, default="", verbose_name="比特浏览器窗口名称（环境名）")
+    boss_username = models.CharField(max_length=128, default="", verbose_name="BOSS 直聘用户名")
+    is_logged_in = models.BooleanField(default=False, verbose_name="是否已登录")
+    current_task_id = models.CharField(max_length=32, null=True, blank=True, verbose_name="当前检测任务 ID")
+    current_task_status = models.CharField(max_length=32, null=True, blank=True, verbose_name="当前检测任务状态")
+    checked_at = models.DateTimeField(null=True, blank=True, verbose_name="最近一次检测时间")
+    created_at = models.DateTimeField(auto_now_add=True, verbose_name="创建时间")
+    updated_at = models.DateTimeField(auto_now=True, verbose_name="更新时间")

-    id = Column(Integer, primary_key=True, autoincrement=True)
-    worker_id = Column(String(64), nullable=False, comment="Worker 标识")
-    browser_id = Column(String(128), nullable=False, default="", comment="比特浏览器窗口 ID")
-    browser_name = Column(String(128), default="", comment="比特浏览器窗口名称（环境名）")
-    boss_username = Column(String(128), default="", comment="BOSS 直聘用户名")
-    is_logged_in = Column(Boolean, default=False, comment="是否已登录")
-    checked_at = Column(DateTime, nullable=True, comment="最近一次检测时间")
-    created_at = Column(DateTime, default=func.now(), comment="创建时间")
-    updated_at = Column(DateTime, default=func.now(), onupdate=func.now(), comment="更新时间")
+    class Meta:
+        db_table = "boss_account"
+        unique_together = [("worker_id", "browser_id")]
+        verbose_name = "BOSS 账号"
+        verbose_name_plural = verbose_name

-    __table_args__ = (
-        UniqueConstraint("worker_id", "browser_id", name="uk_worker_browser"),
-        {"mysql_charset": "utf8mb4", "comment": "BOSS 账号登录状态"},
-    )
-
-    def to_dict(self) -> dict:
-        return {
-            "id": self.id,
-            "worker_id": self.worker_id,
-            "browser_id": self.browser_id,
-            "browser_name": self.browser_name,
-            "boss_username": self.boss_username,
-            "is_logged_in": self.is_logged_in,
-            "checked_at": self.checked_at.isoformat() if self.checked_at else None,
-            "created_at": self.created_at.isoformat() if self.created_at else None,
-            "updated_at": self.updated_at.isoformat() if self.updated_at else None,
-        }
+    def __str__(self):
+        return f"{self.browser_name}@{self.worker_id}"


-class TaskLog(Base):
+class TaskLog(models.Model):
    """任务执行记录表。"""
-    __tablename__ = "task_log"
+    task_id = models.CharField(max_length=32, unique=True, verbose_name="任务 ID")
+    task_type = models.CharField(max_length=64, verbose_name="任务类型")
+    worker_id = models.CharField(max_length=64, default="", verbose_name="执行的 Worker")
+    status = models.CharField(max_length=32, default="", verbose_name="最终状态")
+    params = models.JSONField(null=True, blank=True, verbose_name="任务参数")
+    result = models.JSONField(null=True, blank=True, verbose_name="任务结果")
+    error = models.TextField(null=True, blank=True, verbose_name="错误信息")
+    created_at = models.DateTimeField(auto_now_add=True, verbose_name="创建时间")

-    id = Column(Integer, primary_key=True, autoincrement=True)
-    task_id = Column(String(32), nullable=False, unique=True, comment="任务 ID")
-    task_type = Column(String(64), nullable=False, comment="任务类型")
-    worker_id = Column(String(64), default="", comment="执行的 Worker")
-    status = Column(String(32), default="", comment="最终状态")
-    params = Column(JSON, nullable=True, comment="任务参数")
-    result = Column(JSON, nullable=True, comment="任务结果")
-    error = Column(Text, nullable=True, comment="错误信息")
-    created_at = Column(DateTime, default=func.now(), comment="创建时间")
+    class Meta:
+        db_table = "task_log"
+        verbose_name = "任务日志"
+        verbose_name_plural = verbose_name

-    __table_args__ = (
-        {"mysql_charset": "utf8mb4", "comment": "任务执行记录"},
-    )
-
-    def to_dict(self) -> dict:
-        return {
-            "id": self.id,
-            "task_id": self.task_id,
-            "task_type": self.task_type,
-            "worker_id": self.worker_id,
-            "status": self.status,
-            "params": self.params,
-            "result": self.result,
-            "error": self.error,
-            "created_at": self.created_at.isoformat() if self.created_at else None,
-        }
+    def __str__(self):
+        return f"{self.task_id} ({self.task_type})"


-class AuthToken(Base):
+class AuthToken(models.Model):
    """登录 token 表：每个用户名仅保留当前有效 token。"""
-    __tablename__ = "auth_token"
+    username = models.CharField(max_length=64, unique=True, verbose_name="用户名")
+    token = models.CharField(max_length=64, verbose_name="当前有效 token")
+    created_at = models.DateTimeField(auto_now_add=True, verbose_name="创建时间")

-    id = Column(Integer, primary_key=True, autoincrement=True)
-    username = Column(String(64), nullable=False, unique=True, comment="用户名")
-    token = Column(String(64), nullable=False, comment="当前有效 token")
-    created_at = Column(DateTime, default=func.now(), comment="创建时间")
+    class Meta:
+        db_table = "auth_token"
+        verbose_name = "登录 Token"
+        verbose_name_plural = verbose_name

-    __table_args__ = (
-        {"mysql_charset": "utf8mb4", "comment": "登录 token"},
-    )
+    def __str__(self):
+        return self.username


 # ══════════════════════════════════════════════════════════════
-#  Pydantic 请求 / 响应模型（API 用）
+#  Pydantic 内存模型（非数据库，用于 Worker 运行时状态与任务调度）
 # ══════════════════════════════════════════════════════════════

 # ─── Worker ───
@@ -131,19 +100,10 @@ class WorkerInfo(BaseModel):
    current_task_id: Optional[str] = None


-class WorkerOut(BaseModel):
-    """返回给前端的 Worker 信息。"""
-    worker_id: str
-    worker_name: str
-    browsers: List[BrowserProfile]
-    online: bool
-    current_task_id: Optional[str] = None
-
-
 # ─── Task ───

 class TaskCreate(BaseModel):
-    """前端提交任务的请求体。"""
+    """前端提交任务的请求体（也用于内部创建任务）。"""
    task_type: TaskType
    worker_id: Optional[str] = None
    account_name: Optional[str] = None
@@ -151,7 +111,7 @@ class TaskCreate(BaseModel):


 class TaskInfo(BaseModel):
-    """任务完整信息（内存 / 返回前端）。"""
+    """任务完整信息（内存中保存）。"""
    task_id: str = Field(default_factory=lambda: uuid.uuid4().hex[:12])
    task_type: TaskType
    status: TaskStatus = TaskStatus.PENDING
@@ -163,43 +123,3 @@ class TaskInfo(BaseModel):
    error: Optional[str] = None
    created_at: float = Field(default_factory=time.time)
    updated_at: float = Field(default_factory=time.time)
-
-
-class TaskOut(BaseModel):
-    """返回给前端的任务信息。"""
-    task_id: str
-    task_type: TaskType
-    status: TaskStatus
-    worker_id: Optional[str] = None
-    account_name: Optional[str] = None
-    params: Dict[str, Any] = {}
-    progress: Optional[str] = None
-    result: Any = None
-    error: Optional[str] = None
-    created_at: float
-    updated_at: float
-
-
-# ─── 简化接口：前端添加环境名 ───
-
-class CheckLoginRequest(BaseModel):
-    """前端提交检测登录请求。worker_id 可不传（走绑定关系）。"""
-    browser_name: str
-    worker_id: Optional[str] = None
-
-
-class AccountBindRequest(BaseModel):
-    """前端添加账号时提交绑定：账号环境名 + 归属电脑。"""
-    browser_name: str
-    worker_id: str
-
-
-class LoginRequest(BaseModel):
-    """登录请求：用户名 + 密码。"""
-    username: str
-    password: str
-
-
-class LoginResponse(BaseModel):
-    """登录成功响应：返回 token。"""
-    token: str