From 94968401fc4f1f6f4a124f024eb9dec93ca910f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=91=E5=85=88=E6=A3=AE?= Date: Fri, 7 Nov 2025 16:44:00 +0800 Subject: [PATCH] =?UTF-8?q?#Update=20=E4=B8=BA=E5=85=AC=E5=85=B1=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E7=AD=9B=E9=80=89=EF=BC=8C=E4=B8=BA=E6=88=90=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0kcp=E4=BB=A3=E7=90=86=E5=92=8Cquic?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E7=AD=89=E6=8F=90=E7=A4=BA=EF=BC=8Cconfig.js?= =?UTF-8?q?on=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0config=5Ftemplate.json=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E6=96=87=E6=A1=A3=20#23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composables/configJson.ts | 4 +- package.json | 2 +- pages/member.vue | 16 +- pages/nodesList.vue | 4 +- src-tauri/Cargo.lock | 326 +++++++++++------------- src-tauri/Cargo.toml | 2 +- src-tauri/capabilities/default.json | 2 +- src-tauri/easytier/config_template.json | 8 +- src-tauri/src/lib.rs | 1 + src-tauri/tauri.conf.json | 4 +- 10 files changed, 179 insertions(+), 190 deletions(-) diff --git a/composables/configJson.ts b/composables/configJson.ts index 9a5b984..4a59f9e 100644 --- a/composables/configJson.ts +++ b/composables/configJson.ts @@ -7,7 +7,7 @@ import { bounce } from "~/utils"; const b = bounce(600); export type ConfigServerUrlType = Array; -export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType) => { +export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType | null) => { b(async () => { const mainStore = useMainStore(); if (mainStore.createConfigInEasytier) { @@ -16,7 +16,7 @@ export const updateConfigJsonBounce = (configJsonSeverUrl?: ConfigServerUrlType) }); }; -export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType) => { +export const updateConfigJson = async (configJsonSeverUrl?: ConfigServerUrlType | null) => { const mainStore = useMainStore(); const path = import.meta.env.VITE_CONFIG_FILE_NAME; if (isNil(configJsonSeverUrl)) { diff --git a/package.json b/package.json index ff8e29a..fc55aac 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "author": "leizi97", "description": "A simple network initiator based on Easytier", - "version": "1.5.1", + "version": "1.5.2", "scripts": { "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "build": "nuxt generate --dotenv env/.env.prod", diff --git a/pages/member.vue b/pages/member.vue index 56ebd64..5bfefad 100644 --- a/pages/member.vue +++ b/pages/member.vue @@ -72,12 +72,14 @@ {{ row.ipv4 || "-" }}
- - {{ row.proxy?.[0] || "-" }} - + + + {{ row.proxy?.[0] || "-" }}代理 + +
@@ -249,7 +251,7 @@ const proxyMember = data.proxy?.filter(proxy => proxy.src.startsWith(`${ipv4}:`)); const proxyObj: Record = {}; for (const proxy of proxyMember) { - proxyObj[proxy.src.split(":")[0]] = [proxy.transport_type, proxy.state]; + proxyObj[proxy.dst.split(":")[0]] = [proxy.transport_type, proxy.state]; } return data.member.map(m => { m.proxy = proxyObj?.[m.ipv4.split(":")?.[0]] || m?.proxy || ["", "Closed"]; diff --git a/pages/nodesList.vue b/pages/nodesList.vue index d3c49b1..c35965f 100644 --- a/pages/nodesList.vue +++ b/pages/nodesList.vue @@ -143,7 +143,6 @@