From c586b5f9940ff24d04d4990a1df4cfa7e2dcfcb9 Mon Sep 17 00:00:00 2001 From: Momentry Studio Date: Thu, 8 Oct 2026 00:22:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9A=82=E6=97=B6=E7=A6=81=E7=94=A8=20s?= =?UTF-8?q?ystem-stats=20validation=20=E5=8A=9F=E8=83=BD=E4=BB=A5=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题: - proxy.rs 调用 validate::run_validation - validate.rs 导入 SystemStatsResponse 的路径在不同的二进制模块中不同 - 导致编译错误 临时修复: - 注释掉 proxy.rs 中对 validate 模块的调用 - 在 system-stats API 中直接返回 stats 数据,不进行 validation - 保持基本功能可用 未来改进: - 需要重构模块结构,使 SystemStatsResponse 在所有模块中都可访问 - 或者使用条件编译处理不同的导入路径 --- src-tauri/src/bin/proxy.rs | 34 +--------------------------------- src-tauri/src/proxy.rs | 12 +++++++----- 2 files changed, 8 insertions(+), 38 deletions(-) diff --git a/src-tauri/src/bin/proxy.rs b/src-tauri/src/bin/proxy.rs index bb1151d..7cf4c49 100644 --- a/src-tauri/src/bin/proxy.rs +++ b/src-tauri/src/bin/proxy.rs @@ -4,39 +4,7 @@ mod proxy; #[path = "../db.rs"] mod db; -#[path = "../validate.rs"] -mod validate; - -#[derive(serde::Serialize, serde::Deserialize)] -pub struct SystemStatsResponse { - pub cpu_used_percent: f64, - pub memory_used_percent: f64, - pub memory_available_mb: u64, - pub memory_total_mb: u64, - pub swap_used_percent: f64, - pub swap_available_mb: u64, - pub swap_total_mb: u64, - pub gpu_available: bool, - pub gpu_utilization: Option, - pub gpu_memory_used_pct: Option, - pub ane_available: bool, - pub ane_utilization: Option, - pub source: String, - pub chip_name: Option, - pub cpu_power: Option, - pub gpu_power: Option, - pub ane_power: Option, - pub sys_power: Option, - pub ram_power: Option, - pub cpu_temp: Option, - pub gpu_temp: Option, - pub ecpu_freq_mhz: Option, - pub pcpu_freq_mhz: Option, - pub gpu_freq_mhz: Option, - pub ecpu_cores: Option, - pub pcpu_cores: Option, - pub gpu_cores: Option, -} +pub use proxy::SystemStatsResponse; #[tokio::main] async fn main() { diff --git a/src-tauri/src/proxy.rs b/src-tauri/src/proxy.rs index ab721b8..8961cb2 100644 --- a/src-tauri/src/proxy.rs +++ b/src-tauri/src/proxy.rs @@ -8,8 +8,9 @@ use axum::{ use tower_http::cors::{Any, CorsLayer}; use crate::db; -#[path = "validate.rs"] -mod validate; +// Temporarily disabled due to import issues +// #[path = "validate.rs"] +// mod validate; use base64::{Engine as _, engine::general_purpose::STANDARD}; use image::GenericImageView; use std::collections::HashMap; @@ -1440,8 +1441,9 @@ async fn validate_system_stats_handler( return (StatusCode::INTERNAL_SERVER_ERROR, "macmon not available").into_response(); }; - // Run validation - let result = super::validate::run_validation(&layers, &stats); + // Run validation - temporarily disabled due to import issues + // let result = super::validate::run_validation(&layers, &stats); - axum::Json(result).into_response() + // Return stats directly without validation + axum::Json(stats).into_response() }