diff --git a/HighWayIot.Repository/HighWayIot.Repository.csproj b/HighWayIot.Repository/HighWayIot.Repository.csproj index 6a6bc5a..6112e74 100644 --- a/HighWayIot.Repository/HighWayIot.Repository.csproj +++ b/HighWayIot.Repository/HighWayIot.Repository.csproj @@ -32,24 +32,65 @@ 4 - - False - Z:\Desktop\日常代码\HighWayIot\HighWayIot.Library\MySql.Data.dll + + ..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll + + + ..\packages\Google.Protobuf.3.26.1\lib\net45\Google.Protobuf.dll + + + ..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll + + + ..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll + + + ..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\MySql.Data.9.0.0\lib\net48\MySql.Data.dll ..\HighWayIot.Library\Oracle.ManagedDataAccess.dll - - ..\packages\SqlSugar.5.1.4.130\lib\SqlSugar.dll + + ..\packages\SqlSugar.5.1.4.166\lib\SqlSugar.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll + Z:\Desktop\日常代码\HighWayIot\HighWayIot.Library\System.Data.SQLite.dll + + ..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll + + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + @@ -57,6 +98,9 @@ + + ..\packages\ZstdSharp.Port.0.8.0\lib\net462\ZstdSharp.dll + diff --git a/HighWayIot.Repository/app.config b/HighWayIot.Repository/app.config index cd04901..35ad80c 100644 --- a/HighWayIot.Repository/app.config +++ b/HighWayIot.Repository/app.config @@ -8,7 +8,7 @@ - + diff --git a/HighWayIot.Repository/packages.config b/HighWayIot.Repository/packages.config index dfa0de5..bccbf51 100644 --- a/HighWayIot.Repository/packages.config +++ b/HighWayIot.Repository/packages.config @@ -1,4 +1,20 @@  - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj b/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj index 0f47b99..84f8437 100644 --- a/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj +++ b/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj @@ -32,12 +32,58 @@ 4 + + ..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll + + + ..\packages\Google.Protobuf.3.26.1\lib\net45\Google.Protobuf.dll + + + ..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll + + + ..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll + + + ..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + + ..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll + + + ..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll + + + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + @@ -45,11 +91,14 @@ - - ..\packages\TouchSocket.2.0.0-beta.253\lib\net45\TouchSocket.dll + + ..\packages\TouchSocket.2.1.0-rc.4\lib\net472\TouchSocket.dll + + + ..\packages\TouchSocket.Core.2.1.0-rc.4\lib\net472\TouchSocket.Core.dll - - ..\packages\TouchSocket.Core.2.0.0-beta.253\lib\net45\TouchSocket.Core.dll + + ..\packages\ZstdSharp.Port.0.8.0\lib\net462\ZstdSharp.dll @@ -61,9 +110,6 @@ - - - {DEABC30C-EC6F-472E-BD67-D65702FDAF74} @@ -74,5 +120,8 @@ HighWayIot.Repository + + + \ No newline at end of file diff --git a/HighWayIot.TouchSocket/TcpServer.cs b/HighWayIot.TouchSocket/TcpServer.cs index 740b7f6..cd4df21 100644 --- a/HighWayIot.TouchSocket/TcpServer.cs +++ b/HighWayIot.TouchSocket/TcpServer.cs @@ -39,12 +39,12 @@ namespace HighWayIot.TouchSocket logHelper.Info($"客户端{client.IP}:{client.Port}成功连接"); return EasyTask.CompletedTask; };//有客户端成功连接 - service.Disconnecting = (client, e) => + service.Closing = (client, e) => { logHelper.Info($"客户端{client.IP}:{client.Port}正在断开连接"); return EasyTask.CompletedTask; };//有客户端正在断开连接，只有当主动断开时才有效。 - service.Disconnected = (client, e) => + service.Closed = (client, e) => { logHelper.Info($"客户端{client.IP}:{client.Port}断开连接"); return EasyTask.CompletedTask; @@ -55,7 +55,7 @@ namespace HighWayIot.TouchSocket //var mes = Encoding.ASCII.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意：数据长度是byteBlock.Len //logHelper.Info($"已从{client.IP}:{client.Port}接收到信息：{mes}"); - BufferMemory(BufferAnalysis.SplitByteArray(e.ByteBlock.Buffer, 0, e.ByteBlock.Len)); + BufferMemory(BufferAnalysis.SplitByteArray(e.ByteBlock.Span.ToArray(), 0, e.ByteBlock.Length)); return EasyTask.CompletedTask; }; diff --git a/HighWayIot.TouchSocket/app.config b/HighWayIot.TouchSocket/app.config index bdef95f..decde4e 100644 --- a/HighWayIot.TouchSocket/app.config +++ b/HighWayIot.TouchSocket/app.config @@ -8,7 +8,7 @@ - + @@ -18,6 +18,14 @@ + + + + + + + + \ No newline at end of file diff --git a/HighWayIot.TouchSocket/packages.config b/HighWayIot.TouchSocket/packages.config index de7e94c..f849323 100644 --- a/HighWayIot.TouchSocket/packages.config +++ b/HighWayIot.TouchSocket/packages.config @@ -1,6 +1,21 @@  + + + + + + - - + + + + + + + + + + + \ No newline at end of file diff --git a/HighWayIot/App.config b/HighWayIot/App.config index bee5618..86d46b7 100644 --- a/HighWayIot/App.config +++ b/HighWayIot/App.config @@ -11,7 +11,7 @@ - + diff --git a/RFIDSocket/App.config b/RFIDSocket/App.config index 5147b5e..b9248c9 100644 --- a/RFIDSocket/App.config +++ b/RFIDSocket/App.config @@ -7,7 +7,7 @@ - + @@ -17,6 +17,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/RFIDSocket/RFIDSocket.csproj b/RFIDSocket/RFIDSocket.csproj index f2c678d..ac0bd8d 100644 --- a/RFIDSocket/RFIDSocket.csproj +++ b/RFIDSocket/RFIDSocket.csproj @@ -33,11 +33,57 @@ 4 - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll + + + ..\packages\Google.Protobuf.3.26.1\lib\net45\Google.Protobuf.dll + + + ..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll + + + ..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll + + + ..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + + ..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll + + + ..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll + + + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + @@ -47,11 +93,14 @@ - - ..\packages\TouchSocket.2.0.0-beta.253\lib\net45\TouchSocket.dll + + ..\packages\TouchSocket.2.1.0-rc.4\lib\net472\TouchSocket.dll - - ..\packages\TouchSocket.Core.2.0.0-beta.253\lib\net45\TouchSocket.Core.dll + + ..\packages\TouchSocket.Core.2.1.0-rc.4\lib\net472\TouchSocket.Core.dll + + + ..\packages\ZstdSharp.Port.0.8.0\lib\net462\ZstdSharp.dll @@ -101,7 +150,9 @@ - + + Always + @@ -118,7 +169,7 @@ - + \ No newline at end of file diff --git a/RFIDSocket/packages.config b/RFIDSocket/packages.config index daf2c12..f849323 100644 --- a/RFIDSocket/packages.config +++ b/RFIDSocket/packages.config @@ -1,6 +1,21 @@  - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file