更新:demo引用

This commit is contained in:
若汝棋茗
2024-11-23 11:31:43 +08:00
parent 2aab3cf78f
commit 4f7cc37d6b
95 changed files with 417 additions and 231 deletions

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -9,6 +9,6 @@
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,78 @@
using System.Text;
using TouchSocket.Core;
using TouchSocket.Sockets;
namespace JsonPackageAdapterConsoleApp
{
internal class Program
{
static async Task Main(string[] args)
{
var service = await CreateService();
var client = await CreateClient();
ConsoleLogger.Default.Info("输入任意符合Json格式的内容回车发送将会循环发送10次");
while (true)
{
var str = Console.ReadLine();
for (var i = 0; i < 10; i++)
{
await client.SendAsync(str);
}
}
}
private static async Task<TcpClient> CreateClient()
{
var client = new TcpClient();
//载入配置
await client.SetupAsync(new TouchSocketConfig()
.SetRemoteIPHost("127.0.0.1:7789")
.SetTcpDataHandlingAdapter(()=>new JsonPackageAdapter(Encoding.UTF8))//赋值适配必须使用委托且返回的适配必须new。不能返回一个单例
.ConfigureContainer(a =>
{
a.AddConsoleLogger();//添加一个日志注入
}));
await client.ConnectAsync();//调用连接,当连接不成功时,会抛出异常。
client.Logger.Info("客户端成功连接");
return client;
}
private static async Task<TcpService> CreateService()
{
var service = new TcpService();
service.Received = async (client, e) =>
{
//从客户端收到信息
if (e.RequestInfo is JsonPackage jsonPackage)
{
StringBuilder sb = new StringBuilder();
sb.Append($"已从{client.Id}接收到数据。");
sb.Append($"数据类型:{jsonPackage.Kind},");
sb.Append($"数据:{jsonPackage.DataString},");
sb.Append($"杂质数据:{jsonPackage.ImpurityData.Span.ToString(Encoding.UTF8)}");
client.Logger.Info(sb.ToString());
}
await e.InvokeNext();
};
await service.SetupAsync(new TouchSocketConfig()//载入配置
.SetListenIPHosts("tcp://127.0.0.1:7789", 7790)//同时监听两个地址
.SetTcpDataHandlingAdapter(() => new JsonPackageAdapter(Encoding.UTF8))
.ConfigureContainer(a =>
{
a.AddConsoleLogger();//添加一个控制台日志注入注意在maui中控制台日志不可用
})
.ConfigurePlugins(a =>
{
//a.Add();//此处可以添加插件
}));
await service.StartAsync();//启动
service.Logger.Info("服务器已启动");
return service;
}
}
}

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -9,12 +9,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,12 +6,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,12 +6,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,12 +7,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.5" />
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,12 +7,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.5" />
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
<ItemGroup>
<PackageReference Include="Consul" Version="1.7.14.5" />
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -9,11 +9,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -5,11 +5,11 @@
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -17,6 +17,6 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="3.0.3" />
<PackageReference Include="TouchSocket.Core" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="3.0.3" />
<PackageReference Include="TouchSocket.Core.DependencyInjection" Version="3.0.3" />
<PackageReference Include="TouchSocket.Core" Version="3.0.4" />
<PackageReference Include="TouchSocket.Core.DependencyInjection" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -9,12 +9,12 @@
<ItemGroup>
<PackageReference Include="log4net" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
<ItemGroup>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,11 +6,11 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -11,6 +11,7 @@
//------------------------------------------------------------------------------
using System.Buffers;
using System.Drawing;
using TouchSocket.Core;
namespace PackageConsoleApp
@@ -243,6 +244,53 @@ namespace PackageConsoleApp
public double P4 { get; set; }
public List<int> P5 { get; set; }
public Dictionary<int, MyClassModel> P6 { get; set; }
[PackageMember(Behavior = PackageBehavior.Ignore)]
public string P7 { get; set; }
[PackageMember(Behavior = PackageBehavior.Include)]
private int P8;
[PackageMember(Index = -1)]
public string P9 { get; set; }
}
[GeneratorPackage]
internal partial class MyGeneratorIndexPackage : PackageBase
{
[PackageMember(Index = 2)]
public int P1 { get; private set; }
[PackageMember(Index = 0)]
public string P2 { get; set; }
[PackageMember(Index = 1)]
public char P3 { get; set; }
}
[GeneratorPackage]
internal partial class MyGeneratorConvertPackage : PackageBase
{
[PackageMember(Converter =typeof(RectangleConverter))]
public Rectangle P1 { get; set; }
}
class RectangleConverter : FastBinaryConverter<Rectangle>
{
protected override Rectangle Read<TByteBlock>(ref TByteBlock byteBlock, Type type)
{
var rectangle = new Rectangle(byteBlock.ReadInt32(), byteBlock.ReadInt32(), byteBlock.ReadInt32(), byteBlock.ReadInt32());
return rectangle;
}
protected override void Write<TByteBlock>(ref TByteBlock byteBlock, in Rectangle obj)
{
byteBlock.WriteInt32(obj.X);
byteBlock.WriteInt32(obj.Y);
byteBlock.WriteInt32(obj.Width);
byteBlock.WriteInt32(obj.Height);
}
}
public class MyClassModel : PackageBase

