From 4a02b5d0aa9cc5aadc9f8c998b73107668ff993a Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 16 Oct 2019 08:25:39 +0800 Subject: [PATCH] update Former-commit-id: f155dd08f280654b112be48f6db9788e01120580 --- projects/Infrastructure/Infrastructure.csproj | 4 +-- projects/IoTCenter/Services/IoTCenterHub.cs | 30 +++++-------------- .../Services/IoTCenterHubExtensions.cs | 2 +- projects/IoTKeyGen/IoTKeyGen.csproj | 5 +++- .../Controllers/FBee/ColorLightController.cs | 2 +- .../Controllers/FBee/CurtainController.cs | 2 +- .../Controllers/FBee/GatewayController.cs | 2 +- .../IoTNode/Controllers/FBee/IrController.cs | 2 +- .../Controllers/FBee/SocketController.cs | 2 +- .../Controllers/FBee/Switch2Controller.cs | 2 +- .../Controllers/FBee/Switch3Controller.cs | 2 +- .../Controllers/FBee/SwitchController.cs | 2 +- .../Controllers/Onvif/OnvifController.cs | 2 +- .../SerialPort/SerialPortController.cs | 2 +- .../DeviceServices/BaseDeviceService.cs | 2 +- .../DeviceServices/FBee/ClusterId.cs | 2 +- .../DeviceServices/FBee/DeviceId.cs | 2 +- .../DeviceServices/FBee/FBeeDataType.cs | 2 +- .../DeviceServices/FBee/FBeeService.cs | 2 +- .../DeviceServices/FBee/Keys.cs | 2 +- .../DeviceServices/FBee/RequestType.cs | 2 +- .../DeviceServices/FBee/ResponseType.cs | 2 +- .../DeviceServices/FBee/TcpClientWrapper.cs | 2 +- .../Onvif/IOnvifDeviceManagement.cs | 2 +- .../DeviceServices/Onvif/IPCamera.cs | 2 +- .../DeviceServices/Onvif/MessageTemplate.cs | 2 +- .../Onvif/OnvifDeviceManagement.cs | 2 +- .../DeviceServices/Onvif/OnvifService.cs | 2 +- .../DeviceServices/Onvif/Profile.cs | 2 +- .../SerialPort/SerialPortService.cs | 2 +- projects/IoTNode/Startup.cs | 4 +-- projects/UserCenter/UserCenter.csproj | 6 ++-- 32 files changed, 45 insertions(+), 58 deletions(-) rename projects/IoTNode/{Services => }/DeviceServices/BaseDeviceService.cs (98%) rename projects/IoTNode/{Services => }/DeviceServices/FBee/ClusterId.cs (84%) rename projects/IoTNode/{Services => }/DeviceServices/FBee/DeviceId.cs (97%) rename projects/IoTNode/{Services => }/DeviceServices/FBee/FBeeDataType.cs (95%) rename projects/IoTNode/{Services => }/DeviceServices/FBee/FBeeService.cs (99%) rename projects/IoTNode/{Services => }/DeviceServices/FBee/Keys.cs (96%) rename projects/IoTNode/{Services => }/DeviceServices/FBee/RequestType.cs (92%) rename projects/IoTNode/{Services => }/DeviceServices/FBee/ResponseType.cs (89%) rename projects/IoTNode/{Services => }/DeviceServices/FBee/TcpClientWrapper.cs (80%) rename projects/IoTNode/{Services => }/DeviceServices/Onvif/IOnvifDeviceManagement.cs (93%) rename projects/IoTNode/{Services => }/DeviceServices/Onvif/IPCamera.cs (98%) rename projects/IoTNode/{Services => }/DeviceServices/Onvif/MessageTemplate.cs (99%) rename projects/IoTNode/{Services => }/DeviceServices/Onvif/OnvifDeviceManagement.cs (99%) rename projects/IoTNode/{Services => }/DeviceServices/Onvif/OnvifService.cs (99%) rename projects/IoTNode/{Services => }/DeviceServices/Onvif/Profile.cs (82%) rename projects/IoTNode/{Services => }/DeviceServices/SerialPort/SerialPortService.cs (98%) diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj index ba1dc54c..f1ce6b9e 100644 --- a/projects/Infrastructure/Infrastructure.csproj +++ b/projects/Infrastructure/Infrastructure.csproj @@ -21,11 +21,11 @@ - + - + diff --git a/projects/IoTCenter/Services/IoTCenterHub.cs b/projects/IoTCenter/Services/IoTCenterHub.cs index 82085597..c0baa21a 100644 --- a/projects/IoTCenter/Services/IoTCenterHub.cs +++ b/projects/IoTCenter/Services/IoTCenterHub.cs @@ -5,6 +5,7 @@ using Infrastructure.Extensions; using Infrastructure.Web.SignalR; using IoT.Shared.Services; using Microsoft.AspNetCore.SignalR; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using System; using System.Collections.Generic; @@ -143,7 +144,8 @@ namespace IoTCenter.Services { var model = message.FromJson(); this._dataService.Edit(model); - this.Clients.Group("page").SendAsync(method, message); + // + this.Clients.Group("page").SendAsync("UpdateNode", model.ToJson()); } else if (method == Methods.EditDeviceResponse) { @@ -155,10 +157,13 @@ namespace IoTCenter.Services var model = message.FromJson(); this._dataService.Delete(model); } - else if (method == Methods.EditDataResponse) + else if (method == Methods.EditDataResponse)//后台编辑或设备上报 { var model = message.FromJson(); this._dataService.Edit(model); + // + var device = _deviceRepo.ReadOnlyTable().Include(o => o.Data).Where(o => o.Id == model.DeviceId).FirstOrDefault(); + this.Clients.Group("page").SendAsync("UpdateDevice", device.ToJson()); } else if (method == Methods.DeleteDataResponse) { @@ -213,27 +218,6 @@ namespace IoTCenter.Services } } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")] - private void DeleteData(string message) - { - try - { - Console.WriteLine("iot center> receive delete data message"); - var model = message.FromJson(); - var data = _dataRepo.Table().FirstOrDefault(o => o.Device.Id == model.DeviceId && o.Id == model.Id); - if (data != null) - { - _dataRepo.Delete(data); - _dataRepo.SaveChanges(); - this.Clients.Group("page").SendAsync("DeleteData", message); - } - } - catch (Exception ex) - { - ex.PrintStack(); - } - } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:不捕获常规异常类型", Justification = "<挂起>")] private void UpdateScene(string message) { diff --git a/projects/IoTCenter/Services/IoTCenterHubExtensions.cs b/projects/IoTCenter/Services/IoTCenterHubExtensions.cs index 2314dcdc..3b176f94 100644 --- a/projects/IoTCenter/Services/IoTCenterHubExtensions.cs +++ b/projects/IoTCenter/Services/IoTCenterHubExtensions.cs @@ -8,7 +8,7 @@ namespace IoTCenter.Services { public static void ServerToClient(this IHubContext hub, string group, string method, object arg, string fromConnectionId = null) { - hub.Clients.Group(group).SendAsync(Methods.ServerToClient, method, arg.ToJson(), fromConnectionId); + hub?.Clients.Group(group).SendAsync(Methods.ServerToClient, method, arg.ToJson(), fromConnectionId); } } } \ No newline at end of file diff --git a/projects/IoTKeyGen/IoTKeyGen.csproj b/projects/IoTKeyGen/IoTKeyGen.csproj index b3bda7b3..1ca636ef 100644 --- a/projects/IoTKeyGen/IoTKeyGen.csproj +++ b/projects/IoTKeyGen/IoTKeyGen.csproj @@ -7,7 +7,10 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + \ No newline at end of file diff --git a/projects/IoTNode/Controllers/FBee/ColorLightController.cs b/projects/IoTNode/Controllers/FBee/ColorLightController.cs index d75ab195..31abebc7 100644 --- a/projects/IoTNode/Controllers/FBee/ColorLightController.cs +++ b/projects/IoTNode/Controllers/FBee/ColorLightController.cs @@ -1,6 +1,6 @@ using Application.Models; using Infrastructure.Extensions; -using IoTNode.Services.DeviceServices.FBee; +using IoTNode.DeviceServices.FBee; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using System; diff --git a/projects/IoTNode/Controllers/FBee/CurtainController.cs b/projects/IoTNode/Controllers/FBee/CurtainController.cs index de91c26e..b6ef36ec 100644 --- a/projects/IoTNode/Controllers/FBee/CurtainController.cs +++ b/projects/IoTNode/Controllers/FBee/CurtainController.cs @@ -1,5 +1,5 @@ using Application.Models; -using IoTNode.Services.DeviceServices.FBee; +using IoTNode.DeviceServices.FBee; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using System; diff --git a/projects/IoTNode/Controllers/FBee/GatewayController.cs b/projects/IoTNode/Controllers/FBee/GatewayController.cs index 0bd270c0..d09ad414 100644 --- a/projects/IoTNode/Controllers/FBee/GatewayController.cs +++ b/projects/IoTNode/Controllers/FBee/GatewayController.cs @@ -1,5 +1,5 @@ using Application.Models; -using IoTNode.Services.DeviceServices.FBee; +using IoTNode.DeviceServices.FBee; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using System; diff --git a/projects/IoTNode/Controllers/FBee/IrController.cs b/projects/IoTNode/Controllers/FBee/IrController.cs index 4d2c30b6..180cb03b 100644 --- a/projects/IoTNode/Controllers/FBee/IrController.cs +++ b/projects/IoTNode/Controllers/FBee/IrController.cs @@ -1,5 +1,5 @@ using Application.Models; -using IoTNode.Services.DeviceServices.FBee; +using IoTNode.DeviceServices.FBee; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using System; diff --git a/projects/IoTNode/Controllers/FBee/SocketController.cs b/projects/IoTNode/Controllers/FBee/SocketController.cs index 33ba582b..efec553f 100644 --- a/projects/IoTNode/Controllers/FBee/SocketController.cs +++ b/projects/IoTNode/Controllers/FBee/SocketController.cs @@ -1,4 +1,4 @@ -using IoTNode.Services.DeviceServices.FBee; +using IoTNode.DeviceServices.FBee; using Swashbuckle.AspNetCore.Annotations; using System; diff --git a/projects/IoTNode/Controllers/FBee/Switch2Controller.cs b/projects/IoTNode/Controllers/FBee/Switch2Controller.cs index 7e50d291..3704323d 100644 --- a/projects/IoTNode/Controllers/FBee/Switch2Controller.cs +++ b/projects/IoTNode/Controllers/FBee/Switch2Controller.cs @@ -1,5 +1,5 @@ using Application.Models; -using IoTNode.Services.DeviceServices.FBee; +using IoTNode.DeviceServices.FBee; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using System; diff --git a/projects/IoTNode/Controllers/FBee/Switch3Controller.cs b/projects/IoTNode/Controllers/FBee/Switch3Controller.cs index 5ab3c41f..cf2d27de 100644 --- a/projects/IoTNode/Controllers/FBee/Switch3Controller.cs +++ b/projects/IoTNode/Controllers/FBee/Switch3Controller.cs @@ -1,5 +1,5 @@ using Application.Models; -using IoTNode.Services.DeviceServices.FBee; +using IoTNode.DeviceServices.FBee; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using System; diff --git a/projects/IoTNode/Controllers/FBee/SwitchController.cs b/projects/IoTNode/Controllers/FBee/SwitchController.cs index cf3866c4..44863649 100644 --- a/projects/IoTNode/Controllers/FBee/SwitchController.cs +++ b/projects/IoTNode/Controllers/FBee/SwitchController.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using System; -using IoTNode.Services.DeviceServices.FBee; +using IoTNode.DeviceServices.FBee; namespace IoTNode.Controllers { diff --git a/projects/IoTNode/Controllers/Onvif/OnvifController.cs b/projects/IoTNode/Controllers/Onvif/OnvifController.cs index 214fbf12..0afe60e6 100644 --- a/projects/IoTNode/Controllers/Onvif/OnvifController.cs +++ b/projects/IoTNode/Controllers/Onvif/OnvifController.cs @@ -1,5 +1,5 @@ using Application.Models; -using IoTNode.Services.DeviceServices.Onvif; +using IoTNode.DeviceServices.Onvif; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using System; diff --git a/projects/IoTNode/Controllers/SerialPort/SerialPortController.cs b/projects/IoTNode/Controllers/SerialPort/SerialPortController.cs index c6b204c5..80777f78 100644 --- a/projects/IoTNode/Controllers/SerialPort/SerialPortController.cs +++ b/projects/IoTNode/Controllers/SerialPort/SerialPortController.cs @@ -1,5 +1,5 @@ using Application.Models; -using IoTNode.Services.DeviceServices.SerialPort; +using IoTNode.DeviceServices.SerialPort; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; using System; diff --git a/projects/IoTNode/Services/DeviceServices/BaseDeviceService.cs b/projects/IoTNode/DeviceServices/BaseDeviceService.cs similarity index 98% rename from projects/IoTNode/Services/DeviceServices/BaseDeviceService.cs rename to projects/IoTNode/DeviceServices/BaseDeviceService.cs index af2ad17f..a8a5eca2 100644 --- a/projects/IoTNode/Services/DeviceServices/BaseDeviceService.cs +++ b/projects/IoTNode/DeviceServices/BaseDeviceService.cs @@ -11,7 +11,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -namespace IoTNode.Services.DeviceServices +namespace IoTNode.DeviceServices { public abstract class BaseDeviceService : IHostedService { diff --git a/projects/IoTNode/Services/DeviceServices/FBee/ClusterId.cs b/projects/IoTNode/DeviceServices/FBee/ClusterId.cs similarity index 84% rename from projects/IoTNode/Services/DeviceServices/FBee/ClusterId.cs rename to projects/IoTNode/DeviceServices/FBee/ClusterId.cs index 19c472df..b8a56b7a 100644 --- a/projects/IoTNode/Services/DeviceServices/FBee/ClusterId.cs +++ b/projects/IoTNode/DeviceServices/FBee/ClusterId.cs @@ -1,4 +1,4 @@ -namespace IoTNode.Services.DeviceServices.FBee +namespace IoTNode.DeviceServices.FBee { public enum ClusterId { diff --git a/projects/IoTNode/Services/DeviceServices/FBee/DeviceId.cs b/projects/IoTNode/DeviceServices/FBee/DeviceId.cs similarity index 97% rename from projects/IoTNode/Services/DeviceServices/FBee/DeviceId.cs rename to projects/IoTNode/DeviceServices/FBee/DeviceId.cs index 910f756e..90f4ebde 100644 --- a/projects/IoTNode/Services/DeviceServices/FBee/DeviceId.cs +++ b/projects/IoTNode/DeviceServices/FBee/DeviceId.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace IoTNode.Services.DeviceServices.FBee +namespace IoTNode.DeviceServices.FBee { public class DeviceId { diff --git a/projects/IoTNode/Services/DeviceServices/FBee/FBeeDataType.cs b/projects/IoTNode/DeviceServices/FBee/FBeeDataType.cs similarity index 95% rename from projects/IoTNode/Services/DeviceServices/FBee/FBeeDataType.cs rename to projects/IoTNode/DeviceServices/FBee/FBeeDataType.cs index d5492758..1632793f 100644 --- a/projects/IoTNode/Services/DeviceServices/FBee/FBeeDataType.cs +++ b/projects/IoTNode/DeviceServices/FBee/FBeeDataType.cs @@ -1,4 +1,4 @@ -namespace IoTNode.Services.DeviceServices.FBee +namespace IoTNode.DeviceServices.FBee { public enum FBeeDataType { diff --git a/projects/IoTNode/Services/DeviceServices/FBee/FBeeService.cs b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs similarity index 99% rename from projects/IoTNode/Services/DeviceServices/FBee/FBeeService.cs rename to projects/IoTNode/DeviceServices/FBee/FBeeService.cs index 616f85a0..dca75315 100644 --- a/projects/IoTNode/Services/DeviceServices/FBee/FBeeService.cs +++ b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs @@ -20,7 +20,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -namespace IoTNode.Services.DeviceServices.FBee +namespace IoTNode.DeviceServices.FBee { public class FBeeService : BaseDeviceService { diff --git a/projects/IoTNode/Services/DeviceServices/FBee/Keys.cs b/projects/IoTNode/DeviceServices/FBee/Keys.cs similarity index 96% rename from projects/IoTNode/Services/DeviceServices/FBee/Keys.cs rename to projects/IoTNode/DeviceServices/FBee/Keys.cs index 05bcfb6f..01b1114a 100644 --- a/projects/IoTNode/Services/DeviceServices/FBee/Keys.cs +++ b/projects/IoTNode/DeviceServices/FBee/Keys.cs @@ -1,4 +1,4 @@ -namespace IoTNode.Services.DeviceServices.FBee +namespace IoTNode.DeviceServices.FBee { public static class Keys { diff --git a/projects/IoTNode/Services/DeviceServices/FBee/RequestType.cs b/projects/IoTNode/DeviceServices/FBee/RequestType.cs similarity index 92% rename from projects/IoTNode/Services/DeviceServices/FBee/RequestType.cs rename to projects/IoTNode/DeviceServices/FBee/RequestType.cs index edd977b7..5de9384f 100644 --- a/projects/IoTNode/Services/DeviceServices/FBee/RequestType.cs +++ b/projects/IoTNode/DeviceServices/FBee/RequestType.cs @@ -1,4 +1,4 @@ -namespace IoTNode.Services.DeviceServices.FBee +namespace IoTNode.DeviceServices.FBee { public static class RequestType { diff --git a/projects/IoTNode/Services/DeviceServices/FBee/ResponseType.cs b/projects/IoTNode/DeviceServices/FBee/ResponseType.cs similarity index 89% rename from projects/IoTNode/Services/DeviceServices/FBee/ResponseType.cs rename to projects/IoTNode/DeviceServices/FBee/ResponseType.cs index b27b9e4a..69b3571a 100644 --- a/projects/IoTNode/Services/DeviceServices/FBee/ResponseType.cs +++ b/projects/IoTNode/DeviceServices/FBee/ResponseType.cs @@ -1,4 +1,4 @@ -namespace IoTNode.Services.DeviceServices.FBee +namespace IoTNode.DeviceServices.FBee { public static class ResponseType { diff --git a/projects/IoTNode/Services/DeviceServices/FBee/TcpClientWrapper.cs b/projects/IoTNode/DeviceServices/FBee/TcpClientWrapper.cs similarity index 80% rename from projects/IoTNode/Services/DeviceServices/FBee/TcpClientWrapper.cs rename to projects/IoTNode/DeviceServices/FBee/TcpClientWrapper.cs index a2e428d2..5e02504e 100644 --- a/projects/IoTNode/Services/DeviceServices/FBee/TcpClientWrapper.cs +++ b/projects/IoTNode/DeviceServices/FBee/TcpClientWrapper.cs @@ -1,6 +1,6 @@ using System.Net.Sockets; -namespace IoTNode.Services.DeviceServices.FBee +namespace IoTNode.DeviceServices.FBee { public class TcpClientWrapper { diff --git a/projects/IoTNode/Services/DeviceServices/Onvif/IOnvifDeviceManagement.cs b/projects/IoTNode/DeviceServices/Onvif/IOnvifDeviceManagement.cs similarity index 93% rename from projects/IoTNode/Services/DeviceServices/Onvif/IOnvifDeviceManagement.cs rename to projects/IoTNode/DeviceServices/Onvif/IOnvifDeviceManagement.cs index c9f7abe0..0a1a8176 100644 --- a/projects/IoTNode/Services/DeviceServices/Onvif/IOnvifDeviceManagement.cs +++ b/projects/IoTNode/DeviceServices/Onvif/IOnvifDeviceManagement.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace IoTNode.Services.DeviceServices.Onvif +namespace IoTNode.DeviceServices.Onvif { public interface IOnvifDeviceManagement { diff --git a/projects/IoTNode/Services/DeviceServices/Onvif/IPCamera.cs b/projects/IoTNode/DeviceServices/Onvif/IPCamera.cs similarity index 98% rename from projects/IoTNode/Services/DeviceServices/Onvif/IPCamera.cs rename to projects/IoTNode/DeviceServices/Onvif/IPCamera.cs index 37dd31cf..75fc8e2d 100644 --- a/projects/IoTNode/Services/DeviceServices/Onvif/IPCamera.cs +++ b/projects/IoTNode/DeviceServices/Onvif/IPCamera.cs @@ -5,7 +5,7 @@ using System.Net; using System.Text.RegularExpressions; using System.Xml.Linq; -namespace IoTNode.Services.DeviceServices.Onvif +namespace IoTNode.DeviceServices.Onvif { public class IPCamera { diff --git a/projects/IoTNode/Services/DeviceServices/Onvif/MessageTemplate.cs b/projects/IoTNode/DeviceServices/Onvif/MessageTemplate.cs similarity index 99% rename from projects/IoTNode/Services/DeviceServices/Onvif/MessageTemplate.cs rename to projects/IoTNode/DeviceServices/Onvif/MessageTemplate.cs index 2af6b313..64e0b635 100644 --- a/projects/IoTNode/Services/DeviceServices/Onvif/MessageTemplate.cs +++ b/projects/IoTNode/DeviceServices/Onvif/MessageTemplate.cs @@ -1,4 +1,4 @@ -namespace IoTNode.Services.DeviceServices.Onvif +namespace IoTNode.DeviceServices.Onvif { public static class MessageTemplate { diff --git a/projects/IoTNode/Services/DeviceServices/Onvif/OnvifDeviceManagement.cs b/projects/IoTNode/DeviceServices/Onvif/OnvifDeviceManagement.cs similarity index 99% rename from projects/IoTNode/Services/DeviceServices/Onvif/OnvifDeviceManagement.cs rename to projects/IoTNode/DeviceServices/Onvif/OnvifDeviceManagement.cs index 833a6095..7ad8de2e 100644 --- a/projects/IoTNode/Services/DeviceServices/Onvif/OnvifDeviceManagement.cs +++ b/projects/IoTNode/DeviceServices/Onvif/OnvifDeviceManagement.cs @@ -13,7 +13,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -namespace IoTNode.Services.DeviceServices.Onvif +namespace IoTNode.DeviceServices.Onvif { public class OnvifDeviceManagement : IOnvifDeviceManagement { diff --git a/projects/IoTNode/Services/DeviceServices/Onvif/OnvifService.cs b/projects/IoTNode/DeviceServices/Onvif/OnvifService.cs similarity index 99% rename from projects/IoTNode/Services/DeviceServices/Onvif/OnvifService.cs rename to projects/IoTNode/DeviceServices/Onvif/OnvifService.cs index 3d50b5ae..4f4f9e74 100644 --- a/projects/IoTNode/Services/DeviceServices/Onvif/OnvifService.cs +++ b/projects/IoTNode/DeviceServices/Onvif/OnvifService.cs @@ -21,7 +21,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -namespace IoTNode.Services.DeviceServices.Onvif +namespace IoTNode.DeviceServices.Onvif { public class OnvifService : BaseDeviceService { diff --git a/projects/IoTNode/Services/DeviceServices/Onvif/Profile.cs b/projects/IoTNode/DeviceServices/Onvif/Profile.cs similarity index 82% rename from projects/IoTNode/Services/DeviceServices/Onvif/Profile.cs rename to projects/IoTNode/DeviceServices/Onvif/Profile.cs index c1f07c3c..ee43b9d9 100644 --- a/projects/IoTNode/Services/DeviceServices/Onvif/Profile.cs +++ b/projects/IoTNode/DeviceServices/Onvif/Profile.cs @@ -1,4 +1,4 @@ -namespace IoTNode.Services.DeviceServices.Onvif +namespace IoTNode.DeviceServices.Onvif { public class Profile { diff --git a/projects/IoTNode/Services/DeviceServices/SerialPort/SerialPortService.cs b/projects/IoTNode/DeviceServices/SerialPort/SerialPortService.cs similarity index 98% rename from projects/IoTNode/Services/DeviceServices/SerialPort/SerialPortService.cs rename to projects/IoTNode/DeviceServices/SerialPort/SerialPortService.cs index ac63f1b1..01d64bed 100644 --- a/projects/IoTNode/Services/DeviceServices/SerialPort/SerialPortService.cs +++ b/projects/IoTNode/DeviceServices/SerialPort/SerialPortService.cs @@ -15,7 +15,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace IoTNode.Services.DeviceServices.SerialPort +namespace IoTNode.DeviceServices.SerialPort { public class SerialPortService : BaseDeviceService { diff --git a/projects/IoTNode/Startup.cs b/projects/IoTNode/Startup.cs index ddf745a7..ae826b45 100644 --- a/projects/IoTNode/Startup.cs +++ b/projects/IoTNode/Startup.cs @@ -4,8 +4,8 @@ using Infrastructure.Extensions; using IoT.Shared.Services; using IoT.UI.Shard; using IoTNode.Services; -using IoTNode.Services.DeviceServices.FBee; -using IoTNode.Services.DeviceServices.Onvif; +using IoTNode.DeviceServices.FBee; +using IoTNode.DeviceServices.Onvif; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; diff --git a/projects/UserCenter/UserCenter.csproj b/projects/UserCenter/UserCenter.csproj index b662a15a..ce4c2063 100644 --- a/projects/UserCenter/UserCenter.csproj +++ b/projects/UserCenter/UserCenter.csproj @@ -9,12 +9,12 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - +