Action

snltty · Sep 13, 2024 · 847321c · 847321c
1 parent 5d0dbcd
commit 847321c
Show file tree

Hide file tree

Showing 38 changed files with 295 additions and 93 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -33,11 +33,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
         with:
-          tag_name: v1.3.3
-          release_name: v1.3.3.${{ steps.date.outputs.today }}
+          tag_name: v1.3.4
+          release_name: v1.3.4.${{ steps.date.outputs.today }}
           draft: false
           prerelease: false
-          body: 1. 优化添加防火墙规则，不使用文件
+          body: "1. 优化添加防火墙规则，不使用文件\r\n2. 优化权限配置\r\n3. 新增Action功能，可用于连接服务器时的自定义第三方验证"
       - name: upload-win-x86-oss
         id: upload-win-x86-oss
         uses: tvrcgo/[email protected]
@@ -47,7 +47,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-win-x86.zip
-          target-path: /downloads/linker/v1.3.3/linker-win-x86.zip
+          target-path: /downloads/linker/v1.3.4/linker-win-x86.zip
       - name: upload-win-x86
         id: upload-win-x86
         uses: actions/upload-release-asset@master
@@ -67,7 +67,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-win-x64.zip
-          target-path: /downloads/linker/v1.3.3/linker-win-x64.zip
+          target-path: /downloads/linker/v1.3.4/linker-win-x64.zip
       - name: upload-win-x64
         id: upload-win-x64
         uses: actions/upload-release-asset@master
@@ -87,7 +87,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-win-arm64.zip
-          target-path: /downloads/linker/v1.3.3/linker-win-arm64.zip
+          target-path: /downloads/linker/v1.3.4/linker-win-arm64.zip
       - name: upload-win-arm64
         id: upload-win-arm64
         uses: actions/upload-release-asset@master
@@ -107,7 +107,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-linux-x64.zip
-          target-path: /downloads/linker/v1.3.3/linker-linux-x64.zip
+          target-path: /downloads/linker/v1.3.4/linker-linux-x64.zip
       - name: upload-linux-x64
         id: upload-linux-x64
         uses: actions/upload-release-asset@master
@@ -127,7 +127,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-linux-arm.zip
-          target-path: /downloads/linker/v1.3.3/linker-linux-arm.zip
+          target-path: /downloads/linker/v1.3.4/linker-linux-arm.zip
       - name: upload-linux-arm
         id: upload-linux-arm
         uses: actions/upload-release-asset@master
@@ -147,7 +147,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-linux-arm64.zip
-          target-path: /downloads/linker/v1.3.3/linker-linux-arm64.zip
+          target-path: /downloads/linker/v1.3.4/linker-linux-arm64.zip
       - name: upload-linux-arm64
         id: upload-linux-arm64
         uses: actions/upload-release-asset@master
@@ -167,7 +167,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-linux-musl-x64.zip
-          target-path: /downloads/linker/v1.3.3/linker-linux-musl-x64.zip
+          target-path: /downloads/linker/v1.3.4/linker-linux-musl-x64.zip
       - name: upload-linux-musl-x64
         id: upload-linux-musl-x64
         uses: actions/upload-release-asset@master
@@ -187,7 +187,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-linux-musl-arm.zip
-          target-path: /downloads/linker/v1.3.3/linker-linux-musl-arm.zip
+          target-path: /downloads/linker/v1.3.4/linker-linux-musl-arm.zip
       - name: upload-linux-musl-arm
         id: upload-linux-musl-arm
         uses: actions/upload-release-asset@master
@@ -207,7 +207,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-linux-musl-arm64.zip
-          target-path: /downloads/linker/v1.3.3/linker-linux-musl-arm64.zip
+          target-path: /downloads/linker/v1.3.4/linker-linux-musl-arm64.zip
       - name: upload-linux-musl-arm64
         id: upload-linux-musl-arm64
         uses: actions/upload-release-asset@master
@@ -227,7 +227,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-osx-x64.zip
-          target-path: /downloads/linker/v1.3.3/linker-osx-x64.zip
+          target-path: /downloads/linker/v1.3.4/linker-osx-x64.zip
       - name: upload-osx-x64
         id: upload-osx-x64
         uses: actions/upload-release-asset@master
@@ -247,7 +247,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-osx-arm64.zip
-          target-path: /downloads/linker/v1.3.3/linker-osx-arm64.zip
+          target-path: /downloads/linker/v1.3.4/linker-osx-arm64.zip
       - name: upload-osx-arm64
         id: upload-osx-arm64
         uses: actions/upload-release-asset@master
@@ -277,7 +277,7 @@ jobs:
           key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
           bucket: ide-qbcode
           asset-path: ./public/publish-zip/linker-windows-route.zip
-          target-path: /downloads/linker/v1.3.3/linker-windows-route.zip
+          target-path: /downloads/linker/v1.3.4/linker-windows-route.zip
       - name: upload-windows-route
         id: upload-windows-route
         uses: actions/upload-release-asset@master

diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -38,6 +38,6 @@ jobs:
 
     - name: Push
       run: |
