Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0

Former-commit-id: 1010aec78d83a6965dd1dd53e585d720f3cd054d

projects/Infrastructure/Infrastructure.csproj

@@ -5,6 +5,7 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <DefaultItemExcludes>$(DefaultItemExcludes);wwwroot\**\*</DefaultItemExcludes>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Deterministic>false</Deterministic>
   </PropertyGroup>
@@ -50,7 +51,8 @@
   </ItemGroup>
    <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
-  </ItemGroup><ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
   </ItemGroup>
 </Project>

projects/IoT.Shared/IoT.Shared.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <DefaultItemExcludes>$(DefaultItemExcludes);wwwroot\**\*</DefaultItemExcludes>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Deterministic>false</Deterministic>

projects/IoTCenter/IoTCenter.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Deterministic>false</Deterministic>

projects/IoTNode/DeviceServices/Onvif/OnvifService.cs

@@ -272,7 +272,31 @@ namespace IoTNode.DeviceServices.Onvif
             }
         }
 
-        private void StartPushToServer(Device camera)
+        public void StartPushToServer()
+        {
+            using var scope = _applicationServices.CreateScope();
+            var repo = scope.ServiceProvider.GetService<IRepository<Device>>();
+            var cameras = repo.ReadOnlyTable().Include(o => o.Data).Where(o => o.Name == "摄像头").ToList();
+            foreach (var camera in cameras)
+            {
+                try
+                {
+                    if (camera.Data.Any(o => o.Key == "Push" && o.Value == "是"))
+                    {
+                        if (camera.Data.Any(o => o.Key == "NeedAuth" && o.Value == "否") || camera.Data.Any(o => o.Key == "HasAuth" && o.Value == "是"))
+                        {
+                            this.StartPushToServer(camera);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ex.PrintStack();
+                }
+            }
+        }
+
+        public void StartPushToServer(Device camera)
         {
             try
             {
@@ -337,6 +361,21 @@ namespace IoTNode.DeviceServices.Onvif
             }
         }
 
+        public void StopPushToServer()
+        {
+            foreach (var item in this._list.Keys)
+            {
+                try
+                {
+                    this.StopPushToServer(item);
+                }
+                catch (Exception ex)
+                {
+                    ex.PrintStack();
+                }
+            }
+        }
+
         public void StopPushToServer(string key)
         {
             if (this._list.TryRemove(key, out Process process))

projects/IoTNode/IoTNode.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Deterministic>false</Deterministic>

projects/IoTNode/Services/IoTNodeEventHandler.cs

@@ -1,14 +1,17 @@
 using Application.Domain.Entities;
 using CSScriptLib;
 using Hangfire;
+using Infrastructure.Application.Entites.Settings;
 using Infrastructure.Events;
 using Infrastructure.Extensions;
+using IoTNode.DeviceServices.Onvif;
 using System;
-using System.Collections.Concurrent;
+using System.Threading.Tasks;
 
 namespace IoTNode.Services
 {
     public class IoTNodeEventHandler :
+        IEventHander<EntityUpdatedEvent<Setting>>,
         IEventHander<EntityInsertedEvent<SceneTimer>>,
         IEventHander<EntityUpdatedEvent<SceneTimer>>,
         IEventHander<EntityDeletedEvent<SceneTimer>>,
@@ -16,11 +19,13 @@ namespace IoTNode.Services
     {
         private readonly ISceneTiggerService _sceneTiggerService;
         private readonly IoTNodeJob _job;
+        private readonly OnvifService _onvifService;
 
-        public IoTNodeEventHandler(ISceneTiggerService sceneTiggerService, IoTNodeJob job)
+        public IoTNodeEventHandler(ISceneTiggerService sceneTiggerService, IoTNodeJob job, OnvifService onvifService)
         {
             this._sceneTiggerService = sceneTiggerService;
             this._job = job;
+            this._onvifService = onvifService;
         }
 
         public void Handle(EntityInsertedEvent<SceneTimer> message)
@@ -63,5 +68,15 @@ namespace IoTNode.Services
                 }
             }
         }
+
+        public void Handle(EntityUpdatedEvent<Setting> message)
+        {
+            if (message.Data.Name == "stream.rtmp" || message.Data.Name == "ffmpeg.args")
+            {
+                Task.Delay(1000);
+                this._onvifService.StopPushToServer();
+                this._onvifService.StartPushToServer();
+            }
+        }
     }
 }

projects/JobServer/JobServer.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Deterministic>false</Deterministic>

projects/StudyCenter/StudyCenter.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Deterministic>false</Deterministic>

projects/UserCenter/UserCenter.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Deterministic>false</Deterministic>

projects/Version.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.*")]
-[assembly: AssemblyInformationalVersion("1.0.0.4292")]
+[assembly: AssemblyInformationalVersion("1.0.0.430")]

projects/WebMVC/WebMVC.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <ItemGroup>

projects/WebSPA/WebSPA.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <ItemGroup>