diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 7ac8dec5..a791c4e6 100644
--- 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.2.8
- release_name: v1.2.8.${{ steps.date.outputs.today }}
+ tag_name: v1.2.9
+ release_name: v1.2.9.${{ steps.date.outputs.today }}
draft: false
prerelease: false
- body: "1. 修复管理页面数据表格绑定显示信息错误\r\n2. 将程序分发给他人进行组网时,可删除web文件夹,使其其仅能使用简单管理页面管理自身"
+ body: 1. 选择是否自动同步配置文件
- name: upload-win-x86-oss
id: upload-win-x86-oss
uses: tvrcgo/oss-action@v0.1.1
@@ -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.2.8/linker-win-x86.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-win-x64.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-win-arm64.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-linux-x64.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-linux-arm.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-linux-arm64.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-linux-musl-x64.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-linux-musl-arm.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-linux-musl-arm64.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-osx-x64.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-osx-arm64.zip
+ target-path: /downloads/linker/v1.2.9/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.2.8/linker-windows-route.zip
+ target-path: /downloads/linker/v1.2.9/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
index ae5e0123..6e71b0c5 100644
--- 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.2.8.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
- nuget push ./linker.libs/bin/release/linker.libs.1.2.8.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
- nuget push ./linker.tun/bin/release/linker.tun.1.2.8.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
+ nuget push ./linker.tunnel/bin/release/linker.tunnel.1.2.9.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
+ nuget push ./linker.libs/bin/release/linker.libs.1.2.9.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
+ nuget push ./linker.tun/bin/release/linker.tun.1.2.9.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
diff --git a/linker.libs/linker.libs.csproj b/linker.libs/linker.libs.csproj
index 1ff5edbc..60acffc9 100644
--- a/linker.libs/linker.libs.csproj
+++ b/linker.libs/linker.libs.csproj
@@ -14,9 +14,9 @@
snltty
https://github.com/snltty/linker
https://github.com/snltty/linker
- 1.2.8
- 1.2.8
- 1.2.8
+ 1.2.9
+ 1.2.9
+ 1.2.9
full
diff --git a/linker.tun/linker.tun.csproj b/linker.tun/linker.tun.csproj
index 668a616b..645cd17f 100644
--- a/linker.tun/linker.tun.csproj
+++ b/linker.tun/linker.tun.csproj
@@ -9,7 +9,7 @@
true
true
linker tun
- 1.2.8
+ 1.2.9
snltty
snltty
linker tun
@@ -17,8 +17,8 @@
https://github.com/snltty/linker
https://github.com/snltty/linker
linker tun
- 1.2.8
- 1.2.8
+ 1.2.9
+ 1.2.9
diff --git a/linker.tunnel/TunnelTransfer.cs b/linker.tunnel/TunnelTransfer.cs
index 01598ac2..d4b3bc74 100644
--- a/linker.tunnel/TunnelTransfer.cs
+++ b/linker.tunnel/TunnelTransfer.cs
@@ -388,8 +388,11 @@ namespace linker.tunnel
}
//在尝试外网
eps.AddRange(new List{
+ //有NAT
new IPEndPoint(tunnelTransportInfo.Remote.Remote.Address,tunnelTransportInfo.Remote.Remote.Port),
new IPEndPoint(tunnelTransportInfo.Remote.Remote.Address,tunnelTransportInfo.Remote.Remote.Port+1),
+ //无NAT
+ new IPEndPoint(tunnelTransportInfo.Remote.Remote.Address,tunnelTransportInfo.Remote.Local.Port),
});
//再尝试IPV6
foreach (IPAddress item in tunnelTransportInfo.Remote.LocalIps.Where(c => c.AddressFamily == AddressFamily.InterNetworkV6))
diff --git a/linker.tunnel/linker.tunnel.csproj b/linker.tunnel/linker.tunnel.csproj
index 065ed3f8..98d4e90b 100644
--- a/linker.tunnel/linker.tunnel.csproj
+++ b/linker.tunnel/linker.tunnel.csproj
@@ -9,7 +9,7 @@
true
true
linker tunnel
- 1.2.8
+ 1.2.9
snltty
snltty
linker tunnel
@@ -17,8 +17,8 @@
https://github.com/snltty/linker
https://github.com/snltty/linker
linker tunnel
- 1.2.8
- 1.2.8
+ 1.2.9
+ 1.2.9
diff --git a/linker.web/src/apis/running.js b/linker.web/src/apis/running.js
index 50513199..e55b699e 100644
--- a/linker.web/src/apis/running.js
+++ b/linker.web/src/apis/running.js
@@ -3,3 +3,6 @@ import { sendWebsocketMsg } from './request'
export const updateVersion = (data) => {
return sendWebsocketMsg('RunningConfig/UpdateVersion', data);
}
+export const updateDisableSync = (data) => {
+ return sendWebsocketMsg('RunningConfig/UpdateDisableSync', data);
+}
\ No newline at end of file
diff --git a/linker.web/src/provide.js b/linker.web/src/provide.js
index 3251b239..e7ab02ef 100644
--- a/linker.web/src/provide.js
+++ b/linker.web/src/provide.js
@@ -16,6 +16,7 @@ export const provideGlobalData = () => {
Relay: { Servers: [] },
Tuntap: { IP: '', PrefixLength: 24 },
Client: { Servers: [] },
+ AutoSyncs: {}
},
configed: false
},
diff --git a/linker.web/src/views/full/settings/Version.vue b/linker.web/src/views/full/settings/Version.vue
index 951b911d..0bdd12bb 100644
--- a/linker.web/src/views/full/settings/Version.vue
+++ b/linker.web/src/views/full/settings/Version.vue
@@ -4,19 +4,26 @@
手动修改版本
高版本一端自动同步到低版本一端
+ 关闭自动同步