diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bbc565dd..f9ad42cd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -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.5.62 snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \ + docker manifest create snltty/linker-musl:v1.5.7 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.5.62 && \ + docker manifest push snltty/linker-musl:v1.5.7 && \ 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.5.62 snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \ + docker manifest create snltty/linker-debian:v1.5.7 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.5.62 \ No newline at end of file + docker manifest push snltty/linker-debian:v1.5.7 \ No newline at end of file diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1c80b384..12c97587 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.5.62 - release_name: v1.5.62.${{ steps.date.outputs.today }} + tag_name: v1.5.7 + release_name: v1.5.7.${{ steps.date.outputs.today }} draft: false prerelease: false - body: 1. 一些修复 + 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.5.62/linker-win-x86.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-win-x64.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-win-arm64.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-linux-x64.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-linux-arm.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-linux-arm64.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-linux-musl-x64.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-linux-musl-arm.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-linux-musl-arm64.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-osx-x64.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-osx-arm64.zip + target-path: /downloads/linker/v1.5.7/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.5.62/linker-windows-route.zip + target-path: /downloads/linker/v1.5.7/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 59e69c32..adcc62ee 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.5.62.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol - nuget push ./linker.libs/bin/release/linker.libs.1.5.62.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol - nuget push ./linker.tun/bin/release/linker.tun.1.5.62.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol + nuget push ./linker.tunnel/bin/release/linker.tunnel.1.5.7.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol + nuget push ./linker.libs/bin/release/linker.libs.1.5.7.nupkg -Source https://api.nuget.org/v3/index.json -SkipDuplicate -ApiKey ${{ secrets.NUGET_KEY }} -NoSymbol + nuget push ./linker.tun/bin/release/linker.tun.1.5.7.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 9225a4d1..68f9a613 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.5.62 - 1.5.62 - 1.5.62 + 1.5.7 + 1.5.7 + 1.5.7 full diff --git a/linker.tun/linker.tun.csproj b/linker.tun/linker.tun.csproj index 1abd95e3..b1430af1 100644 --- a/linker.tun/linker.tun.csproj +++ b/linker.tun/linker.tun.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker tun - 1.5.62 - 1.5.62 - 1.5.62 + 1.5.7 + 1.5.7 + 1.5.7 diff --git a/linker.tunnel/linker.tunnel.csproj b/linker.tunnel/linker.tunnel.csproj index ba37e08d..97906295 100644 --- a/linker.tunnel/linker.tunnel.csproj +++ b/linker.tunnel/linker.tunnel.csproj @@ -16,9 +16,9 @@ https://github.com/snltty/linker https://github.com/snltty/linker linker tunnel - 1.5.62 - 1.5.62 - 1.5.62 + 1.5.7 + 1.5.7 + 1.5.7 diff --git a/linker/config/Config.cs b/linker/config/Config.cs index 25652513..4a987794 100644 --- a/linker/config/Config.cs +++ b/linker/config/Config.cs @@ -105,7 +105,8 @@ namespace linker.config continue; } string text = item.Value.PropertyMethod.Serialize(item.Value.Property.GetValue(Data)); - File.WriteAllText(item.Value.Path, text, encoding: System.Text.Encoding.UTF8); + File.WriteAllText($"{item.Value.Path}.temp", text, encoding: System.Text.Encoding.UTF8); + File.Move($"{item.Value.Path}.temp", item.Value.Path, true); } catch (Exception ex) { diff --git a/linker/linker.csproj b/linker/linker.csproj index 25e1e0a0..3554f6a7 100644 --- a/linker/linker.csproj +++ b/linker/linker.csproj @@ -21,14 +21,14 @@ linker snltty snltty - 1. 一些修复 + 1. 修复设备断电导致配置文件丢失的问题 snltty https://github.com/snltty/linker https://github.com/snltty/linker linker - 1.5.62 - 1.5.62 - 1.5.62 + 1.5.7 + 1.5.7 + 1.5.7 diff --git a/linker/plugins/relay/server/RelayServerNodeTransfer.cs b/linker/plugins/relay/server/RelayServerNodeTransfer.cs index 76118555..39e4bc7e 100644 --- a/linker/plugins/relay/server/RelayServerNodeTransfer.cs +++ b/linker/plugins/relay/server/RelayServerNodeTransfer.cs @@ -163,8 +163,8 @@ namespace linker.plugins.relay.server { fileConfig.Data.Server.Relay.Distributed.Node.MaxGbTotalMonth = DateTime.Now.Month; fileConfig.Data.Server.Relay.Distributed.Node.MaxGbTotalLastBytes = (ulong)(fileConfig.Data.Server.Relay.Distributed.Node.MaxGbTotal * 1024 * 1024 * 1024); + fileConfig.Data.Update(); } - fileConfig.Data.Update(); } private void ReportTask() diff --git a/publish-docker.sh b/publish-docker.sh index 47d4a9d5..6bcc000c 100644 --- a/publish-docker.sh +++ b/publish-docker.sh @@ -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.5.62" . --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.5.7" . --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.5.62" . --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.5.7" . --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.5.62" . --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.5.7" . --push cd ../../../../../ done done \ No newline at end of file diff --git a/version.txt b/version.txt index 631218db..d4bfc955 100644 --- a/version.txt +++ b/version.txt @@ -1,3 +1,3 @@ -v1.5.62 -2024-11-15 19:45:15 -1. 一些修复 \ No newline at end of file +v1.5.7 +2024-11-15 23:39:27 +1. 修复设备断电导致配置文件丢失的问题 \ No newline at end of file