From 133959ef743abf7f9347ea1add0b32a4954f49a4 Mon Sep 17 00:00:00 2001 From: 3970260761 <3970260761@qq.com> Date: Sun, 8 Nov 2026 00:32:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20CPU=E9=A1=B5=E7=B3=BB=E7=BB=9F=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E4=B8=89=E6=A1=A3=E5=88=87=E6=8D=A2=20v1.3.13?= =?UTF-8?q?=EF=BC=88=E7=9C=81=E7=94=B5/=E5=B9=B3=E8=A1=A1/=E9=AB=98?= =?UTF-8?q?=E6=80=A7=E8=83=BD=EF=BC=8C=E5=86=99=E5=AE=BF=E4=B8=BBcpufreq?= =?UTF-8?q?=E5=8D=B3=E6=97=B6=E7=94=9F=E6=95=88=EF=BC=8C=E5=AE=BF=E4=B8=BB?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8C=81=E4=B9=85=E8=AE=B0=E5=BF=86=EF=BC=8C?= =?UTF-8?q?=E6=97=81=E6=B3=A8=E8=AF=B4=E6=98=8E=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 101 ++++++++++++++++++++++++++++++++++++++++++++- docker-compose.yml | 4 +- public/index.html | 15 +++++-- 3 files changed, 114 insertions(+), 6 deletions(-) diff --git a/app.py b/app.py index 1c15dd9..d21d9c8 100644 --- a/app.py +++ b/app.py @@ -16,7 +16,7 @@ PORT = int(os.environ.get("PORT", "7031")) # ---------- CardAuth hub (免费形态: 安装统计/在线/公告/版本推送,失败开放) ---------- HUB_URL = os.environ.get("HUB_URL", "https://auth.88531.cn/api").rstrip("/") HUB_PROJECT_ID = os.environ.get("HUB_PROJECT_ID", "12") -HUB_VERSION = os.environ.get("SITE_VERSION", "1.3.12") +HUB_VERSION = os.environ.get("SITE_VERSION", "1.3.13") HUB = {"ok": False, "install_id": None, "latest": "", "update_available": False, "update_required": False, "download_url": "", "changelog": "", "announcements": [], "popup": [], "ts": 0} @@ -463,6 +463,105 @@ def get_percpu(): except Exception: return [] +# ---------- CPU 性能模式: 省电/平衡/高性能(写宿主 cpufreq,失败开放) ---------- +PERF_FILE = os.environ.get("PERF_FILE", "/run/secrets/perf_mode.json") +PERF_FILE_FALLBACKS = [PERF_FILE, "/app/perf_mode.json"] +PERF_MODES = { + "powersave": {"governor": "powersave", "epp": "power", + "name": "省电模式"}, + "balanced": {"governor": "powersave", "epp": "balance_performance", + "name": "平衡模式"}, + "performance": {"governor": "performance", "epp": "performance", + "name": "高性能模式"}, +} + +def _saved_perf_mode(): + for p in PERF_FILE_FALLBACKS: + try: + with open(p) as f: + m = (json.load(f) or {}).get("mode", "") + if m in PERF_MODES: + return m + except Exception: + continue + return "" + +def _read_perf(): + gov, epp = "", "" + try: + with open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor") as f: + gov = f.read().strip() + except Exception: + pass + try: + with open("/sys/devices/system/cpu/cpufreq/policy0/energy_performance_preference") as f: + epp = f.read().strip().split()[0] + except Exception: + pass + mode = "" + for k, v in PERF_MODES.items(): + if v["governor"] == gov and (not epp or v["epp"] == epp): + mode = k + break + return {"governor": gov, "epp": epp, "mode": mode, + "saved": _saved_perf_mode()} + +def _apply_perf(mode): + if mode not in PERF_MODES: + return {"ok": False, "error": "未知模式"} + want = PERF_MODES[mode] + ok_g = fail_g = ok_e = fail_e = 0 + for p in sorted(glob.glob("/sys/devices/system/cpu/cpu[0-9]*/cpufreq/scaling_governor")): + try: + with open(p, "w") as f: + f.write(want["governor"]) + ok_g += 1 + except Exception: + fail_g += 1 + for p in sorted(glob.glob("/sys/devices/system/cpu/cpufreq/policy*/energy_performance_preference")): + try: + with open(p, "w") as f: + f.write(want["epp"]) + ok_e += 1 + except Exception: + fail_e += 1 + if ok_g == 0 and fail_g > 0: + return {"ok": False, "error": "调频接口不可写( governor 写入失败 )"} + try: + with open(PERF_FILE, "w") as f: + json.dump({"mode": mode}, f) + except Exception: + try: + with open("/app/perf_mode.json", "w") as f: + json.dump({"mode": mode}, f) + except Exception: + pass + st = _read_perf() + st.update({"ok": True, "mode": mode, "gov_ok": ok_g, "gov_fail": fail_g, + "epp_ok": ok_e, "epp_fail": fail_e, + "msg": "已切换为%s,立即生效,不重启电脑" % want["name"]}) + return st + +@app.route("/api/cpu/perf") +def api_cpu_perf(): + return jsonify(_read_perf()) + +@app.route("/api/cpu/perf", methods=["POST"]) +def api_cpu_perf_set(): + try: + mode = (request.get_json(force=True, silent=True) or {}).get("mode", "") + except Exception: + mode = "" + r = _apply_perf(mode) + return jsonify(r), (200 if r.get("ok") else 400) + +try: + _sv = _saved_perf_mode() + if _sv: + _apply_perf(_sv) +except Exception: + pass + @app.route("/api/mem") def api_mem(): vm = psutil.virtual_memory() diff --git a/docker-compose.yml b/docker-compose.yml index 46cadc9..ca34e39 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,12 +8,14 @@ services: environment: - PORT=7031 - PROCFS_PATH=/host/proc - - SITE_VERSION=1.3.12 + - SITE_VERSION=1.3.13 - HUB_URL=https://auth.88531.cn/api - HUB_PROJECT_ID=12 - HUB_KEY_FILE=/run/secrets/hub_key + - PERF_FILE=/run/secrets/perf_mode.json privileged: true volumes: - /proc:/host/proc:rw - /sys:/host/sys:ro - /root/.fnos_resmon_hub_key:/run/secrets/hub_key:ro + - /root/.fnos_resmon_perf.json:/run/secrets/perf_mode.json:rw diff --git a/public/index.html b/public/index.html index 6f75a3a..93c1d11 100644 --- a/public/index.html +++ b/public/index.html @@ -47,6 +47,8 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi .corecell .cb{height:8px;background:#f0f0f0;border-radius:4px;overflow:hidden} .corecell .cb>i{display:block;height:100%;background:#20a53a;border-radius:4px} .corecell .ct{font-size:11px;color:#999;margin-top:2px;font-variant-numeric:tabular-nums} +.perfbtn{border:1px solid #ddd;background:#fff;border-radius:6px;padding:8px 18px;font-size:14px;cursor:pointer;margin-right:8px} +.perfbtn.cur{background:#20a53a;border-color:#20a53a;color:#fff;font-weight:700} @@ -57,7 +59,7 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
网络
🔔 -v1.3.12 +v1.3.13 资享导航站 @@ -66,6 +68,7 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
+ @@ -87,7 +90,7 @@ function loadSort(){try{const v=JSON.parse(localStorage.getItem('fnos_sort_'+cur function saveSort(){try{localStorage.setItem('fnos_sort_'+cur,JSON.stringify(sortState))}catch(e){}} loadSort(); let curData=null; -document.querySelectorAll('.tab').forEach(t=>t.onclick=()=>{document.querySelectorAll('.tab').forEach(x=>x.classList.remove('active'));t.classList.add('active');cur=t.dataset.t;loadSort();document.getElementById('disks').innerHTML='';const ci=document.getElementById('cpuinfo');if(ci)ci.style.display='none';const cs=document.getElementById('cpusensor');if(cs)cs.style.display='none';const ca=document.getElementById('cpuadvise');if(ca)ca.style.display='none';const mi2=document.getElementById('meminfo');if(mi2)mi2.style.display='none';const di=document.getElementById('diskinfo');if(di)di.style.display='none';const ni=document.getElementById('netinfo');if(ni)ni.style.display='none';load(true)}); +document.querySelectorAll('.tab').forEach(t=>t.onclick=()=>{document.querySelectorAll('.tab').forEach(x=>x.classList.remove('active'));t.classList.add('active');cur=t.dataset.t;loadSort();document.getElementById('disks').innerHTML='';const ci=document.getElementById('cpuinfo');if(ci)ci.style.display='none';const cs=document.getElementById('cpusensor');if(cs)cs.style.display='none';const ca=document.getElementById('cpuadvise');if(ca)ca.style.display='none';const cp=document.getElementById('cpuperf');if(cp)cp.style.display='none';const mi2=document.getElementById('meminfo');if(mi2)mi2.style.display='none';const di=document.getElementById('diskinfo');if(di)di.style.display='none';const ni=document.getElementById('netinfo');if(ni)ni.style.display='none';load(true)}); function fmtB(b){if(b==null)return '-';const u=['B','KB','MB','GB','TB'];let i=0;while(b>=1024&&i<4){b/=1024;i++}return b.toFixed(b>=100?0:1)+u[i]} function fmtR(b){return fmtB(b)+'/s'} function esc(s){return String(s==null?'':s).replace(/&/g,'&').replace(/t.name.indexOf('CPU')===0);const oth=j.temps.filter(t=>t.name.indexOf('CPU')!==0);const chip=t=>{const c=t.value>=85?'#f00':(t.value>=70?'#ff9900':'#20a53a');return `${esc(t.name)} ${t.value}°C`};if(cpu.length)h+='
'+cpu.map(chip).join('')+'
';if(oth.length)h+='
'+oth.map(chip).join('')+'
'}if(j.fans&&j.fans.length){h+='
'+j.fans.map(f=>`🌀 ${esc(f.name)} ${f.value} RPM`).join('')+'
'}else{h+='
🌀 风扇转速：宿主未暴露（家用 NAS/主板多无此传感器，属正常）
'}if(j.note&&!j.temps.length)h+=`
${esc(j.note)}
`;el.innerHTML=h}catch(e){el.style.display='';el.innerHTML='
🌡️ 温度读取失败
'}} async function cpuAdvise(){const el=document.getElementById('cpuadvise');const now=Date.now();if(now-lastAdvise<15000){if(el.innerHTML)el.style.display='';return;}lastAdvise=now;try{const r=await fetch('/api/cpu/advise');const j=await r.json();const col=j.level==='轻松'||j.level==='正常'?'#20a53a':(j.level==='偏高'?'#ff9900':'#f00');document.getElementById('cpuadvise').style.display='';document.getElementById('cpuadvise').innerHTML=`
📊 负载诊断：${j.level} （1分钟负载 ${j.load[0]} ÷ ${j.logical}核 = 单核 ${j.per_core}）
${esc(j.verdict)}
如何更流畅：
${j.tips.map(t=>`
· ${esc(t)}
`).join('')}
会做两件事：① 把内存里暂存的数据写回硬盘（sync，防断电丢数据）；② 回收系统缓存占用的内存（drop caches，只清缓存、不动正在运行的程序）。全程不重启、不杀进程，页面照常刷新。
`;restoreOptUI()}catch(e){}} async function kill(pid,name){if(!confirm('结束进程 '+name+' (PID '+pid+') ?'))return;const r=await fetch('/api/kill',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({pid})});const j=await r.json();alert(j.ok?'已发送结束信号':('失败: '+j.error));load(true)} +const PERF_DESC={powersave:'省电模式：限制睿频、能效优先，适合7×24待机/下载机，功耗噪音最低',balanced:'平衡模式：按负载自动升降频，日常使用推荐，性能功耗兼顾',performance:'高性能模式：火力全开，适合转码/编译/虚拟机等重负载，功耗温度最高'}; +let perfCur=''; +async function cpuPerf(){const el=document.getElementById('cpuperf');try{const r=await fetch('/api/cpu/perf');const j=await r.json();const m=j.mode||j.saved||'balanced';const key=m+'|'+(j.governor||'')+'|'+(j.epp||'');if(perfCur===key&&el.innerHTML)return;perfCur=key;el.style.display='';el.innerHTML=`
⚡ 系统性能：${m==='powersave'?'省电模式':m==='performance'?'高性能模式':'平衡模式'} （governor=${esc(j.governor||'-')} epp=${esc(j.epp||'-')}，不重启电脑）
${['powersave','balanced','performance'].map(k=>``).join('')}
${PERF_DESC[m]||''}
`}catch(e){}} +async function setPerf(mode){const msg=document.getElementById('perfMsg');if(msg)msg.textContent='⏳ 正在切换…';try{const r=await fetch('/api/cpu/perf',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({mode})});const j=await r.json();if(!j.ok){if(msg)msg.textContent='❌ 切换失败：'+(j.error||'未知错误');else alert('切换失败: '+(j.error||'未知'));return}cpuPerf()}catch(e){if(msg)msg.textContent='❌ 切换失败：网络错误'}} function cmpVal(p,key){ if(key==='name')return String(p.name||''); if(key==='desc')return String(p.desc||''); @@ -161,7 +168,7 @@ const I=j.info||{},P=j.percpu||[]; document.getElementById('cpuinfo').style.display=''; document.getElementById('cpuinfo').innerHTML=`
${esc(I.model||'未知CPU')} ${esc(I.arch||'')}
物理 ${I.physical||'-'} 核 / 逻辑 ${I.logical||'-'} 核 · ${I.sockets?('共 '+I.sockets+' 路 × '+I.cores_per_socket+'核 × '+I.threads_per_core+'线程'):''} · 当前 ${I.freq_cur||'-'} MHz（${I.freq_min||'-'} ~ ${I.freq_max||'-'} MHz）
L1d ${esc(I.l1d||'-')} · L1i ${esc(I.l1i||'-')} · L2 ${esc(I.l2||'-')} · L3 ${esc(I.l3||'-')}
${P.map((v,i)=>`
#${i} ${v}%
`).join('')}
`; document.getElementById('sub').textContent=`共 ${j.total} 个进程,显示占用最高的前 ${j.items.length} 个（进程CPU为单进程占用，单核满=100%，16核满=1600%，进程之和÷16≈整机占用）`; -cpuAdvise();cpuSensor(); +cpuPerf();cpuAdvise();cpuSensor(); renderHeader(); renderBody(); }else if(cur==='mem'){ @@ -215,7 +222,7 @@ function togglePause(){paused=!paused;document.getElementById('pauseBtn').textCo startTimer(); async function licPoll(){try{const r=await fetch('/api/license-config',{cache:'no-store'});const j=await r.json();LIC=j; const dot=document.getElementById('licDot');if(dot)dot.style.display=(j.announcements&&j.announcements.length)?'':'none'; -const v=document.getElementById('licVer');if(v)v.textContent='v'+(j.version||'1.3.12')+(j.update_available?' ●':''); +const v=document.getElementById('licVer');if(v)v.textContent='v'+(j.version||'1.3.13')+(j.update_available?' ●':''); if(j.popup&&j.popup.length){try{const seen=JSON.parse(localStorage.getItem('fnos_ann_seen')||'[]');const fresh=j.popup.filter(a=>seen.indexOf(a.id)<0);if(fresh.length){const a=fresh[0];const el=document.getElementById('annPop');el.innerHTML=`
📢 ${esc(a.title||'公告')}✕
${a.content||''}
`;el.style.display='';}}catch(e){}} if(document.getElementById('annPanel').style.display!=='none')renderAnn();}catch(e){}} function renderAnn(){const el=document.getElementById('annPanel');const list=LIC.announcements||[];el.innerHTML=list.length?(`📢 公告（${list.length}）`+list.map(a=>`
${esc(a.title||'')}
${a.content||''}
`).join('')):'暂无公告';}