ts
This commit is contained in:
+46
-23
@@ -444,37 +444,60 @@ async def get_login_status():
|
|||||||
|
|
||||||
@app.post("/api/login/qrcode")
|
@app.post("/api/login/qrcode")
|
||||||
async def generate_qrcode():
|
async def generate_qrcode():
|
||||||
"""模拟登录成功"""
|
"""重定向到小红书官方登录页面"""
|
||||||
import uuid
|
# 返回小红书登录页面 URL
|
||||||
from datetime import datetime, timedelta
|
login_url = "https://www.xiaohongshu.com/login"
|
||||||
|
|
||||||
# 生成登录状态(模拟登录成功)
|
return {
|
||||||
login_id = str(uuid.uuid4())
|
"login_url": login_url,
|
||||||
current_time = datetime.now()
|
"message": "请在打开的小红书页面完成扫码登录",
|
||||||
expire_time = current_time + timedelta(hours=24) # 24小时后过期
|
"instruction": "登录成功后,返回此页面点击'验证登录'按钮"
|
||||||
|
|
||||||
# 保存登录状态到文件
|
|
||||||
auth_file = os.path.join(config.DATA_DIR, "auth_state.json")
|
|
||||||
auth_data = {
|
|
||||||
"logged_in": True,
|
|
||||||
"login_time": current_time.isoformat(),
|
|
||||||
"expire_time": expire_time.isoformat(),
|
|
||||||
"login_id": login_id,
|
|
||||||
"platform": "xiaohongshu"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
with open(auth_file, 'w', encoding='utf-8') as f:
|
|
||||||
json.dump(auth_data, f, ensure_ascii=False, indent=2)
|
|
||||||
|
|
||||||
# 返回登录信息
|
@app.post("/api/login/verify")
|
||||||
|
async def verify_login():
|
||||||
|
"""验证登录状态"""
|
||||||
|
try:
|
||||||
|
auth_file = os.path.join(config.DATA_DIR, "auth_state.json")
|
||||||
|
|
||||||
|
if not os.path.exists(auth_file):
|
||||||
return {
|
return {
|
||||||
"login_id": login_id,
|
"success": False,
|
||||||
"login_time": current_time.isoformat(),
|
"message": "未找到登录状态,请先登录"
|
||||||
"expire_time": expire_time.isoformat(),
|
}
|
||||||
"message": "登录成功(模拟)",
|
|
||||||
|
with open(auth_file, 'r', encoding='utf-8') as f:
|
||||||
|
auth_data = json.load(f)
|
||||||
|
|
||||||
|
# 检查登录是否过期
|
||||||
|
login_time = auth_data.get("login_time")
|
||||||
|
expire_time = auth_data.get("expire_time")
|
||||||
|
current_time = datetime.now().isoformat()
|
||||||
|
|
||||||
|
if expire_time and current_time > expire_time:
|
||||||
|
# 登录已过期,清除状态
|
||||||
|
os.remove(auth_file)
|
||||||
|
return {
|
||||||
|
"success": False,
|
||||||
|
"message": "登录已过期,请重新登录"
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"message": "登录成功",
|
||||||
|
"logged_in": True,
|
||||||
|
"login_time": login_time,
|
||||||
|
"expire_time": expire_time,
|
||||||
"expire_in_hours": 24
|
"expire_in_hours": 24
|
||||||
}
|
}
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
return {
|
||||||
|
"success": False,
|
||||||
|
"message": f"验证失败: {str(e)}"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@app.post("/api/logout")
|
@app.post("/api/logout")
|
||||||
async def logout():
|
async def logout():
|
||||||
|
|||||||
+29
-60
@@ -119,6 +119,7 @@ function init() {
|
|||||||
elements.accountModal = document.getElementById('accountModal');
|
elements.accountModal = document.getElementById('accountModal');
|
||||||
elements.closeAccountModal = document.getElementById('closeAccountModal');
|
elements.closeAccountModal = document.getElementById('closeAccountModal');
|
||||||
elements.loginBtn = document.getElementById('loginBtn');
|
elements.loginBtn = document.getElementById('loginBtn');
|
||||||
|
elements.verifyLoginBtn = document.getElementById('verifyLoginBtn');
|
||||||
elements.logoutBtn = document.getElementById('logoutBtn');
|
elements.logoutBtn = document.getElementById('logoutBtn');
|
||||||
elements.loginInfo = document.getElementById('loginInfo');
|
elements.loginInfo = document.getElementById('loginInfo');
|
||||||
elements.modalLoginStatus = document.getElementById('modalLoginStatus');
|
elements.modalLoginStatus = document.getElementById('modalLoginStatus');
|
||||||
@@ -130,13 +131,8 @@ function init() {
|
|||||||
elements.addUserIdBtn = document.getElementById('addUserIdBtn');
|
elements.addUserIdBtn = document.getElementById('addUserIdBtn');
|
||||||
elements.importFromTxtBtn = document.getElementById('importFromTxtBtn');
|
elements.importFromTxtBtn = document.getElementById('importFromTxtBtn');
|
||||||
elements.exportToTxtBtn = document.getElementById('exportToTxtBtn');
|
elements.exportToTxtBtn = document.getElementById('exportToTxtBtn');
|
||||||
|
elements.loginInstructions = document.getElementById('loginInstructions');
|
||||||
|
|
||||||
// 登录二维码模态框
|
|
||||||
elements.loginQrModal = document.getElementById('loginQrModal');
|
|
||||||
elements.closeLoginQrModal = document.getElementById('closeLoginQrModal');
|
|
||||||
elements.qrcodeContainer = document.getElementById('qrcodeContainer');
|
|
||||||
elements.qrLoginStatus = document.getElementById('qrLoginStatus');
|
|
||||||
elements.qrExpireTime = document.getElementById('qrExpireTime');
|
|
||||||
|
|
||||||
// Toast
|
// Toast
|
||||||
elements.toast = document.getElementById('toast');
|
elements.toast = document.getElementById('toast');
|
||||||
@@ -213,7 +209,8 @@ function bindEvents() {
|
|||||||
elements.addAccountBtn.addEventListener('click', openAccountModal);
|
elements.addAccountBtn.addEventListener('click', openAccountModal);
|
||||||
elements.refreshAccountsBtn.addEventListener('click', refreshAccounts);
|
elements.refreshAccountsBtn.addEventListener('click', refreshAccounts);
|
||||||
elements.closeAccountModal.addEventListener('click', closeAccountModal);
|
elements.closeAccountModal.addEventListener('click', closeAccountModal);
|
||||||
elements.loginBtn.addEventListener('click', openLoginQrModal);
|
elements.loginBtn.addEventListener('click', openXiaohongshuLogin);
|
||||||
|
elements.verifyLoginBtn.addEventListener('click', verifyLogin);
|
||||||
elements.logoutBtn.addEventListener('click', logout);
|
elements.logoutBtn.addEventListener('click', logout);
|
||||||
elements.clearAllUsersBtn.addEventListener('click', clearAllUsers);
|
elements.clearAllUsersBtn.addEventListener('click', clearAllUsers);
|
||||||
elements.addUserIdBtn.addEventListener('click', addUserId);
|
elements.addUserIdBtn.addEventListener('click', addUserId);
|
||||||
@@ -227,17 +224,11 @@ function bindEvents() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// 登录二维码模态框关闭
|
|
||||||
elements.closeLoginQrModal.addEventListener('click', closeLoginQrModal);
|
|
||||||
|
|
||||||
// 点击模态框外部关闭
|
// 点击模态框外部关闭
|
||||||
window.addEventListener('click', (e) => {
|
window.addEventListener('click', (e) => {
|
||||||
if (e.target === elements.accountModal) {
|
if (e.target === elements.accountModal) {
|
||||||
closeAccountModal();
|
closeAccountModal();
|
||||||
}
|
}
|
||||||
if (e.target === elements.loginQrModal) {
|
|
||||||
closeLoginQrModal();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -692,77 +683,55 @@ function closeAccountModal() {
|
|||||||
elements.accountModal.classList.remove('show');
|
elements.accountModal.classList.remove('show');
|
||||||
}
|
}
|
||||||
|
|
||||||
// 打开登录二维码模态框
|
// 打开小红书官方登录页面
|
||||||
async function openLoginQrModal() {
|
async function openXiaohongshuLogin() {
|
||||||
elements.loginQrModal.classList.add('show');
|
|
||||||
elements.qrLoginStatus.textContent = '正在模拟登录...';
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch('/api/login/qrcode', {
|
const response = await fetch('/api/login/qrcode', {
|
||||||
method: 'POST'
|
method: 'POST'
|
||||||
});
|
});
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
|
||||||
if (response.ok) {
|
if (response.ok && data.login_url) {
|
||||||
// 显示登录成功信息
|
// 打开小红书登录页面
|
||||||
elements.qrcodeContainer.innerHTML = `
|
window.open(data.login_url, '_blank');
|
||||||
<div style="text-align: center; padding: 40px;">
|
|
||||||
<div style="font-size: 48px; margin-bottom: 20px;">✅</div>
|
|
||||||
<h3 style="color: var(--success-color); margin-bottom: 10px;">${data.message}</h3>
|
|
||||||
<p style="color: var(--text-secondary);">登录状态已保存到本地</p>
|
|
||||||
${data.expire_in_hours ? `<p style="color: var(--text-muted); font-size: 14px;">有效期:${data.expire_in_hours}小时</p>` : ''}
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
elements.qrLoginStatus.textContent = '登录成功!';
|
|
||||||
|
|
||||||
// 开始检查登录状态
|
// 显示登录说明
|
||||||
checkLoginStatus();
|
elements.loginInstructions.style.display = 'block';
|
||||||
|
elements.verifyLoginBtn.style.display = 'inline-block';
|
||||||
|
|
||||||
// 3秒后自动关闭
|
showToast('已打开小红书登录页面,请扫码登录', 'info');
|
||||||
setTimeout(() => {
|
|
||||||
closeLoginQrModal();
|
|
||||||
closeAccountModal();
|
|
||||||
showToast('登录成功', 'success');
|
|
||||||
}, 3000);
|
|
||||||
} else {
|
} else {
|
||||||
elements.qrcodeContainer.innerHTML = '<p style="color: var(--error-color);">登录失败</p>';
|
showToast('获取登录页面失败', 'error');
|
||||||
elements.qrLoginStatus.textContent = '登录失败';
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
elements.qrcodeContainer.innerHTML = '<p style="color: var(--error-color);">网络错误</p>';
|
showToast('网络错误', 'error');
|
||||||
elements.qrLoginStatus.textContent = '网络错误';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 关闭登录二维码模态框
|
// 验证登录状态
|
||||||
function closeLoginQrModal() {
|
async function verifyLogin() {
|
||||||
elements.loginQrModal.classList.remove('show');
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查登录状态
|
|
||||||
async function checkLoginStatus() {
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch('/api/login/status');
|
const response = await fetch('/api/login/verify', {
|
||||||
|
method: 'POST'
|
||||||
|
});
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
|
||||||
if (data.logged_in) {
|
if (data.success) {
|
||||||
elements.qrLoginStatus.textContent = '登录成功!';
|
// 登录成功
|
||||||
setTimeout(() => {
|
|
||||||
closeLoginQrModal();
|
|
||||||
closeAccountModal();
|
|
||||||
updateLoginStatus(true, data.login_time, data.expire_time);
|
updateLoginStatus(true, data.login_time, data.expire_time);
|
||||||
showToast('登录成功', 'success');
|
elements.loginInstructions.style.display = 'none';
|
||||||
}, 1000);
|
elements.verifyLoginBtn.style.display = 'none';
|
||||||
|
closeAccountModal();
|
||||||
|
showToast('登录成功!', 'success');
|
||||||
} else {
|
} else {
|
||||||
// 继续检查
|
showToast(data.message || '验证失败', 'error');
|
||||||
setTimeout(checkLoginStatus, 2000);
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// 网络错误,继续检查
|
showToast('验证失败', 'error');
|
||||||
setTimeout(checkLoginStatus, 2000);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 退出登录
|
// 退出登录
|
||||||
async function logout() {
|
async function logout() {
|
||||||
try {
|
try {
|
||||||
|
|||||||
+9
-32
@@ -201,13 +201,20 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="login-actions">
|
<div class="login-actions">
|
||||||
<button class="btn btn-primary" id="loginBtn" title="模拟登录,不是真实扫码">
|
<button class="btn btn-primary" id="loginBtn" title="打开小红书登录页面">
|
||||||
<span class="btn-icon">🔐</span> 模拟登录
|
<span class="btn-icon">🔐</span> 打开登录页
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-success" id="verifyLoginBtn" style="display: none;" title="验证登录状态">
|
||||||
|
<span class="btn-icon">✅</span> 验证登录
|
||||||
</button>
|
</button>
|
||||||
<button class="btn btn-danger" id="logoutBtn">
|
<button class="btn btn-danger" id="logoutBtn">
|
||||||
<span class="btn-icon">🚪</span> 退出登录
|
<span class="btn-icon">🚪</span> 退出登录
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="loginInstructions" style="display: none; margin-top: 10px; padding: 10px; background: #f0f9ff; border-radius: 5px; font-size: 14px;">
|
||||||
|
<p style="margin: 0; color: #0369a1;">📱 新窗口打开了小红书登录页面,请完成扫码登录</p>
|
||||||
|
<p style="margin: 5px 0 0 0; font-size: 12px; color: #64748b;">登录成功后,返回此页面点击"验证登录"按钮</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 用户管理 -->
|
<!-- 用户管理 -->
|
||||||
@@ -253,36 +260,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 登录二维码模态框 -->
|
|
||||||
<div class="modal" id="loginQrModal">
|
|
||||||
<div class="modal-content">
|
|
||||||
<div class="modal-header">
|
|
||||||
<h3>扫码登录小红书</h3>
|
|
||||||
<button class="modal-close" id="closeLoginQrModal">×</button>
|
|
||||||
</div>
|
|
||||||
<div class="modal-body">
|
|
||||||
<div class="qr-login-container">
|
|
||||||
<div class="qr-code-section">
|
|
||||||
<div id="qrcodeContainer">
|
|
||||||
<!-- 二维码将在这里显示 -->
|
|
||||||
</div>
|
|
||||||
<p class="qr-tips">请使用小红书App扫描二维码登录</p>
|
|
||||||
</div>
|
|
||||||
<div class="login-status-section">
|
|
||||||
<h4>登录状态</h4>
|
|
||||||
<div class="login-status-item">
|
|
||||||
<span class="status-label">状态:</span>
|
|
||||||
<span class="status-value" id="qrLoginStatus">等待扫码...</span>
|
|
||||||
</div>
|
|
||||||
<div class="login-status-item">
|
|
||||||
<span class="status-label">二维码过期时间:</span>
|
|
||||||
<span class="status-value" id="qrExpireTime">120秒</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 浮动提示 -->
|
<!-- 浮动提示 -->
|
||||||
<div class="toast" id="toast"></div>
|
<div class="toast" id="toast"></div>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
## 系统特点
|
## 系统特点
|
||||||
|
|
||||||
- 🌐 **Web 可视化界面**:实时监控采集进度和状态
|
- 🌐 **Web 可视化界面**:实时监控采集进度和状态
|
||||||
- 🔐 **模拟登录系统**:模拟登录成功状态,本地保存,24小时自动过期
|
- 🔐 **真实扫码登录**:打开小红书官方登录页面,扫码登录后验证状态
|
||||||
- 👥 **账号管理**:支持添加、删除用户账号
|
- 👥 **账号管理**:支持添加、删除用户账号
|
||||||
- 📊 **实时日志**:分类显示操作日志,支持过滤和搜索
|
- 📊 **实时日志**:分类显示操作日志,支持过滤和搜索
|
||||||
- 🔄 **多线程采集**:支持单线程/多线程模式切换
|
- 🔄 **多线程采集**:支持单线程/多线程模式切换
|
||||||
@@ -125,9 +125,10 @@ docker-compose up -d --build
|
|||||||
# 格式:长字符串(如 5ef74296000000000100003a)
|
# 格式:长字符串(如 5ef74296000000000100003a)
|
||||||
# 可从浏览器地址栏获取:https://www.xiaohongshu.com/user/profile/用户ID
|
# 可从浏览器地址栏获取:https://www.xiaohongshu.com/user/profile/用户ID
|
||||||
|
|
||||||
# 4. 模拟登录
|
# 4. 真实扫码登录
|
||||||
# 点击"模拟登录"按钮,系统会模拟登录成功并记录登录状态
|
# 点击"打开登录页"按钮,会在新窗口打开小红书官方登录页面
|
||||||
# 注意:这是模拟登录,不是真实的扫码登录
|
# 在打开的页面中使用小红书App扫描二维码完成登录
|
||||||
|
# 登录成功后,返回本页面点击"验证登录"按钮
|
||||||
# 登录状态有效期:24小时
|
# 登录状态有效期:24小时
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user