View File

@@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Core" Version="3.0.3" />
<PackageReference Include="TouchSocket.Core" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -5,6 +5,6 @@
<Copyright>Copyright © 2024 若汝棋茗</Copyright>
<Authors>若汝棋茗</Authors>
<NoWarn>IDE0290;IDE0090;IDE0305</NoWarn>
<!--<DebugMode>DebugProSources</DebugMode>-->
<DebugMode>DebugProSources</DebugMode>
</PropertyGroup>
</Project>

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -26,7 +26,7 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.AspNetCore" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="3.0.3" />
<PackageReference Include="TouchSocket.AspNetCore" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -35,6 +35,6 @@
</Reference>
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
<ItemGroup>

View File

@@ -10,11 +10,11 @@
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,11 +6,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
</ItemGroup>
<ItemGroup>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,12 +6,12 @@
<ItemGroup>
<PackageReference Include="MemoryPack" Version="1.21.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,12 +7,12 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SerializationSelectorClassLibrary\SerializationSelectorClassLibrary.csproj" />

View File

@@ -293,6 +293,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNetCore", "AspNetCore",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NamedPipeWebApplication", "NamedPipe\NamedPipeWebApplication\NamedPipeWebApplication.csproj", "{FE53A35A-9234-44B8-ABFF-F4511EC8B196}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonPackageAdapterConsoleApp", "Adapter\JsonPackageAdapterConsoleApp\JsonPackageAdapterConsoleApp.csproj", "{E81C54A4-6D9F-4AAA-A288-4F6BBAB9B895}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -655,6 +657,10 @@ Global
{FE53A35A-9234-44B8-ABFF-F4511EC8B196}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE53A35A-9234-44B8-ABFF-F4511EC8B196}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE53A35A-9234-44B8-ABFF-F4511EC8B196}.Release|Any CPU.Build.0 = Release|Any CPU
{E81C54A4-6D9F-4AAA-A288-4F6BBAB9B895}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E81C54A4-6D9F-4AAA-A288-4F6BBAB9B895}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E81C54A4-6D9F-4AAA-A288-4F6BBAB9B895}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E81C54A4-6D9F-4AAA-A288-4F6BBAB9B895}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -780,6 +786,7 @@ Global
{C58500D3-9D03-48A6-A85F-A46EA32F0520} = {A228384F-7DF9-4144-B84E-AC8BF2F69D1B}
{B31BF274-5600-4CAD-A2E4-64B51B89EF42} = {5126C261-9A81-4FBC-8653-7710C1D1D735}
{FE53A35A-9234-44B8-ABFF-F4511EC8B196} = {B31BF274-5600-4CAD-A2E4-64B51B89EF42}
{E81C54A4-6D9F-4AAA-A288-4F6BBAB9B895} = {F8C07F29-7233-4FD3-A3DC-45963071E20A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DB787235-A13A-4A3D-B5A8-5DFEB6511EEE}

View File

