197

2025-12-17 17:06:47 +08:00 · 2025-12-12 21:42:19 +08:00
parent abcce7f261
commit 290fe66ee9
17 changed files with 34 additions and 25 deletions
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -19,7 +19,7 @@ jobs:
          release_name: v1.9.7.${{ steps.date.outputs.today }}
          draft: false
          prerelease: false
-          body: "1. 一些累计更新，一些BUG修复\r\n2. 重构中继和穿透的多节点模式\r\n3. 中继连接合并到隧道协议中\r\n4. 修复socks代理模块\r\n5. 发布飞牛fpk安装包(docker+bin)\r\n6. 优化虚拟网卡自动连接表现\r\n7. 简化加入分组操作\r\n8. 先不要更新，作者测试中，请使用v1.9.6"
+          body: "1. 一些累计更新，一些BUG修复\r\n2. 重构中继和穿透的多节点模式\r\n3. 中继连接合并到隧道协议中\r\n4. 修复socks代理错误\r\n5. 发布飞牛fpk安装包(docker+bin)\r\n6. 优化虚拟网卡自动连接表现\r\n7. 简化加入分组操作\r\n8. 先不要更新，作者测试中，请使用v1.9.6"
      - name: setup node.js
        uses: actions/setup-node@v2
        with:
@@ -214,6 +214,16 @@ jobs:
          asset_path: ./public/publish-zip/linker-linux-musl-arm64.zip
          asset_name: linker-linux-musl-arm64.zip
          asset_content_type: application/zip
+      - name: upload-version-oss
+        id: upload-version-oss
+        uses: tvrcgo/oss-action@v0.1.1
+        with:
+          region: oss-cn-shenzhen
+          key-id: ${{ secrets.ALIYUN_OSS_ID }}
+          key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
+          bucket: ide-qbcode
+          asset-path: ./public/version.txt
+          target-path: /downloads/linker/version.txt
      - name: upload-install-service-oss
        id: upload-install-service-oss
        uses: tvrcgo/oss-action@v0.1.1
--- a/linker.sln
+++ b/linker.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.0.11222.15 d18.0
+VisualStudioVersion = 18.0.11222.15
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker", "src\linker\linker.csproj", "{267DE8BE-F91C-4CCB-9D58-D33FDA661126}"
 EndProject
@@ -71,7 +71,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.rapp", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "linker.messenger.wlist", "src\linker.messenger.wlist\linker.messenger.wlist.csproj", "{26550C65-0960-4BA3-9F83-BAC90DE9AA57}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "linker.messenger.node", "linker.messenger.node\linker.messenger.node.csproj", "{1A14DE99-3939-4E37-9FD5-9C467DF015EC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "linker.messenger.node", "src\linker.messenger.node\linker.messenger.node.csproj", "{96BBC3AB-E248-6EE8-4969-4623C5D62E12}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -497,18 +497,18 @@ Global
 		{26550C65-0960-4BA3-9F83-BAC90DE9AA57}.Release|x64.Build.0 = Release|Any CPU
 		{26550C65-0960-4BA3-9F83-BAC90DE9AA57}.Release|x86.ActiveCfg = Release|Any CPU
 		{26550C65-0960-4BA3-9F83-BAC90DE9AA57}.Release|x86.Build.0 = Release|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Debug|x64.Build.0 = Debug|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Debug|x86.Build.0 = Debug|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Release|x64.ActiveCfg = Release|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Release|x64.Build.0 = Release|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Release|x86.ActiveCfg = Release|Any CPU
-		{1A14DE99-3939-4E37-9FD5-9C467DF015EC}.Release|x86.Build.0 = Release|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Debug|x64.Build.0 = Debug|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Debug|x86.Build.0 = Debug|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Release|x64.ActiveCfg = Release|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Release|x64.Build.0 = Release|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Release|x86.ActiveCfg = Release|Any CPU
+		{96BBC3AB-E248-6EE8-4969-4623C5D62E12}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/shells/gen/index.js
+++ b/shells/gen/index.js
@@ -87,7 +87,7 @@ function writeUpload(data, tagName) {
        };
    }
    
