fix: 系统资源面板未开实时监控时按页面刷新间隔自动更新

- 新增 systemRefreshTimer，切换至系统Tab时自动启动 - 未开实时监控 → 按页面「刷新间隔」秒数定时刷新系统资源 - 开启实时监控 → 按实时间隔秒数刷新（原有逻辑不变） - 关闭实时监控 → 切回页面刷新间隔继续更新 - 修改页面刷新间隔 → 同步更新系统资源刷新频率 - 新增 watchdog.sh 守护脚本，端口掉线自动重启
fix: 服务发现支持无权限查看的端口（Docker host网络等）
2026-06-01 20:35:07 +08:00 · 2026-06-01 18:32:10 +08:00 · 2026-06-01 18:28:44 +08:00 · 2026-06-01 18:23:23 +08:00
3 changed files with 91 additions and 18 deletions
--- a/routes_discovery.py
+++ b/routes_discovery.py
@@ -8,7 +8,7 @@ import os
 import re
 import json
 import subprocess
-from flask import jsonify
+from flask import jsonify, request
 from utils import log_message
 from config import PROJECTS_FILE

@@ -71,13 +71,10 @@ def _get_listening_ports():
            port = int(port_match.group(1))
            
            pid_match = re.search(r'pid=(\d+)', line)
-            if not pid_match:
-                continue
-            pid = int(pid_match.group(1))
+            pid = int(pid_match.group(1)) if pid_match else None
            
-            # 提取进程名
            proc_match = re.search(r'users:\(\(\"([^\"]+)\"', line)
