From b13edd29140786a40a2b32c6dba7230549d2b9e0 Mon Sep 17 00:00:00 2001 From: snltty <1069410172@qq.com> Date: Wed, 24 Jul 2024 09:58:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=98=E7=9B=98=E5=92=8C=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dotnet.yml | 10 +++---- linker.doc.web/docs/2、首次运行/2.1、安装.md | 8 +++--- linker.libs/linker.libs.csproj | 4 +-- linker.service/LinkerService.cs | 13 ++++++++++ linker.service/linker.service.csproj | 4 +-- linker.tray.win/default.aproj | 2 +- linker.tray.win/dist/linker.tray.win.exe | Bin 1508352 -> 1509376 bytes linker.tray.win/main.aardio | 26 ++++++++++++++++++- linker.tunnel/linker.tunnel.csproj | 4 +-- linker/linker.csproj | 4 +-- 10 files changed, 55 insertions(+), 20 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 0ddbe8d4..046431fa 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -48,15 +48,13 @@ jobs: env: GITHUB_TOKEN: '${{ secrets.ACTIONS_TOKEN }}' with: - tag_name: v1.1.2.5 - release_name: v1.1.2.5.${{ steps.date.outputs.today }} + tag_name: v1.1.2.6 + release_name: v1.1.2.6.${{ steps.date.outputs.today }} draft: false prerelease: false body: | - 1. 脑抽 - 2. 更新错误 - 3. 中继错误 - 4. 请更新服务端 + 1. 托盘检查 + 2. 停止服务清理网卡 - name: upload win x64 id: upload-win-x64 diff --git a/linker.doc.web/docs/2、首次运行/2.1、安装.md b/linker.doc.web/docs/2、首次运行/2.1、安装.md index 821a16a6..30269c07 100644 --- a/linker.doc.web/docs/2、首次运行/2.1、安装.md +++ b/linker.doc.web/docs/2、首次运行/2.1、安装.md @@ -50,8 +50,8 @@ systemctl enable linker 2. 客户端端口 `1804`、`1803` TCP 3. 配置文件夹 `./configs` 4. 日志文件夹 `./logs` -5. debian `snltty/linker-debian-x64`、`snltty/linker-debian-arm64`，可以用`msquic`、`tun`网卡 -4. alpine `snltty/linker-musl-x64`、`snltty/linker-musl-arm64`，可以用`tun`网卡、msquic尚未编译成功 +5. debian `snltty/linker-debian-x64`、`snltty/linker-debian-arm64`，压缩约`70MB`、未压缩约`177MB` +4. alpine `snltty/linker-musl-x64`、`snltty/linker-musl-arm64`，压缩约`19MB`、未压缩约`43MB` #### 客户端 ``` @@ -62,7 +62,7 @@ docker run -it -d --name linker \ --device /dev/net/tun \ --restart=always \ --privileged=true \ -snltty/linker-debian-x64 +snltty/linker-musl-x64 ``` #### 服务端 @@ -73,5 +73,5 @@ docker run -it -d --name linker \ -v /usr/local/linker-docker/logs:/app/logs \ --restart=always \ --privileged=true \ -snltty/linker-debian-x64 +snltty/linker-musl-x64 ``` \ No newline at end of file diff --git a/linker.libs/linker.libs.csproj b/linker.libs/linker.libs.csproj index 22433b03..21013f8f 100644 --- a/linker.libs/linker.libs.csproj +++ b/linker.libs/linker.libs.csproj @@ -15,8 +15,8 @@ https://github.com/snltty/linker https://github.com/snltty/linker 1.1.2 - 1.1.2.5 - 1.1.2.5 + 1.1.2.6 + 1.1.2.6 full diff --git a/linker.service/LinkerService.cs b/linker.service/LinkerService.cs index 09104a06..48f566eb 100644 --- a/linker.service/LinkerService.cs +++ b/linker.service/LinkerService.cs @@ -100,6 +100,19 @@ namespace linker.service proc?.Dispose(); foreach (var item in Process.GetProcessesByName(mainExeName)) + { + try + { + item.Close(); + item.WaitForExit(TimeSpan.FromMilliseconds(2000)); + item.Kill(); + } + catch (Exception) + { + } + } + + foreach (var item in Process.GetProcessesByName("tun2socks")) { item.Kill(); } diff --git a/linker.service/linker.service.csproj b/linker.service/linker.service.csproj index f666805a..81185c7b 100644 --- a/linker.service/linker.service.csproj +++ b/linker.service/linker.service.csproj @@ -22,8 +22,8 @@ https://github.com/snltty/linker https://github.com/snltty/linker snltty service - 1.1.2.5 - 1.1.2.5 + 1.1.2.6 + 1.1.2.6 diff --git a/linker.tray.win/default.aproj b/linker.tray.win/default.aproj index 0f2ae1ff..9c882c82 100644 --- a/linker.tray.win/default.aproj +++ b/linker.tray.win/default.aproj @@ -1,5 +1,5 @@  - + diff --git a/linker.tray.win/dist/linker.tray.win.exe b/linker.tray.win/dist/linker.tray.win.exe index 090d058081147662a246130c5090212eb1b5b183..495db5c806e3ee59154fcce1dac059ded78058de 100644 GIT binary patch delta 2924 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 GjDG=PAzHuy diff --git a/linker.tray.win/main.aardio b/linker.tray.win/main.aardio index e64461a8..f4c023cd 100644 --- a/linker.tray.win/main.aardio +++ b/linker.tray.win/main.aardio @@ -78,7 +78,7 @@ mainForm.showPopmenu = function(){ mainForm.popmenu=win.ui.popmenu(mainForm); mainForm.popmenu.add(mainForm.ckAutoStart.checked ? '取消托盘自启动':'开启托盘自启动',function(id){mainForm.runAsTaskCommand()}); - mainForm.popmenu.add(service.isRunning(mainForm.serviceName) ? '停止服务':'运行服务',function(id){mainForm.installCommand()}); + mainForm.popmenu.add(service.isRunning(mainForm.serviceName) ? '停止服务':'运行服务',function(id){mainForm.runCommand()}); mainForm.popmenu.add(service.isExist(mainForm.serviceName) ? '卸载服务':'安装服务',function(id){mainForm.installCommand()}); mainForm.popmenu.add('退出托盘',function(id){ @@ -111,6 +111,24 @@ mainForm.checkService = function(){ mainForm.failureService(); } + +mainForm.checkServiceInstall = ""; +mainForm.checkServiceRun = ""; + +mainForm.checkService1 = function(){ + import service; + + mainForm.btnInstall.text = service.isExist(mainForm.serviceName) ? "卸载服务" : "安装服务"; + mainForm.btnRun.text = service.isRunning(mainForm.serviceName) ? "停止服务" : "运行服务"; + if(mainForm.checkServiceInstall != mainForm.btnInstall.text || mainForm.checkServiceRun != mainForm.btnRun.text) + { + mainForm.showPopmenu(); + } + + mainForm.checkServiceInstall = mainForm.btnInstall.text; + mainForm.checkServiceRun = mainForm.btnRun.text ; +} + mainForm.btnCheck.oncommand = function(id,event){ mainForm.checkService(); win.msgbox('已检查'); @@ -246,6 +264,12 @@ mainForm.setInterval( }catch(e) { } + try{ + mainForm.checkService1(); + } + catch(e){ + + } return true; },1000 ) diff --git a/linker.tunnel/linker.tunnel.csproj b/linker.tunnel/linker.tunnel.csproj index 7be29bcc..0156fa92 100644 --- a/linker.tunnel/linker.tunnel.csproj +++ b/linker.tunnel/linker.tunnel.csproj @@ -17,8 +17,8 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker tunnel - 1.1.2.5 - 1.1.2.5 + 1.1.2.6 + 1.1.2.6 diff --git a/linker/linker.csproj b/linker/linker.csproj index 69992ba4..03b1400a 100644 --- a/linker/linker.csproj +++ b/linker/linker.csproj @@ -25,8 +25,8 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker - 1.1.2.5 - 1.1.2.5 + 1.1.2.6 + 1.1.2.6