update

Former-commit-id: 1c00447c388fb343d0d997ed09f431117c0d05d6
6 years ago · df5edeb6e1
parent 72dada1889
commit df5edeb6e1
356 changed files with 152 additions and 2777 deletions
--- a/projects/IoT.Shared/.gitignore
+++ b/projects/IoT.Shared/.gitignore
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Api.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Api.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Category.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Category.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Command.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Command.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Data.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Data.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Device.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Device.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/DeviceDataType.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/DeviceDataType.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/IoTTigger.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/IoTTigger.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/IoTTimer.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/IoTTimer.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/LiveRecord.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/LiveRecord.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Node.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Node.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Parameter.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Parameter.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Product.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Product.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Scene.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Scene.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/SceneCommand.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/SceneCommand.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/TiggerCommand.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/TiggerCommand.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/TimerCommand.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/TimerCommand.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/Permission.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/Permission.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/PermissionCategory.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/PermissionCategory.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/Role.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/Role.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/RolePermission.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/RolePermission.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/User.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/User.cs
--- a/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/UserRole.cs
+++ b/projects/IoT/IoT.Shared/Application/Domain/Entities/Users/UserRole.cs
--- a/projects/IoT/IoT.Shared/Application/Models/ApiResponse.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/ApiResponse.cs
--- a/projects/IoT/IoT.Shared/Application/Models/ApiSearchModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/ApiSearchModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/CallApiRequest.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/CallApiRequest.cs
--- a/projects/IoT/IoT.Shared/Application/Models/DataSearchModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/DataSearchModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/DataViewModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/DataViewModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/DeviceSearchMode.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/DeviceSearchMode.cs
--- a/projects/IoT/IoT.Shared/Application/Models/DisplayCommandModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/DisplayCommandModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/DisplaySceneModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/DisplaySceneModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditApiModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditApiModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditApiParameterModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditApiParameterModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditCategoryModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditCategoryModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditCommandModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditCommandModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditDataModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditDataModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditDeviceModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditDeviceModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditGlobalSceneModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditGlobalSceneModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditNodeModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditNodeModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditParameterModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditParameterModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditProductModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditProductModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditSceneCommandModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditSceneCommandModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditSceneModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditSceneModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditTiggerModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditTiggerModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/EditTimerModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/EditTimerModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/HomeViewModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/HomeViewModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/IrDataModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/IrDataModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/Methods.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/Methods.cs
--- a/projects/IoT/IoT.Shared/Application/Models/NotifyModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/NotifyModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/ProductDto.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/ProductDto.cs
--- a/projects/IoT/IoT.Shared/Application/Models/Users/ChangePasswordModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/Users/ChangePasswordModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/Users/EditPermissionModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/Users/EditPermissionModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/Users/EditRoleModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/Users/EditRoleModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/Users/EditUserModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/Users/EditUserModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/Users/ForgotPasswordModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/Users/ForgotPasswordModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/Users/LoginModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/Users/LoginModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/Users/RegisterModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/Users/RegisterModel.cs
--- a/projects/IoT/IoT.Shared/Application/Models/Users/ResetPasswordModel.cs
+++ b/projects/IoT/IoT.Shared/Application/Models/Users/ResetPasswordModel.cs
--- a/projects/IoT/IoT.Shared/Controllers/AjaxController.cs
+++ b/projects/IoT/IoT.Shared/Controllers/AjaxController.cs
--- a/projects/IoT/IoT.Shared/Infrastructure/OpenApiService.cs
+++ b/projects/IoT/IoT.Shared/Infrastructure/OpenApiService.cs
--- a/projects/IoT/IoT.Shared/IoT.Shared.csproj
+++ b/projects/IoT/IoT.Shared/IoT.Shared.csproj
@ -26,6 +26,6 @@
    <EmbeddedResource Include="wwwroot\**\*" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Infrastructure\Infrastructure.csproj" />
+    <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
  </ItemGroup>
 </Project>
--- a/projects/IoT/IoT.Shared/IoTServiceStartup.cs
+++ b/projects/IoT/IoT.Shared/IoTServiceStartup.cs
--- a/projects/IoT/IoT.Shared/Properties/launchSettings.json
+++ b/projects/IoT/IoT.Shared/Properties/launchSettings.json
--- a/projects/IoT/IoT.Shared/Views/Account/ChangePassword.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Account/ChangePassword.cshtml
--- a/projects/IoT/IoT.Shared/Views/Account/ForgotPassword.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Account/ForgotPassword.cshtml
--- a/projects/IoT/IoT.Shared/Views/Account/Index.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Account/Index.cshtml
--- a/projects/IoT/IoT.Shared/Views/Account/Login.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Account/Login.cshtml
--- a/projects/IoT/IoT.Shared/Views/Account/Register.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Account/Register.cshtml
--- a/projects/IoT/IoT.Shared/Views/Account/ResetPassword.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Account/ResetPassword.cshtml
--- a/projects/IoT/IoT.Shared/Views/Account/_Menu.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Account/_Menu.cshtml
--- a/projects/IoT/IoT.Shared/Views/Account/_Script.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Account/_Script.cshtml
--- a/projects/IoT/IoT.Shared/Views/Device/Details.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Device/Details.cshtml
--- a/projects/IoT/IoT.Shared/Views/Device/Index.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Device/Index.cshtml
--- a/projects/IoT/IoT.Shared/Views/Home/Node.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Home/Node.cshtml
--- a/projects/IoT/IoT.Shared/Views/Shared/_Menu.cshtml
+++ b/projects/IoT/IoT.Shared/Views/Shared/_Menu.cshtml
--- a/projects/IoT/IoT.Shared/Views/_ViewImports.cshtml
+++ b/projects/IoT/IoT.Shared/Views/_ViewImports.cshtml
--- a/projects/IoT/IoT.Shared/Views/_ViewStart.cshtml
+++ b/projects/IoT/IoT.Shared/Views/_ViewStart.cshtml
--- a/projects/IoT/IoT.Shared/wwwroot/css/iot.css
+++ b/projects/IoT/IoT.Shared/wwwroot/css/iot.css
--- a/projects/IoT/IoT.Shared/wwwroot/iot/10.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/10.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/20.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/20.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/30.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/30.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/40.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/40.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/air.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/air.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/alarm.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/alarm.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/ap.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/ap.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/button.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/button.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/camera.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/camera.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/classroom.jpg
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/classroom.jpg
--- a/projects/IoT/IoT.Shared/wwwroot/iot/close.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/close.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/co2.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/co2.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/control.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/control.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/curtain.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/curtain.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/door.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/door.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/electric.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/electric.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/gateway.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/gateway.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/humidity.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/humidity.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/left.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/left.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/light.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/light.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/lighting.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/lighting.png
--- a/projects/IoT/IoT.Shared/wwwroot/iot/monitor.png
+++ b/projects/IoT/IoT.Shared/wwwroot/iot/monitor.png
--- a/Show More
+++ b/Show More