修复一些文本说明,增加清除easytierGame数据的bat,可用于完全卸载easytierGame

This commit is contained in:
黑先森
2024-11-20 12:09:07 +08:00
parent 096d5f03da
commit 37fd7b6fb0
3 changed files with 170 additions and 74 deletions
+1 -1
View File
@@ -76,7 +76,7 @@
<ElDivider />
<div><ElCheckbox v-model="mainStore.config.enablExitNode">允许此节点成为出口节点</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密默认为false必须与对等节点相同</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.disableEncryption">禁用对等节点通信的加密默认为启用必须与对等节点相同</ElCheckbox></div>
<div><ElCheckbox v-model="mainStore.config.multiThread">使用多线程运行时默认为单线程</ElCheckbox></div>
<ElDivider />
+115 -73
View File
@@ -2,7 +2,8 @@
<ElForm
size="small"
label-position="top"
:model="config">
:model="config"
>
<!-- element-loading-custom-class="config-start"
v-loading="mainStore.configStartEnable"
:element-loading-spinner="'<path />'"
@@ -10,24 +11,28 @@
<!-- <div> -->
<ElFormItem
label="服务器"
prop="serverUrl">
prop="serverUrl"
>
<template #label>
<div class="flex items-center gap-[0_5px]">
<div>服务器</div>
<span>-</span>
<ElTag
effect="dark"
:type="data.isSuccessGetIp ? 'success' : 'info'">
:type="data.isSuccessGetIp ? 'success' : 'info'"
>
{{ data.isSuccessGetIp ? "联机成功" : data.isStart && !data.isSuccessGetIp ? "联机中" : "未联机" }}
</ElTag>
<ElButton
v-if="!data.coreVersion"
@click="getCoreVersion(true)">
@click="getCoreVersion(true)"
>
获取内核版本
</ElButton>
<ElTag
v-else
type="info">
type="info"
>
{{ data.coreVersion }}
</ElTag>
<ElPopconfirm
@@ -36,13 +41,15 @@
confirm-button-text="继续"
title="内核从github下载,需要出国工具,可能下载缓慢或失败,是否继续?
也可以从官方群里手动下载后解压到easytier-game.exe同级目录下的easytier目录里,全部覆盖即可"
@confirm="handleUpdateCore">
@confirm="handleUpdateCore"
>
<template #reference>
<ElButton
:disabled="data.isStart"
:loading="data.update"
type="warning"
size="small">
size="small"
>
{{ data.coreVersion ? "更新内核" : "下载内核" }}
</ElButton>
</template>
@@ -55,7 +62,8 @@
placeholder="请选择服务器地址"
default-first-option
v-model="config.serverUrl"
@change="handleServerUrlChange">
@change="handleServerUrlChange"
>
<template #prefix>
<div :class="config.protocol && config.protocol.length > 1 ? 'w-[120px]' : 'w-[80px]'">
<ElSelect
@@ -64,12 +72,14 @@
collapse-tags
@click.stop
v-model="config.protocol"
@change="handleServerUrlChange">
@change="handleServerUrlChange"
>
<ElOption
v-for="item in protocols"
:key="item"
:label="item"
:value="item"></ElOption>
:value="item"
></ElOption>
</ElSelect>
</div>
</template>
@@ -77,7 +87,8 @@
v-for="item in mainStore.basePeers"
:key="item"
:label="item"
:value="item">
:value="item"
>
<div class="flex items-center gap-[20px] overflow-hidden flex-nowrap max-w-[calc(100vw-62px)]">
<ElTooltip :content="item">
<p class="truncate">{{ item }}</p>
@@ -87,7 +98,8 @@
@click.stop="handleDeleteServerUrl(item)"
round
:icon="Delete"
type="danger"></ElButton>
type="danger"
></ElButton>
</div>
</div>
</ElOption>
@@ -107,7 +119,8 @@
<ElInput
maxlength="100"
placeholder="请输入网络名"
v-model="config.networkName"></ElInput>
v-model="config.networkName"
></ElInput>
</ElFormItem>
</div>
<div class="flex-1">
@@ -125,7 +138,8 @@
maxlength="100"
placeholder="请输入网络密码"
v-model="config.networkPassword"
type="password"></ElInput>
type="password"
></ElInput>
</ElFormItem>
</div>
</div>
@@ -142,11 +156,13 @@
<ElInput
maxlength="100"
placeholder="例如: Player1"
v-model="config.hostname"></ElInput>
v-model="config.hostname"
></ElInput>
</ElFormItem>
<ElFormItem
class="w-[70%]"
label="局域网IP">
label="局域网IP"
>
<template #label>
<div class="flex items-center h-[20px]">
虚拟网IP
@@ -159,14 +175,16 @@
inline-prompt
inactive-text="固定IP"
active-text="动态获取IP"
size="small"></ElSwitch>
size="small"
></ElSwitch>
</div>
</template>
<ElInput
maxlength="100"
:disabled="config.dhcp"
:placeholder="data.isStart && config.dhcp ? '等待动态分配IP...' : '例如: 10.126.126.1'"
v-model="config.ipv4"></ElInput>
v-model="config.ipv4"
></ElInput>
</ElFormItem>
</div>
<!-- </div> -->
@@ -180,24 +198,28 @@
size="default"
:type="!data.isStart ? 'primary' : 'danger'"
:disabled="data.startLoading || !data.coreVersion || data.update"
@click="handleConnection">
@click="handleConnection"
>
{{ !data.isStart ? "启动联机" : "停止联机" }}
<template #dropdown>
<ElDropdownMenu>
<ElDropdownItem
command="import_config"
:icon="Link">
:icon="Link"
>
导入配置
</ElDropdownItem>
<ElDropdownItem
command="share_config"
:icon="Share">
:icon="Share"
>
分享配置
</ElDropdownItem>
<ElDropdownItem
:icon="Tools"
command="toml"
:disabled="data.isStart">
:disabled="data.isStart"
>
使用外部配置文件
</ElDropdownItem>
</ElDropdownMenu>
@@ -207,51 +229,60 @@
<div class="mt-[6px] pl-[2px]">
<ElTooltip
placement="left"
content="日志">
content="日志"
>
<ElButton
:type="!data.logVisible ? 'info' : 'warning'"
@click="handleShowLogDialog"
:icon="List"
size="small"
plain></ElButton>
plain
></ElButton>
</ElTooltip>
<ElTooltip
placement="left"
content="成员">
content="成员"
>
<ElButton
@click="handleShowMemberDialog"
:icon="UserFilled"
plain
type="success"
size="small"></ElButton>
size="small"
></ElButton>
</ElTooltip>
</div>
</div>
<div class="ml-auto">
<ElCheckbox
v-model="config.disbleP2p"
size="small">
size="small"
>
强制中转
</ElCheckbox>
<ElTooltip
placement="top-start"
content="自启后隐藏于托盘,不显示界面">
content="自启后隐藏于托盘,不显示界面"
>
<ElCheckbox
@change="handleAutoStartByTask"
:model-value="config.autoStart"
size="small">
size="small"
>
开机自启
</ElCheckbox>
</ElTooltip>
<div>
<ElButton
@click="handleShowCidrDialog"
:icon="Share">
:icon="Share"
>
子网代理
</ElButton>
<ElButton
@click="handleShowAdvanceDialog"
:icon="Setting">
:icon="Setting"
>
高级选项
</ElButton>
</div>
@@ -262,7 +293,8 @@
type="primary"
size="small"
:icon="MagicStick"
@click="handleShowToolDialog">
@click="handleShowToolDialog"
>
增强工具
</ElButton>
</div>
@@ -270,7 +302,8 @@
class="!text-[9px] pb-[2px] ml-[8px] truncate"
type="info"
:underline="false"
@click="open('https://github.com/EasyTier/EasytierGame')">
@click="open('https://github.com/EasyTier/EasytierGame')"
>
EasytierGame主页
</ElLink>
</div>
@@ -285,12 +318,14 @@
class="!mb-0"
v-model="importConfigData.visible"
:close-on-press-escape="false"
title="导入分享">
title="导入分享"
>
<ElInput
type="textarea"
:rows="6"
placeholder="请粘贴分享的配置"
v-model="importConfigData.data"></ElInput>
v-model="importConfigData.data"
></ElInput>
<template #footer>
<div>
<el-text type="danger">导入成功后您当前的部分配置将被替换</el-text>
@@ -299,7 +334,8 @@
<ElButton
size="small"
@click="handleStartImport"
type="primary">
type="primary"
>
导入
</ElButton>
</div>
@@ -313,7 +349,8 @@
class="!mb-0"
v-model="configStart.visible"
:close-on-press-escape="false"
title="配置文件启动">
title="配置文件启动"
>
<div class="flex items-center gap-[0_4px]">
<span>启用</span>
<ElSwitch v-model="mainStore.configStartEnable"></ElSwitch>
@@ -322,14 +359,16 @@
</ElTooltip>
<ElButton
@click="openConfigDir"
size="small">
size="small"
>
打开配置目录
</ElButton>
<ElButton
@click="handleStartCommand('toml')"
type="primary"
:icon="RefreshRight"
size="small">
size="small"
>
刷新
</ElButton>
</div>
@@ -337,12 +376,14 @@
<ElSelect
v-model="mainStore.configPath"
no-data-text="目录没有配置文件"
placeholder="选择配置文件">
placeholder="选择配置文件"
>
<ElOption
v-for="item in configStart.list"
:key="item.path"
:value="item.path"
:label="item.name"></ElOption>
:label="item.name"
></ElOption>
</ElSelect>
</div>
<template #footer>
@@ -350,7 +391,8 @@
<ElButton
size="small"
@click="configStart.visible = false"
type="danger">
type="danger"
>
关闭
</ElButton>
</div>
@@ -406,25 +448,25 @@
startLoading: false,
isStart: false,
connectionSuccess: false,
configJsonSeverUrl: "", // 本地保存一次,用于回填config.json
configJsonSeverUrl: "" // 本地保存一次,用于回填config.json
});
const configStart = reactive<{ list: Array<{ path: string; name: string }>; [key: string]: any }>({
visible: false,
loading: false,
list: [], //配置文件列表
list: [] //配置文件列表
});
const importConfigData = reactive<{ data: ""; [key: string]: any }>({
visible: false,
loading: false,
data: "",
data: ""
});
const closePrevent = async () => {
const appWindow = getCurrentWindow();
if (appWindow.label == "main") {
appWindow.onCloseRequested(async (event) => {
appWindow.onCloseRequested(async event => {
// console.error(appWindow.label);
if (!is_close) {
// console.error(1);
@@ -472,7 +514,7 @@
thread_id: null,
async listenOutput() {
// const appWindow = getCurrentWindow();
const unListen = await listen("command-output", async (event) => {
const unListen = await listen("command-output", async event => {
data.isStart = true;
// console.error(event.payload);
if (event.payload) {
@@ -487,7 +529,7 @@
await setTrayTooltip(tray, `IP: ${ipv4}`);
}
} else {
if ((event.payload as string).includes("new peer connection added")) {
if ((event.payload as string).includes("new peer connection added") && !data.isSuccessGetIp) {
await setTrayRunState(tray, true);
data.isSuccessGetIp = true;
await setTrayTooltip(tray, `IP: ${config.ipv4}`);
@@ -505,7 +547,7 @@
"netsh",
["interface", "ipv4", "set", "interface", devName, "metric=", `${mainStore.config.netCardMetricValue}`],
{
encoding: "gb2312",
encoding: "gb2312"
}
).execute();
} catch (err) {
@@ -522,7 +564,7 @@
this.unListenOutPut = unListen;
},
async listenThreadId() {
const unListen = await listen("thread-id", (event) => {
const unListen = await listen("thread-id", event => {
if (event.payload) {
this.thread_id = event.payload;
}
@@ -530,14 +572,14 @@
this.unListenThreadId = unListen;
},
async listenConfigStart() {
const unListen = await listen("config", (event) => {
const unListen = await listen("config", event => {
console.error("config", event.payload);
const ipv4 = config.ipv4;
mainStore.$patch(event.payload as any);
config.ipv4 = ipv4;
});
this.unListenConfigStart = unListen;
},
}
};
const unListenAll = async () => {
@@ -593,7 +635,7 @@
await getCoreVersion();
} catch (err) {
console.error(err);
}finally {
} finally {
data.update = false;
}
};
@@ -704,8 +746,8 @@
config: {
...mainStore.config,
...guiJson,
serverUrl: saveServerUrl,
},
serverUrl: saveServerUrl
}
});
if (mainStore.createConfigInEasytier) {
await updateConfigJson(data.configJsonSeverUrl);
@@ -715,7 +757,7 @@
ElMessage.error(`config.json格式错误`);
} finally {
mainStore.$patch({
createConfigInEasytier: true, // 发现本地存在config.json 默认启用该功能
createConfigInEasytier: true // 发现本地存在config.json 默认启用该功能
});
}
}
@@ -781,7 +823,7 @@
}
if (config.serverUrl) {
const formatUrl = config.serverUrl.replace(/\\/g, "/");
args.push("--peers", ...config.protocol.map((protocol) => `${protocol}://${formatUrl}`));
args.push("--peers", ...config.protocol.map(protocol => `${protocol}://${formatUrl}`));
}
if (config.disbleP2p) {
args.push("--disable-p2p");
@@ -797,8 +839,8 @@
const reg = /\d+\.\d+\.\d+\.\d+\/\d+/g;
const formatProxyNetworks = config.proxyNetworks
.split("\n")
.map((item) => item.trim())
.filter((item) => item && reg.test(item));
.map(item => item.trim())
.filter(item => item && reg.test(item));
args.push("--proxy-networks", ...formatProxyNetworks);
config.proxyNetworks = formatProxyNetworks.join("\n");
}
@@ -842,7 +884,7 @@
config.ipv4 = "";
}
const memberDialog = await getAllWebviewWindows();
const memberDialogs = memberDialog.filter((item) => item.label === "member");
const memberDialogs = memberDialog.filter(item => item.label === "member");
if (memberDialogs && memberDialogs.length > 0) {
data.memberVisible = false;
for (const memberDialog of memberDialogs) {
@@ -868,7 +910,7 @@
if (args[0] === "-c") {
ElMessage.warning({
message: "使用配置文件中.",
duration: 5000,
duration: 5000
});
}
data.log = ""; //清空日志
@@ -877,7 +919,7 @@
await listenObj.listenOutput();
await invoke("run_command", {
args,
args
});
}
};
@@ -891,10 +933,10 @@
if (isExists) {
const entries = await readDir(path, { baseDir: BaseDirectory.Resource });
configStart.list = entries
.filter((item) => item.isFile)
.map((item) => ({
.filter(item => item.isFile)
.map(item => ({
name: item.name,
path: `${path}${item.name}`,
path: `${path}${item.name}`
})) as any;
} else {
mainStore.configStartEnable = false;
@@ -937,14 +979,14 @@
try {
await ElMessageBox.confirm("确定导入?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
cancelButtonText: "取消"
});
const payload = JSON.parse(decodeURIComponent(atob(importConfigData.data)));
mainStore.$patch({
config: {
...mainStore.config,
...payload.config,
},
...payload.config
}
});
ElMessage.success("导入成功");
importConfigData.visible = false;
@@ -992,7 +1034,7 @@
title: "成员列表",
width: 875,
height: 380,
url: "#/member",
url: "#/member"
},
() => {
data.memberVisible = true;
@@ -1011,7 +1053,7 @@
width: 600,
height: 380,
resizable: false,
url: "#/log",
url: "#/log"
},
(_, appWindow) => {
data.logVisible = true;
@@ -1034,7 +1076,7 @@
width: 600,
height: 380,
resizable: false,
url: "#/cidr",
url: "#/cidr"
},
(_, appWindow) => {
data.cidrVisible = true;
@@ -1053,7 +1095,7 @@
width: 600,
height: 380,
resizable: false,
url: "#/advance",
url: "#/advance"
},
(_, appWindow) => {
data.advanceVisible = true;
@@ -1072,7 +1114,7 @@
width: 460,
height: 480,
resizable: true,
url: "#/tool",
url: "#/tool"
},
(_, appWindow) => {
data.toolVisible = true;
+54
View File
@@ -0,0 +1,54 @@
@echo off
chcp 65001 >nul
setlocal
REM 检查是否具有管理员权限
openfiles >nul 2>&1
if %errorlevel% neq 0 (
echo 当前没有管理员权限,鼠标右键clear_data.bat,选择使用管理员模式运行...
pause
exit /b
)
REM 获取当前用户的 Local 目录路径
set "local_dir=%LOCALAPPDATA%"
REM 设置要删除的任务计划程序文件夹名称
set "folder_name=\easytierGame"
set "task_name=auto start"
REM 设置要删除的目标文件夹
set "target_data_dir=%local_dir%\com.tauri.easytier-game"
echo ---
REM 打印 Local 目录路径
echo 当前数据目录: %target_data_dir%
echo ---
echo 您确定要清除EasytierGame的本地数据吗? (y/n)
echo ---
REM 等待用户输入
set /p confirm=输入'y/n'进行确认:
if /i "%confirm%"=="y" (
echo 清除数据中,请稍后...
echo ---
REM 删除任务计划程序文件夹
echo delete auto_start task ...
echo ---
REM 获取文件夹中的所有任务
schtasks /delete /tn "%folder_name%\%task_name%" /f
schtasks /delete /tn "%folder_name%" /f
if exist "%target_data_dir%" (
REM 删除目标文件夹及其内容
rd /s /q "%target_data_dir%"
)
echo 清楚本地缓存数据完毕.
echo ---
echo 您可以手动删除当前目录完成EasytierGame的卸载.
) else (
echo 取消清理数据
)
pause
endlocal