diff --git a/Sln.Iot.Business/DevControlBusiness.cs b/Sln.Iot.Business/DevControlBusiness.cs index 4d53029..660d3fe 100644 --- a/Sln.Iot.Business/DevControlBusiness.cs +++ b/Sln.Iot.Business/DevControlBusiness.cs @@ -71,15 +71,18 @@ namespace Sln.Iot.Business _logger.Info($"向客户端:{idStr};发送开锁指令:{_stringChange.bytesToHexStr(buffer,buffer.Length)}"); bufferRequestInfo = _tcpServer.SendMsgToClient(idStr, buffer).Result; - if (bufferRequestInfo.DataType == 0x35) + /*if (bufferRequestInfo.DataType == 0x35) { _logger.Info($"开锁指令下发成功，已收到设备回复"); apiResInfo = ApiResInfo.Success("开锁指令下发成功，已收到设备回复",bufferRequestInfo); } else { - throw new InvalidOperationException($"关锁指令下发成功，设备回复控制码不为 0x35"); - } + throw new InvalidOperationException($"开锁指令下发成功，设备回复控制码不为 0x35"); + }*/ + + _logger.Info($"开锁指令下发成功，已收到设备回复"); + apiResInfo = ApiResInfo.Success("开锁指令下发成功，已收到设备回复",bufferRequestInfo); } catch (Exception e) { diff --git a/Sln.Iot.Business/LoginBusiness.cs b/Sln.Iot.Business/LoginBusiness.cs index d911c7d..65d5887 100644 --- a/Sln.Iot.Business/LoginBusiness.cs +++ b/Sln.Iot.Business/LoginBusiness.cs @@ -60,6 +60,8 @@ namespace Sln.Iot.Business Array.Copy(requestInfo.buffer, 1, ids, 0, ids.Length); string clientIdStr = _stringChange.bytesToHexStr(ids,ids.Length); + _logger.Iot($"收到:{clientIdStr}；登录指令"); + if (clientIdStr.Contains("37")) { if (client.Id != clientIdStr) diff --git a/Sln.Iot.Business/RfidBusiness.cs b/Sln.Iot.Business/RfidBusiness.cs index cbc0691..6f21453 100644 --- a/Sln.Iot.Business/RfidBusiness.cs +++ b/Sln.Iot.Business/RfidBusiness.cs @@ -27,6 +27,7 @@ using System; using Sln.Iot.Business.@base; using Sln.Iot.Common; using Sln.Iot.Config; +using Sln.Iot.Repository.service; using Sln.Iot.Serilog; using Sln.Iot.Socket.Adapter; using TouchSocket.Core; @@ -36,8 +37,10 @@ namespace Sln.Iot.Business { public class RfidBusiness:BaseBusiness { - public RfidBusiness(SerilogHelper logger, AppConfig appConfig, StringChange stringChange) : base(logger, appConfig, stringChange) + private readonly IDeviceRecordService _deviceRecordService; + public RfidBusiness(SerilogHelper logger, AppConfig appConfig, StringChange stringChange, IDeviceRecordService deviceRecordService) : base(logger, appConfig, stringChange) { + _deviceRecordService = deviceRecordService; } public override FilterResult BufferAnalysis(ISocketClient client, BufferRequestInfo requestInfo, int bodyLength) @@ -62,9 +65,13 @@ namespace Sln.Iot.Business Array.Copy(requestInfo.buffer, 1, ids, 0, ids.Length); string idsStr = _stringChange.bytesToHexStr(ids,ids.Length); - var status = _stringChange.bytesToHexStr(requestInfo.Body, requestInfo.Body.Length); + var rfidStr = _stringChange.bytesToHexStr(requestInfo.Body, requestInfo.Body.Length); - _logger.Info($"设备编号：{idsStr};RFID:{status}"); + //_logger.Info($"设备编号：{idsStr};RFID:{rfidStr}"); + + var res = _deviceRecordService.UpdateRfid(idsStr,rfidStr,out int resIds); + + _logger.Info($"设备编号：{idsStr};RFID:{rfidStr};更新成功"); } return FilterResult.Success; diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.deps.json b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.deps.json index 772860e..e347014 100644 --- a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.deps.json +++ b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.deps.json @@ -1285,6 +1285,7 @@ }, "Sln.Iot.Socket/1.0.0": { "dependencies": { + "Sln.Iot.Common": "1.0.0", "Sln.Iot.Model": "1.0.0", "Sln.Iot.Serilog": "1.0.0", "TouchSocket": "2.0.0", diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.dll b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.dll index 8c2b5dd..db75cad 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.dll and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.dll differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.pdb b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.pdb index b3a0997..8346aaf 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.pdb and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Business.pdb differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll index d2f09b1..e26b06c 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb index ffb558f..dfbba36 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll index 3d2708b..cba5225 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb index c698874..a5664de 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll index 7fc0d27..526f4f6 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll differ diff --git a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb index 0e408fc..bede643 100644 Binary files a/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb and b/Sln.Iot.Business/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb differ diff --git a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.AssemblyReference.cache b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.AssemblyReference.cache index dbfb425..324315e 100644 Binary files a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.AssemblyReference.cache and b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.csproj.AssemblyReference.cache differ diff --git a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.dll b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.dll index 8c2b5dd..db75cad 100644 Binary files a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.dll and b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.dll differ diff --git a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.pdb b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.pdb index b3a0997..8346aaf 100644 Binary files a/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.pdb and b/Sln.Iot.Business/obj/Debug/netstandard2.1/Sln.Iot.Business.pdb differ diff --git a/Sln.Iot.Business/obj/Sln.Iot.Business.csproj.nuget.dgspec.json b/Sln.Iot.Business/obj/Sln.Iot.Business.csproj.nuget.dgspec.json index 18b8207..dee9f71 100644 --- a/Sln.Iot.Business/obj/Sln.Iot.Business.csproj.nuget.dgspec.json +++ b/Sln.Iot.Business/obj/Sln.Iot.Business.csproj.nuget.dgspec.json @@ -399,6 +399,9 @@ "netstandard2.1": { "targetAlias": "netstandard2.1", "projectReferences": { + "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj": { + "projectPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj" + }, "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj": { "projectPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj" }, diff --git a/Sln.Iot.Business/obj/project.assets.json b/Sln.Iot.Business/obj/project.assets.json index 2350fb2..9ca387a 100644 --- a/Sln.Iot.Business/obj/project.assets.json +++ b/Sln.Iot.Business/obj/project.assets.json @@ -1974,6 +1974,7 @@ "type": "project", "framework": ".NETStandard,Version=v2.1", "dependencies": { + "Sln.Iot.Common": "1.0.0", "Sln.Iot.Model": "1.0.0", "Sln.Iot.Serilog": "1.0.0", "TouchSocket": "2.0.0", diff --git a/Sln.Iot.Business/obj/project.nuget.cache b/Sln.Iot.Business/obj/project.nuget.cache index ae92961..f7c5b32 100644 --- a/Sln.Iot.Business/obj/project.nuget.cache +++ b/Sln.Iot.Business/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "gB7T5pBAji0=", + "dgSpecHash": "L9WraAJjJvs=", "success": true, "projectFilePath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Business/Sln.Iot.Business.csproj", "expectedPackageFiles": [ diff --git a/Sln.Iot.Business/obj/rider.project.restore.info b/Sln.Iot.Business/obj/rider.project.restore.info index 30fb9c1..a1fd1e5 100644 --- a/Sln.Iot.Business/obj/rider.project.restore.info +++ b/Sln.Iot.Business/obj/rider.project.restore.info @@ -1 +1 @@ -17467833632525836 \ No newline at end of file +17484812605973990 \ No newline at end of file diff --git a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll index d2f09b1..e26b06c 100644 Binary files a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll and b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.dll differ diff --git a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb index ffb558f..dfbba36 100644 Binary files a/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb and b/Sln.Iot.Repository/bin/Debug/netstandard2.1/Sln.Iot.Repository.pdb differ diff --git a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.dll b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.dll index d2f09b1..e26b06c 100644 Binary files a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.dll and b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.dll differ diff --git a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.pdb b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.pdb index ffb558f..dfbba36 100644 Binary files a/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.pdb and b/Sln.Iot.Repository/obj/Debug/netstandard2.1/Sln.Iot.Repository.pdb differ diff --git a/Sln.Iot.Repository/service/IDeviceRecordService.cs b/Sln.Iot.Repository/service/IDeviceRecordService.cs index ceb0f09..da40837 100644 --- a/Sln.Iot.Repository/service/IDeviceRecordService.cs +++ b/Sln.Iot.Repository/service/IDeviceRecordService.cs @@ -33,5 +33,7 @@ namespace Sln.Iot.Repository.service { bool UpdateCloseTime(DeviceRecord deviceRecord,out List resIds,out int infoRes); + + bool UpdateRfid(string deviceCode,string locationName, out int infoRes); } } \ No newline at end of file diff --git a/Sln.Iot.Repository/service/Impl/DeviceRecordServiceImpl.cs b/Sln.Iot.Repository/service/Impl/DeviceRecordServiceImpl.cs index e76672f..8b88bf5 100644 --- a/Sln.Iot.Repository/service/Impl/DeviceRecordServiceImpl.cs +++ b/Sln.Iot.Repository/service/Impl/DeviceRecordServiceImpl.cs @@ -69,11 +69,27 @@ namespace Sln.Iot.Repository.service.Impl } else { - throw new ArgumentNullException($"锁具:{deviceRecord.deviceCode};不存在已上锁的锁具记录"); + throw new ArgumentNullException($"锁具:{deviceRecord.deviceCode};不存在已开锁的锁具记录"); } return false; } - + + public bool UpdateRfid(string deviceCode,string locationName, out int infoRes) + { + infoRes = 0; + var dt = new Dictionary(); + dt.Add("device_code", deviceCode); + dt.Add("location_name", locationName); + infoRes = _rep.Context.Updateable(dt).AS("device_base_info").WhereColumns("device_code").ExecuteCommand(); + + if (infoRes < 1) + { + throw new ArgumentNullException($"锁具:{deviceCode};RFID:{locationName}；信息更新失败"); + } + + return false; + } + private decimal CalculateHoursDifference(DateTime startTime, DateTime endTime) { TimeSpan duration = endTime - startTime; diff --git a/Sln.Iot.Serilog/SerilogExtensions.cs b/Sln.Iot.Serilog/SerilogExtensions.cs index 48ca446..02bb9d3 100644 --- a/Sln.Iot.Serilog/SerilogExtensions.cs +++ b/Sln.Iot.Serilog/SerilogExtensions.cs @@ -48,8 +48,8 @@ namespace Sln.Iot.Serilog .Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey("Module") && logEvent.Properties["Module"].ToString().Contains("Info")) .WriteTo.File(Path.Combine($"{logPath}/Info/", "Info.log"), rollingInterval: RollingInterval.Day)) .WriteTo.Logger(lc => lc - .Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey("Module") && logEvent.Properties["Module"].ToString().Contains("Plc")) - .WriteTo.File(Path.Combine($"{logPath}/Plc/", "Plc.log"), rollingInterval: RollingInterval.Day)) + .Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey("Module") && logEvent.Properties["Module"].ToString().Contains("Iot")) + .WriteTo.File(Path.Combine($"{logPath}/Iot/", "Iot.log"), rollingInterval: RollingInterval.Day)) .WriteTo.Logger(lc => lc .Filter.ByIncludingOnly(logEvent => logEvent.Properties.ContainsKey("Module") && logEvent.Properties["Module"].ToString().Contains("Camera")) .WriteTo.File(Path.Combine($"{logPath}/Camera/", "Camera.log"), rollingInterval: RollingInterval.Day)) diff --git a/Sln.Iot.Serilog/SerilogHelper.cs b/Sln.Iot.Serilog/SerilogHelper.cs index 7a00349..9f52c81 100644 --- a/Sln.Iot.Serilog/SerilogHelper.cs +++ b/Sln.Iot.Serilog/SerilogHelper.cs @@ -31,7 +31,7 @@ namespace Sln.Iot.Serilog public class SerilogHelper { private readonly ILogger? Info_logger = Log.ForContext("Module", "Info"); - private readonly ILogger? Plc_logger = Log.ForContext("Module", "Plc"); + private readonly ILogger? Iot_logger = Log.ForContext("Module", "Iot"); private readonly ILogger? Error_logger = Log.ForContext("Module", "Error"); private readonly ILogger? Camera_logger = Log.ForContext("Module", "Camera"); @@ -48,14 +48,14 @@ namespace Sln.Iot.Serilog } /// - /// Plc日志 + /// Iot日志 /// /// - public void Plc(string msg) + public void Iot(string msg) { - if (Plc_logger != null) + if (Iot_logger != null) { - this.Plc_logger.Information(msg); + this.Iot_logger.Information(msg); } } diff --git a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll index 3d2708b..cba5225 100644 Binary files a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll and b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb index c698874..a5664de 100644 Binary files a/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb and b/Sln.Iot.Serilog/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.dll b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.dll index 3d2708b..cba5225 100644 Binary files a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.dll and b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.pdb b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.pdb index c698874..a5664de 100644 Binary files a/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.pdb and b/Sln.Iot.Serilog/obj/Debug/netstandard2.1/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot.Socket/Sln.Iot.Socket.csproj b/Sln.Iot.Socket/Sln.Iot.Socket.csproj index ffe3c78..0da87f0 100644 --- a/Sln.Iot.Socket/Sln.Iot.Socket.csproj +++ b/Sln.Iot.Socket/Sln.Iot.Socket.csproj @@ -12,6 +12,7 @@ + diff --git a/Sln.Iot.Socket/TcpServer.cs b/Sln.Iot.Socket/TcpServer.cs index 4fad1eb..054eb86 100644 --- a/Sln.Iot.Socket/TcpServer.cs +++ b/Sln.Iot.Socket/TcpServer.cs @@ -27,6 +27,7 @@ using System; using System.Linq; using System.Text; using System.Threading.Tasks; +using Sln.Iot.Common; using Sln.Iot.Model.dto; using Sln.Iot.Serilog; using Sln.Iot.Socket.Adapter; @@ -39,11 +40,13 @@ namespace Sln.Iot.Socket { private readonly SerilogHelper _logger; public readonly TcpService _service; + private readonly StringChange _stringChange; - public TcpServer(SerilogHelper logger, TcpService service) + public TcpServer(SerilogHelper logger, TcpService service, StringChange stringChange) { _logger = logger; _service = service; + _stringChange = stringChange; } /// @@ -81,6 +84,7 @@ namespace Sln.Iot.Socket { if (e.RequestInfo is BufferRequestInfo request) { + _logger.Iot($"收到客户端:{client.Id};原始指令====>>>>{_stringChange.bytesToHexStr(request.buffer.Buffer, request.buffer.Len)}"); string msg = $"收到客户端:{client.Id};指令====>>>>Header:{BitConverter.ToString(request.header).Replace("-", "")};DataType:{request.DataType.ToString("X2")};BufferLength:{request.BufferLength};Body:{BitConverter.ToString(request.Body).Replace("-", "")};CheckBit:{request.CheckBit.ToString("X2")};Tail:{BitConverter.ToString(request.Tail).Replace("-", "")};"; _logger.Info($"{msg}"); diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll index 3d2708b..cba5225 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb index c698874..a5664de 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.deps.json b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.deps.json index 94627de..4249ce4 100644 --- a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.deps.json +++ b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.deps.json @@ -9,6 +9,7 @@ ".NETStandard,Version=v2.1/": { "Sln.Iot.Socket/1.0.0": { "dependencies": { + "Sln.Iot.Common": "1.0.0", "Sln.Iot.Model": "1.0.0", "Sln.Iot.Serilog": "1.0.0", "TouchSocket": "2.0.0", @@ -826,6 +827,14 @@ } } }, + "System.Drawing.Common/6.0.0": { + "runtime": { + "lib/netstandard2.0/System.Drawing.Common.dll": { + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.21.52210" + } + } + }, "System.Globalization/4.3.0": { "dependencies": { "Microsoft.NETCore.Platforms": "1.1.1", @@ -1232,6 +1241,14 @@ } } }, + "Sln.Iot.Common/1.0.0": { + "dependencies": { + "System.Drawing.Common": "6.0.0" + }, + "runtime": { + "Sln.Iot.Common.dll": {} + } + }, "Sln.Iot.Config/1.0.0": { "dependencies": { "Microsoft.Extensions.Options": "9.0.4" @@ -1735,6 +1752,13 @@ "path": "system.directoryservices.protocols/6.0.1", "hashPath": "system.directoryservices.protocols.6.0.1.nupkg.sha512" }, + "System.Drawing.Common/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", + "path": "system.drawing.common/6.0.0", + "hashPath": "system.drawing.common.6.0.0.nupkg.sha512" + }, "System.Globalization/4.3.0": { "type": "package", "serviceable": true, @@ -2001,6 +2025,11 @@ "path": "touchsocket.webapi.swagger/2.0.0", "hashPath": "touchsocket.webapi.swagger.2.0.0.nupkg.sha512" }, + "Sln.Iot.Common/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, "Sln.Iot.Config/1.0.0": { "type": "project", "serviceable": false, diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll index 7fc0d27..526f4f6 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.dll differ diff --git a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb index 0e408fc..bede643 100644 Binary files a/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb and b/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Socket.pdb differ diff --git a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.assets.cache b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.assets.cache index 8bb9414..c1b5bce 100644 Binary files a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.assets.cache and b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.assets.cache differ diff --git a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.AssemblyReference.cache b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.AssemblyReference.cache index 9a8e885..f4c06a4 100644 Binary files a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.AssemblyReference.cache and b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.AssemblyReference.cache differ diff --git a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.CoreCompileInputs.cache b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.CoreCompileInputs.cache index f4c0037..ca9bd3c 100644 --- a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.CoreCompileInputs.cache +++ b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d506f3d99375d6d2210c02c0f3120bc13f5684e7 +224323bdf7fdaa0bdaf63eebd1869195707e7239 diff --git a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.FileListAbsolute.txt b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.FileListAbsolute.txt index cd60ff3..49e1f98 100644 --- a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.FileListAbsolute.txt +++ b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.csproj.FileListAbsolute.txt @@ -30,3 +30,5 @@ /Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.pdb /Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Model.dll /Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Model.pdb +/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Common.dll +/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/bin/Debug/netstandard2.1/Sln.Iot.Common.pdb diff --git a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.dll b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.dll index 7fc0d27..526f4f6 100644 Binary files a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.dll and b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.dll differ diff --git a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.pdb b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.pdb index 0e408fc..bede643 100644 Binary files a/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.pdb and b/Sln.Iot.Socket/obj/Debug/netstandard2.1/Sln.Iot.Socket.pdb differ diff --git a/Sln.Iot.Socket/obj/Sln.Iot.Socket.csproj.nuget.dgspec.json b/Sln.Iot.Socket/obj/Sln.Iot.Socket.csproj.nuget.dgspec.json index e4c81a5..8d95809 100644 --- a/Sln.Iot.Socket/obj/Sln.Iot.Socket.csproj.nuget.dgspec.json +++ b/Sln.Iot.Socket/obj/Sln.Iot.Socket.csproj.nuget.dgspec.json @@ -4,6 +4,65 @@ "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/Sln.Iot.Socket.csproj": {} }, "projects": { + "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj", + "projectName": "Sln.Iot.Common", + "projectPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj", + "packagesPath": "/Users/wenxiansheng/.nuget/packages/", + "outputPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/wenxiansheng/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "netstandard2.1" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netstandard2.1": { + "targetAlias": "netstandard2.1", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "netstandard2.1": { + "targetAlias": "netstandard2.1", + "dependencies": { + "System.Drawing.Common": { + "target": "Package", + "version": "[6.0.0, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "NETStandard.Library": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/6.0.417/RuntimeIdentifierGraph.json" + } + } + }, "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Config/Sln.Iot.Config.csproj": { "version": "1.0.0", "restore": { @@ -211,6 +270,9 @@ "netstandard2.1": { "targetAlias": "netstandard2.1", "projectReferences": { + "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj": { + "projectPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj" + }, "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj": { "projectPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj" }, diff --git a/Sln.Iot.Socket/obj/project.assets.json b/Sln.Iot.Socket/obj/project.assets.json index 62af06a..a9fa62d 100644 --- a/Sln.Iot.Socket/obj/project.assets.json +++ b/Sln.Iot.Socket/obj/project.assets.json @@ -1249,6 +1249,19 @@ } } }, + "System.Drawing.Common/6.0.0": { + "type": "package", + "compile": { + "lib/netstandard2.0/System.Drawing.Common.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/netstandard2.0/System.Drawing.Common.dll": { + "related": ".xml" + } + } + }, "System.Globalization/4.3.0": { "type": "package", "dependencies": { @@ -1889,6 +1902,19 @@ } } }, + "Sln.Iot.Common/1.0.0": { + "type": "project", + "framework": ".NETStandard,Version=v2.1", + "dependencies": { + "System.Drawing.Common": "6.0.0" + }, + "compile": { + "bin/placeholder/Sln.Iot.Common.dll": {} + }, + "runtime": { + "bin/placeholder/Sln.Iot.Common.dll": {} + } + }, "Sln.Iot.Config/1.0.0": { "type": "project", "framework": ".NETStandard,Version=v2.1", @@ -3788,6 +3814,45 @@ "useSharedDesignerContext.txt" ] }, + "System.Drawing.Common/6.0.0": { + "sha512": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", + "type": "package", + "path": "system.drawing.common/6.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/netcoreapp2.0/System.Drawing.Common.targets", + "buildTransitive/netcoreapp3.1/_._", + "lib/MonoAndroid10/_._", + "lib/MonoTouch10/_._", + "lib/net461/System.Drawing.Common.dll", + "lib/net461/System.Drawing.Common.xml", + "lib/net6.0/System.Drawing.Common.dll", + "lib/net6.0/System.Drawing.Common.xml", + "lib/netcoreapp3.1/System.Drawing.Common.dll", + "lib/netcoreapp3.1/System.Drawing.Common.xml", + "lib/netstandard2.0/System.Drawing.Common.dll", + "lib/netstandard2.0/System.Drawing.Common.xml", + "lib/xamarinios10/_._", + "lib/xamarinmac20/_._", + "lib/xamarintvos10/_._", + "lib/xamarinwatchos10/_._", + "runtimes/unix/lib/net6.0/System.Drawing.Common.dll", + "runtimes/unix/lib/net6.0/System.Drawing.Common.xml", + "runtimes/unix/lib/netcoreapp3.1/System.Drawing.Common.dll", + "runtimes/unix/lib/netcoreapp3.1/System.Drawing.Common.xml", + "runtimes/win/lib/net6.0/System.Drawing.Common.dll", + "runtimes/win/lib/net6.0/System.Drawing.Common.xml", + "runtimes/win/lib/netcoreapp3.1/System.Drawing.Common.dll", + "runtimes/win/lib/netcoreapp3.1/System.Drawing.Common.xml", + "system.drawing.common.6.0.0.nupkg.sha512", + "system.drawing.common.nuspec", + "useSharedDesignerContext.txt" + ] + }, "System.Globalization/4.3.0": { "sha512": "kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==", "type": "package", @@ -5597,6 +5662,11 @@ "touchsocket.webapi.swagger.nuspec" ] }, + "Sln.Iot.Common/1.0.0": { + "type": "project", + "path": "../Sln.Iot.Common/Sln.Iot.Common.csproj", + "msbuildProject": "../Sln.Iot.Common/Sln.Iot.Common.csproj" + }, "Sln.Iot.Config/1.0.0": { "type": "project", "path": "../Sln.Iot.Config/Sln.Iot.Config.csproj", @@ -5615,6 +5685,7 @@ }, "projectFileDependencyGroups": { ".NETStandard,Version=v2.1": [ + "Sln.Iot.Common >= 1.0.0", "Sln.Iot.Model >= 1.0.0", "Sln.Iot.Serilog >= 1.0.0", "TouchSocket >= 2.0.0", @@ -5647,6 +5718,9 @@ "netstandard2.1": { "targetAlias": "netstandard2.1", "projectReferences": { + "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj": { + "projectPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj" + }, "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj": { "projectPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj" }, diff --git a/Sln.Iot.Socket/obj/project.nuget.cache b/Sln.Iot.Socket/obj/project.nuget.cache index 4d1c834..91b1e61 100644 --- a/Sln.Iot.Socket/obj/project.nuget.cache +++ b/Sln.Iot.Socket/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "kPLAlwG06+E=", + "dgSpecHash": "oaySHAgI1x4=", "success": true, "projectFilePath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/Sln.Iot.Socket.csproj", "expectedPackageFiles": [ @@ -71,6 +71,7 @@ "/Users/wenxiansheng/.nuget/packages/system.diagnostics.performancecounter/6.0.1/system.diagnostics.performancecounter.6.0.1.nupkg.sha512", "/Users/wenxiansheng/.nuget/packages/system.directoryservices/6.0.1/system.directoryservices.6.0.1.nupkg.sha512", "/Users/wenxiansheng/.nuget/packages/system.directoryservices.protocols/6.0.1/system.directoryservices.protocols.6.0.1.nupkg.sha512", + "/Users/wenxiansheng/.nuget/packages/system.drawing.common/6.0.0/system.drawing.common.6.0.0.nupkg.sha512", "/Users/wenxiansheng/.nuget/packages/system.globalization/4.3.0/system.globalization.4.3.0.nupkg.sha512", "/Users/wenxiansheng/.nuget/packages/system.identitymodel.tokens.jwt/6.35.0/system.identitymodel.tokens.jwt.6.35.0.nupkg.sha512", "/Users/wenxiansheng/.nuget/packages/system.io/4.3.0/system.io.4.3.0.nupkg.sha512", diff --git a/Sln.Iot.Socket/obj/project.packagespec.json b/Sln.Iot.Socket/obj/project.packagespec.json index 778c3ac..965745f 100644 --- a/Sln.Iot.Socket/obj/project.packagespec.json +++ b/Sln.Iot.Socket/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/Sln.Iot.Socket.csproj","projectName":"Sln.Iot.Socket","projectPath":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/Sln.Iot.Socket.csproj","outputPath":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["netstandard2.1"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"netstandard2.1":{"targetAlias":"netstandard2.1","projectReferences":{"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj":{"projectPath":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj"},"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Serilog/Sln.Iot.Serilog.csproj":{"projectPath":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Serilog/Sln.Iot.Serilog.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"netstandard2.1":{"targetAlias":"netstandard2.1","dependencies":{"TouchSocket":{"target":"Package","version":"[2.0.0, )"},"TouchSocket.WebApi":{"target":"Package","version":"[2.0.0, )"},"TouchSocket.WebApi.Swagger":{"target":"Package","version":"[2.0.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"NETStandard.Library":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/local/share/dotnet/sdk/6.0.417/RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/Sln.Iot.Socket.csproj","projectName":"Sln.Iot.Socket","projectPath":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/Sln.Iot.Socket.csproj","outputPath":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Socket/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["netstandard2.1"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"netstandard2.1":{"targetAlias":"netstandard2.1","projectReferences":{"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj":{"projectPath":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj"},"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj":{"projectPath":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj"},"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Serilog/Sln.Iot.Serilog.csproj":{"projectPath":"/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Serilog/Sln.Iot.Serilog.csproj"}}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"netstandard2.1":{"targetAlias":"netstandard2.1","dependencies":{"TouchSocket":{"target":"Package","version":"[2.0.0, )"},"TouchSocket.WebApi":{"target":"Package","version":"[2.0.0, )"},"TouchSocket.WebApi.Swagger":{"target":"Package","version":"[2.0.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"NETStandard.Library":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/local/share/dotnet/sdk/6.0.417/RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/Sln.Iot.Socket/obj/rider.project.restore.info b/Sln.Iot.Socket/obj/rider.project.restore.info index 480765d..9bb6045 100644 --- a/Sln.Iot.Socket/obj/rider.project.restore.info +++ b/Sln.Iot.Socket/obj/rider.project.restore.info @@ -1 +1 @@ -17467833632526926 \ No newline at end of file +17484812605986785 \ No newline at end of file diff --git a/Sln.Iot.sln.DotSettings.user b/Sln.Iot.sln.DotSettings.user index f06ee5c..6642e9b 100644 --- a/Sln.Iot.sln.DotSettings.user +++ b/Sln.Iot.sln.DotSettings.user @@ -13,6 +13,8 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded - ForceIncluded \ No newline at end of file + ForceIncluded + ForceIncluded \ No newline at end of file diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.dll index 8c2b5dd..db75cad 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.pdb index b3a0997..8346aaf 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Business.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.dll index d2f09b1..e26b06c 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.pdb index ffb558f..dfbba36 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Repository.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.dll index 3d2708b..cba5225 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.pdb index c698874..a5664de 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Serilog.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.dll index 7fc0d27..526f4f6 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.pdb index 0e408fc..bede643 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.Socket.pdb differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.deps.json b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.deps.json index 57179fa..c9d51ff 100644 --- a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.deps.json +++ b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.deps.json @@ -1606,6 +1606,7 @@ }, "Sln.Iot.Socket/1.0.0": { "dependencies": { + "Sln.Iot.Common": "1.0.0", "Sln.Iot.Model": "1.0.0", "Sln.Iot.Serilog": "1.0.0", "TouchSocket": "2.0.0", diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.dll b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.dll index eac0c5e..26d166c 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.dll and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.dll differ diff --git a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.pdb b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.pdb index 29a0a73..1548ccb 100644 Binary files a/Sln.Iot/bin/Debug/net6.0/Sln.Iot.pdb and b/Sln.Iot/bin/Debug/net6.0/Sln.Iot.pdb differ diff --git a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.csproj.AssemblyReference.cache b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.csproj.AssemblyReference.cache index 4f0c7c3..2704459 100644 Binary files a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.csproj.AssemblyReference.cache and b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.csproj.AssemblyReference.cache differ diff --git a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.dll b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.dll index eac0c5e..26d166c 100644 Binary files a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.dll and b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.dll differ diff --git a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.pdb b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.pdb index 29a0a73..1548ccb 100644 Binary files a/Sln.Iot/obj/Debug/net6.0/Sln.Iot.pdb and b/Sln.Iot/obj/Debug/net6.0/Sln.Iot.pdb differ diff --git a/Sln.Iot/obj/Sln.Iot.csproj.nuget.dgspec.json b/Sln.Iot/obj/Sln.Iot.csproj.nuget.dgspec.json index 54b48c6..5f5ef8a 100644 --- a/Sln.Iot/obj/Sln.Iot.csproj.nuget.dgspec.json +++ b/Sln.Iot/obj/Sln.Iot.csproj.nuget.dgspec.json @@ -399,6 +399,9 @@ "netstandard2.1": { "targetAlias": "netstandard2.1", "projectReferences": { + "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj": { + "projectPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Common/Sln.Iot.Common.csproj" + }, "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj": { "projectPath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot.Model/Sln.Iot.Model.csproj" }, diff --git a/Sln.Iot/obj/project.assets.json b/Sln.Iot/obj/project.assets.json index fe02e79..4ed635e 100644 --- a/Sln.Iot/obj/project.assets.json +++ b/Sln.Iot/obj/project.assets.json @@ -2392,6 +2392,7 @@ "type": "project", "framework": ".NETStandard,Version=v2.1", "dependencies": { + "Sln.Iot.Common": "1.0.0", "Sln.Iot.Model": "1.0.0", "Sln.Iot.Serilog": "1.0.0", "TouchSocket": "2.0.0", diff --git a/Sln.Iot/obj/project.nuget.cache b/Sln.Iot/obj/project.nuget.cache index 9101415..65abb75 100644 --- a/Sln.Iot/obj/project.nuget.cache +++ b/Sln.Iot/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "5hv7MCi29ac=", + "dgSpecHash": "jrZY+njCoCc=", "success": true, "projectFilePath": "/Users/wenxiansheng/Public/WorkSpace/Mesnac/项目资料/大兴机场 IOT 项目/Sln.Iot/Sln.Iot/Sln.Iot.csproj", "expectedPackageFiles": [ diff --git a/Sln.Iot/obj/rider.project.restore.info b/Sln.Iot/obj/rider.project.restore.info index d9a575a..b977c76 100644 --- a/Sln.Iot/obj/rider.project.restore.info +++ b/Sln.Iot/obj/rider.project.restore.info @@ -1 +1 @@ -17467833632579223 \ No newline at end of file +17484812605988104 \ No newline at end of file