apps/linker
1
0
Fork 0
mirror of https://github.com/snltty/linker.git synced 2025-10-27 11:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
snltty
2024-12-09 14:29:54 +08:00
parent 7480963635
commit 908248abe6
22 changed files with 119 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/docker.yml vendored
View File

@@ -57,9 +57,9 @@ jobs:
docker tag snltty/linker-musl-x64:latest snltty/linker-musl:amd64 && \
docker push snltty/linker-musl:amd64 && \
docker manifest create snltty/linker-musl:latest snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \
docker manifest create snltty/linker-musl:v1.6.2 snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \
docker manifest create snltty/linker-musl:v1.6.3 snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \
docker manifest push snltty/linker-musl:latest && \
docker manifest push snltty/linker-musl:v1.6.2 && \
docker manifest push snltty/linker-musl:v1.6.3 && \
docker pull --platform linux/arm/v7 snltty/linker-debian-arm:latest && \
docker tag snltty/linker-debian-arm:latest snltty/linker-debian:arm && \
docker push snltty/linker-debian:arm && \
@@ -70,6 +70,6 @@ jobs:
docker tag snltty/linker-debian-x64:latest snltty/linker-debian:amd64 && \
docker push snltty/linker-debian:amd64 && \
docker manifest create snltty/linker-debian:latest snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \
docker manifest create snltty/linker-debian:v1.6.2 snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \
docker manifest create snltty/linker-debian:v1.6.3 snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \
docker manifest push snltty/linker-debian:latest && \
docker manifest push snltty/linker-debian:v1.6.2
docker manifest push snltty/linker-debian:v1.6.3

30
.github/workflows/dotnet.yml vendored
View File

@@ -33,11 +33,11 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
with:
tag_name: v1.6.2
release_name: v1.6.2.${{ steps.date.outputs.today }}
tag_name: v1.6.3
release_name: v1.6.3.${{ steps.date.outputs.today }}
draft: false
prerelease: false
body: "1. 修复UI\r\n2. 修复服务端重启无法关闭内网穿透的问题\r\n3. 修复网络掩码计算错误"
body: "1. 优化UI，显示网络计算IP数\r\n2. 修复内网穿透不停止直接删除导致的无法再次添加的问题\r\n3. 优化网卡的端口转发\r\n4. 修复网络掩码计算错误\r\n5. 测试中，不要更，不要更，不要更"
- 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.6.2/linker-win-x86.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-win-x64.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-win-arm64.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-linux-x64.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-linux-arm.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-linux-arm64.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-linux-musl-x64.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-linux-musl-arm.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-linux-musl-arm64.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-osx-x64.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-osx-arm64.zip
target-path: /downloads/linker/v1.6.3/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.6.2/linker-windows-route.zip
target-path: /downloads/linker/v1.6.3/linker-windows-route.zip
- name: upload-version-oss
id: upload-version-oss
uses: tvrcgo/oss-action@v0.1.1

6
.github/workflows/nuget.yml vendored
View File

@@ -38,6 +38,6 @@ jobs:
- name: Push
run: |
nuget push ./linker.tunnel/bin/release/linker.tunnel.1.6.2.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
nuget push ./linker.libs/bin/release/linker.libs.1.6.2.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
nuget push ./linker.tun/bin/release/linker.tun.1.6.2.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol
nuget push ./linker.tunnel/bin/release/linker.tunnel.1.6.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.6.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.6.3.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol

6
linker.libs/linker.libs.csproj
View File

@@ -14,9 +14,9 @@
<Copyright>snltty</Copyright>
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<Version>1.6.2</Version>
<AssemblyVersion>1.6.2</AssemblyVersion>
<FileVersion>1.6.2</FileVersion>
<Version>1.6.3</Version>
<AssemblyVersion>1.6.3</AssemblyVersion>
<FileVersion>1.6.3</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>full</DebugType>

2
linker.tray.win/default.aproj
View File

@@ -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.183" ProductVersion="0.0.0.183" 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.184" ProductVersion="0.0.0.184" 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"/>

BIN
linker.tray.win/dist/linker.tray.win.exe vendored
View File

Binary file not shown.

16
linker.tun/ILinkerTunDevice.cs
View File

