github/EasytierGame
4
0
Fork 0
mirror of https://github.com/EasyTier/EasytierGame.git synced 2025-05-19 10:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

重大结构更新

Browse Source 
+ 升级rust为1.8版本
+ 升级tauri为最新版，以及其他包升级
+ 现在构建分为window7和window7以上两种版本
+ 优化分享配置弹窗遮盖问题
+ 增加uninstall.exe（不会删除日志）
+ 增加windows.0.48.5.lib
+ 增加build.bat 内含windows7构建之前的操作
This commit is contained in:
黑先森
2025-01-16 16:53:51 +08:00
parent 0a17c269ea
commit 41f58f1df6
12 changed files with 1577 additions and 886 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.bat
+11
View File
@@ -0,0 +1,11 @@
rustup default nightly
@echo 使用rust nightly构建支持win7的版本，请先将根目录的windows.0.48.5 放入以下目录
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x64
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\lib\x86
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x64
@echo C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\你自己的版本\atlmfc\lib\x86
pnpm tauri build -- -Z build-std --target x86_64-win7-windows-msvc
rustup default stable
pnpm tauri build
pnpm run release
pnpm run release-win7
package.json
+12 -11
View File
@@ -3,21 +3,22 @@
"private": true,
"author": "leizi97",
"description": "A simple network initiator based on Easytier",
"version": "1.3.6",
"version": "1.3.7",
"scripts": {
"dev": "nuxt dev --dotenv env/.env.dev --host 0.0.0.0",
"build": "nuxt generate --dotenv env/.env.prod",
"release": "node zip.js"
"release": "node zip.js",
"release-win7": "node zip.js win7"
},
"devDependencies": {
"@element-plus/icons-vue": "^2.3.1",
"@element-plus/nuxt": "^1.1.1",
"@nuxtjs/tailwindcss": "^6.12.2",
"@nuxtjs/tailwindcss": "6.13.1",
"@pinia/nuxt": "0.9.0",
"@tauri-apps/api": "^2.2.0",
"@tauri-apps/cli": "^2.2.2",
"@tauri-apps/cli": "2.2.4",
"@tauri-apps/plugin-cli": "^2.2.0",
"@tauri-apps/plugin-clipboard-manager": "^2.0.0",
"@tauri-apps/plugin-clipboard-manager": "2.2.0",
"@tauri-apps/plugin-fs": "^2.2.0",
"@tauri-apps/plugin-log": "^2.2.0",
"@tauri-apps/plugin-shell": "^2.2.0",
@@ -25,17 +26,17 @@
"@tauri-apps/plugin-dialog": "2.2.0",
"@types/lodash-es": "^4.17.12",
"@vitejs/plugin-vue-jsx": "^4.1.1",
"@vueuse/core": "12.2.0",
"@vueuse/core": "12.4.0",
"archiver": "^7.0.1",
"element-plus": "2.9.2",
"less": "^4.2.0",
"element-plus": "2.9.3",
"less": "4.2.1",
"lodash-es": "^4.17.21",
"nuxt": "3.15.1",
"nuxt": "3.15.2",
"pinia": "^2.3.0",
"pinia-plugin-persistedstate": "^4.2.0",
"postcss": "^8.4.38",
"prettier": "^3.4.1",
"prettier-plugin-tailwindcss": "^0.6.9",
"prettier": "3.4.2",
"prettier-plugin-tailwindcss": "0.6.10",
"vue-clipboard3": "^2.0.0"
}
}
pages/index.vue
+10 -9
View File
@@ -1331,20 +1331,21 @@
)
);
await writeText(WT);
await ElConfirmPrimary(
`{action} 虚拟网IP，主机名，子网代理，为子网代理启用smoltcp堆栈，开机自启，软件启动自动联机，出口节点，不生成Tun网卡，错误日志相关配置`,
"提示",
{
confirmButtonText: "知道了",
showCancelButton: false,
action: "不会分享"
}
);
ElMessage.success("配置已复制");
} catch (err) {
console.error(err);
ElMessage.error("分享失败");
}
ElConfirmPrimary(
`{action} 虚拟网IP，主机名，子网代理，为子网代理启用smoltcp堆栈，开机自启，软件启动自动联机，出口节点，不生成Tun网卡，错误日志相关配置`,
"提示",
{
confirmButtonText: "知道了",
showCancelButton: false,
action: "不会分享"
}
);
}
if (command === "import_config") {
importConfigData.data = "";
pnpm-lock.yaml
Generated
+600 -385
View File
File diff suppressed because it is too large Load Diff
src-tauri/Cargo.lock
Generated
+926 -467
View File
File diff suppressed because it is too large Load Diff
src-tauri/Cargo.toml
+8 -7
View File
@@ -1,6 +1,6 @@
[package]
name = "easytier-game"
version = "1.3.6"
version = "1.3.7"
homepage = "https://github.com/EasyTier/EasyTier"
repository = "https://github.com/EasyTier/EasytierGame"
description = "A simple network initiator based on Easytier"
@@ -8,7 +8,7 @@ authors = ["leizi97"]
license = "LICENSE"
edition = "2021"
rust-version = "1.77.2"
# rust-version = "1.77.2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -18,17 +18,18 @@ name = "app_lib"
crate-type = ["staticlib", "cdylib", "rlib"]
[build-dependencies]
tauri-build = { version = "2.0.4", features = [] }
tauri-build = { version = "2.0.5", features = [] }
# prost-build = "0.13.2"
[dependencies]
serde_json = "1.0.135"
serde = { version = "1.0.217", features = ["derive"] }
log = "0.4"
tauri = { version = "2.2.0", features = [
log = "0.4.25"
tauri = { version = "2.2.2", features = [
"tray-icon",
"image-png",
"image-ico",
"devtools"
] }
tauri-plugin-log = "2.2.0"
@@ -42,7 +43,7 @@ tauri-plugin-fs = "2.2.0"
tauri-plugin-clipboard-manager = "2.2.0"
rand = "0.8.5"
tokio = { version = "1.43.0", features = ["process"] }
tauri-plugin-dialog = "2"
tauri-plugin-dialog = "2.2.0"
# prost = "0.13"
# prost-types = "0.13"
hashbrown = "0.15.2"
@@ -53,5 +54,5 @@ features = ["Win32_System_TaskScheduler", "Win32_System_Power", "Win32_NetworkMa
[target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
tauri-plugin-cli = "2.2.0"
tauri-plugin-single-instance = "2.2.0"
tauri-plugin-single-instance = "2.2.1"
tauri-plugin-window-state = "2.2.0"
src-tauri/easytier/easytier-cli.exe
BIN
View File
Binary file not shown.
src-tauri/easytier/easytier-core.exe
BIN
View File
Binary file not shown.
src-tauri/tauri.conf.json
+4 -3
View File
@@ -1,7 +1,7 @@
{
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "easytier-game",
"version": "1.3.6",
"version": "1.3.7",
"identifier": "com.tauri.easytier-game",
"build": {
@@ -13,7 +13,7 @@
"app": {
"windows": [
{
"title": "easytier-game 1.3.6",
"title": "easytier-game 1.3.7",
"label": "main",
"minWidth": 340,
"width": 340,
@@ -63,7 +63,8 @@
"easytier/Packet.dll",
"easytier/wintun.dll",
"easytier/clear_local_data.bat",
"帮助.txt"
"帮助.txt",
"uninstall.exe"
],
"windows": {
"webviewInstallMode": {
src-tauri/uninstall.exe
BIN
View File
Binary file not shown.
windows.0.48.5.lib
BIN
View File
Binary file not shown.
zip.js
+6 -4
View File
@@ -1,14 +1,15 @@
/**
* 生成 release 发布包 zip 文件
*/
const releaseDir = "./src-tauri/target/release";
const pkg = require("./package.json");
const isWin7 = process.argv[2] == 'win7';
const releaseDir = isWin7 ? "./src-tauri/target/x86_64-win7-windows-msvc/release" : "./src-tauri/target/release";
const fileName = isWin7 ? `easytier-game_windows7_fix_${pkg.version}.zip` : `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
const releaseDirEasytier = `${releaseDir}/easytier/`;
const releaseExe = `${releaseDir}/easytier-game.exe`;
const releaseHelp = `${releaseDir}/帮助.txt`;
const releaseUninstall = `${releaseDir}/uninstall.exe`;
const deleteEasytierFiles = ["logs/", "guiLogs/", "cache/"];
const pkg = require("./package.json");
const fileName = `easytier-game_windows_x86_64_${pkg.version}.zip`; // 发布包格式
const releaseZipDir = "./release";
const releaseZip = `${releaseZipDir}/${fileName}`;
@@ -62,5 +63,6 @@ archive.pipe(output);
archive
.append(fs.createReadStream(path.join(__dirname, releaseExe)), { name: "easytier-game.exe" })
.append(fs.createReadStream(path.join(__dirname, releaseHelp)), { name: "帮助.txt" })
.append(fs.createReadStream(path.join(__dirname, releaseUninstall)), { name: "uninstall.exe" })
.directory(path.join(__dirname, releaseDirEasytier), "easytier")
.finalize();