change - 黏包数据处理

main
WenJY 2 weeks ago
parent 6b461d5b24
commit a74ce43000

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Sln.IntelliBelt.Business")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b461d5b24faedab7312cb874d8662497fd130a2")]
[assembly: System.Reflection.AssemblyProductAttribute("Sln.IntelliBelt.Business")]
[assembly: System.Reflection.AssemblyTitleAttribute("Sln.IntelliBelt.Business")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
943258922db53cec3eaeb4f416be896260e74d58745e3d2c7de53b13dad69e86
cafc2c6e043701c17435c8f4a70b04b418a75e52e7ff040de88f5bd9c27a4093

@ -1 +1 @@
17798510557063344
17798681620281188

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Sln.IntelliBelt.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b461d5b24faedab7312cb874d8662497fd130a2")]
[assembly: System.Reflection.AssemblyProductAttribute("Sln.IntelliBelt.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Sln.IntelliBelt.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
10affb36c13741355fe387494c6511b205e98cf719b5600d28c95d1f2b45bb03
35b9dddadfb903ee584351d481286cf9c3526029ed7b6f945c1d65c0a33eadb2

@ -1 +1 @@
17798510556981773
17798681620194766

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Sln.IntelliBelt.Config")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b461d5b24faedab7312cb874d8662497fd130a2")]
[assembly: System.Reflection.AssemblyProductAttribute("Sln.IntelliBelt.Config")]
[assembly: System.Reflection.AssemblyTitleAttribute("Sln.IntelliBelt.Config")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
e3196c6824eace56f16aec99df26d44827ed722dcb976bae48197a0bc1167db7
fbc8de7c319c0b8358ba1a4618e61c1d2b831b4355ec6c359d806c929cc92a9e

@ -1 +1 @@
17798510557020963
17798681620212943

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Sln.IntelliBelt.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b461d5b24faedab7312cb874d8662497fd130a2")]
[assembly: System.Reflection.AssemblyProductAttribute("Sln.IntelliBelt.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Sln.IntelliBelt.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
c789dfb3e2d2bf8cd9e88881efe7908abe49add9e3a1ccaec89cf6aa958e7b9f
dfe5888135081333667ecd355b464ee16695a309329653cdf75131aeeb07836c

@ -1 +1 @@
17798510556980289
17798681620187669

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Sln.IntelliBelt.Serilog")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b461d5b24faedab7312cb874d8662497fd130a2")]
[assembly: System.Reflection.AssemblyProductAttribute("Sln.IntelliBelt.Serilog")]
[assembly: System.Reflection.AssemblyTitleAttribute("Sln.IntelliBelt.Serilog")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
840f02524b9550062906f9f417ba8d4046dbdefbdfac23a7d0882b58c5736057
d92e43b0d8edd07e3092099d0927604b4312d0a9d969224e643d49f4a3f950c7

@ -1 +1 @@
17798510557050680
17798681620252075

@ -105,7 +105,9 @@ public class CustomDataHandlingAdapter:CustomDataHandlingAdapter<BufferRequestIn
//读取帧尾
byte tailByte = reader.GetSpan(1).ToArray()[0];
reader.Advance(1);
Byte[] checkBitBytes = new Byte[buffer.Length - 2];
//Byte[] checkBitBytes = new Byte[buffer.Length - 2];
Byte[] checkBitBytes = new Byte[contentLen + 8];
Array.Copy(buffer, 0, checkBitBytes, 0, checkBitBytes.Length);
byte checkRes = _stringChange.CalculateChecksum(checkBitBytes);

@ -114,26 +114,25 @@ public class TcpServer
/// </summary>
public async Task<BufferRequestInfo> SendMsgToClient(string clientId, byte[] buffer)
{
return null;
// if (_service.TryGetSocketClient(clientId, out SocketClient tcpSessionClient))
// {
// var waitClinet = tcpSessionClient.CreateWaitingClient(new WaitingOptions()
// {
// FilterFunc = response => //设置用于筛选的fun委托当返回为true时才会响应返回
// {
// return true;
// }
// });
// Task<ResponsedData> responsedData = waitClinet.SendThenResponseAsync(buffer, 5000);
// IRequestInfo requestInfo = responsedData.Result.RequestInfo;
//
// BufferRequestInfo bufferRequestInfo = (BufferRequestInfo)requestInfo ;
//
// return bufferRequestInfo;
// }
// else
// {
// return new BufferRequestInfo();
// }
if (_service.Clients.TryGetClient(clientId, out TcpSessionClient tcpSessionClient))
{
var waitClinet = tcpSessionClient.CreateWaitingClient(new WaitingOptions()
{
FilterFunc = response => //设置用于筛选的fun委托当返回为true时才会响应返回
{
return true;
}
});
Task<ResponsedData> responsedData = waitClinet.SendThenResponseAsync(buffer, 5000);
IRequestInfo requestInfo = responsedData.Result.RequestInfo;
BufferRequestInfo bufferRequestInfo = (BufferRequestInfo)requestInfo ;
return bufferRequestInfo;
}
else
{
return new BufferRequestInfo();
}
}
}

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Sln.IntelliBelt.Socket")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b461d5b24faedab7312cb874d8662497fd130a2")]
[assembly: System.Reflection.AssemblyProductAttribute("Sln.IntelliBelt.Socket")]
[assembly: System.Reflection.AssemblyTitleAttribute("Sln.IntelliBelt.Socket")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
2b71fc5898e2d08d07a4ab2e2827233ce9442429f1cedd2997a8a0b7f43e77c7
7b1d9e1d08ca43b0af06559d87f4760401e8280fe0e69324b48d15cc3c153b96

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Sln.IntelliBelt.WebSocket")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b461d5b24faedab7312cb874d8662497fd130a2")]
[assembly: System.Reflection.AssemblyProductAttribute("Sln.IntelliBelt.WebSocket")]
[assembly: System.Reflection.AssemblyTitleAttribute("Sln.IntelliBelt.WebSocket")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
961b6a4f5bf638dc4dbeba5cb9ba2710eb2b6fc445bc781684ece9296f9ab2cb
895b5ae108f34666340e1beb5c334d1f56cfdf832e1418cdef8082aa914c364a

@ -1 +1 @@
17798510557060552
17798681620273228

@ -1,6 +1,6 @@
{
"AppConfig": {
"logPath": "\\\\Mac\\Home\\Public\\WorkSpace\\Mesnac\\项目资料\\日志信息",
"logPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/研发项目/RFID 智能输送带监控平台研发/日志信息",
"terminalCode": "9000",
"listernTcpPort": 6000,
"listernWebSocketPort": 7182

@ -1,6 +1,6 @@
{
"AppConfig": {
"logPath": "\\\\Mac\\Home\\Public\\WorkSpace\\Mesnac\\项目资料\\日志信息",
"logPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/研发项目/RFID 智能输送带监控平台研发/日志信息",
"terminalCode": "9000",
"listernTcpPort": 6000,
"listernWebSocketPort": 7182

@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Sln.IntelliBelt")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b461d5b24faedab7312cb874d8662497fd130a2")]
[assembly: System.Reflection.AssemblyProductAttribute("Sln.IntelliBelt")]
[assembly: System.Reflection.AssemblyTitleAttribute("Sln.IntelliBelt")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
67965fc4d71bf3b594978a96c76dbf07aecf8b361520d8c3ae76bf8439246122
e017c5e4d8321014b54a913c0c09869d654c270fbca11f3b85e41b92133f207a

@ -1 +1 @@
17798510557144363
17798681620347209
Loading…
Cancel
Save