@@ -54,6 +54,11 @@ namespace linker.tun
public void RemoveNat(out string error);
/// <summary>
/// 获取端口转发
/// </summary>
/// <returns></returns>
public List<LinkerTunDeviceForwardItem> GetForward();
/// <summary>
/// 添加端口转发
/// </summary>
@@ -117,6 +122,17 @@ namespace linker.tun
public string Key => $"{ListenAddr}:{ListenPort}->{ConnectAddr}:{ConnectPort}";
}
public sealed class LinkerTunDeviceForwardItemComparer : IEqualityComparer<LinkerTunDeviceForwardItem>
{
public bool Equals(LinkerTunDeviceForwardItem x, LinkerTunDeviceForwardItem y)
{
return x.ListenPort == y.ListenPort && x.ConnectAddr.Equals(y.ConnectAddr) && x.ConnectPort == y.ConnectPort;
}
public int GetHashCode(LinkerTunDeviceForwardItem obj)
{
return obj.ListenPort.GetHashCode() ^ obj.ConnectAddr.GetHashCode() ^ obj.ConnectPort;
}
}
/// <summary>
/// 数据包

16
linker.tun/LinkerLinuxTunDevice.cs
View File

@@ -3,6 +3,7 @@ using linker.libs.extends;
using Microsoft.Win32.SafeHandles;
using System.Net;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
namespace linker.tun
{
@@ -188,7 +189,20 @@ namespace linker.tun
}
}
public List<LinkerTunDeviceForwardItem> GetForward()
{
string str = CommandHelper.Linux(string.Empty, new string[] { $"iptables -t nat -L PREROUTING" });
IEnumerable<LinkerTunDeviceForwardItem> lines = str.Split(Environment.NewLine)
.Select(c => Regex.Replace(c, @"\s+", " ").Split(' '))
.Where(c => c.Length > 0 && c[0] == "DNAT" && c[1] == "tcp")
.Select(c =>
{
IPEndPoint dist = IPEndPoint.Parse(c[^1].Replace("to:", ""));
int port = int.Parse(c[^2].Replace("dpt:", ""));
return new LinkerTunDeviceForwardItem { ListenAddr=IPAddress.Any, ListenPort=port, ConnectAddr=dist.Address, ConnectPort=dist.Port };
});
return lines.ToList();
}
public void AddForward(List<LinkerTunDeviceForwardItem> forwards)
{
string[] commands = forwards.Where(c => c != null && c.Enable).SelectMany(c =>

4
linker.tun/LinkerOsxTunDevice.cs
View File

@@ -112,6 +112,10 @@ namespace linker.tun
error = string.Empty;
}
public List<LinkerTunDeviceForwardItem> GetForward()
{
return new List<LinkerTunDeviceForwardItem>();
}
public void AddForward(List<LinkerTunDeviceForwardItem> forwards)
{
}

8
linker.tun/LinkerTunDeviceAdapter.cs
View File

@@ -155,6 +155,14 @@ namespace linker.tun
linkerTunDevice?.RemoveNat(out string error);
}
/// <summary>
/// 获取端口转发
/// </summary>
/// <returns></returns>
public List<LinkerTunDeviceForwardItem> GetForward()
{
return linkerTunDevice?.GetForward() ?? [];
}
/// <summary>
/// 添加端口转发
/// </summary>

15
linker.tun/LinkerWinTunDevice.cs
View File

