托盘和服务更新

2025-12-18 23:38:11 +08:00 · 2024-07-24 09:58:57 +08:00
parent 9a2f8073a1
commit b13edd2914
10 changed files with 55 additions and 20 deletions
--- 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
--- 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
 ```
--- a/linker.libs/linker.libs.csproj
+++ b/linker.libs/linker.libs.csproj
@@ -15,8 +15,8 @@
 		<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
 		<Version>1.1.2</Version>
-		<AssemblyVersion>1.1.2.5</AssemblyVersion>
-		<FileVersion>1.1.2.5</FileVersion>
+		<AssemblyVersion>1.1.2.6</AssemblyVersion>
+		<FileVersion>1.1.2.6</FileVersion>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<DebugType>full</DebugType>
--- 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();
                }
--- a/linker.service/linker.service.csproj
+++ b/linker.service/linker.service.csproj
@@ -22,8 +22,8 @@
 		<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
 		<PackageReleaseNotes>snltty service</PackageReleaseNotes>
-		<AssemblyVersion>1.1.2.5</AssemblyVersion>
-		<FileVersion>1.1.2.5</FileVersion>
+		<AssemblyVersion>1.1.2.6</AssemblyVersion>
+		<FileVersion>1.1.2.6</FileVersion>
 	</PropertyGroup>

 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/linker.tray.win/default.aproj
+++ b/linker.tray.win/default.aproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project ver="10" name="linker.tray.win" libEmbed="true" icon="..\linker\favicon.ico" ui="win" output="linker.tray.win.exe" CompanyName="snltty" FileDescription="linker.tray.win" LegalCopyright="Copyright (C) snltty 2024" ProductName="linker.tray.win" InternalName="linker.install.win" FileVersion="0.0.0.47" ProductVersion="0.0.0.47" publishDir="/dist/" dstrip="false" local="false" ignored="false">
+<project ver="10" name="linker.tray.win" libEmbed="true" icon="..\linker\favicon.ico" ui="win" output="linker.tray.win.exe" CompanyName="snltty" FileDescription="linker.tray.win" LegalCopyright="Copyright (C) snltty 2024" ProductName="linker.tray.win" InternalName="linker.install.win" FileVersion="0.0.0.49" ProductVersion="0.0.0.49" publishDir="/dist/" dstrip="false" local="false" ignored="false">
 	<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
 	<folder name="资源文件" path="res" embed="true" local="false" ignored="false">
 		<file name="favicon.ico" path="res\favicon.ico" comment="res\favicon.ico"/>
--- a/linker.tray.win/dist/linker.tray.win.exe
+++ b/linker.tray.win/dist/linker.tray.win.exe
--- 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
 )
--- a/linker.tunnel/linker.tunnel.csproj
+++ b/linker.tunnel/linker.tunnel.csproj
@@ -17,8 +17,8 @@
 	  <PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
 	  <RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
 	  <PackageReleaseNotes>linker tunnel</PackageReleaseNotes>
-	  <AssemblyVersion>1.1.2.5</AssemblyVersion>
-	  <FileVersion>1.1.2.5</FileVersion>
+	  <AssemblyVersion>1.1.2.6</AssemblyVersion>
+	  <FileVersion>1.1.2.6</FileVersion>
  </PropertyGroup>

 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/linker/linker.csproj
+++ b/linker/linker.csproj
@@ -25,8 +25,8 @@
 		<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
 		<PackageReleaseNotes>linker</PackageReleaseNotes>
-		<AssemblyVersion>1.1.2.5</AssemblyVersion>
-		<FileVersion>1.1.2.5</FileVersion>
+		<AssemblyVersion>1.1.2.6</AssemblyVersion>
+		<FileVersion>1.1.2.6</FileVersion>
 	</PropertyGroup>