From f64209cb047b7f9f13ab3447eca77f780ef54492 Mon Sep 17 00:00:00 2001 From: zqm Date: Tue, 14 Apr 2026 11:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Windows/CS/Framework4.0/Updater/src/main.rs | 27 +-------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/Windows/CS/Framework4.0/Updater/src/main.rs b/Windows/CS/Framework4.0/Updater/src/main.rs index 31df944..a1d23ab 100644 --- a/Windows/CS/Framework4.0/Updater/src/main.rs +++ b/Windows/CS/Framework4.0/Updater/src/main.rs @@ -1548,8 +1548,6 @@ fn notify_app_upgrade(app_name: &str, current_ver: &str, latest_ver: &str, _debu }; if pids.is_empty() { - let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f"); - log_print!("{} [升级确认] {} 未运行，跳过通知", ts, app_name); return false; } @@ -1562,26 +1560,18 @@ fn notify_app_upgrade(app_name: &str, current_ver: &str, latest_ver: &str, _debu // 3. 对每个 PID 发送升级确认并等待用户响应（双向握手） for pid in pids { let pipe_name = format!("\\\\.\\pipe\\EasyTest_{}", pid); - let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f"); - log_print!("{} [升级确认] 连接到 {} (PID={})，等待响应...", ts, pipe_name, pid); // 发送 UpgradeConfirm 并等待 UpgradeResponse（超时 10 秒） let response = connect_and_wait_response(&pipe_name, &msg, 10000); match response { Ok(true) => { - log_print!("{} [升级确认] 用户批准升级 {} (PID={})，应用将退出", - ts, app_name, pid); return true; } Ok(false) => { - log_print!("{} [升级确认] 用户拒绝升级 {} (PID={})", - ts, app_name, pid); return false; } - Err(e) => { - log_print!("{} [升级确认] 通信失败 {} (PID={}): {}", - ts, app_name, pid, e); + Err(_e) => { return false; } } @@ -1592,8 +1582,6 @@ fn notify_app_upgrade(app_name: &str, current_ver: &str, latest_ver: &str, _debu #[cfg(not(windows))] { - let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f"); - log_print!("{} [升级确认] 非 Windows 平台，跳过通知", ts); return false; } } @@ -1717,12 +1705,6 @@ fn connect_and_wait_response( .trim_end_matches(|c| c == '\r' || c == '\n') .to_string(); - // 调试：打印原始响应 - { - let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f"); - log_print!("{} [升级确认] 收到原始响应: {:?}", ts, response); - } - // 解析 {"Type":"UpgradeResponse","Approved":true/false} if let Some(start) = response.find("\"Approved\":") { // "Approved": 共11个字符，true/false 从 start+11 开始 @@ -1737,15 +1719,10 @@ fn connect_and_wait_response( /// 通知所有升级了的应用（EasyTest 等） /// app_upgrades: Vec<(app_name, current_ver, latest_ver, exe_path)> fn notify_all_app_upgrades(app_upgrades: &[(String, String, String, String)], _debug: bool) { - let ts = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f"); - if app_upgrades.is_empty() { - log_print!("{} [升级确认] 没有应用需要升级通知（upgraded_apps 为空）", ts); return; } - log_print!("{} [升级确认] 准备通知 {} 个应用: {:?}", ts, app_upgrades.len(), app_upgrades); - for (app_name, current_ver, latest_ver, exe_path) in app_upgrades { // 发送升级确认消息，等待用户响应 let approved = notify_app_upgrade(app_name, current_ver, latest_ver, true); @@ -1753,7 +1730,6 @@ fn notify_all_app_upgrades(app_upgrades: &[(String, String, String, String)], _d // 用户批准升级后，等待应用退出，然后复制文件并重启 if approved { // 等待应用退出（最多 15 秒） - log_print!("{} [升级确认] 等待 {} 退出...", ts, app_name); let start = std::time::Instant::now(); let mut exited = false; @@ -1771,7 +1747,6 @@ fn notify_all_app_upgrades(app_upgrades: &[(String, String, String, String)], _d } if start.elapsed().as_secs() > 15 { - log_print!("{} [升级确认] 等待退出超时，跳过", ts); break; }