mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-08-04 19:45:34 +08:00
fix(deeplink): use primary endpoint for usage script base_url
- Fix usage_script.base_url getting comma-separated string when multiple endpoints - Add i18n support for primary endpoint label in DeepLinkImportDialog
This commit is contained in:
@@ -205,6 +205,7 @@ fn build_provider_meta(request: &DeepLinkImportRequest) -> Result<Option<Provide
|
|||||||
let enabled = request.usage_enabled.unwrap_or(!code.is_empty());
|
let enabled = request.usage_enabled.unwrap_or(!code.is_empty());
|
||||||
|
|
||||||
// Build UsageScript - use provider's API key and endpoint as defaults
|
// Build UsageScript - use provider's API key and endpoint as defaults
|
||||||
|
// Note: use primary endpoint only (first one if comma-separated)
|
||||||
let usage_script = UsageScript {
|
let usage_script = UsageScript {
|
||||||
enabled,
|
enabled,
|
||||||
language: "javascript".to_string(),
|
language: "javascript".to_string(),
|
||||||
@@ -214,10 +215,14 @@ fn build_provider_meta(request: &DeepLinkImportRequest) -> Result<Option<Provide
|
|||||||
.usage_api_key
|
.usage_api_key
|
||||||
.clone()
|
.clone()
|
||||||
.or_else(|| request.api_key.clone()),
|
.or_else(|| request.api_key.clone()),
|
||||||
base_url: request
|
base_url: request.usage_base_url.clone().or_else(|| {
|
||||||
.usage_base_url
|
let primary = get_primary_endpoint(request);
|
||||||
.clone()
|
if primary.is_empty() {
|
||||||
.or_else(|| request.endpoint.clone()),
|
None
|
||||||
|
} else {
|
||||||
|
Some(primary)
|
||||||
|
}
|
||||||
|
}),
|
||||||
access_token: request.usage_access_token.clone(),
|
access_token: request.usage_access_token.clone(),
|
||||||
user_id: request.usage_user_id.clone(),
|
user_id: request.usage_user_id.clone(),
|
||||||
auto_query_interval: request.usage_auto_interval,
|
auto_query_interval: request.usage_auto_interval,
|
||||||
|
|||||||
@@ -405,7 +405,7 @@ export function DeepLinkImportDialog() {
|
|||||||
{ep.trim()}
|
{ep.trim()}
|
||||||
{idx === 0 && request.endpoint?.includes(",") && (
|
{idx === 0 && request.endpoint?.includes(",") && (
|
||||||
<span className="text-xs text-muted-foreground ml-2">
|
<span className="text-xs text-muted-foreground ml-2">
|
||||||
(主)
|
({t("deeplink.primaryEndpoint")})
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -958,6 +958,7 @@
|
|||||||
"configDetails": "Config Details",
|
"configDetails": "Config Details",
|
||||||
"configUrl": "Config File URL",
|
"configUrl": "Config File URL",
|
||||||
"configMergeError": "Failed to merge configuration file",
|
"configMergeError": "Failed to merge configuration file",
|
||||||
|
"primaryEndpoint": "Primary",
|
||||||
"mcp": {
|
"mcp": {
|
||||||
"title": "Batch Import MCP Servers",
|
"title": "Batch Import MCP Servers",
|
||||||
"targetApps": "Target Apps",
|
"targetApps": "Target Apps",
|
||||||
|
|||||||
@@ -958,6 +958,7 @@
|
|||||||
"configDetails": "設定の詳細",
|
"configDetails": "設定の詳細",
|
||||||
"configUrl": "設定ファイル URL",
|
"configUrl": "設定ファイル URL",
|
||||||
"configMergeError": "設定ファイルのマージに失敗しました",
|
"configMergeError": "設定ファイルのマージに失敗しました",
|
||||||
|
"primaryEndpoint": "メイン",
|
||||||
"mcp": {
|
"mcp": {
|
||||||
"title": "MCP サーバーを一括インポート",
|
"title": "MCP サーバーを一括インポート",
|
||||||
"targetApps": "ターゲットアプリ",
|
"targetApps": "ターゲットアプリ",
|
||||||
|
|||||||
@@ -958,6 +958,7 @@
|
|||||||
"configDetails": "配置详情",
|
"configDetails": "配置详情",
|
||||||
"configUrl": "配置文件 URL",
|
"configUrl": "配置文件 URL",
|
||||||
"configMergeError": "合并配置文件失败",
|
"configMergeError": "合并配置文件失败",
|
||||||
|
"primaryEndpoint": "主",
|
||||||
"mcp": {
|
"mcp": {
|
||||||
"title": "批量导入 MCP Servers",
|
"title": "批量导入 MCP Servers",
|
||||||
"targetApps": "目标应用",
|
"targetApps": "目标应用",
|
||||||
|
|||||||
Reference in New Issue
Block a user