-            proc_name = proc_match.group(1) if proc_match else 'unknown'
+            proc_name = proc_match.group(1) if proc_match else '未知进程'
            
            services.append({
                'port': port,
@@ -165,7 +162,7 @@ def register_discovery_routes(app):
    @app.route('/api/discovery/services')
    def api_discovery_services():
        """扫描本机未注册的新服务"""
-        # 1. 获取已知端口
+        # 1. 收集已知端口
        known_ports = set()
        try:
            with open(PROJECTS_FILE, 'r', encoding='utf-8') as f:
@@ -179,7 +176,16 @@ def register_discovery_routes(app):
        except:
            pass
        
-        # 2. 获取 Docker 容器端口
+        # 2. 前端传入的额外排除端口（自定义服务等）
+        exclude_str = request.args.get('exclude_ports', '')
+        if exclude_str:
+            try:
+                for p in exclude_str.split(','):
+                    known_ports.add(int(p.strip()))
+            except:
+                pass
+        
+        # 3. 获取 Docker 容器端口
        try:
            result = subprocess.run(
                ['docker', 'ps', '--format', '{{.Ports}}'],
@@ -210,10 +216,16 @@ def register_discovery_routes(app):
                continue
            seen_ports.add(port)
            
-            cmdline = _get_process_cmdline(pid)
-            cwd = _get_process_cwd(pid)
-            name = _guess_service_name(pid, svc['process'], cmdline)
-            svc_type = _guess_service_type(cmdline)
+            if pid:
+                cmdline = _get_process_cmdline(pid)
+                cwd = _get_process_cwd(pid)
+                name = _guess_service_name(pid, svc['process'], cmdline)
+                svc_type = _guess_service_type(cmdline)
+            else:
+                cmdline = ''
+                cwd = ''
+                name = svc['process']
+                svc_type = 'unknown'
            
            undiscovered.append({
                'port': port,
--- a/templates_full.txt
+++ b/templates_full.txt
@@ -929,6 +929,7 @@
        // Tab 切换
        // 系统资源监控变量（必须先声明）
        let realtimeTimer = null;
+        let systemRefreshTimer = null;
        let realtimeInterval = 2; // 秒
        let lastAlertTime = 0; // 上次警告时间
        let thresholds = { cpu: 80, cpu_temp: 80, memory: 85, disk: 90, interval: 60 };
@@ -957,6 +958,12 @@
                document.getElementById('processListSection').classList.add('hidden');
            }
            
+            // 离开系统Tab时关闭非实时刷新定时器
+            if (tab !== 'system' && systemRefreshTimer) {
+                clearInterval(systemRefreshTimer);
+                systemRefreshTimer = null;
+            }
+            
            if (tab === 'cron') {
                loadCronTasks();
            }
@@ -965,6 +972,8 @@
                loadDesktopNotifySetting();
                renderEmailRules();
                loadSystemStats();
+                // 启动系统资源定时刷新（按页面刷新间隔）
+                startSystemRefresh();
            }
        }

@@ -1281,14 +1290,17 @@
            const toggle = document.getElementById('realtimeToggle');
            const indicator = document.getElementById('realtimeIndicator');
            
+            // 先停止系统定时刷新
+            if (systemRefreshTimer) {
+                clearInterval(systemRefreshTimer);
+                systemRefreshTimer = null;
+            }
+            
            if (checked) {
                toggle.classList.add('active');
                indicator.classList.remove('hidden');
-                // 立即加载一次
                loadSystemStats();
-                // 启动定时器
                realtimeTimer = setInterval(loadSystemStats, realtimeInterval * 1000);
-                // 如果进程列表开关也开启，则显示并加载
                if (document.getElementById('showProcessListCheck').checked) {
                    document.getElementById('processListSection').classList.remove('hidden');
                    loadTopProcesses();
@@ -1297,14 +1309,28 @@
                toggle.classList.remove('active');
                indicator.classList.add('hidden');
                document.getElementById('processListSection').classList.add('hidden');
-                // 停止定时器
                if (realtimeTimer) {
                    clearInterval(realtimeTimer);
                    realtimeTimer = null;
                }
+                // 关闭实时后，按页面刷新间隔继续刷新系统资源
+                startSystemRefresh();
            }
        }
        
+        function startSystemRefresh() {
+            // 先停掉旧定时器
+            if (systemRefreshTimer) {
+                clearInterval(systemRefreshTimer);
+                systemRefreshTimer = null;
+            }
+            // 如果在实时监控模式则不启动（由realtimeTimer负责）
+            if (document.getElementById('realtimeCheck').checked) return;
+            // 按页面刷新间隔定时刷新
+            const intervalSec = parseInt(document.getElementById('refreshInterval').value) || 30;
+            systemRefreshTimer = setInterval(loadSystemStats, intervalSec * 1000);
+        }
+        
        function toggleProcessList() {
            const checked = document.getElementById('showProcessListCheck').checked;
            const realtimeChecked = document.getElementById('realtimeCheck').checked;
@@ -2238,6 +2264,7 @@
            const newService = {
                id: 'custom_' + Date.now(),
                name: name,
+                port: port || '',
                url: mainUrl,
                admin_url: adminUrl || null,
                description: desc || '自定义外部服务',
@@ -2750,6 +2777,11 @@
            
            clearInterval(refreshTimer);
            refreshTimer = setInterval(() => { if (currentTab === 'projects') loadProjects(); }, seconds * 1000);
+            
+            // 如果当前在系统Tab且非实时模式，更新系统刷新间隔
+            if (currentTab === 'system' && !document.getElementById('realtimeCheck').checked) {
+                startSystemRefresh();
+            }
        }

        setInterval(() => {
@@ -2886,7 +2918,12 @@
            list.innerHTML = '<div class="text-gray-400 text-xs text-center py-2"><i class="ri-loader-4-line animate-spin"></i> 扫描中...</div>';
            
            try {
-                const res = await fetch('/api/discovery/services');
+                // 收集前端已注册的自定义服务端口，传给后端排除
+                const customServices = getCustomServices();
+                const customPorts = customServices.map(s => parseInt(s.port)).filter(p => !isNaN(p));
+                const excludeParam = customPorts.length > 0 ? `?exclude_ports=${customPorts.join(',')}` : '';
+                
+                const res = await fetch(`/api/discovery/services${excludeParam}`);
                const data = await res.json();
                const services = data.services || [];
                document.getElementById('discoveryCount').textContent = `发现 ${services.length} 个`;
@@ -2899,7 +2936,7 @@
                            <div class="flex items-center gap-3 flex-1 min-w-0">
                                <span class="text-xs text-cyan-400 font-mono">:${s.port}</span>
                                <span class="text-gray-300 text-sm truncate">${s.suggested_name}</span>
-                                <span class="text-gray-500 text-xs">PID ${s.pid}</span>
+                                <span class="text-gray-500 text-xs">PID ${s.pid != null ? s.pid : '受权限限制'}</span>
                                <span class="text-gray-500 text-xs truncate hidden md:inline">${(s.cmdline || '').substring(0, 60)}</span>
                            </div>
                            <button onclick="quickAddService(${s.port}, '${s.suggested_name.replace(/'/g, "\\'")}', '${s.suggested_type}', '${(s.cwd || '').replace(/'/g, "\\'")}')" class="btn bg-green-600/50 hover:bg-green-600 px-2 py-1 rounded text-xs shrink-0 ml-2">
--- a/watchdog.sh
+++ b/watchdog.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# project-panel 守护脚本 - 进程挂了自动重启
+SERVICE_DIR="/home/openclaw/.openclaw/workspace-hz4th_coder/works/project-panel"
+PYTHON="/home/hz1/miniconda3/envs/openclaw/bin/python3.12"
+PORT=16022
+LOG="$SERVICE_DIR/logs/watchdog.log"
+
+echo "[$(date '+%Y-%m-%d %H:%M:%S')] 守护进程启动，监控端口 $PORT" >> "$LOG"
+
+while true; do
+    if ! ss -tlnp 2>/dev/null | grep -q ":$PORT "; then
+        echo "[$(date '+%Y-%m-%d %H:%M:%S')] 检测到 $PORT 端口离线，重启服务..." >> "$LOG"
+        cd "$SERVICE_DIR"
+        mkdir -p logs
+        nohup "$PYTHON" app.py > logs/app.log 2>&1 &
+        sleep 3
+        if ss -tlnp 2>/dev/null | grep -q ":$PORT "; then
+            echo "[$(date '+%Y-%m-%d %H:%M:%S')] 服务重启成功" >> "$LOG"
+        else
+            echo "[$(date '+%Y-%m-%d %H:%M:%S')] 服务重启失败！" >> "$LOG"
+        fi
+    fi
+    sleep 10
+done
Author	SHA1	Message	Date
hz4th_coder	f7722be539	fix: 系统资源面板未开实时监控时按页面刷新间隔自动更新 - 新增 systemRefreshTimer，切换至系统Tab时自动启动 - 未开实时监控 → 按页面「刷新间隔」秒数定时刷新系统资源 - 开启实时监控 → 按实时间隔秒数刷新（原有逻辑不变） - 关闭实时监控 → 切回页面刷新间隔继续更新 - 修改页面刷新间隔 → 同步更新系统资源刷新频率 - 新增 watchdog.sh 守护脚本，端口掉线自动重启	2026-06-01 20:35:07 +08:00
hz4th_coder	779f42c98c	fix: 服务发现支持无权限查看的端口（Docker host网络等） - ss -tlnp 输出中没有 pid= 的端口不再跳过 - pid 为 None 时显示「受权限限制」, 进程名标记「未知进程」 - 当前发现: 8088, 9119, 16031, 16067, 18789	2026-06-01 18:32:10 +08:00
hz4th_coder	525620b0f8	fix: 自定义服务保存时添加port字段，修复发现扫描排除失效之前 quickAddService 保存自定义服务时遗漏了 port 字段，导致 scanServices 的 exclude_ports 取不到有效端口值	2026-06-01 18:28:44 +08:00
hz4th_coder	ebc8d687d0	fix: 服务发现排除前端已注册的自定义服务 - API 新增 exclude_ports 查询参数，接受逗号分隔端口列表 - 前端 scanServices() 读取 localStorage 自定义服务端口传给后端 - 已添加的服务不再出现在扫描结果中	2026-06-01 18:23:23 +08:00