提交 8d0fffa0 编写于 作者: 若汝棋茗

更新引用

上级 0039ccaa
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="SGCC测试数据.txt"> <None Update="SGCC测试数据.txt">
......
...@@ -10,10 +10,17 @@ namespace AdapterConsoleApp ...@@ -10,10 +10,17 @@ namespace AdapterConsoleApp
{ {
public override int HeaderLength => throw new NotImplementedException(); public override int HeaderLength => throw new NotImplementedException();
public override bool CanSendRequestInfo => false;
protected override MyBigFixedHeaderRequestInfo GetInstance() protected override MyBigFixedHeaderRequestInfo GetInstance()
{ {
return new MyBigFixedHeaderRequestInfo(); return new MyBigFixedHeaderRequestInfo();
} }
protected override void PreviewSend(IRequestInfo requestInfo, bool isAsync)
{
throw new NotImplementedException();
}
} }
/// <summary> /// <summary>
......
...@@ -14,10 +14,17 @@ namespace AdapterConsoleApp ...@@ -14,10 +14,17 @@ namespace AdapterConsoleApp
public override byte[] EndCode => Encoding.UTF8.GetBytes("##");//必须为有效值。 public override byte[] EndCode => Encoding.UTF8.GetBytes("##");//必须为有效值。
public override bool CanSendRequestInfo => false;
protected override MyBetweenAndRequestInfo GetInstance() protected override MyBetweenAndRequestInfo GetInstance()
{ {
return new MyBetweenAndRequestInfo(); return new MyBetweenAndRequestInfo();
} }
protected override void PreviewSend(IRequestInfo requestInfo, bool isAsync)
{
throw new System.NotImplementedException();
}
} }
/// <summary> /// <summary>
......
...@@ -8,6 +8,8 @@ namespace AdapterConsoleApp ...@@ -8,6 +8,8 @@ namespace AdapterConsoleApp
/// </summary> /// </summary>
internal class MyCustomDataHandlingAdapter : CustomDataHandlingAdapter<MyRequestInfo> internal class MyCustomDataHandlingAdapter : CustomDataHandlingAdapter<MyRequestInfo>
{ {
public override bool CanSendRequestInfo => false;
/// <summary> /// <summary>
/// 筛选解析数据。实例化的TRequest会一直保存,直至解析成功,或手动清除。 /// 筛选解析数据。实例化的TRequest会一直保存,直至解析成功,或手动清除。
/// <para>当不满足解析条件时,请返回<see cref="FilterResult.Cache"/>,此时会保存<see cref="ByteBlock.CanReadLen"/>的数据</para> /// <para>当不满足解析条件时,请返回<see cref="FilterResult.Cache"/>,此时会保存<see cref="ByteBlock.CanReadLen"/>的数据</para>
...@@ -55,6 +57,11 @@ namespace AdapterConsoleApp ...@@ -55,6 +57,11 @@ namespace AdapterConsoleApp
return FilterResult.Success;//返回成功 return FilterResult.Success;//返回成功
} }
} }
protected override void PreviewSend(IRequestInfo requestInfo, bool isAsync)
{
throw new System.NotImplementedException();
}
} }
internal class MyRequestInfo : IRequestInfo internal class MyRequestInfo : IRequestInfo
......
...@@ -17,6 +17,8 @@ namespace AdapterConsoleApp ...@@ -17,6 +17,8 @@ namespace AdapterConsoleApp
/// </summary> /// </summary>
public override int HeaderLength => 3; public override int HeaderLength => 3;
public override bool CanSendRequestInfo => false;
/// <summary> /// <summary>
/// 获取新实例 /// 获取新实例
/// </summary> /// </summary>
...@@ -25,6 +27,11 @@ namespace AdapterConsoleApp ...@@ -25,6 +27,11 @@ namespace AdapterConsoleApp
{ {
return new MyFixedHeaderRequestInfo(); return new MyFixedHeaderRequestInfo();
} }
protected override void PreviewSend(IRequestInfo requestInfo, bool isAsync)
{
throw new System.NotImplementedException();
}
} }
public class MyFixedHeaderRequestInfo : IFixedHeaderRequestInfo public class MyFixedHeaderRequestInfo : IFixedHeaderRequestInfo
......
...@@ -24,6 +24,8 @@ namespace AdapterConsoleApp ...@@ -24,6 +24,8 @@ namespace AdapterConsoleApp
/// </summary> /// </summary>
public override bool CanSplicingSend => false; public override bool CanSplicingSend => false;
public override bool CanSendRequestInfo => false;
/// <summary> /// <summary>
/// 设计原则:接收时,尽量不抛出异常。 /// 设计原则:接收时,尽量不抛出异常。
/// </summary> /// </summary>
...@@ -101,6 +103,11 @@ namespace AdapterConsoleApp ...@@ -101,6 +103,11 @@ namespace AdapterConsoleApp
//暂时不实现。 //暂时不实现。
} }
protected override void PreviewSend(IRequestInfo requestInfo, bool isAsync)
{
throw new System.NotImplementedException();
}
protected override void Reset() protected override void Reset()
{ {
} }
......
...@@ -11,10 +11,17 @@ namespace AdapterConsoleApp ...@@ -11,10 +11,17 @@ namespace AdapterConsoleApp
{ {
public override int HeaderLength => 30; public override int HeaderLength => 30;
public override bool CanSendRequestInfo => false;
protected override SGCCRequestInfo GetInstance() protected override SGCCRequestInfo GetInstance()
{ {
return new SGCCRequestInfo(); return new SGCCRequestInfo();
} }
protected override void PreviewSend(IRequestInfo requestInfo, bool isAsync)
{
throw new System.NotImplementedException();
}
} }
public class SGCCRequestInfo : IFixedHeaderRequestInfo public class SGCCRequestInfo : IFixedHeaderRequestInfo
......
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -80,10 +80,17 @@ namespace HeartbeatConsoleApp ...@@ -80,10 +80,17 @@ namespace HeartbeatConsoleApp
{ {
public override int HeaderLength => 3; public override int HeaderLength => 3;
public override bool CanSendRequestInfo => false;
protected override MyRequestInfo GetInstance() protected override MyRequestInfo GetInstance()
{ {
return new MyRequestInfo(); return new MyRequestInfo();
} }
protected override void PreviewSend(IRequestInfo requestInfo, bool isAsync)
{
throw new NotImplementedException();
}
} }
internal class MyRequestInfo : IFixedHeaderRequestInfo internal class MyRequestInfo : IFixedHeaderRequestInfo
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Consul" Version="1.6.10.6" /> <PackageReference Include="Consul" Version="1.6.10.6" />
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Consul" Version="1.6.10.6" /> <PackageReference Include="Consul" Version="1.6.10.6" />
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Consul" Version="1.6.10.6" /> <PackageReference Include="Consul" Version="1.6.10.6" />
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocketPro" Version="0.2.3" /> <PackageReference Include="TouchSocketPro" Version="0.2.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocketPro" Version="0.2.3" /> <PackageReference Include="TouchSocketPro" Version="0.2.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="RRQMSkin" Version="3.7.1" /> <PackageReference Include="RRQMSkin" Version="3.7.1" />
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="RRQMSkin" Version="3.7.1" /> <PackageReference Include="RRQMSkin" Version="3.7.1" />
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
...@@ -85,7 +85,6 @@ namespace FileServiceGUI ...@@ -85,7 +85,6 @@ namespace FileServiceGUI
this.fileService.Connected += this.FileService_Connected; this.fileService.Connected += this.FileService_Connected;
this.fileService.Disconnected += this.FileService_Disconnected; this.fileService.Disconnected += this.FileService_Disconnected;
this.fileService.FileTransfering += this.FileService_FileTransfering; this.fileService.FileTransfering += this.FileService_FileTransfering;
var config = new TouchSocketConfig(); var config = new TouchSocketConfig();
config.SetListenIPHosts(new IPHost[] { new IPHost(7789) }) config.SetListenIPHosts(new IPHost[] { new IPHost(7789) })
.SetVerifyToken("FileService"); .SetVerifyToken("FileService");
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocketPro" Version="0.2.3" /> <PackageReference Include="TouchSocketPro" Version="0.2.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -46,12 +46,14 @@ ...@@ -46,12 +46,14 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="TouchSocket, Version=0.2.2.0, Culture=neutral, PublicKeyToken=aab106fd42dbd097, processorArchitecture=MSIL"> <Reference Include="TouchSocket, Version=0.3.0.0, Culture=neutral, PublicKeyToken=aab106fd42dbd097, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\TouchSocket.0.2.2\lib\net45\TouchSocket.dll</HintPath> <HintPath>..\..\..\packages\TouchSocket.0.3.0\lib\net45\TouchSocket.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Form1.cs" /> <Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs"> <Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</Compile> </Compile>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="TouchSocket" version="0.2.2" targetFramework="net48" /> <package id="TouchSocket" version="0.3.0" targetFramework="net48" />
</packages> </packages>
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -46,12 +46,14 @@ ...@@ -46,12 +46,14 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="TouchSocket, Version=0.2.2.0, Culture=neutral, PublicKeyToken=aab106fd42dbd097, processorArchitecture=MSIL"> <Reference Include="TouchSocket, Version=0.3.0.0, Culture=neutral, PublicKeyToken=aab106fd42dbd097, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\TouchSocket.0.2.2\lib\net45\TouchSocket.dll</HintPath> <HintPath>..\..\..\packages\TouchSocket.0.3.0\lib\net45\TouchSocket.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Form1.cs" /> <Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs"> <Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</Compile> </Compile>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="TouchSocket" version="0.2.2" targetFramework="net48" /> <package id="TouchSocket" version="0.3.0" targetFramework="net48" />
</packages> </packages>
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.3" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.3" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -63,6 +63,6 @@ API:https://www.yuque.com/rrqm/touchsocket/index</Description> ...@@ -63,6 +63,6 @@ API:https://www.yuque.com/rrqm/touchsocket/index</Description>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.26" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.26" />
<PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" /> <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
<PackageReference Include="TouchSocket" Version="0.2.2" /> <PackageReference Include="TouchSocket" Version="0.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册