From 54f3951e85793a7e89d58dd313376e287884303f Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 6 Dec 2019 17:19:50 +0800
Subject: [PATCH] update

Former-commit-id: 209064e85a3f4ea217a2f483fefd69e51678ce3a
---
 projects/Infrastructure/Infrastructure.csproj      | 14 +++++++-------
 .../Areas/Admin/Views/Command/_Api.cshtml          |  6 +++---
 projects/IoT.Shared/IoT.Shared.csproj              |  8 ++++----
 .../Assets/StreamingAssets/IoT.Resources.csproj    |  2 +-
 projects/IoTNode/IoTNode.csproj                    |  2 +-
 publish/src/linux-arm64/publish/install.md         |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj
index c51a09fc..76794160 100644
--- a/projects/Infrastructure/Infrastructure.csproj
+++ b/projects/Infrastructure/Infrastructure.csproj
@@ -14,11 +14,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="JWT" Version="5.3.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="DotNetCore.NPOI" Version="1.2.2" />
@@ -30,11 +30,11 @@
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0-rc4" />
-    <PackageReference Include="System.Drawing.Common" Version="4.6.1" />
-    <PackageReference Include="System.Management" Version="4.6.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="System.Management" Version="4.7.0" />
     <PackageReference Include="ValueInjecter" Version="3.2.0" />
     <PackageReference Include="Flurl" Version="2.8.2" />
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.7" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.8" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.6.3" />
     <PackageReference Include="Cronos" Version="0.7.0" />
     <PackageReference Include="Polly" Version="7.2.0" />
diff --git a/projects/IoT.Shared/Areas/Admin/Views/Command/_Api.cshtml b/projects/IoT.Shared/Areas/Admin/Views/Command/_Api.cshtml
index 8f6c418b..2a5b1bea 100644
--- a/projects/IoT.Shared/Areas/Admin/Views/Command/_Api.cshtml
+++ b/projects/IoT.Shared/Areas/Admin/Views/Command/_Api.cshtml
@@ -17,9 +17,9 @@
         }
         else
         {
-            <div class="form-group">
-                <lable class="col-sm-2 control-label">@item.Description：</lable>
-                <div class="col-sm-6">
+            <div class="form-group row">
+                <lable class="col-sm-2 col-form-label required">@item.Description：</lable>
+                <div class="col-sm-8">
                     @if (item.SelectList != null)
                     {
                         @Html.DropDownList(name, item.SelectList, "请选择", new { @class = "form-control select search", data_val = "true", data_val_required = $"请输入{item.Description}" })
diff --git a/projects/IoT.Shared/IoT.Shared.csproj b/projects/IoT.Shared/IoT.Shared.csproj
index 14a4fb63..53bcfcd9 100644
--- a/projects/IoT.Shared/IoT.Shared.csproj
+++ b/projects/IoT.Shared/IoT.Shared.csproj
@@ -12,13 +12,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.0" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.1.4" />
     <PackageReference Include="SSH.NET" Version="2016.1.0" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.1.4" />
-    <PackageReference Include="System.IO.Ports" Version="4.6.0" />
+    <PackageReference Include="System.IO.Ports" Version="4.7.0" />
     <PackageReference Include="Vibrant.InfluxDB.Client" Version="4.0.1" />
   </ItemGroup>
   <ItemGroup>
diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
index 38319b65..e8da8fcb 100644
--- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
+++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
@@ -7,7 +7,7 @@
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
    <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.0" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
diff --git a/projects/IoTNode/IoTNode.csproj b/projects/IoTNode/IoTNode.csproj
index d6a0e4e9..d8c56679 100644
--- a/projects/IoTNode/IoTNode.csproj
+++ b/projects/IoTNode/IoTNode.csproj
@@ -8,7 +8,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
diff --git a/publish/src/linux-arm64/publish/install.md b/publish/src/linux-arm64/publish/install.md
index 35d21991..24c6e38b 100644
--- a/publish/src/linux-arm64/publish/install.md
+++ b/publish/src/linux-arm64/publish/install.md
@@ -29,7 +29,7 @@ root
 #chmod 755 /root/publish/apps/IoTNode/wwwroot/ffmpeg-linux-arm64
 9.¸ü»»Ô´
 #cp /etc/apt/sources.list  /etc/apt/sources.list.bk
-#sed -i 's/ports.ubuntu.com/mirrors.aliyun.com/' /etc/apt/sources.list
+#sed -i 's/ports.ubuntu.com\S*/mirrors.aliyun.com\/ubuntu-ports\//' /etc/apt/sources.list
 10.¸üÐÂÈí¼þ
 #apt update
 #apt upgrade