-    /*
+    
    data.jobs.build.steps.push({
        name: `upload-version-oss`,
        id: `upload-version-oss`,
@@ -101,7 +101,7 @@ function writeUpload(data, tagName) {
            'target-path': `/downloads/linker/version.txt`
        }
    });
-    */
+    
    
    
    data.jobs.build.steps.push({
--- a/shells/version.txt
+++ b/shells/version.txt
@@ -1,9 +1,9 @@
 v1.9.7
-2025-12-12 16:29:48
+2025-12-12 21:42:19
 1. 一些累计更新，一些BUG修复
 2. 重构中继和穿透的多节点模式
 3. 中继连接合并到隧道协议中
-4. 修复socks代理模块
+4. 修复socks代理错误
 5. 发布飞牛fpk安装包(docker+bin)
 6. 优化虚拟网卡自动连接表现
 7. 简化加入分组操作
--- a/src/linker.messenger.node/INodeConfigStore.cs
+++ b/src/linker.messenger.node/INodeConfigStore.cs
--- a/src/linker.messenger.node/INodeMasterDenyStore.cs
+++ b/src/linker.messenger.node/INodeMasterDenyStore.cs
--- a/src/linker.messenger.node/INodeStore.cs
+++ b/src/linker.messenger.node/INodeStore.cs
--- a/src/linker.messenger.node/INodeWhiteListStore.cs
+++ b/src/linker.messenger.node/INodeWhiteListStore.cs
--- a/src/linker.messenger.node/NodeConnectionResolver.cs
+++ b/src/linker.messenger.node/NodeConnectionResolver.cs
--- a/src/linker.messenger.node/NodeConnectionTransfer.cs
+++ b/src/linker.messenger.node/NodeConnectionTransfer.cs
--- a/src/linker.messenger.node/NodeReportTransfer.cs
+++ b/src/linker.messenger.node/NodeReportTransfer.cs
--- a/src/linker.messenger.node/NodeTransfer.cs
+++ b/src/linker.messenger.node/NodeTransfer.cs
--- a/src/linker.messenger.node/linker.messenger.node.csproj
+++ b/src/linker.messenger.node/linker.messenger.node.csproj
@@ -36,8 +36,7 @@
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\src\linker.libs\linker.libs.csproj" />
-	  <ProjectReference Include="..\src\linker.messenger\linker.messenger.csproj" />
+	  <ProjectReference Include="..\linker.messenger\linker.messenger.csproj" />
 	</ItemGroup>

 </Project>
--- a/src/linker.messenger.relay/linker.messenger.relay.csproj
+++ b/src/linker.messenger.relay/linker.messenger.relay.csproj
@@ -38,8 +38,8 @@
 	  <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\..\linker.messenger.node\linker.messenger.node.csproj" />
 		<ProjectReference Include="..\linker.libs\linker.libs.csproj" />
+		<ProjectReference Include="..\linker.messenger.node\linker.messenger.node.csproj" />
 		<ProjectReference Include="..\linker.messenger.signin\linker.messenger.signin.csproj" />
 		<ProjectReference Include="..\linker.messenger.sync\linker.messenger.sync.csproj" />
 		<ProjectReference Include="..\linker.messenger\linker.messenger.csproj" />
--- a/src/linker.messenger.relay/transport/TransportRelay.cs
+++ b/src/linker.messenger.relay/transport/TransportRelay.cs
@@ -31,7 +31,7 @@ namespace linker.tunnel.transport

        public bool SSL => true;

-        public bool DisableSSL => true;
+        public bool DisableSSL => false;

        public byte Order => 0;

--- a/src/linker.messenger.sforward/linker.messenger.sforward.csproj
+++ b/src/linker.messenger.sforward/linker.messenger.sforward.csproj
@@ -36,9 +36,9 @@
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\..\linker.messenger.node\linker.messenger.node.csproj" />
 		<ProjectReference Include="..\linker.libs\linker.libs.csproj" />
 		<ProjectReference Include="..\linker.messenger.decenter\linker.messenger.decenter.csproj" />
+		<ProjectReference Include="..\linker.messenger.node\linker.messenger.node.csproj" />
 		<ProjectReference Include="..\linker.messenger.plan\linker.messenger.plan.csproj" />
 		<ProjectReference Include="..\linker.messenger.signin\linker.messenger.signin.csproj" />
 		<ProjectReference Include="..\linker.messenger.sync\linker.messenger.sync.csproj" />
--- a/src/linker/linker.csproj
+++ b/src/linker/linker.csproj
@@ -22,7 +22,7 @@
 		<Description>1. 一些累计更新，一些BUG修复
 2. 重构中继和穿透的多节点模式
 3. 中继连接合并到隧道协议中
-4. 修复socks代理模块
+4. 修复socks代理错误
 5. 发布飞牛fpk安装包(docker+bin)
 6. 优化虚拟网卡自动连接表现
 7. 简化加入分组操作