mirror of
https://github.com/snltty/linker.git
synced 2025-09-26 21:15:57 +08:00
累计更新
This commit is contained in:
8
.github/workflows/docker.yml
vendored
8
.github/workflows/docker.yml
vendored
@@ -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.7.6 snltty/linker-musl:amd64 snltty/linker-musl:arm64 snltty/linker-musl:arm && \
|
||||
docker manifest create snltty/linker-musl:v1.7.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.7.6 && \
|
||||
docker manifest push snltty/linker-musl:v1.7.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.7.6 snltty/linker-debian:amd64 snltty/linker-debian:arm64 snltty/linker-debian:arm && \
|
||||
docker manifest create snltty/linker-debian:v1.7.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.7.6
|
||||
docker manifest push snltty/linker-debian:v1.7.7
|
26
.github/workflows/dotnet.yml
vendored
26
.github/workflows/dotnet.yml
vendored
@@ -33,11 +33,11 @@ jobs:
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
|
||||
with:
|
||||
tag_name: v1.7.6
|
||||
release_name: v1.7.6.${{ steps.date.outputs.today }}
|
||||
tag_name: v1.7.7
|
||||
release_name: v1.7.7.${{ steps.date.outputs.today }}
|
||||
draft: false
|
||||
prerelease: false
|
||||
body: "1. 一些优化\r\n2. 安卓APP勉强能用,支持分身,下拉刷新,在线升级\r\n5. 如果你设备很多,请尝试升级其中一个成功重启后再升级其它"
|
||||
body: "1. 一些累计更新\r\n2. 优化ssl证书,兼容安卓\r\n3. 打洞和中继优化,显示loading,增加手动尝试打洞\r\n5. 修改入参格式,增加虚拟网卡设置\r\n5. 如果你设备很多,请尝试升级其中一个成功重启后再升级其它"
|
||||
- name: publish projects
|
||||
run: ./publish.bat "C:\\Android\\android-sdk"
|
||||
- name: upload-win-x86-oss
|
||||
@@ -49,7 +49,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.7.6/linker-win-x86.zip
|
||||
target-path: /downloads/linker/v1.7.7/linker-win-x86.zip
|
||||
- name: upload-win-x86
|
||||
id: upload-win-x86
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -69,7 +69,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.7.6/linker-win-x64.zip
|
||||
target-path: /downloads/linker/v1.7.7/linker-win-x64.zip
|
||||
- name: upload-win-x64
|
||||
id: upload-win-x64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -89,7 +89,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.7.6/linker-win-arm64.zip
|
||||
target-path: /downloads/linker/v1.7.7/linker-win-arm64.zip
|
||||
- name: upload-win-arm64
|
||||
id: upload-win-arm64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -109,7 +109,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.7.6/linker-linux-x64.zip
|
||||
target-path: /downloads/linker/v1.7.7/linker-linux-x64.zip
|
||||
- name: upload-linux-x64
|
||||
id: upload-linux-x64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -129,7 +129,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.7.6/linker-linux-arm.zip
|
||||
target-path: /downloads/linker/v1.7.7/linker-linux-arm.zip
|
||||
- name: upload-linux-arm
|
||||
id: upload-linux-arm
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -149,7 +149,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.7.6/linker-linux-arm64.zip
|
||||
target-path: /downloads/linker/v1.7.7/linker-linux-arm64.zip
|
||||
- name: upload-linux-arm64
|
||||
id: upload-linux-arm64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -169,7 +169,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.7.6/linker-linux-musl-x64.zip
|
||||
target-path: /downloads/linker/v1.7.7/linker-linux-musl-x64.zip
|
||||
- name: upload-linux-musl-x64
|
||||
id: upload-linux-musl-x64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -189,7 +189,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.7.6/linker-linux-musl-arm.zip
|
||||
target-path: /downloads/linker/v1.7.7/linker-linux-musl-arm.zip
|
||||
- name: upload-linux-musl-arm
|
||||
id: upload-linux-musl-arm
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -209,7 +209,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.7.6/linker-linux-musl-arm64.zip
|
||||
target-path: /downloads/linker/v1.7.7/linker-linux-musl-arm64.zip
|
||||
- name: upload-linux-musl-arm64
|
||||
id: upload-linux-musl-arm64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -259,7 +259,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-zip/linker.apk
|
||||
target-path: /downloads/linker/v1.7.6/linker.apk
|
||||
target-path: /downloads/linker/v1.7.7/linker.apk
|
||||
- name: upload-apk
|
||||
id: upload-apk
|
||||
uses: actions/upload-release-asset@master
|
||||
|
6
.github/workflows/ipk.yml
vendored
6
.github/workflows/ipk.yml
vendored
@@ -44,7 +44,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-ipk/x64/linker-x64.ipk
|
||||
target-path: /downloads/linker/v1.7.6/linker-x64.ipk
|
||||
target-path: /downloads/linker/v1.7.7/linker-x64.ipk
|
||||
- name: upload-x64
|
||||
id: upload-x64
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -64,7 +64,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-ipk/arm/linker-arm.ipk
|
||||
target-path: /downloads/linker/v1.7.6/linker-arm.ipk
|
||||
target-path: /downloads/linker/v1.7.7/linker-arm.ipk
|
||||
- name: upload-arm
|
||||
id: upload-arm
|
||||
uses: actions/upload-release-asset@master
|
||||
@@ -84,7 +84,7 @@ jobs:
|
||||
key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
|
||||
bucket: ide-qbcode
|
||||
asset-path: ./public/publish-ipk/arm64/linker-arm64.ipk
|
||||
target-path: /downloads/linker/v1.7.6/linker-arm64.ipk
|
||||
target-path: /downloads/linker/v1.7.7/linker-arm64.ipk
|
||||
- name: upload-arm64
|
||||
id: upload-arm64
|
||||
uses: actions/upload-release-asset@master
|
||||
|
56
.github/workflows/nuget.yml
vendored
56
.github/workflows/nuget.yml
vendored
@@ -83,31 +83,31 @@ jobs:
|
||||
|
||||
- name: Push
|
||||
run: |
|
||||
dotnet nuget push ./src/linker.libs/bin/release/linker.libs.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger/bin/release/linker.messenger.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.access/bin/release/linker.messenger.access.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.action/bin/release/linker.messenger.action.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.api/bin/release/linker.messenger.api.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.channel/bin/release/linker.messenger.channel.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.decenter/bin/release/linker.messenger.decenter.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.entry/bin/release/linker.messenger.entry.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.exroute/bin/release/linker.messenger.exroute.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.flow/bin/release/linker.messenger.flow.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.forward/bin/release/linker.messenger.forward.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.listen/bin/release/linker.messenger.listen.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.logger/bin/release/linker.messenger.logger.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.pcp/bin/release/linker.messenger.pcp.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.plan/bin/release/linker.messenger.plan.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.relay/bin/release/linker.messenger.relay.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.serializer.memorypack/bin/release/linker.messenger.serializer.memorypack.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.sforward/bin/release/linker.messenger.sforward.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.signin/bin/release/linker.messenger.signin.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.socks5/bin/release/linker.messenger.socks5.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.store.file/bin/release/linker.messenger.store.file.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.sync/bin/release/linker.messenger.sync.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.tunnel/bin/release/linker.messenger.tunnel.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.tuntap/bin/release/linker.messenger.tuntap.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.updater/bin/release/linker.messenger.updater.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.tun/bin/release/linker.tun.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.snat/bin/release/linker.snat.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.tunnel/bin/release/linker.tunnel.1.7.6.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.libs/bin/release/linker.libs.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger/bin/release/linker.messenger.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.access/bin/release/linker.messenger.access.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.action/bin/release/linker.messenger.action.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.api/bin/release/linker.messenger.api.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.channel/bin/release/linker.messenger.channel.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.decenter/bin/release/linker.messenger.decenter.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.entry/bin/release/linker.messenger.entry.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.exroute/bin/release/linker.messenger.exroute.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.flow/bin/release/linker.messenger.flow.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.forward/bin/release/linker.messenger.forward.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.listen/bin/release/linker.messenger.listen.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.logger/bin/release/linker.messenger.logger.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.pcp/bin/release/linker.messenger.pcp.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.plan/bin/release/linker.messenger.plan.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.relay/bin/release/linker.messenger.relay.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.serializer.memorypack/bin/release/linker.messenger.serializer.memorypack.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.sforward/bin/release/linker.messenger.sforward.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.signin/bin/release/linker.messenger.signin.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.socks5/bin/release/linker.messenger.socks5.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.store.file/bin/release/linker.messenger.store.file.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.sync/bin/release/linker.messenger.sync.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.tunnel/bin/release/linker.messenger.tunnel.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.tuntap/bin/release/linker.messenger.tuntap.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.messenger.updater/bin/release/linker.messenger.updater.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.tun/bin/release/linker.tun.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.snat/bin/release/linker.snat.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
dotnet nuget push ./src/linker.tunnel/bin/release/linker.tunnel.1.7.7.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ secrets.NUGET_KEY }} --no-symbols
|
||||
|
@@ -92,11 +92,18 @@ Built-in SNAT enables you to use the point-to-site functionality even on Windows
|
||||
<p><img src="./readme/snat.jpg"></p>
|
||||
</div>
|
||||
|
||||
## Plan Task
|
||||
Schedule tasks to control activation and deactivation timing.
|
||||
|
||||
<div align="center">
|
||||
<p><img src="./readme/plan.jpg"></p>
|
||||
</div>
|
||||
|
||||
## Management Website
|
||||
|
||||
<div align="center">
|
||||
|
||||
<p><img src="./readme/full.png"></p>
|
||||
<p><img src="./readme/full.jpg"></p>
|
||||
</div>
|
||||
|
||||
## Support the Author
|
||||
|
@@ -92,11 +92,18 @@ LinkerMessengerEntry.Setup(ExcludeModule.None);
|
||||
<p><img src="./readme/snat.jpg"></p>
|
||||
</div>
|
||||
|
||||
## 计划任务
|
||||
内网穿透使用计划任务决定开启和关闭的时机
|
||||
|
||||
<div align="center">
|
||||
<p><img src="./readme/plan.jpg"></p>
|
||||
</div>
|
||||
|
||||
|
||||
## 管理页面
|
||||
|
||||
<div align="center">
|
||||
<p><img src="./readme/full.png"></p>
|
||||
<p><img src="./readme/full.jpg"></p>
|
||||
</div>
|
||||
|
||||
## 可怜作者
|
||||
|
@@ -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.7.6" . --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.7.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.7.6" . --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.7.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.7.6" . --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.7.7" . --push
|
||||
cd ../../../../../
|
||||
done
|
||||
done
|
@@ -22,7 +22,7 @@ do
|
||||
mkdir -p public/publish-ipk/${r}/data/usr/bin/linker
|
||||
cp -rf public/publish/${r}/* public/publish-ipk/${r}/data/usr/bin/linker/
|
||||
|
||||
sed -i "s|{version}|1.7.6|g" public/publish-ipk/${r}/control/control
|
||||
sed -i "s|{version}|1.7.7|g" public/publish-ipk/${r}/control/control
|
||||
sed -i 's/\r$//' public/publish-ipk/${r}/data/etc/init.d/linker
|
||||
sed -i 's/\r$//' public/publish-ipk/${r}/control/control
|
||||
sed -i 's/\r$//' public/publish-ipk/${r}/control/postinst
|
||||
|
BIN
readme/full.jpg
Normal file
BIN
readme/full.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 161 KiB |
BIN
readme/full.png
BIN
readme/full.png
Binary file not shown.
Before Width: | Height: | Size: 108 KiB |
BIN
readme/plan.jpg
Normal file
BIN
readme/plan.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 66 KiB |
@@ -14,7 +14,7 @@
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@mipmap/appicon"
|
||||
android:supportsRtl="true" android:usesCleartextTraffic="true">
|
||||
android:supportsRtl="true" android:usesCleartextTraffic="true" android:networkSecurityConfig="@xml/network_security_config">
|
||||
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
|
@@ -215,8 +215,7 @@ namespace linker.app
|
||||
private void RunLinker()
|
||||
{
|
||||
Helper.currentDirectory = FileSystem.Current.AppDataDirectory;
|
||||
Dictionary<string, string> config = InitConfig();
|
||||
|
||||
|
||||
InitLogger();
|
||||
|
||||
LinkerMessengerEntry.Initialize();
|
||||
@@ -225,6 +224,8 @@ namespace linker.app
|
||||
LinkerMessengerEntry.AddService<IUpdaterInstaller, UpdaterInstaller>();
|
||||
|
||||
LinkerMessengerEntry.Build();
|
||||
|
||||
Dictionary<string, string> config = InitConfig();
|
||||
LinkerMessengerEntry.Setup(ExcludeModule.Logger, config);
|
||||
IPlatformApplication.Current.Services.GetService<InitializeService>().SendOnInitialized();
|
||||
|
||||
|
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<network-security-config>
|
||||
<base-config cleartextTrafficPermitted="true">
|
||||
<trust-anchors>
|
||||
<certificates src="system" />
|
||||
<certificates src="user" />
|
||||
</trust-anchors>
|
||||
</base-config>
|
||||
</network-security-config>
|
@@ -28,7 +28,7 @@
|
||||
<ApplicationId>com.snltty.linker.app</ApplicationId>
|
||||
|
||||
<Title>linker.app</Title>
|
||||
<Version>1.7.6</Version>
|
||||
<Version>1.7.7</Version>
|
||||
<Authors>snltty</Authors>
|
||||
<Company>snltty</Company>
|
||||
<Copyright>snltty</Copyright>
|
||||
@@ -38,7 +38,7 @@
|
||||
<PackageReleaseNotes>linker</PackageReleaseNotes>
|
||||
|
||||
<!-- Versions -->
|
||||
<ApplicationDisplayVersion>1.7.6</ApplicationDisplayVersion>
|
||||
<ApplicationDisplayVersion>1.7.7</ApplicationDisplayVersion>
|
||||
<ApplicationVersion>1</ApplicationVersion>
|
||||
|
||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
|
||||
@@ -114,6 +114,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="Platforms\Android\Resources\xml\file_paths.xml" />
|
||||
<None Remove="Platforms\Android\Resources\xml\network_security_config.xml" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@@ -14,9 +14,9 @@
|
||||
<Copyright>snltty</Copyright>
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<DebugType>full</DebugType>
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger api access</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger api action</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger api</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger channel</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger decenter</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger entry</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger exroute</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger flow</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger forward</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger listen</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger logger</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger pcp</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger plan</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -290,7 +290,7 @@ namespace linker.messenger.relay.client.transport
|
||||
if (relayInfo.SSL)
|
||||
{
|
||||
sslStream = new SslStream(new NetworkStream(socket, false), false);
|
||||
await sslStream.AuthenticateAsServerAsync(messengerStore.Certificate,OperatingSystem.IsAndroid(), SslProtocols.Tls13 | SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls, false).ConfigureAwait(false);
|
||||
await sslStream.AuthenticateAsServerAsync(messengerStore.Certificate, OperatingSystem.IsAndroid(), SslProtocols.Tls13 | SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls, false).ConfigureAwait(false);
|
||||
}
|
||||
return new TunnelConnectionTcp
|
||||
{
|
||||
|
@@ -18,9 +18,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger relay</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger serializer aot</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger serializer memorypack</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger sforward</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -17,9 +17,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger signin</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger socks5</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger store file</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
@@ -37,10 +37,12 @@
|
||||
<DebugType>embedded</DebugType>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<None Remove="snltty.pfx" />
|
||||
<None Remove="privatekey.pem" />
|
||||
<None Remove="publickey.pem" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="snltty.pfx" />
|
||||
<EmbeddedResource Include="privatekey.pem" />
|
||||
<EmbeddedResource Include="publickey.pem" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="LiteDB" Version="5.0.17" />
|
||||
|
@@ -2,7 +2,6 @@
|
||||
using System.Reflection;
|
||||
using System.Security.Cryptography;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace linker.messenger.store.file.messenger
|
||||
{
|
||||
@@ -17,110 +16,25 @@ namespace linker.messenger.store.file.messenger
|
||||
{
|
||||
this.fileConfig = fileConfig;
|
||||
|
||||
if (OperatingSystem.IsAndroid())
|
||||
{
|
||||
certificate = LoadCertificate(str);
|
||||
}
|
||||
else
|
||||
{
|
||||
using Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"linker.messenger.store.file.{Helper.GlobalString}.pfx");
|
||||
using MemoryStream memoryStream = new MemoryStream();
|
||||
stream.CopyTo(memoryStream);
|
||||
certificate = new X509Certificate2(memoryStream.ToArray(), Helper.GlobalString, X509KeyStorageFlags.Exportable);
|
||||
}
|
||||
if (certificate == null)
|
||||
{
|
||||
Environment.Exit(0);
|
||||
}
|
||||
try
|
||||
{
|
||||
File.Delete($"{Helper.GlobalString}.pfx");
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
}
|
||||
using Stream streamPublic = Assembly.GetExecutingAssembly().GetManifestResourceStream($"linker.messenger.store.file.publickey.pem");
|
||||
using Stream streamPrivate = Assembly.GetExecutingAssembly().GetManifestResourceStream($"linker.messenger.store.file.privatekey.pem");
|
||||
|
||||
private string str = @"-----BEGIN CERTIFICATE-----
|
||||
MIIFGTCCBAGgAwIBAgISBl90jCZ1O8KnWcG9z3hBRB92MA0GCSqGSIb3DQEBCwUA
|
||||
MDMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQwwCgYDVQQD
|
||||
EwNSMTEwHhcNMjUwMzIwMDg1ODE3WhcNMjUwNjE4MDg1ODE2WjAXMRUwEwYDVQQD
|
||||
DAwqLnNubHR0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7
|
||||
7m9vY6IsWrlxtcsoKX3ebk8FZ8i2HFQz0sO/jBOzfLZeOtXdYpAO+focWQoMiWFU
|
||||
Gl6l9WP3xdwG890aQ23QqGGZwOWG+KlT8LgrIt2/lEq0OQ6apxaHav7IAyB09kNh
|
||||
M1oyXtYA5fuH9sJ+unjbL4a7F5lOxUyumwSigPdOEvBzLL4GJsKQgCsyfumeAz+S
|
||||
Y6ay4Ckwp0zluLwvw8IFhLmIbk7IXBwyr7ZN5ZCx7TpUN18efLDZcdQa/mTwQrCI
|
||||
66ralfkXp/t6uW4FLmi7Bygxqf8XE5WQ5ES6U8Xw9pmeJlUmHCuPnvlP06Dwj5Y0
|
||||
K6n8NuEZ/8kWQSoD6jxzAgMBAAGjggJBMIICPTAOBgNVHQ8BAf8EBAMCBaAwHQYD
|
||||
VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
|
||||
BBYEFCLxyWr4VY/fhtCl5YOi4PbKlH65MB8GA1UdIwQYMBaAFMXPRqTq9MPAemyV
|
||||
xC2wXpIvJuO5MFcGCCsGAQUFBwEBBEswSTAiBggrBgEFBQcwAYYWaHR0cDovL3Ix
|
||||
MS5vLmxlbmNyLm9yZzAjBggrBgEFBQcwAoYXaHR0cDovL3IxMS5pLmxlbmNyLm9y
|
||||
Zy8wFwYDVR0RBBAwDoIMKi5zbmx0dHkuY29tMBMGA1UdIAQMMAowCAYGZ4EMAQIB
|
||||
MC8GA1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9yMTEuYy5sZW5jci5vcmcvMTE5LmNy
|
||||
bDCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3ABNK3xq1mEIJeAxv70x6kaQWtyNJ
|
||||
zlhXat+u2qfCq+AiAAABlbL750kAAAQDAEgwRgIhALNrxvjVBcl4MMuOY9EvxIga
|
||||
R975F8z8hFyrNvnU6q+LAiEAopIUdkaOlTYd8vd/IcpDB22HNY7jtjhVh+PMfq18
|
||||
sAsAdQBOdaMnXJoQwzhbbNTfP1LrHfDgjhuNacCx+mSxYpo53wAAAZWy++5kAAAE
|
||||
AwBGMEQCIFbq4pwZ2OSvUyj89qqiFT2jUtA0fl6osPQVLUI3WgqqAiBNsQKOPEnO
|
||||
RR/aP2AgD9j1XymGzs77uaXw3FfYFeiFpjANBgkqhkiG9w0BAQsFAAOCAQEAkU1I
|
||||
5+b6t55vQkMeeGUGjImq0cdCIaoTn4ViH36nRYzq1W3d6+9fw4U8LiFuy6qnamcu
|
||||
abdpzUZkyZyeqE/N5cpSWLggC0KYJupd2TgA1WKZULKBwwJcrftiqTsyb76rL1nY
|
||||
SIUwK7xAoNM3Oaps9MZuTs1wwgOw0jD+Z5hOgDs9oAb6IzOY1mMb4pX2iKnx8CVI
|
||||
rGCEDOOyniB6RzmmSZRWwghI/GqZZEaUxlrt/y7t5jZFVNvCcez/eJKci1+xXpP3
|
||||
fZ/TnkUdWkXazGE3YNqfTwW8LvZ0VlbT62kwiKhonW9u4HWFrz0/TwreyHPpuWRH
|
||||
UrFq2/AYFWWc14AHog==
|
||||
-----END CERTIFICATE-----
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
MIIEpgIBAAKCAQEAu+5vb2OiLFq5cbXLKCl93m5PBWfIthxUM9LDv4wTs3y2XjrV
|
||||
3WKQDvn6HFkKDIlhVBpepfVj98XcBvPdGkNt0KhhmcDlhvipU/C4KyLdv5RKtDkO
|
||||
mqcWh2r+yAMgdPZDYTNaMl7WAOX7h/bCfrp42y+GuxeZTsVMrpsEooD3ThLwcyy+
|
||||
BibCkIArMn7pngM/kmOmsuApMKdM5bi8L8PCBYS5iG5OyFwcMq+2TeWQse06VDdf
|
||||
Hnyw2XHUGv5k8EKwiOuq2pX5F6f7erluBS5ouwcoMan/FxOVkOREulPF8PaZniZV
|
||||
Jhwrj575T9Og8I+WNCup/DbhGf/JFkEqA+o8cwIDAQABAoIBAQCWVPitSS0sf/KC
|
||||
RKNb4D0A1oq9zzSegPDWd84AhwQneybDIBt+Od71LABn9s30E11ZErMN3Mt4I72L
|
||||
jj4bST8qP9e7T7QMERQawqAAWaa7HtvXaSEGk4yRDQT8aIvpJCnoMlT/oB9enppk
|
||||
O/9/spkE9PK47PrFKUzbC8RcXf/2Ygyy8e1zsq/GwlpQoEO8/jNHE5qUDiPH7XCx
|
||||
gXUY0CvYNOhq/UIWdnaRq+zjDS+UZAfVSyTkISbMruLbpxVA2DI+IWhZ/srLatZk
|
||||
sg7HliTqQ8GftJCCwylMYxvdc8hinOvQ+MyOP4A2l0tG7bivwpD+KN+UYJzKWr4C
|
||||
2nSq65gxAoGBAPb+rOEb9nr6Rh31JuLIDIQhVuyZ9WzeHNus8AE9UEJpoUHznAsD
|
||||
CDQHC/fwTg6Va6ntHDnTOzC+buvBGsew2f8S5Kq9y0y19GMG0QxGsGa68V/3fJ1Y
|
||||
aoP69f28nl6wLfKGsfRVbkmkTSGo9uVClrGZnhI9DKolDIIs2aVh21tLAoGBAMLI
|
||||
feNhxtNJgvd/94nXEpReuokA7qSZhDuUmz7Zj3OOMUW+hnGEhoQR3SW7iekR8hr2
|
||||
BZNptQMWZfcDPNSFRm13W3ZTu0NbvbHgdpUJ44CBq9jmqNjD9dOvGLw2rqaUttO5
|
||||
ap05fcGzG2pOjhizmK5go697irhJpC68thrwoIJ5AoGBAO0wPiZiqv0H0EO+g1wu
|
||||
jc5pEcdeRdAJMB9I4KXgEm3kcCYcYdI1VDBaQAUWMG9S0DQ7beqdzW6OwYgGRchU
|
||||
LdQEebD5V/zPkuNxzViDnazZgygMSw/ysz8Qxh+nfVIiz8zhyox/acywSh2z23zn
|
||||
yDy+74xGMh5GO8/acBugcH0nAoGBAIJjshnnlzBTUm+Z4zwLlC1sKFSUIixfc+xq
|
||||
c24kN2o0cnlsrBULkPyR9MdQfmZeFALGVD81EO4rLUCokyz0touKzdgs/vt9S0Pq
|
||||
rZbhUsDwjPgamEbbDxGQce90b3+lp6mdwmfTV4K2AhEs2uRgPUHmAUz0V408BsMe
|
||||
oozwLZKJAoGBAKEpU57UZEG35jV42nFUAKx3e5FV5pok+lHfqbPhRi9ym6Aro+8h
|
||||
nbzbVVlqAIMHcIHb8XeXqvakATt7SdJfxKSWjLA64FJP4n7hpT5T5Kq/jvIBBClz
|
||||
Yr8Vb0yL3MbH7U/USqY5OLGA4E5C+MYoOYndlfQHO8r2A+ZQ9v3cs4iM
|
||||
-----END RSA PRIVATE KEY-----";
|
||||
using StreamReader readerPublic = new StreamReader(streamPublic);
|
||||
using StreamReader readerPrivate = new StreamReader(streamPrivate);
|
||||
|
||||
private bool VerifyCertificate(string str)
|
||||
{
|
||||
return str.StartsWith("-----BEGIN CERTIFICATE-----") && str.EndsWith("-----END RSA PRIVATE KEY-----");
|
||||
}
|
||||
private X509Certificate2 LoadCertificate(string str)
|
||||
{
|
||||
if (VerifyCertificate(str) == false) return null;
|
||||
RSA rsaPrivateKey = RSA.Create();
|
||||
rsaPrivateKey.ImportFromPem(readerPrivate.ReadToEnd());
|
||||
|
||||
X509Certificate2 certificate = new X509Certificate2(GetBase64Content(str, "-----BEGIN CERTIFICATE-----", "-----END CERTIFICATE-----"));
|
||||
using X509Certificate2 publicCert = X509Certificate2.CreateFromPem(readerPublic.ReadToEnd());
|
||||
certificate = publicCert.CopyWithPrivateKey(rsaPrivateKey);
|
||||
|
||||
using RSA rsa = RSA.Create();
|
||||
rsa.ImportRSAPrivateKey(GetBase64Content(str, "-----BEGIN RSA PRIVATE KEY-----", "-----END RSA PRIVATE KEY-----"), out _);
|
||||
return certificate.CopyWithPrivateKey(rsa);
|
||||
}
|
||||
private byte[] GetBase64Content(ReadOnlySpan<char> chars, ReadOnlySpan<char> startChars, ReadOnlySpan<char> endChars)
|
||||
{
|
||||
int start = chars.IndexOf(startChars) + startChars.Length;
|
||||
int end = chars.IndexOf(endChars) - start;
|
||||
chars = chars.Slice(start, end);
|
||||
|
||||
str = chars.ToString();
|
||||
return Convert.FromBase64String(Regex.Replace(str, @"\r\n?|\n", ""));
|
||||
if (OperatingSystem.IsAndroid() == false)
|
||||
{
|
||||
//不导出不支持windows什么的
|
||||
byte[] pfxBytes = certificate.Export(X509ContentType.Pfx, Helper.GlobalString);
|
||||
certificate.Dispose();
|
||||
certificate = new X509Certificate2(pfxBytes, Helper.GlobalString);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
27
src/linker.messenger.store.file/privatekey.pem
Normal file
27
src/linker.messenger.store.file/privatekey.pem
Normal file
@@ -0,0 +1,27 @@
|
||||
-----BEGIN RSA PRIVATE KEY-----
|
||||
MIIEpAIBAAKCAQEAzgMkrdHs4MWLwKE+eLcduO+52TTQftM76qaE/O9DNPmTjAlk
|
||||
OCiPEXe3ll3zkdMJbnLZoKTctyS/uWWKzqO5y37i7YsCK+zQtvfvv3BY7SxRm3Np
|
||||
PO/BIayKbQFzMwOKFUDyyvGn6e8VQHTaDiJ9TKBm+/tr/f/65jrIMwA2QlDUV6kF
|
||||
c8+LrxRBn9KnpmHj4KtPG8KZuBNyycOaMoK5txiV/iCn7A8wgSfk1TpZx/jkU6L4
|
||||
GuctmYwMVbBSgID52cLPtgZF5Zqlkbm3UFpJcarKmq1bNU9Qm355ajY3zAAr2OHx
|
||||
mkiPXgsfulHvyZzp/Uw6BA5yHZPSqTO1Bf9B0QIDAQABAoIBAQCUkAW6Z8GYEj2G
|
||||
64DekscXX6E5dvHIE9KIlA8hS/W+VSDHAtrH+M+7fAbjo9sLVRHfGWnBhEI6vICa
|
||||
VRS1kbJhgp5pSS6GuJ+G4uN8vasTVjt/i8nfjNJM01174GjP6ASC8TRlj8FUXPqJ
|
||||
YfsB6HNNd/rsSlKFeDzaHJfU15lJVi+bpZW3ySlMaIKeK/f1zDn9++jCaral+uhq
|
||||
O55qIJJw9tUx4oRYP4hmbIkBc10jw6sH58tAvkAdJwWRx8e8BCAKb+xtcsZ64TT/
|
||||
TPlKnKjncUn4zOichUmN2ayRPmYuX9EfQBPXRfrqL6GfGL07Lq3keMyxp9at3ZTR
|
||||
HvihW1TlAoGBAOiC+31kDwK+Qncq0ykd4xwou0eGoXXRWn7R07psnYCY0eHHY6hJ
|
||||
hjf+WZQ9KRiPJUdmQ5e9/VMvbeFAIcDcxZI6sM+588TxGbfTq8CQPq/TtSFqH7kG
|
||||
V3VntfoQxWXiGd1ItBHBBYSJBTOlYOuhVnn5C5y6yAAntL59gW3IFZMDAoGBAOLS
|
||||
21a6uI+glSD2wgvTC26bVRio4xoi9Xo15LOJNjzwh8peqT946d9cf8lDNlyQnzqa
|
||||
52D3eiOscIU0EUQv14cypjaT7d2IxaKX55lxsKpnJY2pTxyF+6nvtyEQ9asZP00R
|
||||
XJZ4xlDSHecxJPjCzdbQgK1Zi00A8nu1KGm+oBWbAoGBAIRgDk6VaPZm2/B8sTv3
|
||||
iBXAGt/eBo7NYnhRffnlXMaaOuQQYOyu73txlA6Rw5P364F694Cs6k0x850Kpizn
|
||||
hJR8Va3ucJrvqXS/TkmT1hzEq5sakHUG50Qwh6qXYctfrtoNSnfRLRMH7643ubZt
|
||||
ZI6M+89/h96OvJi3W7jk8WOBAoGAT4ptzF4yNnuzkBm4NnlNuv3Ru5IOAa5csvyP
|
||||
NL5bPMeEdtz3MQDv0poXXbaqK4+zptOHbCOcu0HPO4bkvyqfxBNo4h7B/TvnQntO
|
||||
hiquLzN4odLLoU8Cz7b2WywdWmDCJ/58n2++67yjK925/1og4MHBPgj2pow8fFEs
|
||||
2Ng2Px0CgYBMNd3BD+37pOiwC+7AjVclj8MnfFYR38UFo9HpD6662uDrS4aB+2Ly
|
||||
IbMSttd+WpZI5w1CBgLMRRdxYBrQPrfyGEicZ5OXU9IA9iubLth/NUj1gD5tQooS
|
||||
yGsBK3umOUjCR4IUHZV3OFNTlCCezIqmY7oHjVNIOCeU6t0DcGADQQ==
|
||||
-----END RSA PRIVATE KEY-----
|
60
src/linker.messenger.store.file/publickey.pem
Normal file
60
src/linker.messenger.store.file/publickey.pem
Normal file
@@ -0,0 +1,60 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIFGTCCBAGgAwIBAgISBjkj+2wqYnhmIOBKjuLhgti5MA0GCSqGSIb3DQEBCwUA
|
||||
MDMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQwwCgYDVQQD
|
||||
EwNSMTEwHhcNMjUwNDE2MDc1NjMwWhcNMjUwNzE1MDc1NjI5WjAXMRUwEwYDVQQD
|
||||
DAwqLnNubHR0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDO
|
||||
AySt0ezgxYvAoT54tx2477nZNNB+0zvqpoT870M0+ZOMCWQ4KI8Rd7eWXfOR0wlu
|
||||
ctmgpNy3JL+5ZYrOo7nLfuLtiwIr7NC29++/cFjtLFGbc2k878EhrIptAXMzA4oV
|
||||
QPLK8afp7xVAdNoOIn1MoGb7+2v9//rmOsgzADZCUNRXqQVzz4uvFEGf0qemYePg
|
||||
q08bwpm4E3LJw5oygrm3GJX+IKfsDzCBJ+TVOlnH+ORTovga5y2ZjAxVsFKAgPnZ
|
||||
ws+2BkXlmqWRubdQWklxqsqarVs1T1CbfnlqNjfMACvY4fGaSI9eCx+6Ue/JnOn9
|
||||
TDoEDnIdk9KpM7UF/0HRAgMBAAGjggJBMIICPTAOBgNVHQ8BAf8EBAMCBaAwHQYD
|
||||
VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
|
||||
BBYEFHXfGYdowCa+nqBwrrr5opUwluF+MB8GA1UdIwQYMBaAFMXPRqTq9MPAemyV
|
||||
xC2wXpIvJuO5MFcGCCsGAQUFBwEBBEswSTAiBggrBgEFBQcwAYYWaHR0cDovL3Ix
|
||||
MS5vLmxlbmNyLm9yZzAjBggrBgEFBQcwAoYXaHR0cDovL3IxMS5pLmxlbmNyLm9y
|
||||
Zy8wFwYDVR0RBBAwDoIMKi5zbmx0dHkuY29tMBMGA1UdIAQMMAowCAYGZ4EMAQIB
|
||||
MC4GA1UdHwQnMCUwI6AhoB+GHWh0dHA6Ly9yMTEuYy5sZW5jci5vcmcvNTguY3Js
|
||||
MIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHcAEvFONL1TckyEBhnDjz96E/jntWKH
|
||||
iJxtMAWE6+WGJjoAAAGWPc8KlAAABAMASDBGAiEA6t/GvDP8n8j83UckIBKrLyol
|
||||
o5s+ZQNqgvpOuBsUP2sCIQDt6nySUZ37C5A4URe3bpuWokq8WmkItwQg5HbKpRbs
|
||||
dgB2AKRCxQZJYGFUjw/U6pz7ei0mRU2HqX8v30VZ9idPOoRUAAABlj3PCp4AAAQD
|
||||
AEcwRQIhANFH1snhNEtKWgQks3eBcgEGJQb4Okd3qz2lkdxm53nEAiBkxCL88a0l
|
||||
DOdfc4D/Lkf6yEp3REmSutvRUro0mtHE7jANBgkqhkiG9w0BAQsFAAOCAQEAtETy
|
||||
HeMqDRmiR4VVyLGP8KqMukF/Ly5NrHX//3pZEqJfAwr5NUFUowFQa9NksOA91FHN
|
||||
XdINWBj9xnW7NOdbBGyfIaHe3eLHFwK0kaikD/Z+M1ybjPCeS2kjCVLf52lTCYdl
|
||||
8qQPoRbQ4/cXqYvIwIJBbTI6v/HyakZuactNpQYzN3w7E0rv4fV0x2eIfKhPnDvM
|
||||
kqlZATtXJri4xd6a93INZRmkTWub0NEfdZg1UW2s/k3/L0aaieowXGQhXMFqz+DF
|
||||
0v25QWpvCiD7bBIiB3/7L02NReD4rNb3NgShxkY5GBtpb9AJnqhBM4TeGukQ7lj/
|
||||
GFbeL1bHmi6+PIqTyA==
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIFBjCCAu6gAwIBAgIRAIp9PhPWLzDvI4a9KQdrNPgwDQYJKoZIhvcNAQELBQAw
|
||||
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
|
||||
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
|
||||
WhcNMjcwMzEyMjM1OTU5WjAzMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
|
||||
RW5jcnlwdDEMMAoGA1UEAxMDUjExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
|
||||
CgKCAQEAuoe8XBsAOcvKCs3UZxD5ATylTqVhyybKUvsVAbe5KPUoHu0nsyQYOWcJ
|
||||
DAjs4DqwO3cOvfPlOVRBDE6uQdaZdN5R2+97/1i9qLcT9t4x1fJyyXJqC4N0lZxG
|
||||
AGQUmfOx2SLZzaiSqhwmej/+71gFewiVgdtxD4774zEJuwm+UE1fj5F2PVqdnoPy
|
||||
6cRms+EGZkNIGIBloDcYmpuEMpexsr3E+BUAnSeI++JjF5ZsmydnS8TbKF5pwnnw
|
||||
SVzgJFDhxLyhBax7QG0AtMJBP6dYuC/FXJuluwme8f7rsIU5/agK70XEeOtlKsLP
|
||||
Xzze41xNG/cLJyuqC0J3U095ah2H2QIDAQABo4H4MIH1MA4GA1UdDwEB/wQEAwIB
|
||||
hjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwEgYDVR0TAQH/BAgwBgEB
|
||||
/wIBADAdBgNVHQ4EFgQUxc9GpOr0w8B6bJXELbBeki8m47kwHwYDVR0jBBgwFoAU
|
||||
ebRZ5nu25eQBc4AIiMgaWPbpm24wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAC
|
||||
hhZodHRwOi8veDEuaS5sZW5jci5vcmcvMBMGA1UdIAQMMAowCAYGZ4EMAQIBMCcG
|
||||
A1UdHwQgMB4wHKAaoBiGFmh0dHA6Ly94MS5jLmxlbmNyLm9yZy8wDQYJKoZIhvcN
|
||||
AQELBQADggIBAE7iiV0KAxyQOND1H/lxXPjDj7I3iHpvsCUf7b632IYGjukJhM1y
|
||||
v4Hz/MrPU0jtvfZpQtSlET41yBOykh0FX+ou1Nj4ScOt9ZmWnO8m2OG0JAtIIE38
|
||||
01S0qcYhyOE2G/93ZCkXufBL713qzXnQv5C/viOykNpKqUgxdKlEC+Hi9i2DcaR1
|
||||
e9KUwQUZRhy5j/PEdEglKg3l9dtD4tuTm7kZtB8v32oOjzHTYw+7KdzdZiw/sBtn
|
||||
UfhBPORNuay4pJxmY/WrhSMdzFO2q3Gu3MUBcdo27goYKjL9CTF8j/Zz55yctUoV
|
||||
aneCWs/ajUX+HypkBTA+c8LGDLnWO2NKq0YD/pnARkAnYGPfUDoHR9gVSp/qRx+Z
|
||||
WghiDLZsMwhN1zjtSC0uBWiugF3vTNzYIEFfaPG7Ws3jDrAMMYebQ95JQ+HIBD/R
|
||||
PBuHRTBpqKlyDnkSHDHYPiNX3adPoPAcgdF3H2/W0rmoswMWgTlLn1Wu0mrks7/q
|
||||
pdWfS6PJ1jty80r2VKsM/Dj3YIDfbjXKdaFU5C+8bhfJGqU3taKauuz0wHVGT3eo
|
||||
6FlWkWYtbt4pgdamlwVeZEW+LM7qZEJEsMNPrfC03APKmZsJgpWCDWOKZvkZcvjV
|
||||
uYkQ4omYCTX5ohy+knMjdOmdH9c7SpqEWBDC86fiNex+O0XOMEZSa8DA
|
||||
-----END CERTIFICATE-----
|
Binary file not shown.
@@ -18,9 +18,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger sync</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger tunnel</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger tuntap</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger updater</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker messenger</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker snat</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -72,7 +72,7 @@ namespace linker.tun
|
||||
string str = CommandHelper.Linux(string.Empty, new string[] { $"ifconfig" });
|
||||
if (str.Contains(Name) == false)
|
||||
{
|
||||
error = CommandHelper.Linux(string.Empty, new string[] { $"ip tuntap add mode tun dev {Name}" });
|
||||
CommandHelper.Linux(string.Empty, new string[] { $"ip tuntap add mode tun dev {Name}" },out error);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -51,17 +51,23 @@ namespace linker.tun
|
||||
return false;
|
||||
}
|
||||
Guid guid = Guid.Parse("771EF382-8718-5BC5-EBF0-A28B86142278");
|
||||
adapter = WinTun.WintunCreateAdapter(name, name, ref guid);
|
||||
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
if ((adapter = WinTun.WintunCreateAdapter(name, name, ref guid)) == 0 && (adapter = WinTun.WintunOpenAdapter(name)) == 0)
|
||||
{
|
||||
Shutdown();
|
||||
Thread.Sleep(2000);
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (adapter == 0)
|
||||
{
|
||||
adapter = WinTun.WintunOpenAdapter(name);
|
||||
if (adapter == 0)
|
||||
{
|
||||
error = ($"Failed to create adapter {Marshal.GetLastWin32Error()}");
|
||||
Shutdown();
|
||||
return false;
|
||||
}
|
||||
error = ($"Failed to create adapter {Marshal.GetLastWin32Error()}");
|
||||
return false;
|
||||
}
|
||||
|
||||
uint version = WinTun.WintunGetRunningDriverVersion();
|
||||
session = WinTun.WintunStartSession(adapter, 0x400000);
|
||||
if (session == 0)
|
||||
@@ -234,7 +240,7 @@ namespace linker.tun
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
winDivertNAT.Setup(new LinkerSrcNat.SetupInfo
|
||||
{
|
||||
Src = address,
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker tun</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -7,7 +7,6 @@ using System.Text.Json.Serialization;
|
||||
using System.Text;
|
||||
using System.Net.Sockets;
|
||||
using System.IO.Pipelines;
|
||||
using System;
|
||||
|
||||
namespace linker.tunnel.connection
|
||||
{
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker tunnel</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
@@ -39,7 +39,7 @@ export default {
|
||||
</script>
|
||||
<style lang="stylus" scoped>
|
||||
.status-api-wrap{
|
||||
padding-right:2rem;
|
||||
padding-right:1rem;
|
||||
&.connected {
|
||||
a{color:green;font-weight:bold;}
|
||||
}
|
||||
|
@@ -247,7 +247,7 @@ export default {
|
||||
</script>
|
||||
<style lang="stylus" scoped>
|
||||
.status-export-wrap{
|
||||
padding-right:2rem;
|
||||
padding-right:1rem;
|
||||
a{
|
||||
color:#333;
|
||||
.el-icon{
|
||||
|
@@ -5,7 +5,7 @@
|
||||
<img src="@/assets/coin.svg" alt="memory" />
|
||||
<span>{{$t('status.support')}}</span>
|
||||
</a>
|
||||
<span>©linker {{ self.Version }}</span>
|
||||
<a href="javascript:;">©linker {{ self.Version }}</a>
|
||||
<a v-if="globalData.isPc" href="https://github.com/snltty/linker" target="_blank">Github</a>
|
||||
<a v-if="globalData.isPc" href="https://linker.snltty.com" target="_blank">{{$t('status.website')}}</a>
|
||||
<a v-if="globalData.isPc" href="https://linker-doc.snltty.com" target="_blank">{{$t('status.doc')}}</a>
|
||||
|
@@ -49,11 +49,12 @@ namespace linker
|
||||
|
||||
public static void Run(string[] args)
|
||||
{
|
||||
Dictionary<string, string> configDic = ParseArgs(args);
|
||||
|
||||
|
||||
LinkerMessengerEntry.Initialize();
|
||||
LinkerMessengerEntry.Build();
|
||||
|
||||
Dictionary<string, string> configDic = ParseArgs(args);
|
||||
LinkerMessengerEntry.Setup(ExcludeModule.None, configDic);
|
||||
|
||||
LoggerHelper.Instance.Warning($"current version : {VersionHelper.version}");
|
||||
|
@@ -20,16 +20,18 @@
|
||||
<Title>linker</Title>
|
||||
<Authors>snltty</Authors>
|
||||
<Company>snltty</Company>
|
||||
<Description>1. 一些优化
|
||||
2. 安卓APP勉强能用,支持分身,下拉刷新,在线升级
|
||||
<Description>1. 一些累计更新
|
||||
2. 优化ssl证书,兼容安卓
|
||||
3. 打洞和中继优化,显示loading,增加手动尝试打洞
|
||||
5. 修改入参格式,增加虚拟网卡设置
|
||||
5. 如果你设备很多,请尝试升级其中一个成功重启后再升级其它</Description>
|
||||
<Copyright>snltty</Copyright>
|
||||
<PackageProjectUrl>https://github.com/snltty/linker</PackageProjectUrl>
|
||||
<RepositoryUrl>https://github.com/snltty/linker</RepositoryUrl>
|
||||
<PackageReleaseNotes>linker</PackageReleaseNotes>
|
||||
<Version>1.7.6</Version>
|
||||
<AssemblyVersion>1.7.6</AssemblyVersion>
|
||||
<FileVersion>1.7.6</FileVersion>
|
||||
<Version>1.7.7</Version>
|
||||
<AssemblyVersion>1.7.7</AssemblyVersion>
|
||||
<FileVersion>1.7.7</FileVersion>
|
||||
<DelaySign>False</DelaySign>
|
||||
</PropertyGroup>
|
||||
|
||||
|
10
version.txt
10
version.txt
@@ -1,5 +1,7 @@
|
||||
v1.7.6
|
||||
2025-04-30 14:41:15
|
||||
1. 一些优化
|
||||
2. 安卓APP勉强能用,支持分身,下拉刷新,在线升级
|
||||
v1.7.7
|
||||
2025-05-01 01:35:23
|
||||
1. 一些累计更新
|
||||
2. 优化ssl证书,兼容安卓
|
||||
3. 打洞和中继优化,显示loading,增加手动尝试打洞
|
||||
5. 修改入参格式,增加虚拟网卡设置
|
||||
5. 如果你设备很多,请尝试升级其中一个成功重启后再升级其它
|
Reference in New Issue
Block a user