This commit is contained in:
2026-08-26 14:15:06 +08:00
parent 48dd28a796
commit e3280623de
10 changed files with 541 additions and 65 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ REM 每次升级改 APP_VERSION,避免与正在运行的旧版本目录冲突
REM 使用:把整个文件夹拷到目标机器(或压缩成 zip 发送), REM 使用:把整个文件夹拷到目标机器(或压缩成 zip 发送),
REM 双击文件夹里的 Boss直聘AI投递-%APP_VERSION%.exe 运行。 REM 双击文件夹里的 Boss直聘AI投递-%APP_VERSION%.exe 运行。
REM ============================================================ REM ============================================================
set APP_VERSION=1.5 set APP_VERSION=1.6
echo [1/2] 安装打包依赖... echo [1/2] 安装打包依赖...
pip install pyinstaller PySide6 --quiet pip install pyinstaller PySide6 --quiet
+18 -2
View File
@@ -117,13 +117,14 @@ class ServerAPI:
resp.raise_for_status() resp.raise_for_status()
return resp.json() return resp.json()
def heartbeat(self) -> bool: def heartbeat(self, payload: dict | None = None) -> bool:
"""发送心跳,刷新服务端 last_seen_at;失败返回 False(不抛异常)""" """发送心跳并携带 RPA 全量状态;失败返回 False(不抛异常)"""
if not self.token: if not self.token:
return False return False
try: try:
resp = self._req("post", resp = self._req("post",
f"{self.base_url}/api/auth/heartbeat", f"{self.base_url}/api/auth/heartbeat",
json=payload or {},
headers=self._headers(), timeout=10, headers=self._headers(), timeout=10,
) )
return resp.status_code == 200 return resp.status_code == 200
@@ -131,6 +132,21 @@ class ServerAPI:
logger.debug(f"心跳发送失败:{e}") logger.debug(f"心跳发送失败:{e}")
return False return False
def fetch_pending_task(self) -> dict | None:
"""轮询拉取待执行的远程控制任务(服务端已标记 running)"""
resp = self._req("get", f"{self.base_url}/api/rpa/tasks/pending",
headers=self._headers(), timeout=10)
resp.raise_for_status()
return resp.json().get("task")
def finish_task(self, task_id: int, status: str, result: str = "") -> None:
"""远程任务执行完回调:更新终态与结果"""
resp = self._req("post",
f"{self.base_url}/api/rpa/tasks/{task_id}/finish",
json={"status": status, "result": result[:500]},
headers=self._headers(), timeout=10)
resp.raise_for_status()
def update_login_status(self, status: str, boss_account: str | None = None) -> dict: def update_login_status(self, status: str, boss_account: str | None = None) -> dict:
payload = {"login_status": status} payload = {"login_status": status}
if boss_account: if boss_account:
+117 -41
View File
@@ -40,7 +40,8 @@ class AppState:
self.applicant: Applicant | None = None self.applicant: Applicant | None = None
self.connected = False # 是否已注册/登录云端 self.connected = False # 是否已注册/登录云端
self.login_polling = False self.login_polling = False
self._heartbeat_started = False self._control_started = False
self._boss_login = "unknown" # Boss 登录状态缓存(控制线程周期刷新)
def ensure_applicant(self) -> Applicant: def ensure_applicant(self) -> Applicant:
if self.applicant is None: if self.applicant is None:
@@ -48,34 +49,129 @@ class AppState:
return self.applicant return self.applicant
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# 心跳:登录成功后启动后台线程,周期性向服务端上报存活 # 控制线程:登录成功后启动,5s 一轮 = 心跳带全量状态 + outbox 补发 + 远程任务轮询
# ------------------------------------------------------------------ # ------------------------------------------------------------------
def ensure_heartbeat(self) -> None: def ensure_control(self) -> None:
if self._heartbeat_started or not self.server_api.token: if self._control_started or not self.server_api.token:
return return
self._heartbeat_started = True self._control_started = True
threading.Thread(target=self._heartbeat_loop, daemon=True).start() threading.Thread(target=self._control_loop, daemon=True).start()
logger.info(f"心跳线程已启动,间隔 {client_settings.HEARTBEAT_INTERVAL}s") logger.info("控制线程已启动(状态上报/outbox 补发/远程任务轮询,间隔 5s)")
def _heartbeat_loop(self) -> None: def _control_loop(self) -> None:
rounds = 0
while True: while True:
if not self.server_api.token: if not self.server_api.token:
# 已退出登录,停止心跳 # 已退出登录,停止控制线程
self._heartbeat_started = False self._control_started = False
logger.info("已退出登录,心跳停止") logger.info("已退出登录,控制线程停止")
break break
self.server_api.heartbeat() try:
# 心跳每轮顺便补发 outbox(网络恢复后自动补齐丢失记录) self.server_api.heartbeat(self._collect_status(rounds))
except Exception as e:
logger.debug(f"状态上报失败:{e}")
try: try:
outbox.flush(self.server_api) outbox.flush(self.server_api)
except Exception as e: except Exception as e:
logger.debug(f"outbox 补发轮异常:{e}") logger.debug(f"outbox 补发轮异常:{e}")
time.sleep(client_settings.HEARTBEAT_INTERVAL) try:
self._poll_remote_task()
except Exception as e:
logger.debug(f"远程任务轮询异常:{e}")
rounds += 1
time.sleep(5)
def _collect_status(self, rounds: int) -> dict:
"""采集 RPA 全量状态,随心跳上报(每用户单设备,服务端一行快照)"""
# 每 6 轮(约 30s)活体刷新 Boss 登录状态,其余轮次用缓存
if rounds % 6 == 0:
try:
if self.browser.is_browser_running():
new = "logged_in" if self.browser.check_boss_login() else "not_login"
else:
new = "not_login"
if new != self._boss_login:
self._boss_login = new
# 与云端 User.login_status 保持一致
try:
if new == "logged_in":
self.server_api.update_login_status("logged_in",
self.browser.get_boss_account_name())
else:
self.server_api.update_login_status("not_login")
except Exception:
pass
except Exception as e:
logger.debug(f"Boss 登录状态刷新失败:{e}")
applying = bool(self.applicant and self.applicant.is_running)
stats = self.applicant.stats if self.applicant else {}
return {
"boss_login": self._boss_login,
"browser": "running" if self.browser.is_browser_running() else "stopped",
"apply_status": "running" if applying else "idle",
"current": (stats.get("current") or "") if applying else "",
"applied": stats.get("applied", 0),
"skipped": stats.get("skipped", 0),
}
def _poll_remote_task(self) -> None:
"""拉取并执行云端下发的远程控制任务,执行完回调终态"""
task = self.server_api.fetch_pending_task()
if not task:
return
tid, ttype = task["id"], task["task_type"]
logger.info(f"收到远程任务 #{tid}:{ttype}")
try:
if ttype == "start_apply":
res = start_apply_shared(task.get("params") or {})
status, result = ("done", res["msg"]) if res["ok"] else ("failed", res["msg"])
elif ttype == "stop_apply":
applicant = self.ensure_applicant()
if applicant.is_running:
applicant.stop()
status, result = "done", "停止指令已下达"
else:
status, result = "done", "当前没有运行中的投递任务"
else:
status, result = "failed", f"未知任务类型:{ttype}"
except Exception as e:
status, result = "failed", f"执行异常:{e}"
logger.info(f"远程任务 #{tid} 执行结果:{status} - {result}")
try:
self.server_api.finish_task(tid, status, result)
except Exception as e:
logger.warning(f"远程任务回调失败 #{tid}:{e}")
state = AppState() state = AppState()
def start_apply_shared(params: dict) -> dict:
"""面板 / 远程任务共用的启动入口(返回 ok+msg,不抛业务异常)"""
if not state.server_api.get_primary_resume():
return {"ok": False, "msg": "请先设置主简历"}
try:
# 浏览器可能被用户手动关闭,投递前确保已拉起(复用登录态 profile)
state.browser.ensure_browser_started()
except RuntimeError as e:
return {"ok": False, "msg": str(e)}
applicant = state.ensure_applicant()
if applicant.is_running:
return {"ok": False, "msg": "已有投递任务在运行"}
applicant.start(
keywords=list(params.get("keywords") or []),
city_code=str(params.get("city_code") or ""),
salary_min=params.get("salary_min"),
salary_max=params.get("salary_max"),
min_score=int(params.get("min_score") or 65),
delay_range=(int(params.get("delay_min") or 3), int(params.get("delay_max") or 8)),
boss_online_only=bool(params.get("boss_online_only")),
daily_limit=int(params.get("daily_limit") or 0),
allow_headhunter=bool(params.get("allow_headhunter")),
)
return {"ok": True, "msg": "投递任务已启动", "session_id": applicant.session_id}
# ======================================================= # =======================================================
# 前置校验(收敛:所有需要已登录云端的路由统一走这里) # 前置校验(收敛:所有需要已登录云端的路由统一走这里)
# ======================================================= # =======================================================
@@ -148,7 +244,7 @@ def get_status():
try: try:
me = state.server_api.get_me() me = state.server_api.get_me()
state.connected = True state.connected = True
state.ensure_heartbeat() # token 有效时确保心跳线程在跑 state.ensure_control() # token 有效时确保控制线程在跑
except Exception: except Exception:
state.connected = False state.connected = False
state.server_api.logout() # token 失效,清除本地缓存 state.server_api.logout() # token 失效,清除本地缓存
@@ -200,7 +296,7 @@ def register(req: AuthReq):
try: try:
data = state.server_api.register(req.username, req.password, req.nickname) data = state.server_api.register(req.username, req.password, req.nickname)
state.connected = True state.connected = True
state.ensure_heartbeat() state.ensure_control()
return {"ok": True, "user_id": data["user_id"], "username": data["username"]} return {"ok": True, "user_id": data["user_id"], "username": data["username"]}
except requests.HTTPError as e: except requests.HTTPError as e:
raise HTTPException(status_code=e.response.status_code, detail=_extract_error(e)) raise HTTPException(status_code=e.response.status_code, detail=_extract_error(e))
@@ -214,7 +310,7 @@ def login(req: AuthReq):
try: try:
data = state.server_api.login(req.username, req.password) data = state.server_api.login(req.username, req.password)
state.connected = True state.connected = True
state.ensure_heartbeat() state.ensure_control()
return {"ok": True, "user_id": data["user_id"], "username": data["username"]} return {"ok": True, "user_id": data["user_id"], "username": data["username"]}
except requests.HTTPError as e: except requests.HTTPError as e:
raise HTTPException(status_code=e.response.status_code, detail=_extract_error(e)) raise HTTPException(status_code=e.response.status_code, detail=_extract_error(e))
@@ -377,30 +473,10 @@ def delete_resume(resume_id: int):
def start_apply(req: StartApplyReq): def start_apply(req: StartApplyReq):
_require_auth() _require_auth()
_require_rpa_online() # 在线预检:与服务端 require_online_user 前置校验呼应 _require_rpa_online() # 在线预检:与服务端 require_online_user 前置校验呼应
if not state.server_api.get_primary_resume(): res = start_apply_shared(req.model_dump())
raise HTTPException(status_code=400, detail="请先设置主简历") if not res["ok"]:
try: raise HTTPException(status_code=400, detail=res["msg"])
# 浏览器可能被用户手动关闭,投递前确保已拉起(复用登录态 profile) return {"ok": True, "session_id": res.get("session_id")}
state.browser.ensure_browser_started()
except RuntimeError as e:
raise HTTPException(status_code=400, detail=str(e))
applicant = state.ensure_applicant()
if applicant.is_running:
raise HTTPException(status_code=400, detail="已有投递任务在运行")
applicant.start(
keywords=req.keywords,
city_code=req.city_code,
salary_min=req.salary_min,
salary_max=req.salary_max,
min_score=req.min_score,
delay_range=(req.delay_min, req.delay_max),
boss_online_only=req.boss_online_only,
daily_limit=req.daily_limit,
allow_headhunter=req.allow_headhunter,
)
return {"ok": True, "session_id": applicant.session_id}
@app.post("/api/stop-apply") @app.post("/api/stop-apply")
+49 -13
View File
@@ -120,21 +120,57 @@ CREATE TABLE IF NOT EXISTS company_blacklist (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
COMMENT='公司黑名单'; COMMENT='公司黑名单';
-- ============================================================ -- ------------------------------------------------------------
-- 附:老库升级脚本(已建过表、缺少新增字段时执行) -- 6. RPA 状态快照(每用户一行,心跳携带全量状态上报)
-- ============================================================ -- ------------------------------------------------------------
ALTER TABLE job_applications CREATE TABLE IF NOT EXISTS rpa_status (
ADD COLUMN jd_text TEXT NULL COMMENT '职位JD全文', user_id INT PRIMARY KEY,
ADD COLUMN greeting VARCHAR(500) NULL COMMENT '实际发送的打招呼语'; boss_login VARCHAR(20) NOT NULL DEFAULT 'unknown' COMMENT 'Boss登录状态',
browser VARCHAR(20) NOT NULL DEFAULT 'unknown' COMMENT '浏览器状态',
apply_status VARCHAR(20) NOT NULL DEFAULT 'idle' COMMENT '投递状态 idle/running',
current VARCHAR(200) NULL COMMENT '当前进度文本',
applied INT NOT NULL DEFAULT 0 COMMENT '本次投递数',
skipped INT NOT NULL DEFAULT 0 COMMENT '本次跳过数',
updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
CONSTRAINT fk_rpa_status_user FOREIGN KEY (user_id)
REFERENCES users (id) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
COMMENT='RPA 状态快照';
老库新增公司黑名单表: -- ------------------------------------------------------------
CREATE TABLE IF NOT EXISTS company_blacklist ( -- 7. 远程控制任务(云端下发 → 客户端轮询执行 → 回调更新)
-- ------------------------------------------------------------
CREATE TABLE IF NOT EXISTS rpa_task (
id INT AUTO_INCREMENT PRIMARY KEY, id INT AUTO_INCREMENT PRIMARY KEY,
user_id INT NOT NULL, user_id INT NOT NULL,
company VARCHAR(128) NOT NULL, task_type VARCHAR(20) NOT NULL COMMENT 'start_apply/stop_apply',
params TEXT NULL COMMENT '任务参数 JSON',
status VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending/running/done/failed/expired',
result VARCHAR(500) NULL COMMENT '执行结果',
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
UNIQUE KEY uq_user_company (user_id, company), updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
KEY ix_blacklist_user_id (user_id), KEY ix_rpa_task_user (user_id),
CONSTRAINT fk_blacklist_user FOREIGN KEY (user_id) KEY ix_rpa_task_user_status (user_id, status),
CONSTRAINT fk_rpa_task_user FOREIGN KEY (user_id)
REFERENCES users (id) ON DELETE CASCADE REFERENCES users (id) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
COMMENT='远程控制任务';
-- -- ============================================================
-- -- 附:老库升级脚本(已建过表、缺少新增字段时执行)
-- -- ============================================================
-- ALTER TABLE job_applications
-- ADD COLUMN jd_text TEXT NULL COMMENT '职位JD全文',
-- ADD COLUMN greeting VARCHAR(500) NULL COMMENT '实际发送的打招呼语';
--
-- 老库新增公司黑名单表:
-- CREATE TABLE IF NOT EXISTS company_blacklist (
-- id INT AUTO_INCREMENT PRIMARY KEY,
-- user_id INT NOT NULL,
-- company VARCHAR(128) NOT NULL,
-- created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-- UNIQUE KEY uq_user_company (user_id, company),
-- KEY ix_blacklist_user_id (user_id),
-- CONSTRAINT fk_blacklist_user FOREIGN KEY (user_id)
-- REFERENCES users (id) ON DELETE CASCADE
-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+2 -1
View File
@@ -14,7 +14,7 @@ from loguru import logger
from .config import settings from .config import settings
from .database import engine from .database import engine
from .routers import register, resumes, sessions, jobs, blacklist from .routers import register, resumes, sessions, jobs, blacklist, rpa
@asynccontextmanager @asynccontextmanager
@@ -49,6 +49,7 @@ app.include_router(resumes.router)
app.include_router(sessions.router) app.include_router(sessions.router)
app.include_router(jobs.router) app.include_router(jobs.router)
app.include_router(blacklist.router) app.include_router(blacklist.router)
app.include_router(rpa.router)
@app.get("/", tags=["健康检查"]) @app.get("/", tags=["健康检查"])
+48
View File
@@ -156,3 +156,51 @@ class CompanyBlacklist(Base):
created_at = Column(DateTime, default=utcnow, nullable=False) created_at = Column(DateTime, default=utcnow, nullable=False)
user = relationship("User", back_populates="blacklist") user = relationship("User", back_populates="blacklist")
class RpaStatus(Base):
"""
客户端 RPA 状态快照(每用户一行,单设备不做设备区分)。
心跳每次携带全量状态上报:Boss 登录 / 浏览器 / 投递状态。
"""
__tablename__ = "rpa_status"
user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"),
primary_key=True)
# Boss 直聘登录状态:not_login / logging_in / logged_in / unknown
boss_login = Column(String(20), default="unknown", nullable=False)
# 指纹浏览器状态:running / stopped / unknown
browser = Column(String(20), default="unknown", nullable=False)
# 投递状态:idle / running
apply_status = Column(String(20), default="idle", nullable=False)
# 当前进度文本(如“评估:xx公司 - xx职位”)
current = Column(String(200), nullable=True)
applied = Column(Integer, default=0, nullable=False)
skipped = Column(Integer, default=0, nullable=False)
updated_at = Column(DateTime, default=utcnow, onupdate=utcnow, nullable=False)
user = relationship("User")
class RpaTask(Base):
"""
远程控制任务(云端下发 → 客户端轮询执行 → 回调更新状态)。
状态机:pending → running → done/failed;pending 超时 → expired。
去重:同类型任务未达终态(done/failed/expired)时拒绝重复下发。
"""
__tablename__ = "rpa_task"
id = Column(Integer, primary_key=True, autoincrement=True)
user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"),
nullable=False, index=True)
# start_apply / stop_apply
task_type = Column(String(20), nullable=False)
# 任务参数 JSON(start_apply 的投递参数)
params = Column(Text, nullable=True)
# pending / running / done / failed / expired
status = Column(String(20), default="pending", nullable=False)
result = Column(String(500), nullable=True)
created_at = Column(DateTime, default=utcnow, nullable=False)
updated_at = Column(DateTime, default=utcnow, onupdate=utcnow, nullable=False)
user = relationship("User")
+20 -3
View File
@@ -2,6 +2,7 @@
账号注册 / 登录 / 用户状态路由 账号注册 / 登录 / 用户状态路由
""" """
from datetime import datetime from datetime import datetime
from typing import Optional
from fastapi import APIRouter, Depends, HTTPException from fastapi import APIRouter, Depends, HTTPException
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
@@ -9,11 +10,11 @@ from ..auth import (
create_access_token, get_current_user, hash_password, verify_password, create_access_token, get_current_user, hash_password, verify_password,
) )
from ..database import get_db from ..database import get_db
from ..models import User from ..models import User, RpaStatus
from ..online import is_online, touch, require_online_user from ..online import is_online, touch, require_online_user
from ..schemas import ( from ..schemas import (
RegisterRequest, LoginRequest, AuthResponse, RegisterRequest, LoginRequest, AuthResponse,
UserInfo, LoginStatusUpdate, Message, UserInfo, LoginStatusUpdate, Message, HeartbeatIn,
) )
router = APIRouter(prefix="/api/auth", tags=["认证与用户"]) router = APIRouter(prefix="/api/auth", tags=["认证与用户"])
@@ -60,11 +61,27 @@ def login(req: LoginRequest, db: Session = Depends(get_db)):
@router.post("/heartbeat", response_model=Message) @router.post("/heartbeat", response_model=Message)
def heartbeat( def heartbeat(
req: Optional[HeartbeatIn] = None,
current_user: User = Depends(get_current_user), current_user: User = Depends(get_current_user),
db: Session = Depends(get_db), db: Session = Depends(get_db),
): ):
"""客户端心跳:刷新 last_seen_at,用于在线判定(统一走 online.touch)""" """客户端心跳:刷新 last_seen_at(在线判定),同时携带 RPA 全量状态写入 rpa_status"""
touch(current_user, db) touch(current_user, db)
st = db.query(RpaStatus).filter(RpaStatus.user_id == current_user.id).first()
if st is None:
st = RpaStatus(user_id=current_user.id)
db.add(st)
if req:
if req.boss_login:
st.boss_login = req.boss_login
if req.browser:
st.browser = req.browser
if req.apply_status:
st.apply_status = req.apply_status
st.current = (req.current or "")[:200] or None
st.applied = req.applied
st.skipped = req.skipped
db.commit()
return Message(msg="ok") return Message(msg="ok")
+167
View File
@@ -0,0 +1,167 @@
"""
远程控制路由:云端下发开始/结束投递任务,客户端轮询执行并回调。
- 状态快照 rpa_status:心跳携带全量状态上报,每用户一行(单设备)
- 任务 rpa_task:pending → running → done/failed,pending 超时 → expired
- 去重(服务端权威拦截):同类型任务未达终态时拒绝重复下发
"""
import json
from datetime import datetime, timedelta
from fastapi import APIRouter, Depends, HTTPException, Query
from sqlalchemy.orm import Session
from ..auth import get_current_user
from ..database import get_db
from ..models import User, RpaStatus, RpaTask
from ..online import is_online
from ..schemas import RpaTaskIn, RpaTaskFinishIn, Message
router = APIRouter(prefix="/api/rpa", tags=["远程控制"])
# 任务终态:达到终态后同类型任务才允许再次下发
TERMINAL_STATUS = ("done", "failed", "expired")
# pending 超过该时长未客户端认领则过期,防止离线恢复后执行过时任务
PENDING_EXPIRE_MINUTES = 10
def _task_dict(t: RpaTask) -> dict:
return {
"id": t.id,
"task_type": t.task_type,
"params": json.loads(t.params) if t.params else None,
"status": t.status,
"result": t.result,
"created_at": (t.created_at + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S"),
"updated_at": (t.updated_at + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S"),
}
@router.get("/status", response_model=dict)
def get_rpa_status(
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""RPA 状态快照(控制端展示):在线 + Boss登录 + 浏览器 + 投递状态"""
st = db.query(RpaStatus).filter(RpaStatus.user_id == current_user.id).first()
return {
"online": is_online(current_user),
"boss_login": st.boss_login if st else "unknown",
"browser": st.browser if st else "unknown",
"apply_status": st.apply_status if st else "idle",
"current": st.current if st else None,
"applied": st.applied if st else 0,
"skipped": st.skipped if st else 0,
"updated_at": (st.updated_at + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S") if st else None,
}
@router.post("/tasks", response_model=dict)
def create_task(
req: RpaTaskIn,
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""控制端下发任务。服务端权威去重:同类型非终态任务存在时拒绝"""
if req.task_type not in ("start_apply", "stop_apply"):
raise HTTPException(status_code=422, detail="未知任务类型")
if not is_online(current_user):
raise HTTPException(status_code=409, detail="RPA 客户端离线,无法下发任务")
# 去重拦截:同类型任务未达终态,禁止重复下发
dup = db.query(RpaTask).filter(
RpaTask.user_id == current_user.id,
RpaTask.task_type == req.task_type,
RpaTask.status.in_(("pending", "running")),
).first()
if dup:
raise HTTPException(
status_code=409,
detail=f"已有同类型任务未结束(#{dup.id} 状态={dup.status}),请勿重复下发")
# 基于状态快照的业务预检,避免下发必然失败的任务
st = db.query(RpaStatus).filter(RpaStatus.user_id == current_user.id).first()
if req.task_type == "start_apply" and st and st.apply_status == "running":
raise HTTPException(status_code=409, detail="投递任务已在运行中")
if req.task_type == "stop_apply" and st and st.apply_status != "running":
raise HTTPException(status_code=409, detail="当前没有运行中的投递任务")
if req.task_type == "start_apply":
params = req.params or {}
if not params.get("keywords") or not params.get("city_code"):
raise HTTPException(status_code=422, detail="开始投递必须提供 keywords 与 city_code")
task = RpaTask(
user_id=current_user.id,
task_type=req.task_type,
params=json.dumps(req.params or {}, ensure_ascii=False),
)
db.add(task)
db.commit()
db.refresh(task)
return _task_dict(task)
@router.get("/tasks", response_model=dict)
def list_tasks(
limit: int = Query(20, ge=1, le=100),
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""控制端任务历史(倒序)"""
rows = db.query(RpaTask).filter(RpaTask.user_id == current_user.id) \
.order_by(RpaTask.id.desc()).limit(limit).all()
return {"items": [_task_dict(t) for t in rows]}
@router.get("/tasks/pending", response_model=dict)
def fetch_pending_task(
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""客户端轮询:取走最早一条 pending 并标记 running(认领即占位,防重复拉取)"""
# 顺带过期清理:pending 超时未认领 → expired
cutoff = datetime.utcnow() - timedelta(minutes=PENDING_EXPIRE_MINUTES)
stale = db.query(RpaTask).filter(
RpaTask.user_id == current_user.id,
RpaTask.status == "pending",
RpaTask.created_at < cutoff,
).all()
for t in stale:
t.status = "expired"
t.result = f"超过 {PENDING_EXPIRE_MINUTES} 分钟未执行,自动过期"
task = db.query(RpaTask).filter(
RpaTask.user_id == current_user.id,
RpaTask.status == "pending",
).order_by(RpaTask.id.asc()).first()
if not task:
db.commit()
return {"task": None}
task.status = "running"
db.commit()
db.refresh(task)
return {"task": _task_dict(task)}
@router.post("/tasks/{task_id}/finish", response_model=Message)
def finish_task(
task_id: int,
req: RpaTaskFinishIn,
current_user: User = Depends(get_current_user),
db: Session = Depends(get_db),
):
"""客户端执行完回调:更新任务终态与结果"""
if req.status not in ("done", "failed"):
raise HTTPException(status_code=422, detail="回调状态只能为 done/failed")
task = db.query(RpaTask).filter(
RpaTask.id == task_id,
RpaTask.user_id == current_user.id,
).first()
if not task:
raise HTTPException(status_code=404, detail="任务不存在")
task.status = req.status
task.result = (req.result or "")[:500]
db.commit()
return Message(msg="ok")
+23
View File
@@ -172,6 +172,29 @@ class BlacklistOut(BaseModel):
from_attributes = True from_attributes = True
# =======================================================
# 远程控制(RPA 状态上报 + 任务下发)
# =======================================================
class HeartbeatIn(BaseModel):
"""心跳携带的 RPA 全量状态(可选,老客户端不带体也兼容)"""
boss_login: Optional[str] = None
browser: Optional[str] = None
apply_status: Optional[str] = None
current: Optional[str] = None
applied: int = 0
skipped: int = 0
class RpaTaskIn(BaseModel):
task_type: str = Field(..., description="start_apply / stop_apply")
params: Optional[dict] = None
class RpaTaskFinishIn(BaseModel):
status: str = Field(..., description="done / failed")
result: Optional[str] = None
# ======================================================= # =======================================================
# 通用 # 通用
# ======================================================= # =======================================================
+96 -4
View File
@@ -111,6 +111,7 @@
<aside> <aside>
<div class="menu-item active" data-page="data">投递数据</div> <div class="menu-item active" data-page="data">投递数据</div>
<div class="menu-item" data-page="blacklist">公司黑名单</div> <div class="menu-item" data-page="blacklist">公司黑名单</div>
<div class="menu-item" data-page="remote">远程控制</div>
</aside> </aside>
<!-- 右侧内容 --> <!-- 右侧内容 -->
@@ -186,6 +187,35 @@
<button id="blNext">下一页</button> <button id="blNext">下一页</button>
</div> </div>
</div> </div>
<!-- 远程控制 -->
<div id="pageRemote" class="hidden">
<div class="stats" id="remoteStatus">
<div class="stat-card"><div class="num" id="rsOnline">-</div><div class="label">客户端在线</div></div>
<div class="stat-card"><div class="num" id="rsBoss">-</div><div class="label">Boss 登录</div></div>
<div class="stat-card"><div class="num" id="rsBrowser">-</div><div class="label">浏览器</div></div>
<div class="stat-card"><div class="num" id="rsApply">-</div><div class="label">投递状态</div></div>
</div>
<div class="bl-tip" id="rsDetail">进度:- | 更新:-</div>
<div class="bl-add" style="flex-wrap:wrap;">
<input type="text" id="rKeywords" placeholder="搜索关键词,多个用逗号分隔,如:java,后端" style="flex:2;min-width:220px;">
<input type="text" id="rCity" placeholder="城市码(如 101010100=北京)" style="flex:1;min-width:150px;">
<input type="number" id="rScore" placeholder="及格分" value="65" style="width:80px;">
<input type="number" id="rLimit" placeholder="每日上限(0不限)" value="0" style="width:130px;">
<label style="display:flex;align-items:center;gap:4px;font-size:13px;"><input type="checkbox" id="rOnlineOnly"> 只投在线Boss</label>
<label style="display:flex;align-items:center;gap:4px;font-size:13px;"><input type="checkbox" id="rHunter"> 考虑猎头</label>
<button id="btnStartRemote" style="background:#1890ff;">开始投递</button>
<button id="btnStopRemote">结束投递</button>
</div>
<div class="bl-tip">任务下发后客户端 5 秒内认领执行;同类型任务未结束前不能重复下发。</div>
<table>
<thead><tr><th style="width:150px">时间</th><th style="width:100px">类型</th><th style="width:90px">状态</th><th>结果</th></tr></thead>
<tbody id="taskTbody"></tbody>
</table>
<div class="empty hidden" id="taskEmpty">暂无远程任务</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -348,13 +378,53 @@ async function removeBlacklist(id) {
} catch (e) { alert('移除失败:' + (e.message || '')); } } catch (e) { alert('移除失败:' + (e.message || '')); }
} }
/* ---------- 远程控制 ---------- */
const TASK_TXT = { start_apply: '开始投递', stop_apply: '结束投递' };
const TASK_STATUS_TXT = { pending: '待认领', running: '执行中', done: '已完成', failed: '失败', expired: '已过期' };
async function loadRemote() {
try {
const st = await api('/api/rpa/status');
const put = (id, txt, cls) => {
const el = document.getElementById(id);
el.textContent = txt;
el.className = 'num ' + (cls || '');
};
put('rsOnline', st.online ? '在线' : '离线', st.online ? 'green' : 'orange');
put('rsBoss', st.boss_login === 'logged_in' ? '已登录' : (st.boss_login === 'logging_in' ? '登录中' : '未登录'),
st.boss_login === 'logged_in' ? 'green' : 'orange');
put('rsBrowser', st.browser === 'running' ? '运行中' : '已停止', st.browser === 'running' ? 'green' : 'orange');
put('rsApply', st.apply_status === 'running' ? '运行中' : '空闲', st.apply_status === 'running' ? 'blue' : 'green');
document.getElementById('rsDetail').textContent =
'进度:' + (st.apply_status === 'running' ? (st.current || '-') + ' 投' + st.applied + '/跳' + st.skipped : '-') +
' | 状态更新:' + (st.updated_at || '-');
} catch (e) { /* 401 已在 api 内处理 */ }
try {
const d = await api('/api/rpa/tasks?limit=15');
const items = d.items || [];
document.getElementById('taskTbody').innerHTML = items.map(t =>
'<tr><td>' + esc(t.created_at) + '</td><td>' + (TASK_TXT[t.task_type] || t.task_type) + '</td><td>' +
(TASK_STATUS_TXT[t.status] || t.status) + '</td><td>' + esc(t.result || '-') + '</td></tr>'
).join('');
document.getElementById('taskEmpty').classList.toggle('hidden', items.length > 0);
} catch (e) { /* ignore */ }
}
async function sendTask(taskType, params) {
try {
await api('/api/rpa/tasks', { method: 'POST', body: JSON.stringify({ task_type: taskType, params }) });
await loadRemote();
} catch (e) { alert('下发失败:' + (e.message || '')); }
}
/* ---------- 页面切换 ---------- */ /* ---------- 页面切换 ---------- */
function switchPage(page) { function switchPage(page) {
document.querySelectorAll('aside .menu-item').forEach(el => document.querySelectorAll('aside .menu-item').forEach(el =>
el.classList.toggle('active', el.dataset.page === page)); el.classList.toggle('active', el.dataset.page === page));
document.getElementById('pageData').classList.toggle('hidden', page !== 'data'); document.getElementById('pageData').classList.toggle('hidden', page !== 'data');
document.getElementById('pageBlacklist').classList.toggle('hidden', page !== 'blacklist'); document.getElementById('pageBlacklist').classList.toggle('hidden', page !== 'blacklist');
if (page === 'data') load(); else loadBlacklist(); document.getElementById('pageRemote').classList.toggle('hidden', page !== 'remote');
if (page === 'data') load(); else if (page === 'blacklist') loadBlacklist(); else loadRemote();
} }
/* ---------- 事件绑定 ---------- */ /* ---------- 事件绑定 ---------- */
@@ -405,6 +475,26 @@ document.getElementById('blCompany').addEventListener('keydown', e => {
}); });
document.getElementById('blPrev').onclick = () => { if (blState.page > 1) { blState.page--; loadBlacklist(); } }; document.getElementById('blPrev').onclick = () => { if (blState.page > 1) { blState.page--; loadBlacklist(); } };
document.getElementById('blNext').onclick = () => { blState.page++; loadBlacklist(); }; document.getElementById('blNext').onclick = () => { blState.page++; loadBlacklist(); };
// 远程控制
document.getElementById('btnStartRemote').onclick = () => {
const keywords = (document.getElementById('rKeywords').value || '').split(/[,,\s]+/).filter(Boolean);
const cityCode = (document.getElementById('rCity').value || '').trim();
if (!keywords.length) { alert('请填写搜索关键词'); return; }
if (!cityCode) { alert('请填写城市码'); return; }
if (!confirm('确认远程启动投递任务?')) return;
sendTask('start_apply', {
keywords, city_code: cityCode,
min_score: parseInt(document.getElementById('rScore').value, 10) || 65,
daily_limit: parseInt(document.getElementById('rLimit').value, 10) || 0,
boss_online_only: document.getElementById('rOnlineOnly').checked,
allow_headhunter: document.getElementById('rHunter').checked,
});
};
document.getElementById('btnStopRemote').onclick = () => {
if (!confirm('确认远程结束投递任务?')) return;
sendTask('stop_apply', null);
};
document.getElementById('blTbody').addEventListener('click', e => { document.getElementById('blTbody').addEventListener('click', e => {
const btn = e.target.closest('.bl-remove'); const btn = e.target.closest('.bl-remove');
if (btn) removeBlacklist(btn.dataset.id); if (btn) removeBlacklist(btn.dataset.id);
@@ -428,9 +518,11 @@ async function enter() {
if (token()) enter(); else showLogin(); if (token()) enter(); else showLogin();
setInterval(() => { setInterval(() => {
if (token() && !document.getElementById('dataView').classList.contains('hidden') if (token() && !document.getElementById('dataView').classList.contains('hidden')) {
&& !document.getElementById('pageData').classList.contains('hidden')) load(); if (!document.getElementById('pageData').classList.contains('hidden')) load();
}, 30000); if (!document.getElementById('pageRemote').classList.contains('hidden')) loadRemote();
}
}, 5000);
</script> </script>
</body> </body>
</html> </html>