From feea75dcb6915dad85a263c61f1818f567c2e7e3 Mon Sep 17 00:00:00 2001 From: heixiansen Date: Tue, 25 Mar 2025 21:30:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dipv6=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9=E5=AF=BC=E8=87=B4=E7=9A=84=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=90=AF=E5=8A=A8=E8=81=94=E6=9C=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98#7=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=86=85=E6=A0=B8?= =?UTF-8?q?=E4=B8=BA=E6=9C=80=E6=96=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=AE=BE=E5=A4=87=E5=92=8C=E5=AD=90=E7=BD=91=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=A6=81=E7=94=A8?= =?UTF-8?q?nat=E7=9B=B8=E5=85=B3=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composables/configJson.ts | 1 + package.json | 2 +- pages/advance.vue | 44 +++++++++++++++++++++++++-- pages/cidr.vue | 22 ++++++++------ pages/index.vue | 28 ++++++++++++++++- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/easytier/easytier-cli.exe | Bin 2924544 -> 3622400 bytes src-tauri/easytier/easytier-core.exe | Bin 11203072 -> 12474368 bytes src-tauri/tauri.conf.json | 4 +-- stores/index.ts | 7 ++++- 11 files changed, 93 insertions(+), 19 deletions(-) diff --git a/composables/configJson.ts b/composables/configJson.ts index a929dc4..9184f22 100644 --- a/composables/configJson.ts +++ b/composables/configJson.ts @@ -19,6 +19,7 @@ export const updateConfigJson = async (configJsonSeverUrl: Array | strin serverUrl, enableCustomListener, customListenerData, + bindDeviceEnable, ...otherConfig } = mainStore.config; let writeServerUrl: Array | string = serverUrl; diff --git a/package.json b/package.json index 934ce76..f42ded3 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.4.2", + "version": "1.4.3", "scripts": { "dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0", "build": "nuxt generate --dotenv env/.env.prod", diff --git a/pages/advance.vue b/pages/advance.vue index 27b1d81..0fad773 100644 --- a/pages/advance.vue +++ b/pages/advance.vue @@ -127,7 +127,8 @@
自定义IPV6监听地址 @@ -140,7 +141,7 @@ placeholder="请输入自定义IPV6监听地址" />
- + @@ -180,6 +181,29 @@ (不使用自定义网卡名,那么联机时默认会生成一个名为 "et_xxx" 的网卡，也可以使用 “设置跃点” 功能，除非你启用了下面的功能) +
+
绑定设备
+ + + + + + + + +
不创建TUN设备(网卡)，可以使用子网代理访问节点
@@ -269,6 +293,20 @@ listenerDialogData.visible = false; }; + const handleCustomListenerV6Change = async (value: boolean) => { + if (value) { + const [error, _] = await ElConfirmDanger("内核版本2.2.3之后，ipv6监听被移除并合并到'自定义监听'，请谨慎使用", "警告", { + confirmButtonText: "继续使用", + cancelButtonText: "取消" + }); + if (!error) { + mainStore.config.enableCustomListenerV6 = value; + } + } else { + mainStore.config.enableCustomListenerV6 = value; + } + }; + const mainStore = useMainStore(); const data = ["trace", "debug", "info", "warn", "error", "off"]; const guids = ref([]); @@ -297,7 +335,7 @@ }; // 为bind_device功能增加改方法 - const _getGuids = async () => { + const getGuids = async () => { const guidsValue = await invoke("get_network_adapter_guids"); guids.value = guidsValue && guidsValue.length > 0 ? guidsValue : []; }; diff --git a/pages/cidr.vue b/pages/cidr.vue index 8c04318..cfc793c 100644 --- a/pages/cidr.vue +++ b/pages/cidr.vue @@ -1,12 +1,18 @@