Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7926a5b51f | |||
| 26e0ed26e1 |
146
app.py
146
app.py
@@ -799,6 +799,58 @@ def api_system_stats():
|
||||
return jsonify({'error': str(e), 'available': False})
|
||||
|
||||
|
||||
@app.route('/api/system/processes')
|
||||
def api_system_processes():
|
||||
"""获取CPU占用最高的进程列表"""
|
||||
if not HAS_PSUTIL:
|
||||
return jsonify({'error': 'psutil未安装', 'available': False})
|
||||
|
||||
try:
|
||||
limit = int(request.args.get('limit', 10))
|
||||
limit = max(1, min(50, limit)) # 限制1-50
|
||||
|
||||
processes = []
|
||||
for proc in psutil.process_iter(['pid', 'name', 'memory_percent', 'status', 'create_time', 'exe', 'cmdline']):
|
||||
try:
|
||||
pinfo = proc.info
|
||||
# 获取实时CPU占用（需要单独调用）
|
||||
cpu_percent = proc.cpu_percent(interval=0.1)
|
||||
|
||||
# 格式化命令行
|
||||
cmdline = pinfo.get('cmdline', [])
|
||||
cmdline_str = ' '.join(cmdline) if cmdline else pinfo['name']
|
||||
if len(cmdline_str) > 60:
|
||||
cmdline_str = cmdline_str[:60] + '...'
|
||||
|
||||
# 启动时间
|
||||
create_time = datetime.fromtimestamp(pinfo['create_time']).strftime('%m-%d %H:%M')
|
||||
|
||||
processes.append({
|
||||
'pid': pinfo['pid'],
|
||||
'name': pinfo['name'],
|
||||
'cpu': cpu_percent,
|
||||
'memory': pinfo['memory_percent'] or 0,
|
||||
'status': pinfo['status'],
|
||||
'create_time': create_time,
|
||||
'exe': pinfo.get('exe', '') or '',
|
||||
'cmdline': cmdline_str
|
||||
})
|
||||
except (psutil.NoSuchProcess, psutil.AccessDenied):
|
||||
continue
|
||||
|
||||
# 按CPU占用排序，取前N个
|
||||
processes.sort(key=lambda x: x['cpu'], reverse=True)
|
||||
top_processes = processes[:limit]
|
||||
|
||||
return jsonify({
|
||||
'available': True,
|
||||
'processes': top_processes,
|
||||
'count': len(top_processes)
|
||||
})
|
||||
except Exception as e:
|
||||
return jsonify({'error': str(e), 'available': False})
|
||||
|
||||
|
||||
def guess_cron_name(command):
|
||||
"""从命令推断任务名称"""
|
||||
keywords = {
|
||||
@@ -1103,7 +1155,7 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>项目服务管理面板 v3.2</title>
|
||||
<title>项目服务管理面板 v3.3</title>
|
||||
<link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><text y='.9em' font-size='90'>📊</text></svg>">
|
||||
<script src="https://cdn.tailwindcss.com"></script>
|
||||
<link href="https://cdn.jsdelivr.net/npm/remixicon@3.5.0/fonts/remixicon.css" rel="stylesheet">
|
||||
@@ -1465,6 +1517,28 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
|
||||
<span id="realtimeIndicator" class="text-xs text-green-400 ml-1 hidden">●</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 进程列表（实时监控时显示） -->
|
||||
<div id="processListSection" class="hidden mt-6">
|
||||
<div class="flex items-center justify-between mb-3">
|
||||
<h3 class="font-bold text-gray-200 flex items-center gap-2">
|
||||
<i class="ri-bar-chart-horizontal text-purple-400"></i> CPU占用最高的进程
|
||||
</h3>
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="text-gray-400 text-xs">显示数量:</span>
|
||||
<select id="processLimitSelect" class="bg-gray-700 text-gray-200 px-2 py-1 rounded text-xs" onchange="loadTopProcesses()">
|
||||
<option value="5">5</option>
|
||||
<option value="10" selected>10</option>
|
||||
<option value="15">15</option>
|
||||
<option value="20">20</option>
|
||||
<option value="30">30</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div id="processList" class="space-y-2">
|
||||
<div class="text-gray-500 text-center py-4"><i class="ri-loader-4-line animate-spin"></i> 加载中...</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Cron 管理 Tab -->
|
||||
@@ -1836,6 +1910,7 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
|
||||
document.getElementById('realtimeCheck').checked = false;
|
||||
document.getElementById('realtimeToggle').classList.remove('active');
|
||||
document.getElementById('realtimeIndicator').classList.add('hidden');
|
||||
document.getElementById('processListSection').classList.add('hidden');
|
||||
}
|
||||
|
||||
if (tab === 'cron') {
|
||||
@@ -2059,26 +2134,82 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
|
||||
// 检查阈值
|
||||
checkThresholds(data);
|
||||
|
||||
// 如果实时监控开启，加载进程列表
|
||||
if (document.getElementById('realtimeCheck').checked) {
|
||||
loadTopProcesses();
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
console.error('系统资源加载失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
// 加载CPU占用最高的进程
|
||||
async function loadTopProcesses() {
|
||||
try {
|
||||
const limit = document.getElementById('processLimitSelect').value;
|
||||
const res = await fetch(`/api/system/processes?limit=${limit}`);
|
||||
const data = await res.json();
|
||||
|
||||
if (!data.available) {
|
||||
document.getElementById('processList').innerHTML = '<div class="text-red-400 text-center py-4">无法获取进程信息</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
const list = document.getElementById('processList');
|
||||
if (data.processes.length === 0) {
|
||||
list.innerHTML = '<div class="text-gray-500 text-center py-4">暂无进程数据</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
list.innerHTML = data.processes.map(proc => `
|
||||
<div class="card rounded-lg p-3 hover:border-gray-500 transition-colors">
|
||||
<div class="flex items-center justify-between">
|
||||
<div class="flex items-center gap-3 min-w-0">
|
||||
<span class="text-purple-400 font-mono text-sm">${proc.pid}</span>
|
||||
<div class="min-w-0 flex-1">
|
||||
<div class="text-gray-200 truncate">${proc.name}</div>
|
||||
<div class="text-gray-500 text-xs truncate">${proc.cmdline || proc.exe}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex items-center gap-4 text-xs shrink-0">
|
||||
<div class="text-right">
|
||||
<span class="text-blue-400 font-bold">${proc.cpu.toFixed(1)}%</span>
|
||||
<span class="text-gray-500 ml-1">CPU</span>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<span class="text-green-400 font-bold">${proc.memory.toFixed(1)}%</span>
|
||||
<span class="text-gray-500 ml-1">内存</span>
|
||||
</div>
|
||||
<div class="text-gray-400">${proc.create_time}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`).join('');
|
||||
} catch (e) {
|
||||
console.error('进程列表加载失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
function toggleRealtime() {
|
||||
const checked = document.getElementById('realtimeCheck').checked;
|
||||
const toggle = document.getElementById('realtimeToggle');
|
||||
const indicator = document.getElementById('realtimeIndicator');
|
||||
const processSection = document.getElementById('processListSection');
|
||||
|
||||
if (checked) {
|
||||
toggle.classList.add('active');
|
||||
indicator.classList.remove('hidden');
|
||||
processSection.classList.remove('hidden');
|
||||
// 立即加载一次
|
||||
loadSystemStats();
|
||||
loadTopProcesses();
|
||||
// 启动定时器
|
||||
realtimeTimer = setInterval(loadSystemStats, realtimeInterval * 1000);
|
||||
} else {
|
||||
toggle.classList.remove('active');
|
||||
indicator.classList.add('hidden');
|
||||
processSection.classList.add('hidden');
|
||||
// 停止定时器
|
||||
if (realtimeTimer) {
|
||||
clearInterval(realtimeTimer);
|
||||
@@ -2426,17 +2557,16 @@ HTML_TEMPLATE = '''<!DOCTYPE html>
|
||||
}
|
||||
|
||||
const resourceNames = { 'cpu': 'CPU', 'memory': '内存', 'disk': '磁盘' };
|
||||
const triggerNames = {
|
||||
'single': '一次性',
|
||||
'continuous': `连续${rule.triggerParam}次`,
|
||||
'duration': `持续${rule.triggerParam}秒`,
|
||||
'average': `平均${rule.triggerParam}次`
|
||||
};
|
||||
|
||||
list.innerHTML = rules.map(rule => {
|
||||
const silentInfo = rule.silentEnabled ? `静默:${rule.silentStart}-${rule.silentEnd}` : '';
|
||||
const triggerType = rule.triggerType || 'single';
|
||||
const triggerDisplay = triggerNames[triggerType] || triggerNames['single'];
|
||||
const triggerParam = rule.triggerParam || 3;
|
||||
let triggerDisplay = '一次性';
|
||||
if (triggerType === 'continuous') triggerDisplay = `连续${triggerParam}次`;
|
||||
else if (triggerType === 'duration') triggerDisplay = `持续${triggerParam}秒`;
|
||||
else if (triggerType === 'average') triggerDisplay = `平均${triggerParam}次`;
|
||||
|
||||
return `
|
||||
<div class="flex items-center justify-between bg-gray-700/50 px-3 py-2 rounded-lg">
|
||||
<div class="flex items-center gap-3 flex-wrap">
|
||||
|
||||
52
logs/app.log
52
logs/app.log
@@ -1,8 +1,8 @@
|
||||
[2026-04-23 23:33:00] ==================================================
|
||||
[2026-04-23 23:33:00] 项目服务管理面板 v2.0.0 启动
|
||||
[2026-04-23 23:33:00] 访问地址: http://localhost:19013
|
||||
[2026-04-23 23:33:00] 进程PID: 1265636
|
||||
[2026-04-23 23:33:00] ==================================================
|
||||
[2026-04-23 23:57:38] ==================================================
|
||||
[2026-04-23 23:57:38] 项目服务管理面板 v2.0.0 启动
|
||||
[2026-04-23 23:57:38] 访问地址: http://localhost:19013
|
||||
[2026-04-23 23:57:38] 进程PID: 1274690
|
||||
[2026-04-23 23:57:38] ==================================================
|
||||
* Serving Flask app 'app'
|
||||
* Debug mode: off
|
||||
WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
|
||||
@@ -10,16 +10,32 @@ WARNING: This is a development server. Do not use it in a production deployment.
|
||||
* Running on http://127.0.0.1:19013
|
||||
* Running on http://192.168.2.17:19013
|
||||
Press CTRL+C to quit
|
||||
127.0.0.1 - - [23/Apr/2026 23:33:03] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:33:05] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:33:06] "GET / HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:33:13] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:33:15] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:33:23] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:33:25] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:33:31] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:33:33] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:33:33] "GET / HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:33:33] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.14 - - [23/Apr/2026 23:33:35] "GET /api/projects HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:33:35] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:57:42] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.14 - - [23/Apr/2026 23:57:43] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:57:45] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:57:47] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:57:52] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.14 - - [23/Apr/2026 23:57:53] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:57:55] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:57:57] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:02] "GET / HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:02] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.14 - - [23/Apr/2026 23:58:03] "GET /api/projects HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:58:04] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:05] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:58:07] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:12] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.14 - - [23/Apr/2026 23:58:13] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:15] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:58:17] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:19] "GET /api/system/processes?limit=5 HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:22] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.14 - - [23/Apr/2026 23:58:23] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:25] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:58:27] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:32] "GET / HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:32] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.14 - - [23/Apr/2026 23:58:33] "GET /api/projects HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:58:34] "GET /api/projects HTTP/1.1" 200 -
|
||||
127.0.0.1 - - [23/Apr/2026 23:58:35] "GET / HTTP/1.1" 200 -
|
||||
192.168.2.8 - - [23/Apr/2026 23:58:37] "GET /api/projects HTTP/1.1" 200 -
|
||||
|
||||
Reference in New Issue
Block a user