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
+130 -21
View File
@@ -3,6 +3,8 @@
FastAPI 应用:提供操作界面 + 编排浏览器自动化流程
"""
import threading
import time
import requests
from pathlib import Path
from fastapi import FastAPI, HTTPException, Request
from fastapi.responses import HTMLResponse
@@ -14,7 +16,7 @@ from loguru import logger
from ..config import client_settings
from ..server_api import ServerAPI
from ..ai import AIClient
from ..fingerprint import generate_client_code, get_machine_summary
from ..fingerprint import get_machine_summary
from ..browser.manager import BrowserManager
from ..browser.resume_scraper import ResumeScraper
from ..browser.applicant import Applicant
@@ -37,20 +39,67 @@ class AppState:
self.applicant: Applicant | None = None
self.connected = False # 是否已注册/登录云端
self.login_polling = False
self._heartbeat_started = False
def ensure_applicant(self) -> Applicant:
if self.applicant is None:
self.applicant = Applicant(self.browser, self.server_api, self.ai)
return self.applicant
# ------------------------------------------------------------------
# 心跳:登录成功后启动后台线程,周期性向服务端上报存活
# ------------------------------------------------------------------
def ensure_heartbeat(self) -> None:
if self._heartbeat_started or not self.server_api.token:
return
self._heartbeat_started = True
threading.Thread(target=self._heartbeat_loop, daemon=True).start()
logger.info(f"心跳线程已启动,间隔 {client_settings.HEARTBEAT_INTERVAL}s")
def _heartbeat_loop(self) -> None:
while True:
if not self.server_api.token:
# 已退出登录,停止心跳
self._heartbeat_started = False
logger.info("已退出登录,心跳停止")
break
self.server_api.heartbeat()
time.sleep(client_settings.HEARTBEAT_INTERVAL)
state = AppState()
# =======================================================
# 前置校验(收敛:所有需要已登录云端的路由统一走这里)
# =======================================================
def _require_auth() -> None:
"""未登录云端时统一抛 400,禁止各路由自行散落判断"""
if not state.connected:
raise HTTPException(status_code=400, detail="请先登录系统账号")
def _require_rpa_online() -> None:
"""
关键操作(开始投递)前的在线预检:
先发一次心跳刷新在线状态,再确认服务端判定为在线,
避免心跳链路异常时启动必然失败的操作。
"""
state.server_api.heartbeat()
try:
me = state.server_api.get_me()
if not me.get("is_online"):
raise HTTPException(status_code=409, detail="RPA 在线状态未确认,请检查网络后重试")
except requests.RequestException as e:
raise HTTPException(status_code=503, detail=f"无法确认在线状态:{e}")
# =======================================================
# 请求模型
# =======================================================
class ConnectReq(BaseModel):
class AuthReq(BaseModel):
username: str
password: str
nickname: str | None = None
@@ -78,15 +127,30 @@ def index(request: Request):
# =======================================================
@app.get("/api/status")
def get_status():
"""返回整体状态,供前端轮询"""
"""返回整体状态,供前端轮询(含本地 token 免登录校验)"""
# 若本地存有 token,尝试校验并获取用户信息(实现二次启动免登录)
me = None
if state.server_api.token:
try:
me = state.server_api.get_me()
state.connected = True
state.ensure_heartbeat() # token 有效时确保心跳线程在跑
except Exception:
state.connected = False
state.server_api.logout() # token 失效,清除本地缓存
else:
state.connected = False
result = {
"client_code": generate_client_code()[:16] + "...",
"machine": get_machine_summary(),
"username": state.server_api.username,
"server_connected": state.connected,
"server_reachable": state.server_api.ping(),
"rpa_online": me.get("is_online", False) if me else False,
"adspower_running": state.browser.is_adspower_running(),
"ai_configured": state.ai.available(),
"login_status": "unknown",
"login_status": me.get("login_status", "unknown") if me else "unknown",
"boss_account": me.get("boss_account") if me else None,
"resume_count": 0,
"has_primary": False,
"applying": False,
@@ -94,14 +158,11 @@ def get_status():
}
if state.connected:
try:
me = state.server_api.get_me()
result["login_status"] = me.get("login_status", "unknown")
result["boss_account"] = me.get("boss_account")
resumes = state.server_api.list_resumes()
result["resume_count"] = len(resumes)
result["has_primary"] = any(r.get("is_primary") for r in resumes)
except Exception as e:
logger.debug(f"获取用户状态失败:{e}")
logger.debug(f"获取简历状态失败:{e}")
if state.applicant and state.applicant.is_running:
result["applying"] = True
result["apply_stats"] = state.applicant.stats
@@ -109,16 +170,50 @@ def get_status():
# =======================================================
# Step 0: 连接云端服务端
# Step 0: 登录 / 注册云端账号(账号密码体系)
# =======================================================
@app.post("/api/connect")
def connect(req: ConnectReq):
def _extract_error(e: requests.HTTPError) -> str:
"""从服务端错误响应中提取 detail 信息"""
try:
data = state.server_api.register(req.nickname)
return e.response.json().get("detail", str(e))
except Exception:
return str(e)
@app.post("/api/register")
def register(req: AuthReq):
"""注册新账号"""
try:
data = state.server_api.register(req.username, req.password, req.nickname)
state.connected = True
return {"ok": True, "user_id": data["user_id"], "is_new": data["is_new"]}
state.ensure_heartbeat()
return {"ok": True, "user_id": data["user_id"], "username": data["username"]}
except requests.HTTPError as e:
raise HTTPException(status_code=e.response.status_code, detail=_extract_error(e))
except Exception as e:
raise HTTPException(status_code=500, detail=f"连接服务端失败:{e}")
raise HTTPException(status_code=500, detail=f"注册失败:{e}")
@app.post("/api/login")
def login(req: AuthReq):
"""账号密码登录"""
try:
data = state.server_api.login(req.username, req.password)
state.connected = True
state.ensure_heartbeat()
return {"ok": True, "user_id": data["user_id"], "username": data["username"]}
except requests.HTTPError as e:
raise HTTPException(status_code=e.response.status_code, detail=_extract_error(e))
except Exception as e:
raise HTTPException(status_code=500, detail=f"登录失败:{e}")
@app.post("/api/logout")
def logout():
"""退出登录,清除本地 token"""
state.server_api.logout()
state.connected = False
return {"ok": True}
# =======================================================
@@ -127,8 +222,7 @@ def connect(req: ConnectReq):
@app.post("/api/start-login")
def start_login():
"""打开 AdsPower 浏览器并跳转到 Boss直聘,等待用户手动登录"""
if not state.connected:
raise HTTPException(status_code=400, detail="请先连接服务端")
_require_auth()
try:
state.server_api.update_login_status("logging_in")
page = state.browser.connect()
@@ -158,6 +252,22 @@ def _poll_login():
state.login_polling = False
@app.post("/api/detect-login")
def detect_login():
"""活体检测 Boss直聘 登录状态(进入登录步骤时自动调用)"""
_require_auth()
try:
logged_in = state.browser.check_boss_login()
except Exception as e:
raise HTTPException(status_code=500, detail=f"检测失败:{e}")
if logged_in:
account = state.browser.get_boss_account_name()
state.server_api.update_login_status("logged_in", account)
return {"logged_in": True, "account": account}
state.server_api.update_login_status("not_login")
return {"logged_in": False}
@app.get("/api/login-status")
def login_status():
"""前端轮询登录状态"""
@@ -180,8 +290,7 @@ def login_status():
@app.post("/api/scrape-resumes")
def scrape_resumes():
"""AI 抓取账号内所有简历并上传到云端"""
if not state.connected:
raise HTTPException(status_code=400, detail="请先连接服务端")
_require_auth()
try:
scraper = ResumeScraper(state.browser, state.ai)
resumes = scraper.scrape_all()
@@ -212,8 +321,8 @@ def set_primary(resume_id: int):
# =======================================================
@app.post("/api/start-apply")
def start_apply(req: StartApplyReq):
if not state.connected:
raise HTTPException(status_code=400, detail="请先连接服务端")
_require_auth()
_require_rpa_online() # 在线预检:与服务端 require_online_user 前置校验呼应
if not state.server_api.get_primary_resume():
raise HTTPException(status_code=400, detail="请先设置主简历")
if not state.browser.is_adspower_running():
+93 -15
View File
@@ -24,8 +24,9 @@ function goToStep(step) {
for (let i = 1; i <= 5; i++) {
$(`panel-${i}`).classList.toggle('hidden', i !== step);
}
if (step === 5) loadHistory();
if (step === 2) detectBossLogin(); // 进入 Boss登录 步骤自动活体检测
if (step === 3) loadResumes();
if (step === 5) loadHistory();
}
document.querySelectorAll('.step').forEach(el => {
el.addEventListener('click', () => goToStep(parseInt(el.dataset.step)));
@@ -53,7 +54,6 @@ function badge(text, cls) {
async function refreshStatus() {
try {
const s = await api('/api/status');
$('clientCode').textContent = s.client_code;
$('serverReachable').innerHTML = badge(
s.server_reachable ? '可连接' : '无法连接',
s.server_reachable ? 'ok' : 'err'
@@ -62,13 +62,25 @@ async function refreshStatus() {
s.adspower_running ? '运行中' : '未运行',
s.adspower_running ? 'ok' : 'warn'
);
// 顶部徽章
$('statusBadges').innerHTML =
badge(s.server_connected ? '已连接' : '未连接', s.server_connected ? 'ok' : '') +
badge(s.ai_configured ? 'AI已配置' : 'AI未配置', s.ai_configured ? 'ok' : 'warn');
// 顶部徽章与用户区
let badges = badge(s.server_connected ? '已连接' : '未连接', s.server_connected ? 'ok' : '');
if (s.server_connected) {
badges += badge(s.rpa_online ? 'RPA在线' : 'RPA离线', s.rpa_online ? 'ok' : 'warn');
}
badges += badge(s.ai_configured ? 'AI已配置' : 'AI未配置', s.ai_configured ? 'ok' : 'warn');
$('statusBadges').innerHTML = badges;
const userArea = $('userArea');
if (s.server_connected && s.username) {
userArea.classList.remove('hidden');
$('userName').textContent = s.username;
} else {
userArea.classList.add('hidden');
}
if (s.server_connected) {
updateLoginBadge(s.login_status, s.boss_account);
// 本地 token 免登录:自动跳过账号步骤
if (currentStep === 1) goToStep(2);
}
return s;
} catch (e) {
@@ -88,29 +100,95 @@ function updateLoginBadge(status, account) {
}
// ==========================================================
// Step 1: 连接服务端
// Step 1: 登录 / 注册系统账号
// ==========================================================
$('btnConnect').addEventListener('click', async () => {
const btn = $('btnConnect');
let registerMode = false;
function setAuthMode(isRegister) {
registerMode = isRegister;
$('btnLogin').classList.toggle('hidden', isRegister);
$('btnRegister').classList.toggle('hidden', !isRegister);
$('nicknameGroup').classList.toggle('hidden', !isRegister);
$('authSwitchHint').textContent = isRegister
? '已有账号?点击上方“登 录”切换为登录模式。'
: '没有账号?点击上方“注册新账号”切换为注册模式。';
}
// 登录/注册模式切换:登录模式下“注册新账号”是切换按钮;注册模式下“登 录”是切换按钮
$('btnRegister').addEventListener('click', () => { if (!registerMode) setAuthMode(true); });
$('btnLogin').addEventListener('click', () => { if (registerMode) setAuthMode(false); });
$('authSwitchHint').addEventListener('click', () => setAuthMode(!registerMode));
$('authSwitchHint').style.cursor = 'pointer';
async function submitAuth() {
const username = $('username').value.trim();
const password = $('password').value;
if (!username || !password) { toast('请输入用户名和密码'); return; }
const wasRegister = registerMode;
const btn = wasRegister ? $('btnRegister') : $('btnLogin');
btn.disabled = true;
try {
const data = await api('/api/connect', {
method: 'POST',
body: JSON.stringify({ nickname: $('nickname').value || null }),
});
toast(data.is_new ? '注册成功!' : '登录成功!');
const path = wasRegister ? '/api/register' : '/api/login';
const body = { username, password };
if (wasRegister) body.nickname = $('nickname').value || null;
const data = await api(path, { method: 'POST', body: JSON.stringify(body) });
toast(wasRegister ? '注册成功!' : `欢迎回来,${data.username}!`);
await refreshStatus();
goToStep(2);
} catch (e) {
toast('连接失败:' + e.message, 5000);
toast(e.message, 5000);
setAuthMode(wasRegister); // 失败时保持当前模式
} finally {
btn.disabled = false;
}
}
// 主按钮提交(当前模式下可见的那个)
$('btnLogin').addEventListener('click', () => { if (!registerMode) submitAuth(); });
$('btnRegister').addEventListener('click', () => { if (registerMode) submitAuth(); });
// 回车提交表单
document.addEventListener('keydown', (e) => {
if (e.key === 'Enter' && currentStep === 1) submitAuth();
});
// 退出登录
$('btnLogout').addEventListener('click', async () => {
try {
await api('/api/logout', { method: 'POST' });
toast('已退出登录');
goToStep(1);
refreshStatus();
} catch (e) { toast('退出失败:' + e.message); }
});
// ==========================================================
// Step 2: 登录 Boss直聘
// ==========================================================
// 活体检测:进入本步骤自动调用,判断指纹浏览器中是否已登录
async function detectBossLogin() {
$('detectSpinner').classList.remove('hidden');
try {
const r = await api('/api/detect-login', { method: 'POST' });
if (r.logged_in) {
updateLoginBadge('logged_in', r.account);
$('btnSkipLogin').classList.remove('hidden');
toast(`检测到已登录:${r.account},可直接进入下一步`);
} else {
updateLoginBadge('not_login');
$('btnSkipLogin').classList.add('hidden');
toast('未检测到登录,请点击“打开浏览器登录”');
}
} catch (e) {
toast('登录检测失败:' + e.message, 5000);
} finally {
$('detectSpinner').classList.add('hidden');
}
}
$('btnRedetect').addEventListener('click', detectBossLogin);
$('btnSkipLogin').addEventListener('click', () => goToStep(3));
$('btnStartLogin').addEventListener('click', async () => {
const btn = $('btnStartLogin');
btn.disabled = true;
+20
View File
@@ -38,6 +38,26 @@ body {
.header h1 { font-size: 22px; }
.status-badges { display: flex; gap: 8px; }
/* ===== 用户区 ===== */
.user-area {
display: flex;
align-items: center;
gap: 10px;
}
.user-name {
font-weight: 600;
color: var(--primary);
}
.btn-link {
background: none;
border: none;
color: var(--text-light);
cursor: pointer;
font-size: 13px;
text-decoration: underline;
}
.btn-link:hover { color: var(--danger); }
/* ===== 步骤导航 ===== */
.steps {
display: flex;
+29 -9
View File
@@ -11,42 +11,62 @@
<!-- 顶部标题栏 -->
<header class="header">
<h1>🎯 Boss直聘 AI 智能投递</h1>
<div class="user-area hidden" id="userArea">
<span class="user-name" id="userName"></span>
<button class="btn-link" id="btnLogout">退出</button>
</div>
<div class="status-badges" id="statusBadges"></div>
</header>
<!-- 步骤导航 -->
<nav class="steps">
<div class="step active" data-step="1"><span class="step-num">1</span> 连接</div>
<div class="step" data-step="2"><span class="step-num">2</span> 登录</div>
<div class="step active" data-step="1"><span class="step-num">1</span> 账号</div>
<div class="step" data-step="2"><span class="step-num">2</span> Boss登录</div>
<div class="step" data-step="3"><span class="step-num">3</span> 简历</div>
<div class="step" data-step="4"><span class="step-num">4</span> 投递</div>
<div class="step" data-step="5"><span class="step-num">5</span> 记录</div>
</nav>
<!-- Step 1: 连接服务端 -->
<!-- Step 1: 登录 / 注册系统账号 -->
<section class="panel" id="panel-1">
<h2>连接云端服务端</h2>
<p class="hint">使用本机硬件指纹作为唯一编码注册,数据将隔离存储在你的账号下。</p>
<h2>登录系统账号</h2>
<p class="hint">简历与投递记录都保存在你的账号下,换机器登录同一账号即可延续数据。</p>
<div class="info-box">
<div><strong>机器指纹:</strong><code id="clientCode">加载中...</code></div>
<div><strong>服务端状态:</strong><span id="serverReachable" class="badge">检测中</span></div>
</div>
<div class="form-group">
<label>用户名</label>
<input type="text" id="username" placeholder="请输入用户名" autocomplete="username">
</div>
<div class="form-group">
<label>密码</label>
<input type="password" id="password" placeholder="请输入密码" autocomplete="current-password">
</div>
<div class="form-group hidden" id="nicknameGroup">
<label>昵称(可选)</label>
<input type="text" id="nickname" placeholder="给自己起个名字">
</div>
<button class="btn btn-primary" id="btnConnect">连接并注册</button>
<div class="action-buttons">
<button class="btn btn-primary" id="btnLogin">登 录</button>
<button class="btn hidden" id="btnRegister">注册新账号</button>
</div>
<p class="hint" id="authSwitchHint">没有账号?点击上方“注册新账号”切换为注册模式。</p>
</section>
<!-- Step 2: 登录 Boss直聘 -->
<section class="panel hidden" id="panel-2">
<h2>登录 Boss直聘</h2>
<p class="hint">点击下方按钮,将通过 AdsPower 指纹浏览器打开 Boss直聘,请在弹出的浏览器窗口中手动完成登录(扫码或账号密码)。</p>
<p class="hint">进入本步骤会自动检测指纹浏览器中的登录状态:若已登录可直接跳过;否则点击下方按钮打开 Boss直聘 手动登录(扫码或账号密码)。</p>
<div class="info-box">
<div><strong>AdsPower 状态:</strong><span id="adspowerStatus" class="badge">检测中</span></div>
<div><strong>登录状态:</strong><span id="loginStatus" class="badge">未登录</span></div>
</div>
<button class="btn btn-primary" id="btnStartLogin">打开浏览器登录</button>
<div class="spinner hidden" id="detectSpinner">正在检测指纹浏览器中的登录状态...</div>
<div class="action-buttons">
<button class="btn btn-primary" id="btnStartLogin">打开浏览器登录</button>
<button class="btn hidden" id="btnSkipLogin">已登录,直接下一步</button>
<button class="btn" id="btnRedetect">重新检测</button>
</div>
<div class="spinner hidden" id="loginSpinner">正在等待登录,请在浏览器中完成操作...</div>
</section>