From 7cdfd76bfbac52d3d23bb8b7d5b2f29cafcbc2c3 Mon Sep 17 00:00:00 2001 From: lingyunxsh Date: Thu, 3 Sep 2026 15:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_exe.bat | 2 +- client/web/app.py | 64 ++++++++++----- docs/schema.sql | 21 +++++ docs/upgrade_rpa_schedule.sql | 26 +++++++ server/main.py | 4 + server/models.py | 27 +++++++ server/routers/rpa.py | 122 +++++++++++++++++++++++++++-- server/scheduler.py | 142 ++++++++++++++++++++++++++++++++++ server/schemas.py | 8 ++ server/static/view.html | 125 +++++++++++++++++++++++++++++- 10 files changed, 516 insertions(+), 25 deletions(-) create mode 100644 docs/upgrade_rpa_schedule.sql create mode 100644 server/scheduler.py diff --git a/build_exe.bat b/build_exe.bat index 17fc2d2..b1c2e97 100644 --- a/build_exe.bat +++ b/build_exe.bat @@ -7,7 +7,7 @@ REM 每次升级改 APP_VERSION,避免与正在运行的旧版本目录冲突 REM 使用:把整个文件夹拷到目标机器(或压缩成 zip 发送), REM 双击文件夹里的 Boss直聘AI投递-%APP_VERSION%.exe 运行。 REM ============================================================ -set APP_VERSION=1.17 +set APP_VERSION=1.18 echo [1/2] 安装打包依赖... pip install pyinstaller PySide6 --quiet diff --git a/client/web/app.py b/client/web/app.py index 2717d23..dfbae29 100644 --- a/client/web/app.py +++ b/client/web/app.py @@ -139,6 +139,17 @@ class AppState: status, result = "done", "停止指令已下达" else: status, result = "done", "当前没有运行中的投递任务" + elif ttype == "start_activate": + # 定时调度器下发的 Boss 激活任务(与面板 /api/start-activate 同一入口) + res = start_activate_shared(task.get("params") or {}) + status, result = ("done", res["msg"]) if res["ok"] else ("failed", res["msg"]) + elif ttype == "stop_activate": + activator = self.ensure_activator() + if activator.is_running: + activator.stop() + status, result = "done", "停止指令已下达" + else: + status, result = "done", "当前没有运行中的激活任务" else: status, result = "failed", f"未知任务类型:{ttype}" except Exception as e: @@ -509,37 +520,54 @@ def stop_apply(): # ======================================================= -# Boss 激活(单机功能,不依赖云端账号) +# Boss 激活(单机功能,不依赖云端账号;也支持定时调度器远程下发) # ======================================================= -@app.post("/api/start-activate") -def start_activate(req: StartActivateReq): - if not req.match_text.strip(): - raise HTTPException(status_code=400, detail="请填写匹配条件文本") - if req.status_filter not in ("unread", "read", "all"): - raise HTTPException(status_code=400, detail="消息状态过滤取值非法") - if not req.reply_message.strip(): - raise HTTPException(status_code=400, detail="请填写激活消息内容") +def start_activate_shared(params: dict) -> dict: + """面板 / 远程定时任务共用的激活启动入口(返回 ok+msg,不抛业务异常)""" + match_text = (params.get("match_text") or "").strip() + if not match_text: + return {"ok": False, "msg": "缺少匹配条件文本 match_text"} + reply_message = (params.get("reply_message") or "").strip() + if not reply_message: + return {"ok": False, "msg": "缺少激活消息 reply_message"} + status_filter = params.get("status_filter") or "unread" + if status_filter not in ("unread", "read", "all"): + return {"ok": False, "msg": f"消息状态过滤取值非法:{status_filter}"} + try: + threshold = max(0, min(100, int(params.get("threshold") or 80))) + max_count = max(0, int(params.get("max_count") or 0)) + except (TypeError, ValueError): + return {"ok": False, "msg": "threshold / max_count 参数非法"} if state.applicant and state.applicant.is_running: - raise HTTPException(status_code=400, detail="投递任务运行中,请先停止") + return {"ok": False, "msg": "投递任务运行中,请先停止"} activator = state.ensure_activator() if activator.is_running: - raise HTTPException(status_code=400, detail="已有激活任务在运行") + return {"ok": False, "msg": "已有激活任务在运行"} try: # 复用登录态 profile,浏览器被手动关闭时自动拉起 state.browser.ensure_browser_started() except RuntimeError as e: - raise HTTPException(status_code=400, detail=str(e)) + return {"ok": False, "msg": str(e)} activator.start( - match_text=req.match_text, - status_filter=req.status_filter, - threshold=req.threshold / 100.0, - reply_message=req.reply_message, - max_count=req.max_count, - dry_run=req.dry_run, + match_text=match_text, + status_filter=status_filter, + threshold=threshold / 100.0, + reply_message=reply_message, + max_count=max_count, + dry_run=bool(params.get("dry_run")), ) return {"ok": True, "msg": "Boss 激活任务已启动"} +@app.post("/api/start-activate") +def start_activate(req: StartActivateReq): + # Pydantic 已校验字段类型,业务校验统一在 shared 入口(与远程定时任务同源) + res = start_activate_shared(req.model_dump()) + if not res["ok"]: + raise HTTPException(status_code=400, detail=res["msg"]) + return {"ok": True, "msg": res["msg"]} + + @app.post("/api/stop-activate") def stop_activate(): activator = state.ensure_activator() diff --git a/docs/schema.sql b/docs/schema.sql index bc708ec..abc9ff8 100644 --- a/docs/schema.sql +++ b/docs/schema.sql @@ -182,6 +182,27 @@ CREATE TABLE IF NOT EXISTS rpa_task ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='远程控制任务'; +-- ------------------------------------------------------------ +-- 7b. 定时任务排程(远程控制页创建,服务端调度器每日到点自动下发 rpa_task) +-- ------------------------------------------------------------ +CREATE TABLE IF NOT EXISTS rpa_schedule ( + id INT AUTO_INCREMENT PRIMARY KEY, + user_id INT NOT NULL, + kind VARCHAR(20) NOT NULL COMMENT 'apply=自动投递/activate=Boss激活', + params TEXT NULL COMMENT '任务参数 JSON(投递条件/激活参数)', + start_time VARCHAR(5) NOT NULL COMMENT '每日开始时间 HH:MM(北京时间)', + end_time VARCHAR(5) NOT NULL COMMENT '每日结束时间 HH:MM(北京时间)', + enabled TINYINT(1) NOT NULL DEFAULT 1 COMMENT '是否启用', + last_start_date VARCHAR(10) NULL COMMENT '最近开始下发日期(北京 YYYY-MM-DD,防当日重复)', + last_stop_date VARCHAR(10) NULL COMMENT '最近结束下发日期(北京 YYYY-MM-DD,防当日重复)', + last_result VARCHAR(255) NULL COMMENT '最近一次调度结果说明', + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + KEY ix_rpa_schedule_user (user_id), + CONSTRAINT fk_rpa_schedule_user FOREIGN KEY (user_id) + REFERENCES users (id) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci + COMMENT='定时任务排程'; + -- ------------------------------------------------------------ -- 8. AI 模型配置(全局单行,id=1,/view 管理页在线维护) -- ------------------------------------------------------------ diff --git a/docs/upgrade_rpa_schedule.sql b/docs/upgrade_rpa_schedule.sql new file mode 100644 index 0000000..a482238 --- /dev/null +++ b/docs/upgrade_rpa_schedule.sql @@ -0,0 +1,26 @@ +-- ============================================================ +-- v1.19 老库升级:新增 rpa_schedule 定时任务排程表 +-- 背景:网页端「远程控制」新增定时任务——每日到点由服务端调度器 +-- 自动下发 rpa_task(apply=自动投递 / activate=Boss激活), +-- 结束时间到点自动下发对应 stop 任务。 +-- 幂等:可重复执行(CREATE TABLE IF NOT EXISTS)。 +-- 执行:docker exec -i jianli-boss-mysql mysql -uroot -p<密码> <数据库名> < docs/upgrade_rpa_schedule.sql +-- ============================================================ + +CREATE TABLE IF NOT EXISTS rpa_schedule ( + id INT AUTO_INCREMENT PRIMARY KEY, + user_id INT NOT NULL, + kind VARCHAR(20) NOT NULL COMMENT 'apply=自动投递/activate=Boss激活', + params TEXT NULL COMMENT '任务参数 JSON(投递条件/激活参数)', + start_time VARCHAR(5) NOT NULL COMMENT '每日开始时间 HH:MM(北京时间)', + end_time VARCHAR(5) NOT NULL COMMENT '每日结束时间 HH:MM(北京时间)', + enabled TINYINT(1) NOT NULL DEFAULT 1 COMMENT '是否启用', + last_start_date VARCHAR(10) NULL COMMENT '最近开始下发日期(北京 YYYY-MM-DD,防当日重复)', + last_stop_date VARCHAR(10) NULL COMMENT '最近结束下发日期(北京 YYYY-MM-DD,防当日重复)', + last_result VARCHAR(255) NULL COMMENT '最近一次调度结果说明', + created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, + KEY ix_rpa_schedule_user (user_id), + CONSTRAINT fk_rpa_schedule_user FOREIGN KEY (user_id) + REFERENCES users (id) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci + COMMENT='定时任务排程'; diff --git a/server/main.py b/server/main.py index 9a570bf..acc31be 100644 --- a/server/main.py +++ b/server/main.py @@ -14,6 +14,7 @@ from loguru import logger from .config import settings from .database import engine +from .scheduler import start_scheduler, stop_scheduler from .routers import register, resumes, sessions, jobs, blacklist, rpa, templates, ai @@ -25,7 +26,10 @@ async def lifespan(app: FastAPI): logger.success("数据库连接成功") except Exception as e: logger.error(f"数据库连接失败,请检查配置及数据库是否已初始化:{e}") + # 定时任务调度器:后台循环扫描 rpa_schedule,到点自动下发 RpaTask + sched_task = start_scheduler() yield + await stop_scheduler(sched_task) app = FastAPI( diff --git a/server/models.py b/server/models.py index 6b27723..1911940 100644 --- a/server/models.py +++ b/server/models.py @@ -212,6 +212,33 @@ class RpaTask(Base): user = relationship("User") +class RpaSchedule(Base): + """ + 定时任务排程(远程控制页创建,服务端调度器每日到点自动下发 RpaTask)。 + kind:apply=自动投递 / activate=Boss 激活;时间均为北京时间 HH:MM。 + 防重复:last_start_date / last_stop_date 记录当日已下发日期,每类动作每天只触发一次。 + """ + __tablename__ = "rpa_schedule" + + id = Column(Integer, primary_key=True, autoincrement=True) + user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), + nullable=False, index=True) + # apply / activate + kind = Column(String(20), nullable=False) + # 任务参数 JSON:apply=投递条件;activate=激活参数(match_text/status_filter/threshold/reply_message/max_count/dry_run) + params = Column(Text, nullable=True) + # 每日开始/结束时间 HH:MM(北京时间),结束时间到点自动下发对应 stop 任务 + start_time = Column(String(5), nullable=False) + end_time = Column(String(5), nullable=False) + enabled = Column(Boolean, default=True, nullable=False) + # 最近一次开始/结束下发日期(北京日期 YYYY-MM-DD,防当日重复触发) + last_start_date = Column(String(10), nullable=True) + last_stop_date = Column(String(10), nullable=True) + # 最近一次调度结果说明(已下发任务#ID / 跳过原因) + last_result = Column(String(255), nullable=True) + created_at = Column(DateTime, default=utcnow, nullable=False) + + class ApplyTemplate(Base): """ 投递条件模板 diff --git a/server/routers/rpa.py b/server/routers/rpa.py index 1fd3e99..f332bcf 100644 --- a/server/routers/rpa.py +++ b/server/routers/rpa.py @@ -1,11 +1,15 @@ """ -远程控制路由:云端下发开始/结束投递任务,客户端轮询执行并回调。 +远程控制路由:云端下发开始/结束任务,客户端轮询执行并回调。 - 状态快照 rpa_status:心跳携带全量状态上报,每用户一行(单设备) - 任务 rpa_task:pending → running → done/failed,pending 超时 → expired + (start_apply / stop_apply 可由控制端手动下发;start_activate / stop_activate + 仅由定时调度器下发) - 去重(服务端权威拦截):同类型任务未达终态时拒绝重复下发 +- 定时排程 rpa_schedule:每日到点由 scheduler 自动下发对应任务 """ import json +import re from datetime import datetime, timedelta from fastapi import APIRouter, Depends, HTTPException, Query @@ -13,16 +17,17 @@ from sqlalchemy.orm import Session from ..auth import get_current_user from ..database import get_db -from ..models import User, RpaStatus, RpaTask +from ..models import User, RpaStatus, RpaTask, RpaSchedule from ..online import is_online -from ..schemas import RpaTaskIn, RpaTaskFinishIn, Message +from ..scheduler import KIND_TASK_TYPES, PENDING_EXPIRE_MINUTES +from ..schemas import RpaTaskIn, RpaTaskFinishIn, RpaScheduleIn, Message router = APIRouter(prefix="/api/rpa", tags=["远程控制"]) # 任务终态:达到终态后同类型任务才允许再次下发 TERMINAL_STATUS = ("done", "failed", "expired") -# pending 超过该时长未客户端认领则过期,防止离线恢复后执行过时任务 -PENDING_EXPIRE_MINUTES = 10 +# 定时排程时间格式:HH:MM(零填充 24 小时制) +_TIME_RE = re.compile(r"^([01]\d|2[0-3]):[0-5]\d$") def _task_dict(t: RpaTask) -> dict: @@ -165,3 +170,110 @@ def finish_task( task.result = (req.result or "")[:500] db.commit() return Message(msg="ok") + + +# ======================================================= +# 定时任务排程(每日到点由调度器自动下发 RpaTask) +# ======================================================= +def _schedule_dict(s: RpaSchedule) -> dict: + return { + "id": s.id, + "kind": s.kind, + "params": json.loads(s.params) if s.params else None, + "start_time": s.start_time, + "end_time": s.end_time, + "enabled": bool(s.enabled), + "last_start_date": s.last_start_date, + "last_stop_date": s.last_stop_date, + "last_result": s.last_result, + "created_at": (s.created_at + timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S"), + } + + +@router.get("/schedules", response_model=dict) +def list_schedules( + current_user: User = Depends(get_current_user), + db: Session = Depends(get_db), +): + """当前用户的定时排程列表(倒序)""" + rows = db.query(RpaSchedule).filter(RpaSchedule.user_id == current_user.id) \ + .order_by(RpaSchedule.id.desc()).all() + return {"items": [_schedule_dict(s) for s in rows]} + + +@router.post("/schedules", response_model=dict) +def create_schedule( + req: RpaScheduleIn, + current_user: User = Depends(get_current_user), + db: Session = Depends(get_db), +): + """创建定时排程。不做客户端在线预检(定时本就是为无人值守场景, + 下发时若离线由 pending 过期机制兑底)""" + if req.kind not in KIND_TASK_TYPES: + raise HTTPException(status_code=422, detail="任务类型只能为 apply(自动投递)或 activate(Boss激活)") + if not _TIME_RE.match(req.start_time or "") or not _TIME_RE.match(req.end_time or ""): + raise HTTPException(status_code=422, detail="时间格式应为 HH:MM(24 小时制)") + if req.end_time <= req.start_time: + raise HTTPException(status_code=422, detail="结束时间必须晚于开始时间") + + params = req.params or {} + if req.kind == "apply": + if not params.get("keywords") or not params.get("city"): + raise HTTPException(status_code=422, detail="定时投递必须提供 keywords 与 city") + else: # activate + if not (params.get("match_text") or "").strip(): + raise HTTPException(status_code=422, detail="定时激活必须提供匹配条件文本 match_text") + if not (params.get("reply_message") or "").strip(): + raise HTTPException(status_code=422, detail="定时激活必须提供激活消息 reply_message") + if params.get("status_filter") not in (None, "unread", "read", "all"): + raise HTTPException(status_code=422, detail="消息状态过滤取值非法") + + sched = RpaSchedule( + user_id=current_user.id, + kind=req.kind, + params=json.dumps(params, ensure_ascii=False), + start_time=req.start_time, + end_time=req.end_time, + enabled=True, + ) + db.add(sched) + db.commit() + db.refresh(sched) + return _schedule_dict(sched) + + +@router.put("/schedules/{schedule_id}", response_model=dict) +def toggle_schedule( + schedule_id: int, + enabled: bool = Query(..., description="启用/停用"), + current_user: User = Depends(get_current_user), + db: Session = Depends(get_db), +): + """启用/停用定时排程""" + sched = db.query(RpaSchedule).filter( + RpaSchedule.id == schedule_id, + RpaSchedule.user_id == current_user.id, + ).first() + if not sched: + raise HTTPException(status_code=404, detail="排程不存在") + sched.enabled = enabled + db.commit() + return _schedule_dict(sched) + + +@router.delete("/schedules/{schedule_id}", response_model=Message) +def delete_schedule( + schedule_id: int, + current_user: User = Depends(get_current_user), + db: Session = Depends(get_db), +): + """删除定时排程(仅停止后续调度,不影响已下发的任务)""" + sched = db.query(RpaSchedule).filter( + RpaSchedule.id == schedule_id, + RpaSchedule.user_id == current_user.id, + ).first() + if not sched: + raise HTTPException(status_code=404, detail="排程不存在") + db.delete(sched) + db.commit() + return Message(msg="已删除") diff --git a/server/scheduler.py b/server/scheduler.py new file mode 100644 index 0000000..7c4518b --- /dev/null +++ b/server/scheduler.py @@ -0,0 +1,142 @@ +""" +定时任务调度器:后台循环扫描 rpa_schedule 表,每日到点自动下发 RpaTask, +客户端通过现有 /api/rpa/tasks/pending 轮询认领执行(认领机制零改动)。 + +- 每 SCAN_INTERVAL 秒扫描一轮;排程时间均为北京时间 HH:MM +- 每个排程每天只下发一次开始动作、一次结束动作 + (last_start_date / last_stop_date 记录北京日期防重复) +- 下发前复用 RpaTask 去重规则:同类型任务未达终态则跳过本轮, + 不消耗当日次数,下轮重试 +- 客户端离线时照常下发:任务 pending 超过 10 分钟无人认领, + 由 fetch_pending_task 的现有过期机制自动 expired +""" +import asyncio +import json +from datetime import datetime, timedelta + +from loguru import logger +from sqlalchemy.orm import Session + +from .database import SessionLocal +from .models import RpaSchedule, RpaTask + +SCAN_INTERVAL = 30 # 秒 +# pending 超过该时长未客户端认领则过期(与 routers/rpa.py 共用同一常量) +PENDING_EXPIRE_MINUTES = 10 + +# kind → (开始任务类型, 结束任务类型) +KIND_TASK_TYPES = { + "apply": ("start_apply", "stop_apply"), + "activate": ("start_activate", "stop_activate"), +} + + +def _beijing_now() -> datetime: + return datetime.utcnow() + timedelta(hours=8) + + +def _due(last_date: str | None, hhmm: str, now_cn: datetime) -> bool: + """到点判断:当日未触发过 且 当前 HH:MM 已到(零填充字符串可按字典序比较)""" + return last_date != now_cn.strftime("%Y-%m-%d") and now_cn.strftime("%H:%M") >= hhmm + + +def _dispatch(db: Session, sched: RpaSchedule, start: bool, now_cn: datetime) -> None: + """下发一次开始/结束任务,并更新防重复日期""" + task_type = KIND_TASK_TYPES[sched.kind][0 if start else 1] + action = "开始" if start else "结束" + dup = db.query(RpaTask).filter( + RpaTask.user_id == sched.user_id, + RpaTask.task_type == task_type, + RpaTask.status.in_(("pending", "running")), + ).first() + if dup: + # 同类型任务未终态:不消耗当日次数,下一轮重试 + sched.last_result = f"定时{action}跳过:同类型任务 #{dup.id} 未结束" + db.commit() + return + + task = RpaTask( + user_id=sched.user_id, + task_type=task_type, + # 只有开始任务携带参数;stop 任务无需 params + params=json.dumps(json.loads(sched.params) if sched.params else {}, + ensure_ascii=False) if start else None, + ) + db.add(task) + db.flush() # 先取 task.id 再写排程状态 + + today = now_cn.strftime("%Y-%m-%d") + if start: + sched.last_start_date = today + else: + sched.last_stop_date = today + sched.last_result = f"定时{action}已下发:任务 #{task.id}({task_type})" + db.commit() + logger.info(f"定时任务排程 #{sched.id}({sched.kind}) {action}已下发 -> RpaTask #{task.id} {task_type}") + + +def _expire_stale(db: Session) -> None: + """pending 过期清理兜底:客户端长期离线不轮询时,fetch_pending_task 的清理 + 永远不会被触发,残留 pending 会永久阻塞后续调度——由调度器每轮代做""" + cutoff = datetime.utcnow() - timedelta(minutes=PENDING_EXPIRE_MINUTES) + stale = db.query(RpaTask).filter( + RpaTask.status == "pending", + RpaTask.created_at < cutoff, + ).all() + for t in stale: + t.status = "expired" + t.result = f"超过 {PENDING_EXPIRE_MINUTES} 分钟未执行,自动过期" + if stale: + db.commit() + logger.info(f"调度器清理超时未认领任务 {len(stale)} 条") + + +def tick(db: Session | None = None) -> None: + """单轮扫描。db 可注入(测试用),缺省自建会话;异常只记日志不中断循环""" + own = db is None + if own: + db = SessionLocal() + try: + _expire_stale(db) + now_cn = _beijing_now() + rows = db.query(RpaSchedule).filter(RpaSchedule.enabled.is_(True)).all() + for s in rows: + if s.kind not in KIND_TASK_TYPES: + logger.warning(f"定时任务排程 #{s.id} 类型未知({s.kind}),跳过") + continue + if _due(s.last_start_date, s.start_time, now_cn): + _dispatch(db, s, start=True, now_cn=now_cn) + if _due(s.last_stop_date, s.end_time, now_cn): + _dispatch(db, s, start=False, now_cn=now_cn) + except Exception as e: + db.rollback() + logger.error(f"定时任务扫描异常:{e}") + finally: + if own: + db.close() + + +async def _loop() -> None: + while True: + try: + # 同步 DB 操作丢线程池,避免阻塞事件循环 + await asyncio.to_thread(tick) + except Exception as e: + logger.error(f"定时任务调度循环异常:{e}") + await asyncio.sleep(SCAN_INTERVAL) + + +def start_scheduler() -> asyncio.Task: + """lifespan 内启动后台调度循环,返回 Task 供关闭时取消""" + logger.info(f"定时任务调度器已启动(每 {SCAN_INTERVAL} 秒扫描)") + return asyncio.create_task(_loop()) + + +async def stop_scheduler(task: asyncio.Task | None) -> None: + if task is None: + return + task.cancel() + try: + await task + except asyncio.CancelledError: + pass diff --git a/server/schemas.py b/server/schemas.py index 4ee4802..5786351 100644 --- a/server/schemas.py +++ b/server/schemas.py @@ -229,6 +229,14 @@ class RpaTaskIn(BaseModel): params: Optional[dict] = None +class RpaScheduleIn(BaseModel): + """定时任务排程:每日 start_time 下发开始任务、end_time 下发结束任务(北京时间)""" + kind: str = Field(..., description="apply=自动投递 / activate=Boss激活") + start_time: str = Field(..., description="每日开始时间 HH:MM") + end_time: str = Field(..., description="每日结束时间 HH:MM") + params: Optional[dict] = None + + class RpaTaskFinishIn(BaseModel): status: str = Field(..., description="done / failed") result: Optional[str] = None diff --git a/server/static/view.html b/server/static/view.html index 02d228a..d835d74 100644 --- a/server/static/view.html +++ b/server/static/view.html @@ -243,7 +243,46 @@
任务下发后客户端 5 秒内认领执行;同类型任务未结束前不能重复下发。
+ +
定时任务(每日自动)
+
+
+
+
+
+
+
+ +
+ + +
自动投递使用上方投递表单的条件;结束时间到点自动下发停止任务;客户端离线时任务 10 分钟未认领自动过期;每条排程每天各触发一次开始/结束。
+ + +
#类型每日开始每日结束状态最近调度操作
+ + +
时间类型状态结果
@@ -434,7 +473,7 @@ async function removeBlacklist(id) { } /* ---------- 远程控制 ---------- */ -const TASK_TXT = { start_apply: '开始投递', stop_apply: '结束投递' }; +const TASK_TXT = { start_apply: '开始投递', stop_apply: '结束投递', start_activate: '开始激活', stop_activate: '停止激活' }; const TASK_STATUS_TXT = { pending: '待认领', running: '执行中', done: '已完成', failed: '失败', expired: '已过期' }; async function loadRemote() { @@ -463,6 +502,67 @@ async function loadRemote() { ).join(''); document.getElementById('taskEmpty').classList.toggle('hidden', items.length > 0); } catch (e) { /* ignore */ } + loadSchedules(); +} + +/* ---------- 定时任务排程 ---------- */ +const SCH_KIND_TXT = { apply: '自动投递', activate: 'Boss 激活' }; + +async function loadSchedules() { + try { + const d = await api('/api/rpa/schedules'); + const items = d.items || []; + document.getElementById('schTbody').innerHTML = items.map(s => + '' + s.id + '' + (SCH_KIND_TXT[s.kind] || esc(s.kind)) + '' + esc(s.start_time) + + '' + esc(s.end_time) + '' + + (s.enabled ? '启用' : '停用') + + '' + esc(s.last_result || '-') + + ' ' + ).join(''); + document.getElementById('schEmpty').classList.toggle('hidden', items.length > 0); + } catch (e) { /* 401 已在 api 内处理 */ } +} + +async function addSchedule() { + const kind = document.getElementById('schKind').value; + const startTime = document.getElementById('schStart').value; + const endTime = document.getElementById('schEnd').value; + if (!startTime || !endTime) { alert('请选择开始/结束时间'); return; } + let params; + if (kind === 'apply') { + // 复用页面上方投递表单的条件(与手动开始投递同一套参数) + const keywords = (document.getElementById('rKeywords').value || '').split(/[,,\s]+/).filter(Boolean); + if (!keywords.length) { alert('自动投递需先在上方表单填写搜索关键词'); return; } + params = { + keywords, + city: document.getElementById('rCity').value, + min_score: parseInt(document.getElementById('rScore').value, 10) || 65, + salary_min: parseInt(document.getElementById('rSalaryMin').value, 10) || 0, + salary_max: parseInt(document.getElementById('rSalaryMax').value, 10) || 0, + daily_limit: parseInt(document.getElementById('rLimit').value, 10) || 0, + boss_online_only: document.getElementById('rOnlineOnly').checked, + allow_headhunter: document.getElementById('rHunter').checked, + prompt: document.getElementById('rPrompt').value.trim() || null, + }; + } else { + params = { + match_text: document.getElementById('schMatch').value.trim(), + status_filter: document.getElementById('schStatus').value, + threshold: parseInt(document.getElementById('schThreshold').value, 10) || 80, + reply_message: document.getElementById('schReply').value.trim(), + max_count: parseInt(document.getElementById('schMax').value, 10) || 0, + dry_run: document.getElementById('schDry').checked, + }; + if (!params.match_text) { alert('Boss 激活需填写匹配条件文本'); return; } + if (!params.reply_message) { alert('Boss 激活需填写激活消息'); return; } + } + try { + await api('/api/rpa/schedules', { method: 'POST', body: JSON.stringify({ + kind, start_time: startTime, end_time: endTime, params, + })}); + await loadSchedules(); + } catch (e) { alert('添加失败:' + (e.message || '')); } } async function sendTask(taskType, params) { @@ -612,6 +712,29 @@ document.getElementById('btnStopRemote').onclick = () => { }; document.getElementById('btnAiSave').onclick = saveAiConfig; document.getElementById('btnAiTest').onclick = testAiConfig; +// 定时任务:类型切换显隐激活参数区 + 添加/启停/删除 +document.getElementById('schKind').addEventListener('change', () => { + document.getElementById('schActParams').classList.toggle('hidden', + document.getElementById('schKind').value !== 'activate'); +}); +document.getElementById('btnSchAdd').onclick = addSchedule; +document.getElementById('schTbody').addEventListener('click', async e => { + const tog = e.target.closest('.sch-toggle'); + if (tog) { + try { + await api('/api/rpa/schedules/' + tog.dataset.id + '?enabled=' + tog.dataset.enabled, { method: 'PUT' }); + await loadSchedules(); + } catch (err) { alert('操作失败:' + (err.message || '')); } + return; + } + const del = e.target.closest('.sch-del'); + if (del && confirm('确定删除该定时任务?删除后不再自动调度。')) { + try { + await api('/api/rpa/schedules/' + del.dataset.id, { method: 'DELETE' }); + await loadSchedules(); + } catch (err) { alert('删除失败:' + (err.message || '')); } + } +}); document.getElementById('blTbody').addEventListener('click', e => { const btn = e.target.closest('.bl-remove'); if (btn) removeBlacklist(btn.dataset.id);