@@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageReference Include="TouchSocket.Hosting" Version="3.0.3" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.3" />
<PackageReference Include="TouchSocket.Hosting" Version="3.0.4" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="3.0.3" />
<PackageReference Include="TouchSocket.Http" Version="3.0.4" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -11,6 +11,7 @@
//------------------------------------------------------------------------------
using System;
using System.Collections.Generic;
using System.IO;
using System.Security.Authentication;
using System.Security.Cryptography.X509Certificates;
@@ -45,7 +46,7 @@ namespace ClientConsoleApp
{
var client = await GetHttpClient();
using (var stream=File.OpenRead("TouchSocket.dll"))
using (var stream = File.OpenRead("TouchSocket.dll"))
{
//创建一个请求
var request = new HttpRequest();
@@ -190,7 +191,7 @@ namespace ClientConsoleApp
protected override async Task WriteContent(Func<ReadOnlyMemory<byte>, Task> writeFunc, CancellationToken token)
{
var buffer=new byte[bufferLength];
var buffer = new byte[bufferLength];
for (int i = 0; i < count; i++)
{
await writeFunc.Invoke(buffer);

View File

@@ -21,7 +21,7 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="3.0.3" />
<PackageReference Include="TouchSocket.Http" Version="3.0.4" />
</ItemGroup>
<ItemGroup>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="3.0.3" />
<PackageReference Include="TouchSocket.Http" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -12,6 +12,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -10,6 +10,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Modbus" Version="3.0.3" />
<PackageReference Include="TouchSocket.Modbus" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Modbus" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Modbus" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Modbus" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Modbus" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.3" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.3" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,8 +8,8 @@
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
<PackageReference Include="TouchSocket.Hosting" Version="3.0.3" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.3" />
<PackageReference Include="TouchSocket.Hosting" Version="3.0.4" />
<PackageReference Include="TouchSocket.NamedPipe" Version="3.0.4" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -6,12 +6,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc.RateLimiting" Version="3.0.3" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc.RateLimiting" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.SerialPorts" Version="3.0.3" />
<PackageReference Include="TouchSocket.SerialPorts" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,12 +6,12 @@
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.AspNetCore" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -18,7 +18,7 @@
</ItemGroup>-->
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,11 +7,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket" Version="3.0.3" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocket" Version="3.0.4" />
<PackageReference Include="TouchSocket.JsonRpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.Rpc" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -5,6 +5,6 @@
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.3" />
<PackageReference Include="TouchSocketPro.Dmtp" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
<Compile Include="..\WebApiServer\WebApiProxy.cs" Link="WebApiProxy.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,8 +6,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.WebApi" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.0.3" />
<PackageReference Include="TouchSocket.WebApi" Version="3.0.4" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.0.4" />
</ItemGroup>
<!--<ItemGroup>

View File

@@ -7,6 +7,6 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.Http" Version="3.0.3" />
<PackageReference Include="TouchSocket.Http" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -59,6 +59,7 @@ namespace WebSocketConsoleApp
})
.ConfigurePlugins(a =>
{
a.UseWebSocketReconnection();
a.Add(typeof(IWebSocketReceivedPlugin), async (IHttpSession c, WSDataFrameEventArgs e) =>
{
client.Logger.Info($"收到Add的计算结果{e.DataFrame.ToText()}");
@@ -70,6 +71,11 @@ namespace WebSocketConsoleApp
await client.SendAsync("Add 10 20");
await Task.Delay(1000);
await client.CloseAsync("我想关就关");
//或者使用关闭状态码
//await client.CloseAsync( WebSocketCloseStatus.InternalServerError,"我不想关,但还得关");
}
private static async Task SendSubstringText()
@@ -237,9 +243,9 @@ namespace WebSocketConsoleApp
//.UseAutoPong()//当收到ping报文时自动回应pong
;
a.Add<MyReadTextWebSocketPlugin>();
//a.Add<MyReadTextWebSocketPlugin>();
a.Add<MyWSCommandLinePlugin>();
//a.Add<MyWSCommandLinePlugin>();
a.Add<MyWebSocketPlugin>();
a.UseWebApi();
@@ -444,7 +450,12 @@ namespace WebSocketConsoleApp
}
}
public class MyWebSocketPlugin : PluginBase, IWebSocketHandshakingPlugin, IWebSocketHandshakedPlugin, IWebSocketReceivedPlugin
public class MyWebSocketPlugin : PluginBase,
IWebSocketHandshakingPlugin,
IWebSocketHandshakedPlugin,
IWebSocketReceivedPlugin,
IWebSocketClosingPlugin,
IWebSocketClosedPlugin
{
public MyWebSocketPlugin(ILog logger)
{
@@ -482,6 +493,22 @@ namespace WebSocketConsoleApp
case WSDataType.Close:
{
this.m_logger.Info("远程请求断开");
//var byteBlock = e.DataFrame.PayloadData;
//byteBlock.SeekToStart();
//var ss = byteBlock.ReadUInt16(EndianType.Big);
//using (var frame = new WSDataFrame())
//{
// frame.Opcode = WSDataType.Close;
// frame.FIN = true;
// frame.PayloadData=new ByteBlock();
// frame.PayloadData.WriteUInt16(1000, EndianType.Big);
// frame.PayloadData.Write(Encoding.UTF8.GetBytes("hello"));
// await client.SendAsync(frame);
//}
//client.Client.TryShutdown();
await client.CloseAsync("断开");
}
return;
@@ -538,13 +565,25 @@ namespace WebSocketConsoleApp
this.m_logger.Exception(ex);
messageCombinator.Clear();//当组合发生异常时,应该清空组合器数据
}
}
break;
}
await e.InvokeNext();
}
public async Task OnWebSocketClosed(IWebSocket webSocket, ClosedEventArgs e)
{
this.m_logger.Info($"WebSocket已断开状态{webSocket.CloseStatus},信息:{e.Message}");
await e.InvokeNext();
}
public async Task OnWebSocketClosing(IWebSocket webSocket, ClosingEventArgs e)
{
this.m_logger.Info($"WebSocket请求断开状态{webSocket.CloseStatus},信息:{e.Message}");
await e.InvokeNext();
}
}
private class MyHttpPlugin : PluginBase, IHttpPlugin

View File

@@ -8,6 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -7,6 +7,6 @@
<Compile Include="..\XmlRpcServerApp\RpcProxy.cs" Link="RpcProxy.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
</ItemGroup>
</Project>

View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.3" />
<PackageReference Include="TouchSocket.XmlRpc" Version="3.0.4" />
</ItemGroup>
</Project>