diff --git a/src-tauri/src/proxy/provider_router.rs b/src-tauri/src/proxy/provider_router.rs index 4ae6ffdf..8e448341 100644 --- a/src-tauri/src/proxy/provider_router.rs +++ b/src-tauri/src/proxy/provider_router.rs @@ -31,16 +31,15 @@ impl ProviderRouter { /// 返回按优先级排序的可用供应商列表 pub async fn select_providers(&self, app_type: &str) -> Result, AppError> { // 直接获取当前选中的供应商(基于 is_current 字段) - let current_id = self.db.get_current_provider(app_type)? - .ok_or_else(|| AppError::Config( - format!("No current provider for {}", app_type) - ))?; + let current_id = self + .db + .get_current_provider(app_type)? + .ok_or_else(|| AppError::Config(format!("No current provider for {}", app_type)))?; let providers = self.db.get_all_providers(app_type)?; - let provider = providers.get(¤t_id) - .ok_or_else(|| AppError::Config( - format!("Current provider {} not found", current_id) - ))? + let provider = providers + .get(¤t_id) + .ok_or_else(|| AppError::Config(format!("Current provider {} not found", current_id)))? .clone(); log::info!( @@ -59,9 +58,10 @@ impl ProviderRouter { "Provider {} is unavailable (circuit breaker open)", provider.id ); - return Err(AppError::Config( - format!("Current provider {} is unavailable (circuit breaker open)", provider.name) - )); + return Err(AppError::Config(format!( + "Current provider {} is unavailable (circuit breaker open)", + provider.name + ))); } // 返回单个供应商(保留 Vec 接口以兼容现有代码) diff --git a/src-tauri/src/services/provider/mod.rs b/src-tauri/src/services/provider/mod.rs index b96d6ec7..bc6be220 100644 --- a/src-tauri/src/services/provider/mod.rs +++ b/src-tauri/src/services/provider/mod.rs @@ -223,9 +223,7 @@ impl ProviderService { // Normal mode: full switch with Live config write // Also clear stale takeover flag if proxy is not running but flag was set if is_takeover_flag && !is_proxy_running { - log::warn!( - "检测到代理接管标志残留(代理已停止),清除标志并执行正常切换" - ); + log::warn!("检测到代理接管标志残留(代理已停止),清除标志并执行正常切换"); // Clear stale takeover flag let _ = futures::executor::block_on(state.db.set_live_takeover_active(false)); }