-        nuget push ./linker.tunnel/bin/release/linker.tunnel.1.3.3.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
-        nuget push ./linker.libs/bin/release/linker.libs.1.3.3.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
-        nuget push ./linker.tun/bin/release/linker.tun.1.3.3.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
+        nuget push ./linker.tunnel/bin/release/linker.tunnel.1.3.4.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
+        nuget push ./linker.libs/bin/release/linker.libs.1.3.4.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
+        nuget push ./linker.tun/bin/release/linker.tun.1.3.4.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
diff --git a/linker.doc.web/docs/5、组网权限/1、组网权限.md → linker.doc.web/docs/5、组网权限.md b/linker.doc.web/docs/5、组网权限/1、组网权限.md → linker.doc.web/docs/5、组网权限.md
@@ -1,8 +1,8 @@
 ---
-sidebar_position: 1
+sidebar_position: 5
 ---
 
-# 1、组网权限
+# 5、组网权限
 
 :::tip[说明]
 1. 按 <a href="../2、首次运行/2.1、安装">首次运行，安装</a>，此设备拥有完全管理权限，可导出配置，用以作为组网子设备运行

diff --git a/linker.doc.web/docs/5、组网权限/_category_.json b/linker.doc.web/docs/5、组网权限/_category_.json
diff --git a/linker.doc.web/docs/6、Action请求.md b/linker.doc.web/docs/6、Action请求.md
@@ -0,0 +1,28 @@
+---
+sidebar_position: 6
+---
+
+# 6、Action请求
+
+:::tip[说明]
+1. 在客户端连接服务器时，可以发出HTTP POST请求，当赶回`ok`时继续连接服务器，当`非ok`时断开连接
+:::
+
+## 1、使用ws向linker提交Action参数
+
+以 javascript为例，提交Action参数
+```
+const ws = new WebSocket(`ws://127.0.0.1:1803`, ['接口密钥']);
+ws.onopen = () => {
+    const arr = [
+        {Key:'token',Value:'snltty',Url:'http://127.0.0.1:5141/token/verify'}
+    ];
+    ws.send(JSON.stringify({  
+        Path:'Action/SetArgs',//设置参数的接口
+        RequestId:1,  //请求id，递增即可
+        Content: JSON.stringify(arr) //内容
+    }));
+}
+``` 
+
+![Docusaurus Plushie](./img/action.png)
diff --git a/linker.doc.web/docs/6、自己发布.md → linker.doc.web/docs/7、自己发布.md b/linker.doc.web/docs/6、自己发布.md → linker.doc.web/docs/7、自己发布.md
@@ -1,8 +1,8 @@
 ---
-sidebar_position: 6
+sidebar_position: 7
 ---
 
-# 6、自己发布
+# 7、自己发布
 
 你可以自己发布项目，因为涉及到很多内容，所以建议使用脚本发布
 

diff --git a/linker.doc.web/docs/7、集成打洞到你的项目.md → linker.doc.web/docs/8、集成打洞到你的项目.md b/linker.doc.web/docs/7、集成打洞到你的项目.md → linker.doc.web/docs/8、集成打洞到你的项目.md
@@ -1,8 +1,8 @@
 ---
-sidebar_position: 7
+sidebar_position: 8
 ---
 
-# 7、集成打洞到你的项目
+# 8、集成打洞到你的项目
 
 你需要自己实现信标服务器，用于交换打洞信息，源码在[https://github.com/snltty/linker/tree/master/linker.tunnel](https://github.com/snltty/linker/tree/master/linker.tunnel)
 

diff --git a/linker.doc.web/docs/8、集成tun网卡到你的项目.md → linker.doc.web/docs/9、集成tun网卡到你的项目.md b/linker.doc.web/docs/8、集成tun网卡到你的项目.md → linker.doc.web/docs/9、集成tun网卡到你的项目.md
@@ -1,8 +1,8 @@
 ---
-sidebar_position: 8
+sidebar_position: 9
 ---
 
-# 8、集成tun网卡到你的项目
+# 9、集成tun网卡到你的项目
 
 在你的.NET8.0+项目中，集成tun网卡，适用于`windows`、`linux`，源码在[https://github.com/snltty/linker/tree/master/linker.tun](https://github.com/snltty/linker/tree/master/linker.tun)
 

diff --git a/linker.doc.web/docs/5、组网权限/img/access.png → linker.doc.web/docs/img/access.png b/linker.doc.web/docs/5、组网权限/img/access.png → linker.doc.web/docs/img/access.png
diff --git a/linker.doc.web/docs/img/action.png b/linker.doc.web/docs/img/action.png
diff --git a/linker.libs/linker.libs.csproj b/linker.libs/linker.libs.csproj
@@ -14,9 +14,9 @@
 		<Copyright>snltty</Copyright>
 		<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
-		<Version>1.3.3</Version>
-		<AssemblyVersion>1.3.3</AssemblyVersion>
-		<FileVersion>1.3.3</FileVersion>
+		<Version>1.3.4</Version>
+		<AssemblyVersion>1.3.4</AssemblyVersion>
+		<FileVersion>1.3.4</FileVersion>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<DebugType>full</DebugType>

diff --git a/linker.tray.win/dist/linker.tray.win.exe b/linker.tray.win/dist/linker.tray.win.exe
diff --git a/linker.tray.win/web/css/555.2e947627.css → linker.tray.win/web/css/155.953da106.css b/linker.tray.win/web/css/555.2e947627.css → linker.tray.win/web/css/155.953da106.css