From bbf13510301b2c64a6da95570e33c7134fd9e59d Mon Sep 17 00:00:00 2001
From: Julian Freeman <freemanjulian372@gmail.com>
Date: Tue, 25 Nov 2025 23:19:23 -0400
Subject: [PATCH] update event log

---
 src-tauri/src/main.rs | 61 +++++++++++++++++++++++++------------------
 src/App.vue           | 12 +++++++++
 2 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 0b142a4..2620f75 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -1,3 +1,5 @@
+// src-tauri/src/main.rs
+
 // 全局允许非标准命名风格 (因为 WMI 结构体必须匹配 Windows API 的命名)
 #![allow(non_camel_case_types, non_snake_case)]
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
@@ -24,15 +26,10 @@ struct SystemHealthReport {
 #[derive(Serialize)]
 struct HardwareSummary {
     cpu_name: String,
-    
-    // [新增] 1. 整机信息 (适合品牌机/笔记本)
     sys_vendor: String,
     sys_product: String,
-
-    // [新增] 2. 主板信息 (适合 DIY 组装机)
     mobo_vendor: String,
     mobo_product: String,
-    
     memory_total_gb: u64,
     memory_used_gb: u64,
     os_version: String,
@@ -54,6 +51,7 @@ struct SystemEvent {
     time_generated: String,
     event_id: u32,
     source: String,
+    message: String,
     analysis_hint: String,
 }
 
@@ -91,6 +89,7 @@ struct Win32_NTLogEvent {
     TimeGenerated: String,
     EventCode: u32,
     SourceName: String,
+    Message: Option<String>,
 }
 
 #[derive(serde::Deserialize, Debug)]
@@ -111,14 +110,12 @@ struct Win32_BIOS {
     SMBIOSBIOSVersion: Option<String>,
 }
 
-// 主板 WMI 结构 (DIY看这个)
 #[derive(serde::Deserialize, Debug)]
 struct Win32_BaseBoard {
     Manufacturer: Option<String>,
     Product: Option<String>,
 }
 
-// [新增] 整机 WMI 结构 (品牌机看这个)
 #[derive(serde::Deserialize, Debug)]
 struct Win32_ComputerSystem {
     Manufacturer: Option<String>,
@@ -173,20 +170,17 @@ async fn run_diagnosis() -> Result<SystemHealthReport, String> {
         let mut sys_product = "Unknown".to_string();
 
         if let Some(con) = &wmi_con {
-            // 获取 BIOS 版本
             if let Ok(results) = con.raw_query::<Win32_BIOS>("SELECT SMBIOSBIOSVersion FROM Win32_BIOS") {
                 if let Some(bios) = results.first() {
                     bios_ver = bios.SMBIOSBIOSVersion.clone().unwrap_or("Unknown".to_string());
                 }
             }
-            // 获取主板信息 (BaseBoard)
             if let Ok(results) = con.raw_query::<Win32_BaseBoard>("SELECT Manufacturer, Product FROM Win32_BaseBoard") {
                 if let Some(board) = results.first() {
                     mobo_vendor = board.Manufacturer.clone().unwrap_or("Unknown".to_string());
                     mobo_product = board.Product.clone().unwrap_or("Unknown".to_string());
                 }
             }
-            // [新增] 获取整机信息 (ComputerSystem)
             if let Ok(results) = con.raw_query::<Win32_ComputerSystem>("SELECT Manufacturer, Model FROM Win32_ComputerSystem") {
                 if let Some(cs) = results.first() {
                     sys_vendor = cs.Manufacturer.clone().unwrap_or("Unknown".to_string());
@@ -218,7 +212,6 @@ async fn run_diagnosis() -> Result<SystemHealthReport, String> {
             cpu_name: cpu_brand,
             mobo_vendor,
             mobo_product,
-            // [新增] 填入整机数据
             sys_vendor,
             sys_product,
             memory_total_gb: sys.total_memory() / 1024 / 1024 / 1024,
@@ -251,24 +244,40 @@ async fn run_diagnosis() -> Result<SystemHealthReport, String> {
             }
         }
 
-        // 3. 关键日志
+        // 3. 关键日志 (严格模式)
         let mut events = Vec::new();
         if let Some(con) = &wmi_con {
-            let query = "SELECT TimeGenerated, EventCode, SourceName FROM Win32_NTLogEvent WHERE Logfile = 'System' AND (EventCode = 41 OR EventCode = 18 OR EventCode = 19)";
-            if let Ok(mut results) = con.raw_query::<Win32_NTLogEvent>(query) {
-                results.truncate(5);
+            // 先按 ID 粗查
+            let query = "SELECT TimeGenerated, EventCode, SourceName, Message FROM Win32_NTLogEvent WHERE Logfile = 'System' AND (EventCode = 41 OR EventCode = 18 OR EventCode = 19)";
+            if let Ok(results) = con.raw_query::<Win32_NTLogEvent>(query) {
+                // 不在这里 truncate，而是过滤后再截取，保证显示的是真问题
                 for event in results {
-                    let hint = match event.EventCode {
-                        41 => "系统意外断电 (电源/强关)",
-                        18 | 19 => "WHEA 硬件致命错误 (CPU/超频)",
-                        _ => "系统关键错误",
-                    };
-                    events.push(SystemEvent {
-                        time_generated: format_wmi_time(&event.TimeGenerated),
-                        event_id: event.EventCode,
-                        source: event.SourceName,
-                        analysis_hint: hint.to_string(),
-                    });
+                    let mut is_target_event = false;
+                    let mut hint = String::new();
+
+                    // [修复逻辑] 必须同时匹配 ID 和 Source
+                    if event.EventCode == 41 && event.SourceName == "Microsoft-Windows-Kernel-Power" {
+                        is_target_event = true;
+                        hint = "系统意外断电 (电源/强关)".to_string();
+                    } else if (event.EventCode == 18 || event.EventCode == 19) && event.SourceName == "Microsoft-Windows-WHEA-Logger" {
+                        is_target_event = true;
+                        hint = "WHEA 硬件致命错误 (CPU/超频/PCIe)".to_string();
+                    }
+
+                    if is_target_event {
+                        events.push(SystemEvent {
+                            time_generated: format_wmi_time(&event.TimeGenerated),
+                            event_id: event.EventCode,
+                            source: event.SourceName,
+                            message: event.Message.unwrap_or("无详细信息".to_string()),
+                            analysis_hint: hint,
+                        });
+                    }
+
+                    // 只需要最近的 5 条真实错误
+                    if events.len() >= 5 {
+                        break;
+                    }
                 }
             }
         }
diff --git a/src/App.vue b/src/App.vue
index d0b2dea..85fb6d1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -201,6 +201,8 @@
               <span class="event-time">{{ formatTime(evt.time_generated) }}</span>
             </div>
             <p class="description highlight">{{ evt.analysis_hint }}</p>
+            <!-- 新增：显示原始错误信息 -->
+            <p v-if="evt.message" class="description raw-message">{{ evt.message }}</p>
           </div>
         </div>
       </div>
@@ -632,6 +634,16 @@ h2 {
 }
 
 .description.highlight { color: #d35400; font-weight: 500; }
+.description.raw-message {
+  margin-top: 5px;
+  font-size: 0.85rem;
+  color: #7f8c8d;
+  font-family: Consolas, Monaco, 'Courier New', monospace;
+  background: #f0f3f4;
+  padding: 5px 8px;
+  border-radius: 4px;
+  word-break: break-all;
+}
 
 /* 状态文本与徽章 */
 .status-text { font-weight: 600; font-size: 0.9rem; }