From b5bd645d3fd0371cce6580ff03c2473b93746fa5 Mon Sep 17 00:00:00 2001 From: wood chen Date: Fri, 18 Apr 2025 21:25:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ServerCard=20=E5=92=8C=20S?= =?UTF-8?q?erviceTracker=20=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E6=B5=81=E9=87=8F=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8C=B9=E9=85=8D=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E7=AE=80=E6=B4=81=E6=80=A7=E5=92=8C=E5=8F=AF=E8=AF=BB=E6=80=A7?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ServerCard.tsx | 18 +----------------- src/components/ServiceTracker.tsx | 3 --- src/pages/Server.tsx | 18 +++--------------- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/src/components/ServerCard.tsx b/src/components/ServerCard.tsx index 101fef3..3283f67 100644 --- a/src/components/ServerCard.tsx +++ b/src/components/ServerCard.tsx @@ -67,7 +67,6 @@ export default function ServerCard({ now, serverInfo, cycleStats }: ServerCardPr // 获取匹配当前服务器的流量计费周期 const getServerCycleData = () => { if (!cycleStats) { - console.log('cycleStats is null or undefined'); return null; } @@ -75,9 +74,6 @@ export default function ServerCard({ now, serverInfo, cycleStats }: ServerCardPr const serverId = String(serverInfo.id); const serverIdNum = Number(serverInfo.id); - console.log(`ServerCard: Looking for server "${serverInfo.name}" with ID:`, serverId, 'type:', typeof serverInfo.id); - console.log('All cycleStats:', cycleStats); - const matchedCycles: Array<{ name: string; from: string; @@ -89,16 +85,13 @@ export default function ServerCard({ now, serverInfo, cycleStats }: ServerCardPr }> = [] // 遍历所有流量周期,查找匹配当前服务器ID的数据 - Object.entries(cycleStats).forEach(([cycleId, cycleData]) => { - console.log(`\nChecking cycle ${cycleId}:`, cycleData.name); + Object.values(cycleStats).forEach((cycleData) => { if (!cycleData.server_name) { - console.log(` No server_name in this cycle`); return; } const serverIdsInCycle = Object.keys(cycleData.server_name); - console.log(` Server IDs in this cycle:`, serverIdsInCycle); // 检查各种可能的ID形式 let matchedId = null; @@ -106,12 +99,10 @@ export default function ServerCard({ now, serverInfo, cycleStats }: ServerCardPr // 1. 直接匹配字符串ID if (serverIdsInCycle.includes(serverId)) { matchedId = serverId; - console.log(` ✓ Direct string match: ${serverId}`); } // 2. 尝试匹配数字ID (如果API返回的是数字ID) else if (serverIdsInCycle.includes(String(serverIdNum))) { matchedId = String(serverIdNum); - console.log(` ✓ Numeric match: ${serverIdNum}`); } // 3. 通过名称匹配 else { @@ -120,7 +111,6 @@ export default function ServerCard({ now, serverInfo, cycleStats }: ServerCardPr for (const [id, name] of serverNames) { if (name === serverInfo.name) { matchedId = id; - console.log(` ✓ Name match: ${serverInfo.name} -> ID: ${id}`); break; } } @@ -128,10 +118,8 @@ export default function ServerCard({ now, serverInfo, cycleStats }: ServerCardPr // 如果还没匹配,尝试循环比较所有ID if (!matchedId) { for (const id of serverIdsInCycle) { - console.log(` Comparing IDs: ${id} vs ${serverId}`); if (Number(id) === serverIdNum) { matchedId = id; - console.log(` ✓ Found match after conversion: ${id}`); break; } } @@ -140,7 +128,6 @@ export default function ServerCard({ now, serverInfo, cycleStats }: ServerCardPr // 如果找到匹配的ID,且有对应的传输数据 if (matchedId && cycleData.transfer && cycleData.transfer[matchedId] !== undefined) { - console.log(` ✓ Found valid transfer data for server ${serverInfo.name} (ID: ${matchedId}) in cycle ${cycleId}`); const transfer = cycleData.transfer[matchedId]; const progress = (transfer / cycleData.max) * 100; @@ -153,12 +140,9 @@ export default function ServerCard({ now, serverInfo, cycleStats }: ServerCardPr nextUpdate: cycleData.next_update?.[matchedId] || "", progress: progress }); - } else { - console.log(` ✗ No valid transfer data found for this server in this cycle`); } }); - console.log('Matched cycles result:', matchedCycles); return matchedCycles.length > 0 ? matchedCycles : null; } diff --git a/src/components/ServiceTracker.tsx b/src/components/ServiceTracker.tsx index 80d13ac..2d96695 100644 --- a/src/components/ServiceTracker.tsx +++ b/src/components/ServiceTracker.tsx @@ -57,9 +57,6 @@ export function ServiceTracker({ serverList }: { serverList: NezhaServer[] }) { ) } - // 调试日志 - console.log('cycle_transfer_stats data:', serviceData?.data?.cycle_transfer_stats); - return (
{serviceData.data.cycle_transfer_stats && ( diff --git a/src/pages/Server.tsx b/src/pages/Server.tsx index b1ed64d..6d018cd 100644 --- a/src/pages/Server.tsx +++ b/src/pages/Server.tsx @@ -58,6 +58,9 @@ export default function Servers() { setShowServices("1") } else if (showServicesState !== null) { setShowServices(showServicesState) + } else { + localStorage.setItem("showServices", "0") + setShowServices("0") } }, []) @@ -121,22 +124,7 @@ export default function Servers() { }) const cycleTransferStats = serviceData?.data?.cycle_transfer_stats - console.log('Server.tsx - cycleTransferStats:', cycleTransferStats); - // 检查服务器ID是否匹配 - if (cycleTransferStats && nezhaWsData?.servers) { - console.log('Server IDs in cycleTransferStats:'); - Object.entries(cycleTransferStats).forEach(([cycleId, cycleData]) => { - if (cycleData.server_name) { - console.log(`Cycle ${cycleId} server IDs:`, Object.keys(cycleData.server_name)); - } - }); - - console.log('Server IDs from websocket:'); - nezhaWsData.servers.forEach(server => { - console.log(`Server ${server.name} ID:`, server.id, typeof server.id); - }); - } if (!connected && !lastMessage) { return (