diff --git a/Dianci/.vs/Dianci/FileContentIndex/2974ea1e-e7c4-4038-97af-b357509fec90.vsidx b/Dianci/.vs/Dianci/FileContentIndex/2974ea1e-e7c4-4038-97af-b357509fec90.vsidx deleted file mode 100644 index 9ee561d..0000000 Binary files a/Dianci/.vs/Dianci/FileContentIndex/2974ea1e-e7c4-4038-97af-b357509fec90.vsidx and /dev/null differ diff --git a/Dianci/.vs/Dianci/FileContentIndex/4edace2f-6e33-4f23-8710-b5c73f3251c0.vsidx b/Dianci/.vs/Dianci/FileContentIndex/4edace2f-6e33-4f23-8710-b5c73f3251c0.vsidx new file mode 100644 index 0000000..6ddbba5 Binary files /dev/null and b/Dianci/.vs/Dianci/FileContentIndex/4edace2f-6e33-4f23-8710-b5c73f3251c0.vsidx differ diff --git a/Dianci/.vs/Dianci/FileContentIndex/b4c0fc31-6e8e-43c1-81a1-1f2a1573788e.vsidx b/Dianci/.vs/Dianci/FileContentIndex/6295a5b0-d05e-4d3c-8cab-d73d245db0f3.vsidx similarity index 100% rename from Dianci/.vs/Dianci/FileContentIndex/b4c0fc31-6e8e-43c1-81a1-1f2a1573788e.vsidx rename to Dianci/.vs/Dianci/FileContentIndex/6295a5b0-d05e-4d3c-8cab-d73d245db0f3.vsidx diff --git a/Dianci/.vs/Dianci/FileContentIndex/412523f9-b226-4fee-962c-44c7b0f21420.vsidx b/Dianci/.vs/Dianci/FileContentIndex/dd50e5af-c20a-41af-b379-0e3c334cd747.vsidx similarity index 100% rename from Dianci/.vs/Dianci/FileContentIndex/412523f9-b226-4fee-962c-44c7b0f21420.vsidx rename to Dianci/.vs/Dianci/FileContentIndex/dd50e5af-c20a-41af-b379-0e3c334cd747.vsidx diff --git a/Dianci/.vs/Dianci/FileContentIndex/8e4c9b36-4b8f-4abf-b915-ec308ff32bec.vsidx b/Dianci/.vs/Dianci/FileContentIndex/f2349fe6-d682-4f85-9ac0-30a24508ced1.vsidx similarity index 90% rename from Dianci/.vs/Dianci/FileContentIndex/8e4c9b36-4b8f-4abf-b915-ec308ff32bec.vsidx rename to Dianci/.vs/Dianci/FileContentIndex/f2349fe6-d682-4f85-9ac0-30a24508ced1.vsidx index 48792ca..da80245 100644 Binary files a/Dianci/.vs/Dianci/FileContentIndex/8e4c9b36-4b8f-4abf-b915-ec308ff32bec.vsidx and b/Dianci/.vs/Dianci/FileContentIndex/f2349fe6-d682-4f85-9ac0-30a24508ced1.vsidx differ diff --git a/Dianci/.vs/Dianci/v17/.suo b/Dianci/.vs/Dianci/v17/.suo index d036a85..f8b620b 100644 Binary files a/Dianci/.vs/Dianci/v17/.suo and b/Dianci/.vs/Dianci/v17/.suo differ diff --git a/Dianci/Dianci.cs b/Dianci/Dianci.cs index 0c4a9eb..706ca0f 100644 --- a/Dianci/Dianci.cs +++ b/Dianci/Dianci.cs @@ -202,6 +202,8 @@ internal class MagnetServer /// private static void ReceiveMsg(Socket clientSocket) { + StringBuilder builder_shuju = new StringBuilder("");//需校验字节 + StringBuilder builder_crc = new StringBuilder("");//收到检验位 while (true) { byte[] bytes = new byte[1024]; @@ -229,7 +231,27 @@ internal class MagnetServer { //string message = Encoding.Default.GetString(bytes, 0, length); string message = ToolKit.byteArrayToHexString(bytes, length); - log.Info("接收到" + clientSocket.RemoteEndPoint + ": " + message); + + //CRC校验--失败返回不解析 + builder_shuju.Clear(); + builder_crc.Clear(); + for (int i = 0; i < message.Length - 4; i++) + { + builder_shuju.Append(message[i]); + } + for (int i = message.Length - 4; i < message.Length; i++) + { + builder_crc.Append(message[i]); + } + if (CRC.CRCForModbus(builder_shuju.ToString().ToUpper()) != builder_crc.ToString().ToUpper()) + { + log.Info("接收数据校验失败: " + clientSocket.RemoteEndPoint + ": " + message); + Console.WriteLine("接收数据校验失败: " + clientSocket.RemoteEndPoint + ": " + message); + return; + } + + //执行解析 + log.Info("接收到" + clientSocket.RemoteEndPoint + ": " + message); message = message.Replace(" ", ""); JudgmentFunction(message); } diff --git a/Dianci/bin/Debug/App_Data/Logs_20230222.txt b/Dianci/bin/Debug/App_Data/Logs_20230222.txt new file mode 100644 index 0000000..1496340 --- /dev/null +++ b/Dianci/bin/Debug/App_Data/Logs_20230222.txt @@ -0,0 +1,4 @@ + ------------------------------------------------ + ------------------------------------------------ + ------------------------------------------------ +2023-02-22 14:08:20,199 [4] INFO loginfo - Уʧ; 172.16.1.49:52873: 01 03 04 00 08 95 91 D1 0D diff --git a/Dianci/bin/Debug/ceshi.exe b/Dianci/bin/Debug/ceshi.exe index 9b8452c..1313634 100644 Binary files a/Dianci/bin/Debug/ceshi.exe and b/Dianci/bin/Debug/ceshi.exe differ diff --git a/Dianci/bin/Debug/ceshi.pdb b/Dianci/bin/Debug/ceshi.pdb index 79dbdb9..a88a953 100644 Binary files a/Dianci/bin/Debug/ceshi.pdb and b/Dianci/bin/Debug/ceshi.pdb differ diff --git a/Dianci/bin/Release/ceshi.exe b/Dianci/bin/Release/ceshi.exe index 32b5ac4..253236b 100644 Binary files a/Dianci/bin/Release/ceshi.exe and b/Dianci/bin/Release/ceshi.exe differ diff --git a/Dianci/bin/Release/ceshi.pdb b/Dianci/bin/Release/ceshi.pdb index 9ded395..eb9f69d 100644 Binary files a/Dianci/bin/Release/ceshi.pdb and b/Dianci/bin/Release/ceshi.pdb differ diff --git a/Dianci/obj/Debug/Dianci.csproj.CoreCompileInputs.cache b/Dianci/obj/Debug/Dianci.csproj.CoreCompileInputs.cache index 8a31a3e..8cc692b 100644 --- a/Dianci/obj/Debug/Dianci.csproj.CoreCompileInputs.cache +++ b/Dianci/obj/Debug/Dianci.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -f65eb3423fba3e60e41a46bfb0af0337b8d3322f +898be911263aa5e48f96ba6f764bf3ee4a35a632 diff --git a/Dianci/obj/Debug/Dianci.csproj.FileListAbsolute.txt b/Dianci/obj/Debug/Dianci.csproj.FileListAbsolute.txt index dc37686..4f47f30 100644 --- a/Dianci/obj/Debug/Dianci.csproj.FileListAbsolute.txt +++ b/Dianci/obj/Debug/Dianci.csproj.FileListAbsolute.txt @@ -9,3 +9,14 @@ D:\GaoGuoZheng_U3D\C#\Dianci\obj\Debug\ceshi.pdb D:\GaoGuoZheng_U3D\C#\Dianci\bin\Debug\log4net.dll D:\GaoGuoZheng_U3D\C#\Dianci\bin\Debug\log4net.xml D:\GaoGuoZheng_U3D\C#\Dianci\obj\Debug\Dianci.csproj.CopyComplete +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Debug\ceshi.exe.config +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Debug\ceshi.exe +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Debug\ceshi.pdb +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Debug\log4net.dll +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Debug\log4net.xml +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Debug\Dianci.csproj.AssemblyReference.cache +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Debug\Dianci.csproj.SuggestedBindingRedirects.cache +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Debug\Dianci.csproj.CoreCompileInputs.cache +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Debug\Dianci.csproj.CopyComplete +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Debug\ceshi.exe +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Debug\ceshi.pdb diff --git a/Dianci/obj/Debug/ceshi.exe b/Dianci/obj/Debug/ceshi.exe index 9b8452c..1313634 100644 Binary files a/Dianci/obj/Debug/ceshi.exe and b/Dianci/obj/Debug/ceshi.exe differ diff --git a/Dianci/obj/Debug/ceshi.pdb b/Dianci/obj/Debug/ceshi.pdb index 79dbdb9..a88a953 100644 Binary files a/Dianci/obj/Debug/ceshi.pdb and b/Dianci/obj/Debug/ceshi.pdb differ diff --git a/Dianci/obj/Release/Dianci.csproj.AssemblyReference.cache b/Dianci/obj/Release/Dianci.csproj.AssemblyReference.cache index 9274bd3..3441a87 100644 Binary files a/Dianci/obj/Release/Dianci.csproj.AssemblyReference.cache and b/Dianci/obj/Release/Dianci.csproj.AssemblyReference.cache differ diff --git a/Dianci/obj/Release/Dianci.csproj.CoreCompileInputs.cache b/Dianci/obj/Release/Dianci.csproj.CoreCompileInputs.cache index c51094d..98cd9d4 100644 --- a/Dianci/obj/Release/Dianci.csproj.CoreCompileInputs.cache +++ b/Dianci/obj/Release/Dianci.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2c30b29a00d23c23fe7971b86deffc378110adf1 +73dddfdf5ddec9ab02df30c1163cfbf98d3b50f4 diff --git a/Dianci/obj/Release/Dianci.csproj.FileListAbsolute.txt b/Dianci/obj/Release/Dianci.csproj.FileListAbsolute.txt index ed81471..e7b1d75 100644 --- a/Dianci/obj/Release/Dianci.csproj.FileListAbsolute.txt +++ b/Dianci/obj/Release/Dianci.csproj.FileListAbsolute.txt @@ -9,3 +9,14 @@ D:\GaoGuoZheng_U3D\C#\Dianci\obj\Release\ceshi.pdb D:\GaoGuoZheng_U3D\C#\Dianci\bin\Release\log4net.dll D:\GaoGuoZheng_U3D\C#\Dianci\bin\Release\log4net.xml D:\GaoGuoZheng_U3D\C#\Dianci\obj\Release\Dianci.csproj.CopyComplete +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Release\ceshi.exe.config +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Release\ceshi.exe +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Release\ceshi.pdb +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Release\log4net.dll +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\bin\Release\log4net.xml +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Release\Dianci.csproj.AssemblyReference.cache +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Release\Dianci.csproj.SuggestedBindingRedirects.cache +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Release\Dianci.csproj.CoreCompileInputs.cache +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Release\Dianci.csproj.CopyComplete +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Release\ceshi.exe +D:\GaoGuoZheng_U3D\C#\nenglaingbiao\Dianci\obj\Release\ceshi.pdb diff --git a/Dianci/obj/Release/ceshi.exe b/Dianci/obj/Release/ceshi.exe index 32b5ac4..253236b 100644 Binary files a/Dianci/obj/Release/ceshi.exe and b/Dianci/obj/Release/ceshi.exe differ diff --git a/Dianci/obj/Release/ceshi.pdb b/Dianci/obj/Release/ceshi.pdb index 9ded395..eb9f69d 100644 Binary files a/Dianci/obj/Release/ceshi.pdb and b/Dianci/obj/Release/ceshi.pdb differ