C:/Program Files/Git/api/events加入socketio机制——更新超时时间
This commit is contained in:
12
app.py
12
app.py
@@ -251,7 +251,9 @@ socketio = SocketIO(
|
||||
"https://valuefrontier.cn", "http://valuefrontier.cn"],
|
||||
async_mode='gevent',
|
||||
logger=True,
|
||||
engineio_logger=False
|
||||
engineio_logger=False,
|
||||
ping_timeout=120, # 心跳超时时间（秒），客户端120秒内无响应才断开
|
||||
ping_interval=25 # 心跳检测间隔（秒），每25秒发送一次ping
|
||||
)
|
||||
|
||||
|
||||
@@ -7583,7 +7585,7 @@ last_checked_event_id = 0
|
||||
def poll_new_events():
|
||||
"""
|
||||
定期轮询数据库，检查是否有新事件
|
||||
每 2 分钟执行一次
|
||||
每 30 秒执行一次
|
||||
"""
|
||||
global last_checked_event_id
|
||||
|
||||
@@ -7629,17 +7631,17 @@ def initialize_event_polling():
|
||||
|
||||
# 创建后台调度器
|
||||
scheduler = BackgroundScheduler()
|
||||
# 每 2 分钟执行一次轮询
|
||||
# 每 30 秒执行一次轮询
|
||||
scheduler.add_job(
|
||||
func=poll_new_events,
|
||||
trigger='interval',
|
||||
minutes=2,
|
||||
seconds=30,
|
||||
id='poll_new_events',
|
||||
name='检查新事件并推送',
|
||||
replace_existing=True
|
||||
)
|
||||
scheduler.start()
|
||||
print('[轮询] 调度器已启动，每 2 分钟检查一次新事件')
|
||||
print('[轮询] 调度器已启动，每 30 秒检查一次新事件')
|
||||
|
||||
except Exception as e:
|
||||
print(f'[轮询] 初始化失败: {e}')
|
||||
|
||||
109
test_create_event.py
Normal file
109
test_create_event.py
Normal file
@@ -0,0 +1,109 @@
|
||||
"""
|
||||
测试脚本：手动创建事件到数据库
|
||||
用于测试 WebSocket 实时推送功能
|
||||
"""
|
||||
|
||||
import sys
|
||||
from datetime import datetime
|
||||
from sqlalchemy import create_engine, Column, Integer, String, Text, Float, DateTime
|
||||
from sqlalchemy.ext.declarative import declarative_base
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
# 数据库连接（从 app.py 复制）
|
||||
DATABASE_URI = 'mysql+pymysql://root:Zzl5588161!@111.198.58.126:33060/stock?charset=utf8mb4'
|
||||
|
||||
engine = create_engine(DATABASE_URI, echo=False)
|
||||
Session = sessionmaker(bind=engine)
|
||||
session = Session()
|
||||
|
||||
Base = declarative_base()
|
||||
|
||||
# Event 模型（简化版，只包含必要字段）
|
||||
class Event(Base):
|
||||
__tablename__ = 'events'
|
||||
|
||||
id = Column(Integer, primary_key=True)
|
||||
title = Column(String(500), nullable=False)
|
||||
description = Column(Text)
|
||||
event_type = Column(String(100))
|
||||
importance = Column(String(10))
|
||||
status = Column(String(50), default='active')
|
||||
hot_score = Column(Float, default=0)
|
||||
view_count = Column(Integer, default=0)
|
||||
created_at = Column(DateTime, default=datetime.now)
|
||||
updated_at = Column(DateTime, default=datetime.now, onupdate=datetime.now)
|
||||
|
||||
|
||||
def create_test_event():
|
||||
"""创建一个测试事件"""
|
||||
|
||||
import random
|
||||
|
||||
event_types = ['policy', 'market', 'tech', 'industry', 'finance']
|
||||
importances = ['S', 'A', 'B', 'C']
|
||||
|
||||
test_event = Event(
|
||||
title=f'测试事件 - {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}',
|
||||
description=f'这是一个用于测试 WebSocket 实时推送的事件，创建于 {datetime.now()}',
|
||||
event_type=random.choice(event_types),
|
||||
importance=random.choice(importances),
|
||||
status='active',
|
||||
hot_score=round(random.uniform(50, 100), 2),
|
||||
view_count=random.randint(100, 1000)
|
||||
)
|
||||
|
||||
try:
|
||||
session.add(test_event)
|
||||
session.commit()
|
||||
|
||||
print("✅ 测试事件创建成功!")
|
||||
print(f" ID: {test_event.id}")
|
||||
print(f" 标题: {test_event.title}")
|
||||
print(f" 类型: {test_event.event_type}")
|
||||
print(f" 重要性: {test_event.importance}")
|
||||
print(f" 热度: {test_event.hot_score}")
|
||||
print(f"\n💡 提示: 轮询将在 2 分钟内检测到此事件并推送到前端")
|
||||
print(f" （如果需要立即推送，请将轮询间隔改为更短）")
|
||||
|
||||
return test_event.id
|
||||
|
||||
except Exception as e:
|
||||
session.rollback()
|
||||
print(f"❌ 创建事件失败: {e}")
|
||||
return None
|
||||
finally:
|
||||
session.close()
|
||||
|
||||
|
||||
def create_multiple_events(count=3):
|
||||
"""创建多个测试事件"""
|
||||
print(f"正在创建 {count} 个测试事件...\n")
|
||||
|
||||
for i in range(count):
|
||||
event_id = create_test_event()
|
||||
if event_id:
|
||||
print(f"[{i+1}/{count}] 事件 #{event_id} 创建成功\n")
|
||||
else:
|
||||
print(f"[{i+1}/{count}] 创建失败\n")
|
||||
|
||||
print(f"\n✅ 完成！共创建 {count} 个事件")
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
print("=" * 60)
|
||||
print("WebSocket 事件推送测试 - 手动创建事件")
|
||||
print("=" * 60)
|
||||
print()
|
||||
|
||||
if len(sys.argv) > 1:
|
||||
try:
|
||||
count = int(sys.argv[1])
|
||||
create_multiple_events(count)
|
||||
except ValueError:
|
||||
print("❌ 参数必须是数字")
|
||||
print("用法: python test_create_event.py [数量]")
|
||||
else:
|
||||
# 默认创建 1 个事件
|
||||
create_test_event()
|
||||
|
||||
print("\n" + "=" * 60)
|
||||
289
test_websocket.html
Normal file
289
test_websocket.html
Normal file
@@ -0,0 +1,289 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>WebSocket 事件推送测试</title>
|
||||
<script src="https://cdn.socket.io/4.7.4/socket.io.min.js"></script>
|
||||
<style>
|
||||
body {
|
||||
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
||||
max-width: 1000px;
|
||||
margin: 50px auto;
|
||||
padding: 20px;
|
||||
background: #f5f5f5;
|
||||
}
|
||||
.container {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 30px;
|
||||
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
|
||||
}
|
||||
h1 {
|
||||
color: #333;
|
||||
border-bottom: 3px solid #4CAF50;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
.status {
|
||||
padding: 15px;
|
||||
margin: 20px 0;
|
||||
border-radius: 5px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.status.connected {
|
||||
background: #d4edda;
|
||||
color: #155724;
|
||||
border: 1px solid #c3e6cb;
|
||||
}
|
||||
.status.disconnected {
|
||||
background: #f8d7da;
|
||||
color: #721c24;
|
||||
border: 1px solid #f5c6cb;
|
||||
}
|
||||
button {
|
||||
background: #4CAF50;
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 12px 24px;
|
||||
font-size: 16px;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
margin: 5px;
|
||||
}
|
||||
button:hover {
|
||||
background: #45a049;
|
||||
}
|
||||
button:disabled {
|
||||
background: #ccc;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.log {
|
||||
background: #f9f9f9;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 5px;
|
||||
padding: 15px;
|
||||
margin-top: 20px;
|
||||
max-height: 400px;
|
||||
overflow-y: auto;
|
||||
font-family: 'Courier New', monospace;
|
||||
font-size: 13px;
|
||||
}
|
||||
.log-item {
|
||||
padding: 8px;
|
||||
margin: 5px 0;
|
||||
border-left: 3px solid #4CAF50;
|
||||
background: white;
|
||||
}
|
||||
.log-item.error {
|
||||
border-left-color: #f44336;
|
||||
background: #ffebee;
|
||||
}
|
||||
.log-item.event {
|
||||
border-left-color: #2196F3;
|
||||
background: #e3f2fd;
|
||||
}
|
||||
.event-card {
|
||||
background: #fff3cd;
|
||||
border: 2px solid #ffc107;
|
||||
border-radius: 8px;
|
||||
padding: 15px;
|
||||
margin: 10px 0;
|
||||
}
|
||||
.event-card h3 {
|
||||
margin-top: 0;
|
||||
color: #856404;
|
||||
}
|
||||
.timestamp {
|
||||
color: #666;
|
||||
font-size: 12px;
|
||||
}
|
||||
.controls {
|
||||
margin: 20px 0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<h1>🔌 WebSocket 事件推送测试页面</h1>
|
||||
|
||||
<div id="status" class="status disconnected">
|
||||
状态: 未连接
|
||||
</div>
|
||||
|
||||
<div class="controls">
|
||||
<button id="connectBtn" onclick="connect()">连接 WebSocket</button>
|
||||
<button id="subscribeBtn" onclick="subscribe()" disabled>订阅所有事件</button>
|
||||
<button id="unsubscribeBtn" onclick="unsubscribe()" disabled>取消订阅</button>
|
||||
<button id="disconnectBtn" onclick="disconnect()" disabled>断开连接</button>
|
||||
<button onclick="clearLog()">清空日志</button>
|
||||
</div>
|
||||
|
||||
<div id="events"></div>
|
||||
|
||||
<h2>📋 日志</h2>
|
||||
<div id="log" class="log"></div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
let socket = null;
|
||||
let isSubscribed = false;
|
||||
|
||||
function updateStatus(connected) {
|
||||
const statusDiv = document.getElementById('status');
|
||||
const connectBtn = document.getElementById('connectBtn');
|
||||
const subscribeBtn = document.getElementById('subscribeBtn');
|
||||
const unsubscribeBtn = document.getElementById('unsubscribeBtn');
|
||||
const disconnectBtn = document.getElementById('disconnectBtn');
|
||||
|
||||
if (connected) {
|
||||
statusDiv.className = 'status connected';
|
||||
statusDiv.textContent = '状态: 已连接 ✓';
|
||||
connectBtn.disabled = true;
|
||||
subscribeBtn.disabled = false;
|
||||
disconnectBtn.disabled = false;
|
||||
} else {
|
||||
statusDiv.className = 'status disconnected';
|
||||
statusDiv.textContent = '状态: 未连接 ✗';
|
||||
connectBtn.disabled = false;
|
||||
subscribeBtn.disabled = true;
|
||||
unsubscribeBtn.disabled = true;
|
||||
disconnectBtn.disabled = true;
|
||||
isSubscribed = false;
|
||||
}
|
||||
}
|
||||
|
||||
function log(message, type = 'info') {
|
||||
const logDiv = document.getElementById('log');
|
||||
const timestamp = new Date().toLocaleTimeString();
|
||||
const item = document.createElement('div');
|
||||
item.className = `log-item ${type}`;
|
||||
item.innerHTML = `<span class="timestamp">[${timestamp}]</span> ${message}`;
|
||||
logDiv.insertBefore(item, logDiv.firstChild);
|
||||
console.log(`[${timestamp}] ${message}`);
|
||||
}
|
||||
|
||||
function showEvent(event) {
|
||||
const eventsDiv = document.getElementById('events');
|
||||
const card = document.createElement('div');
|
||||
card.className = 'event-card';
|
||||
card.innerHTML = `
|
||||
<h3>🔔 新事件通知</h3>
|
||||
<p><strong>ID:</strong> ${event.id}</p>
|
||||
<p><strong>标题:</strong> ${event.title}</p>
|
||||
<p><strong>类型:</strong> ${event.event_type || 'N/A'}</p>
|
||||
<p><strong>重要性:</strong> ${event.importance || 'N/A'}</p>
|
||||
<p><strong>描述:</strong> ${event.description || 'N/A'}</p>
|
||||
<p><strong>热度:</strong> ${event.hot_score || 0}</p>
|
||||
<p class="timestamp">收到时间: ${new Date().toLocaleString()}</p>
|
||||
`;
|
||||
eventsDiv.insertBefore(card, eventsDiv.firstChild);
|
||||
|
||||
// 只保留最近 5 个事件
|
||||
while (eventsDiv.children.length > 5) {
|
||||
eventsDiv.removeChild(eventsDiv.lastChild);
|
||||
}
|
||||
}
|
||||
|
||||
function connect() {
|
||||
log('正在连接到 WebSocket 服务器...');
|
||||
|
||||
socket = io('http://localhost:5001', {
|
||||
transports: ['websocket', 'polling'],
|
||||
reconnection: true,
|
||||
reconnectionAttempts: 5,
|
||||
reconnectionDelay: 1000
|
||||
});
|
||||
|
||||
socket.on('connect', () => {
|
||||
log('✅ WebSocket 连接成功！', 'info');
|
||||
updateStatus(true);
|
||||
});
|
||||
|
||||
socket.on('connection_response', (data) => {
|
||||
log(`📡 服务器响应: ${JSON.stringify(data)}`, 'info');
|
||||
});
|
||||
|
||||
socket.on('new_event', (eventData) => {
|
||||
log(`🔔 收到新事件: ${eventData.title}`, 'event');
|
||||
showEvent(eventData);
|
||||
});
|
||||
|
||||
socket.on('subscription_confirmed', (data) => {
|
||||
log(`✅ 订阅成功: ${JSON.stringify(data)}`, 'info');
|
||||
isSubscribed = true;
|
||||
document.getElementById('subscribeBtn').disabled = true;
|
||||
document.getElementById('unsubscribeBtn').disabled = false;
|
||||
});
|
||||
|
||||
socket.on('unsubscription_confirmed', (data) => {
|
||||
log(`✅ 取消订阅成功: ${JSON.stringify(data)}`, 'info');
|
||||
isSubscribed = false;
|
||||
document.getElementById('subscribeBtn').disabled = false;
|
||||
document.getElementById('unsubscribeBtn').disabled = true;
|
||||
});
|
||||
|
||||
socket.on('disconnect', () => {
|
||||
log('❌ WebSocket 连接已断开', 'error');
|
||||
updateStatus(false);
|
||||
});
|
||||
|
||||
socket.on('connect_error', (error) => {
|
||||
log(`❌ 连接错误: ${error.message}`, 'error');
|
||||
});
|
||||
|
||||
socket.on('error', (error) => {
|
||||
log(`❌ 错误: ${error}`, 'error');
|
||||
});
|
||||
}
|
||||
|
||||
function subscribe() {
|
||||
if (!socket || !socket.connected) {
|
||||
log('❌ 请先连接 WebSocket', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
log('发送订阅请求...');
|
||||
socket.emit('subscribe_events', {
|
||||
event_type: 'all',
|
||||
importance: 'all'
|
||||
});
|
||||
}
|
||||
|
||||
function unsubscribe() {
|
||||
if (!socket || !socket.connected) {
|
||||
log('❌ 请先连接 WebSocket', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
log('发送取消订阅请求...');
|
||||
socket.emit('unsubscribe_events', {
|
||||
event_type: 'all'
|
||||
});
|
||||
}
|
||||
|
||||
function disconnect() {
|
||||
if (socket) {
|
||||
socket.disconnect();
|
||||
log('已手动断开连接');
|
||||
updateStatus(false);
|
||||
}
|
||||
}
|
||||
|
||||
function clearLog() {
|
||||
document.getElementById('log').innerHTML = '';
|
||||
document.getElementById('events').innerHTML = '';
|
||||
log('日志已清空');
|
||||
}
|
||||
|
||||
// 页面加载时显示提示
|
||||
window.onload = function() {
|
||||
log('📌 测试步骤:');
|
||||
log('1. 确保 Flask 服务已启动 (python app.py)');
|
||||
log('2. 点击 "连接 WebSocket" 按钮');
|
||||
log('3. 点击 "订阅所有事件" 按钮');
|
||||
log('4. 等待后台脚本创建新事件，或等待轮询检测到新事件');
|
||||
log('5. 新事件会自动推送到这个页面');
|
||||
};
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user