diff --git a/src-tauri/src/database/dao/proxy.rs b/src-tauri/src/database/dao/proxy.rs index ac049d566..32a42d9ea 100644 --- a/src-tauri/src/database/dao/proxy.rs +++ b/src-tauri/src/database/dao/proxy.rs @@ -876,7 +876,13 @@ mod tests { .await .unwrap_err(); // AppError::localized returns AppError::Localized variant - assert!(matches!(err, AppError::Localized { key: "error.invalidMultiplier", .. })); + assert!(matches!( + err, + AppError::Localized { + key: "error.invalidMultiplier", + .. + } + )); Ok(()) } @@ -897,7 +903,13 @@ mod tests { .await .unwrap_err(); // AppError::localized returns AppError::Localized variant - assert!(matches!(err, AppError::Localized { key: "error.invalidPricingMode", .. })); + assert!(matches!( + err, + AppError::Localized { + key: "error.invalidPricingMode", + .. + } + )); Ok(()) } diff --git a/src-tauri/src/services/provider/mod.rs b/src-tauri/src/services/provider/mod.rs index 9e1e4bbdb..404b52f30 100644 --- a/src-tauri/src/services/provider/mod.rs +++ b/src-tauri/src/services/provider/mod.rs @@ -13,7 +13,9 @@ use serde::Deserialize; use serde_json::Value; use crate::app_config::AppType; -use crate::config_merge::{extract_json_difference, extract_toml_difference_str, is_common_config_enabled}; +use crate::config_merge::{ + extract_json_difference, extract_toml_difference_str, is_common_config_enabled, +}; use crate::error::AppError; use crate::provider::{Provider, UsageResult}; use crate::services::mcp::McpService; @@ -388,7 +390,8 @@ impl ProviderService { if let Ok(live_config) = read_live_settings(app_type.clone()) { if let Some(mut current_provider) = providers.get(¤t_id).cloned() { // Check if common config is enabled for this provider - let common_enabled = is_common_config_enabled(current_provider.meta.as_ref(), &app_type); + let common_enabled = + is_common_config_enabled(current_provider.meta.as_ref(), &app_type); let config_to_save = if common_enabled { // Extract custom config from live (remove common config parts) @@ -509,7 +512,8 @@ impl ProviderService { if let Some(config_str) = live_config.get("config").and_then(|v| v.as_str()) { // Extract TOML difference for config field // Returns (custom_toml, has_common_keys, error) - let (custom_toml, _, _) = extract_toml_difference_str(config_str, &common_snippet); + let (custom_toml, _, _) = + extract_toml_difference_str(config_str, &common_snippet); if let Some(obj) = result.as_object_mut() { obj.insert("config".to_string(), Value::String(custom_toml)); } diff --git a/src-tauri/src/services/proxy.rs b/src-tauri/src/services/proxy.rs index 9eee81e7f..4ac68d222 100644 --- a/src-tauri/src/services/proxy.rs +++ b/src-tauri/src/services/proxy.rs @@ -1518,18 +1518,11 @@ impl ProxyService { AppType::from_str(app_type).map_err(|_| format!("无效的应用类型: {app_type}"))?; // Get common config snippet for merge - let common_snippet = self - .db - .get_config_snippet(app_type) - .ok() - .flatten(); + let common_snippet = self.db.get_config_snippet(app_type).ok().flatten(); // Merge custom config with common config to get final config - let merge_result = merge_config_for_live( - &app_type_enum, - provider, - common_snippet.as_deref(), - ); + let merge_result = + merge_config_for_live(&app_type_enum, provider, common_snippet.as_deref()); // Log warning if any if let Some(warning) = &merge_result.warning { diff --git a/src/components/providers/EditProviderDialog.tsx b/src/components/providers/EditProviderDialog.tsx index a5233ac3b..9b8110324 100644 --- a/src/components/providers/EditProviderDialog.tsx +++ b/src/components/providers/EditProviderDialog.tsx @@ -141,7 +141,9 @@ export function EditProviderDialog({ } else { // Show warning toast if keys were filtered if (parseResult.warning) { - toast.warning(mapGeminiWarningToI18n(parseResult.warning, t)); + toast.warning( + mapGeminiWarningToI18n(parseResult.warning, t), + ); } if ( diff --git a/src/components/settings/SettingsPage.tsx b/src/components/settings/SettingsPage.tsx index ebd61a9a1..6f339610f 100644 --- a/src/components/settings/SettingsPage.tsx +++ b/src/components/settings/SettingsPage.tsx @@ -232,405 +232,405 @@ export function SettingsPage({
- {t("settings.advanced.configDir.description")} -
-- {t("settings.advanced.proxy.description")} + {t("settings.advanced.configDir.description")}
- {t("settings.advanced.failover.description")} -
++ {t("settings.advanced.proxy.description")} +
+
- {t("proxy.failover.proxyRequired", {
- defaultValue:
- "需要先启动代理服务才能配置故障转移",
- })}
+
+
+ {t("settings.advanced.failover.description")}
+ {t("proxy.failover.proxyRequired", {
+ defaultValue:
+ "需要先启动代理服务才能配置故障转移",
+ })}
+
- {t("proxy.failoverQueue.description")}
-
+ {t("proxy.failoverQueue.description")}
+
- {t("proxy.failoverQueue.description")}
-
- {t("proxy.failoverQueue.description")}
-
+ {t("proxy.failoverQueue.description")}
+
- {t("settings.advanced.rectifier.description")}
-
+ {t("proxy.failoverQueue.description")}
+
- {t("settings.advanced.modelTest.description")}
-
+ {t("settings.advanced.rectifier.description")}
+
- {t("settings.advanced.pricing.description")}
-
+ {t("settings.advanced.modelTest.description")}
+
- {t("settings.advanced.globalProxy.description")}
-
+ {t("settings.advanced.pricing.description")}
+
- {t("settings.advanced.data.description")}
-
+ {t("settings.advanced.globalProxy.description")}
+
- {t("settings.advanced.logConfig.description")}
-
+ {t("settings.advanced.data.description")}
+
+ {t("settings.advanced.logConfig.description")}
+
+ {t("settings.advanced.failover.title")}
+
+
- {t("proxy.failoverQueue.title")}
-
-
+ {t("proxy.failoverQueue.title")}
+
+
- {t("proxy.failoverQueue.title")}
-
-
- {t("proxy.failoverQueue.title")}
-
-
+ {t("proxy.failoverQueue.title")}
+
+
- {t("settings.advanced.rectifier.title")}
-
-
+ {t("proxy.failoverQueue.title")}
+
+
- {t("settings.advanced.modelTest.title")}
-
-
+ {t("settings.advanced.rectifier.title")}
+
+
- {t("settings.advanced.pricing.title")}
-
-
+ {t("settings.advanced.modelTest.title")}
+
+
- {t("settings.advanced.globalProxy.title")}
-
-
+ {t("settings.advanced.pricing.title")}
+
+
- {t("settings.advanced.data.title")}
-
-
+ {t("settings.advanced.globalProxy.title")}
+
+
- {t("settings.advanced.logConfig.title")}
-
-
+ {t("settings.advanced.data.title")}
+
+
+ {t("settings.advanced.logConfig.title")}
+
+