@@ -6,6 +6,7 @@ using System.Net;
using System.Net.NetworkInformation;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
using System.Text.RegularExpressions;
namespace linker.tun
{
@@ -192,6 +193,20 @@ namespace linker.tun
}
public List<LinkerTunDeviceForwardItem> GetForward()
{
string str = CommandHelper.Windows(string.Empty, new string[] { $"netsh interface portproxy show v4tov4" });
IEnumerable<LinkerTunDeviceForwardItem> lines = str.Split(Environment.NewLine)
.Select(c => Regex.Replace(c, @"\s+", " ").Split(' '))
.Where(c => c.Length > 0 && c[0] == "0.0.0.0")
.Select(c =>
{
IPEndPoint dist = IPEndPoint.Parse($"{c[2]}:{c[3]}");
int port = int.Parse(c[1]);
return new LinkerTunDeviceForwardItem { ListenAddr = IPAddress.Any, ListenPort = port, ConnectAddr = dist.Address, ConnectPort = dist.Port };
});
return lines.ToList();
}
public void AddForward(List<LinkerTunDeviceForwardItem> forwards)
{
string[] commands = forwards.Where(c => c != null && c.Enable).Select(c =>

6
linker.tun/linker.tun.csproj
View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker tun</PackageReleaseNotes>
<Version>1.6.2</Version>
<AssemblyVersion>1.6.2</AssemblyVersion>
<FileVersion>1.6.2</FileVersion>
<Version>1.6.3</Version>
<AssemblyVersion>1.6.3</AssemblyVersion>
<FileVersion>1.6.3</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

6
linker.tunnel/linker.tunnel.csproj
View File

@@ -16,9 +16,9 @@
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker tunnel</PackageReleaseNotes>
<Version>1.6.2</Version>
<AssemblyVersion>1.6.2</AssemblyVersion>
<FileVersion>1.6.2</FileVersion>
<Version>1.6.3</Version>
<AssemblyVersion>1.6.3</AssemblyVersion>
<FileVersion>1.6.3</FileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

14
linker/linker.csproj
View File

@@ -21,16 +21,18 @@
<Title>linker</Title>
<Authors>snltty</Authors>
<Company>snltty</Company>
<Description>1. 修复UI
2. 修复服务端重启无法关闭内网穿透的问题
3. 修复网络掩码计算错误</Description>
<Description>1. 优化UI，显示网络计算IP数
2. 修复内网穿透不停止直接删除导致的无法再次添加的问题
3. 优化网卡的端口转发
4. 修复网络掩码计算错误
5. 测试中，不要更，不要更，不要更</Description>
<Copyright>snltty</Copyright>
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
<PackageReleaseNotes>linker</PackageReleaseNotes>
<Version>1.6.2</Version>
<AssemblyVersion>1.6.2</AssemblyVersion>
<FileVersion>1.6.2</FileVersion>
<Version>1.6.3</Version>
<AssemblyVersion>1.6.3</AssemblyVersion>
<FileVersion>1.6.3</FileVersion>
</PropertyGroup>

20
linker/plugins/forward/ForwardTransfer.cs
View File

@@ -35,8 +35,6 @@ namespace linker.plugins.forward
this.messengerSender = messengerSender;
clientSignInState.NetworkEnabledHandle += Reset;
CheckTask();
}
public Memory<byte> GetData()
@@ -97,23 +95,7 @@ namespace linker.plugins.forward
Start(false);
});
}
private void CheckTask()
{
TimerHelper.SetInterval(() =>
{
lock (this)
{
var items = running.Data.Forwards
.Where(c => c.GroupId == fileConfig.Data.Client.Group.Id)
.Where(c => c.Started && c.Proxy == false && string.IsNullOrWhiteSpace(c.Msg) == false);
foreach (var item in items)
{
Start(item, false);
}
}
return true;
}, 30000);
}
private void Start(bool errorStop = true)
{
lock (this)

4
linker/plugins/forward/proxy/ForwardProxyTcp.cs
View File

@@ -23,8 +23,8 @@ namespace linker.plugins.forward.proxy
{
IPEndPoint _localEndPoint = ep;
socket = new Socket(_localEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
socket.IPv6Only(_localEndPoint.AddressFamily, false);
socket.ReuseBind(_localEndPoint);
//socket.IPv6Only(_localEndPoint.AddressFamily, false);
//socket.ReuseBind(_localEndPoint);
socket.Listen(int.MaxValue);
LocalEndpoint = socket.LocalEndPoint as IPEndPoint;

4
linker/plugins/sforward/proxy/SForwardProxyTcp.cs
View File

@@ -23,8 +23,8 @@ namespace linker.plugins.sforward.proxy
{
IPEndPoint localEndPoint = new IPEndPoint(IPAddress.Any, port);
Socket socket = new Socket(localEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
socket.IPv6Only(localEndPoint.AddressFamily, false);
socket.ReuseBind(localEndPoint);
//socket.IPv6Only(localEndPoint.AddressFamily, false);
//socket.ReuseBind(localEndPoint);
socket.Listen(int.MaxValue);
AsyncUserToken userToken = new AsyncUserToken
{

1
linker/plugins/sforward/proxy/SForwardProxyUdp.cs
View File

@@ -1,6 +1,5 @@
using linker.libs;
using linker.libs.extends;
using System;
using System.Buffers;
using System.Collections.Concurrent;
using System.Net;

21
linker/plugins/tuntap/TuntapConfigTransfer.cs
View File

@@ -11,6 +11,7 @@ using linker.tun;
using linker.plugins.tuntap.lease;
using linker.plugins.decenter;
using System.Text.RegularExpressions;
using linker.libs.extends;
namespace linker.plugins.tuntap
{
@@ -296,27 +297,15 @@ namespace linker.plugins.tuntap
/// </summary>
private void AddForward()
{
string oldStr = string.Join(",", forwardItems.Select(c => c.Key));
var temp = ParseForwardItems();
var newStr = string.Join(",", temp.Select(c => c.Key));
if (oldStr != newStr)
var removes = forwardItems.Except(temp, new LinkerTunDeviceForwardItemComparer());
if (removes.Any())
{
DeleteForward();
tuntapTransfer.RemoveForward(removes.ToList());
}
forwardItems = temp;
if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG)
LoggerHelper.Instance.Debug($"add forward : {newStr}");
tuntapTransfer.AddForward(forwardItems);
}
else
{
if (LoggerHelper.Instance.LoggerLevel <= LoggerTypes.DEBUG)
{
LoggerHelper.Instance.Debug($"tuntap forward unchanged old : {oldStr}");
LoggerHelper.Instance.Debug($"tuntap forward unchanged new : {newStr}");
}
}
}
/// <summary>
/// 删除端口转发
/// </summary>

14
linker/plugins/tuntap/TuntapProxy.cs
View File

@@ -75,20 +75,6 @@ namespace linker.plugins.tuntap
/// <returns></returns>
public async Task Closed(ITunnelConnection connection, object state)
{
/*
bool online = await clientSignInTransfer.GetOnline(connection.RemoteMachineId);
if (online == false)
{
foreach (var item in ip2MachineDic.Where(c => c.Value == connection.RemoteMachineId).Select(c => c.Key).ToList())
{
ip2MachineDic.TryRemove(item, out string str);
ipConnections.TryRemove(item, out ITunnelConnection con);
ipRefreshCache.Remove(item);
}
RefreshConfig();
}
*/
RefreshConfig();
Version.Add();
await Task.CompletedTask;

6
publish-docker.sh
View File

@@ -33,16 +33,16 @@ do
fi
done
cd public/publish/docker/linux-${p}-x64/${f}
docker buildx build -f ${target}/public/publish/docker/linux-${p}-x64/${f}/Dockerfile-${p} --platform="linux/x86_64" --force-rm -t "${image}-${p}-x64:latest" -t "${image}-${p}-x64:v1.6.2" . --push
docker buildx build -f ${target}/public/publish/docker/linux-${p}-x64/${f}/Dockerfile-${p} --platform="linux/x86_64" --force-rm -t "${image}-${p}-x64:latest" -t "${image}-${p}-x64:v1.6.3" . --push
cd ../../../../../
cd public/publish/docker/linux-${p}-arm64/${f}
docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm64/${f}/Dockerfile-${p} --platform="linux/arm64" --force-rm -t "${image}-${p}-arm64:latest" -t "${image}-${p}-arm64:v1.6.2" . --push
docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm64/${f}/Dockerfile-${p} --platform="linux/arm64" --force-rm -t "${image}-${p}-arm64:latest" -t "${image}-${p}-arm64:v1.6.3" . --push
cd ../../../../../
cd public/publish/docker/linux-${p}-arm/${f}
docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm/${f}/Dockerfile-${p} --platform="linux/arm/v7" --force-rm -t "${image}-${p}-arm:latest" -t "${image}-${p}-arm:v1.6.2" . --push
docker buildx build -f ${target}/public/publish/docker/linux-${p}-arm/${f}/Dockerfile-${p} --platform="linux/arm/v7" --force-rm -t "${image}-${p}-arm:latest" -t "${image}-${p}-arm:v1.6.3" . --push
cd ../../../../../
done
done

12
version.txt
View File

@@ -1,5 +1,7 @@
v1.6.2
2024-12-09 00:49:52
1. 修复UI
2. 修复服务端重启无法关闭内网穿透的问题
3. 修复网络掩码计算错误
v1.6.3
2024-12-09 14:29:54
1. 优化UI，显示网络计算IP数
2. 修复内网穿透不停止直接删除导致的无法再次添加的问题
3. 优化网卡的端口转发
4. 修复网络掩码计算错误
5. 测试中，不要更，不要更，不要更