diff --git a/app.py b/app.py
index 66f00c0..b79ca6e 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.16")
+HUB_VERSION = os.environ.get("SITE_VERSION", "1.3.17")
HUB = {"ok": False, "install_id": None, "latest": "", "update_available": False,
"update_required": False, "download_url": "", "changelog": "",
"announcements": [], "popup": [], "ts": 0}
@@ -620,6 +620,9 @@ def api_bench(kind):
p = _read_perf()
r.update({"ok": True, "mode": p.get("mode", ""),
"governor": p.get("governor", ""), "epp": p.get("epp", ""),
+ "cap_max_mhz": p.get("cap_max_mhz", 0),
+ "hw_max_mhz": p.get("hw_max_mhz", 0),
+ "capped": p.get("capped", False),
"mhz_avg": (sum(get_percpu_mhz()) // len(get_percpu_mhz()) if get_percpu_mhz() else 0)})
elif kind == "mem":
r = _bench_mem()
@@ -649,16 +652,39 @@ PERF_MODES = {
"name": "高性能模式"},
}
-def _saved_perf_mode():
+def _saved_perf():
for p in PERF_FILE_FALLBACKS:
try:
with open(p) as f:
- m = (json.load(f) or {}).get("mode", "")
+ d = json.load(f) or {}
+ m = d.get("mode", "")
if m in PERF_MODES:
- return m
+ return {"mode": m, "cap": int(d.get("cap") or 0)}
except Exception:
continue
- return ""
+ return {"mode": "", "cap": 0}
+
+def _saved_perf_mode():
+ return _saved_perf().get("mode", "")
+
+def _read_cpu_freq_limits():
+ cur_max, hw_max, hw_min = 0, 0, 0
+ try:
+ with open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq") as f:
+ cur_max = int(f.read().strip()) // 1000
+ except Exception:
+ pass
+ try:
+ with open("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq") as f:
+ hw_max = int(f.read().strip()) // 1000
+ except Exception:
+ pass
+ try:
+ with open("/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq") as f:
+ hw_min = int(f.read().strip()) // 1000
+ except Exception:
+ pass
+ return cur_max, hw_max, hw_min
def _read_perf():
gov, epp = "", ""
@@ -677,10 +703,13 @@ def _read_perf():
if v["governor"] == gov and (not epp or v["epp"] == epp):
mode = k
break
+ cur_max, hw_max, hw_min = _read_cpu_freq_limits()
+ capped = bool(hw_max and cur_max and cur_max < hw_max)
return {"governor": gov, "epp": epp, "mode": mode,
- "saved": _saved_perf_mode()}
+ "saved": _saved_perf_mode(), "cap_max_mhz": cur_max,
+ "hw_max_mhz": hw_max, "hw_min_mhz": hw_min, "capped": capped}
-def _apply_perf(mode):
+def _apply_perf(mode, cap_mhz=0):
if mode not in PERF_MODES:
return {"ok": False, "error": "未知模式"}
want = PERF_MODES[mode]
@@ -699,20 +728,42 @@ def _apply_perf(mode):
ok_e += 1
except Exception:
fail_e += 1
+ ok_c = fail_c = 0
+ cap_applied = 0
+ target = 0
+ if mode == "powersave" and cap_mhz:
+ target = cap_mhz * 1000
+ elif mode != "powersave":
+ try:
+ with open("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq") as f:
+ target = int(f.read().strip())
+ except Exception:
+ target = 0
+ if target:
+ for p in sorted(glob.glob("/sys/devices/system/cpu/cpu[0-9]*/cpufreq/scaling_max_freq")) + \
+ sorted(glob.glob("/sys/devices/system/cpu/cpufreq/policy*/scaling_max_freq")):
+ try:
+ with open(p, "w") as f:
+ f.write(str(target))
+ ok_c += 1
+ except Exception:
+ fail_c += 1
+ cap_applied = target // 1000
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)
+ json.dump({"mode": mode, "cap": (cap_mhz if mode == "powersave" else 0)}, f)
except Exception:
try:
with open("/app/perf_mode.json", "w") as f:
- json.dump({"mode": mode}, f)
+ json.dump({"mode": mode, "cap": (cap_mhz if mode == "powersave" else 0)}, 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,
+ "cap_ok": ok_c, "cap_fail": fail_c, "cap_applied_mhz": cap_applied,
"msg": "已切换为%s,立即生效,不重启电脑" % want["name"]})
return st
@@ -723,16 +774,23 @@ def api_cpu_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", "")
+ body = request.get_json(force=True, silent=True) or {}
+ mode = body.get("mode", "")
+ try:
+ cap_mhz = int(body.get("cap_mhz") or 0)
+ except Exception:
+ cap_mhz = 0
+ if cap_mhz < 0:
+ cap_mhz = 0
except Exception:
- mode = ""
- r = _apply_perf(mode)
+ mode, cap_mhz = "", 0
+ r = _apply_perf(mode, cap_mhz)
return jsonify(r), (200 if r.get("ok") else 400)
try:
- _sv = _saved_perf_mode()
- if _sv:
- _apply_perf(_sv)
+ _sv = _saved_perf()
+ if _sv.get("mode"):
+ _apply_perf(_sv["mode"], _sv.get("cap") or 0)
except Exception:
pass
diff --git a/docker-compose.yml b/docker-compose.yml
index 083ccdf..ebc17b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
environment:
- PORT=7031
- PROCFS_PATH=/host/proc
- - SITE_VERSION=1.3.16
+ - SITE_VERSION=1.3.17
- HUB_URL=https://auth.88531.cn/api
- HUB_PROJECT_ID=12
- HUB_KEY_FILE=/run/secrets/hub_key
diff --git a/public/index.html b/public/index.html
index 82557a4..b20d801 100644
--- a/public/index.html
+++ b/public/index.html
@@ -62,7 +62,7 @@ button.refresh{background:#20a53a;color:#fff;border:none;border-radius:3px;paddi
网络
🔔
-
v1.3.16
+
v1.3.17
资享导航站
@@ -112,10 +112,11 @@ let lastAdvise=0;
async function cpuSensor(){const el=document.getElementById('cpusensor');try{const r=await fetch('/api/sensors');const j=await r.json();el.style.display='';let h='
🌡️ 温度 / 🌀 风扇
';if(j.temps&&j.temps.length){const cpu=j.temps.filter(t=>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:'高性能模式:火力全开,适合转码/编译/虚拟机等重负载,功耗温度最高'};
+const PERF_DESC={powersave:'省电模式:限制睿频、能效优先,适合7×24待机/下载机,功耗噪音最低。可选硬上限频率锁住最高MHz',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){el.style.display='';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='❌ 切换失败:网络错误'}}
+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 capMax=j.cap_max_mhz||0,hwMax=j.hw_max_mhz||0;const key=m+'|'+(j.governor||'')+'|'+(j.epp||'')+'|'+capMax;if(perfCur===key&&el.innerHTML){el.style.display='';return;}perfCur=key;el.style.display='';const capTxt=hwMax?((j.capped||(capMax&&capMax
⚡ 系统性能:${m==='powersave'?'省电模式':m==='performance'?'高性能模式':'平衡模式'} (governor=${esc(j.governor||'-')} epp=${esc(j.epp||'-')} ${capTxt},不重启电脑) ${['powersave','balanced','performance'].map(k=>``).join('')}
${m==='powersave'?`🔒 硬上限频率: (写 scaling_max_freq,立即生效;切平衡/高性能自动恢复满血;用 CPU 测速验证是否压住)
`:''}${PERF_DESC[m]||''}
`}catch(e){}}
+async function setPerf(mode){const msg=document.getElementById('perfMsg');if(msg)msg.textContent='⏳ 正在切换…';let cap=0;if(mode==='powersave'){const s=document.getElementById('capSel');if(s)cap=parseInt(s.value||'0',10)||0}try{const r=await fetch('/api/cpu/perf',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({mode,cap_mhz:cap})});const j=await r.json();if(!j.ok){if(msg)msg.textContent='❌ 切换失败:'+(j.error||'未知错误');else alert('切换失败: '+(j.error||'未知'));return}perfCur='';cpuPerf()}catch(e){if(msg)msg.textContent='❌ 切换失败:网络错误'}}
+async function setPerfCap(){const s=document.getElementById('capSel');const cap=s?parseInt(s.value||'0',10)||0:0;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:'powersave',cap_mhz:cap})});const j=await r.json();if(!j.ok){if(msg)msg.textContent='❌ 设置失败:'+(j.error||'未知错误');return}perfCur='';await cpuPerf();const m2=document.getElementById('perfMsg');if(m2)m2.textContent=(cap?`✅ 已锁上限 ${cap}MHz(${j.cap_ok||0}核生效),跑一遍 CPU 测速验证`:'✅ 已恢复满血(不限上限)')}catch(e){if(msg)msg.textContent='❌ 设置失败:网络错误'}}
function cmpVal(p,key){
if(key==='name')return String(p.name||'');
if(key==='desc')return String(p.desc||'');
@@ -231,7 +232,7 @@ function renderBench(k,msg){const el=document.getElementById(k+'bench');if(!el)r
const BENCH_CTL={};
function stopBench(k){const c=BENCH_CTL[k];if(c){try{c.abort()}catch(e){}}}
function showBench(k){const el=document.getElementById(k+'bench');if(!el)return;el.style.display='';if(!el.innerHTML)renderBench(k)}
-async function runBench(k){const b=document.getElementById('benchbtn_'+k),m=document.getElementById('benchmsg_'+k),st=document.getElementById('benchstop_'+k);if(b){b.disabled=true;b.textContent='测速中…'}if(st)st.style.display='';if(m)m.textContent='正在测速,请稍候('+BENCH_TXT[k][2]+'),可点 ⏹ 停止';const ctl=new AbortController();BENCH_CTL[k]=ctl;try{const r=await fetch('/api/bench/'+k,{method:'POST',signal:ctl.signal});const j=await r.json();let line='';if(j.ok){if(k==='cpu')line=j.at+' ['+j.mode+'|'+(j.governor||'-')+'] '+j.ms+'ms '+j.kops+'kops AVG'+j.mhz_avg+'MHz';else if(k==='mem')line=j.at+' W'+j.write_mbs+'MB/s R'+j.read_mbs+'MB/s';else if(k==='disk')line=j.at+' W'+j.write_mbs+'MB/s R'+j.read_mbs+'MB/s '+(j.file||'');else if(k==='net')line=j.at+' DOWN'+j.down_mbps+'Mbps'+(j.up_mbps?' UP'+j.up_mbps+'Mbps':' UPFAIL');benchPush(k,line);renderBench(k,'✅ '+line)}else renderBench(k,'❌ '+(j.error||'测速失败'))}catch(e){if(e&&e.name==='AbortError'){renderBench(k,'⏹ 已停止(本次不记录)')}else renderBench(k,'❌ 测速失败: '+e)}finally{delete BENCH_CTL[k]}}
+async function runBench(k){const b=document.getElementById('benchbtn_'+k),m=document.getElementById('benchmsg_'+k),st=document.getElementById('benchstop_'+k);if(b){b.disabled=true;b.textContent='测速中…'}if(st)st.style.display='';if(m)m.textContent='正在测速,请稍候('+BENCH_TXT[k][2]+'),可点 ⏹ 停止';const ctl=new AbortController();BENCH_CTL[k]=ctl;try{const r=await fetch('/api/bench/'+k,{method:'POST',signal:ctl.signal});const j=await r.json();let line='';if(j.ok){if(k==='cpu')line=j.at+' ['+j.mode+'|'+(j.governor||'-')+(j.capped?('|🔒'+j.cap_max_mhz+'MHz'):'')+'] '+j.ms+'ms '+j.kops+'kops AVG'+j.mhz_avg+'MHz';else if(k==='mem')line=j.at+' W'+j.write_mbs+'MB/s R'+j.read_mbs+'MB/s';else if(k==='disk')line=j.at+' W'+j.write_mbs+'MB/s R'+j.read_mbs+'MB/s '+(j.file||'');else if(k==='net')line=j.at+' DOWN'+j.down_mbps+'Mbps'+(j.up_mbps?' UP'+j.up_mbps+'Mbps':' UPFAIL');benchPush(k,line);renderBench(k,'✅ '+line)}else renderBench(k,'❌ '+(j.error||'测速失败'))}catch(e){if(e&&e.name==='AbortError'){renderBench(k,'⏹ 已停止(本次不记录)')}else renderBench(k,'❌ 测速失败: '+e)}finally{delete BENCH_CTL[k]}}
load(true);
let ivalSec=3,timer=null,paused=false;
function startTimer(){if(timer)clearInterval(timer);if(!paused)timer=setInterval(()=>load(false),ivalSec*1000)}
@@ -240,7 +241,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.16')+(j.update_available?' ●':'');
+const v=document.getElementById('licVer');if(v)v.textContent='v'+(j.version||'1.3.17')+(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('')):'暂无公告';}