From cdec4603de73a100bb4e06ff109bf27f328ca6c3 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 18 Feb 2020 16:51:19 +0800
Subject: [PATCH] update

Former-commit-id: b50c7b1a213c5eadf00dadce68e73234fb5ecede
---
 projects/Infrastructure/Infrastructure.csproj | 20 +++++++++----------
 .../Application/Models/ApiResponse.cs         |  3 +++
 projects/IoT.Shared/IoT.Shared.csproj         |  8 ++++----
 .../Services/IoTNode/IoTNodeClient.cs         |  2 --
 projects/IoTNode/IoTNode.csproj               |  2 +-
 projects/UserCenter/UserCenter.csproj         |  6 +++---
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj
index f6fd819f..a01dfa97 100644
--- a/projects/Infrastructure/Infrastructure.csproj
+++ b/projects/Infrastructure/Infrastructure.csproj
@@ -9,34 +9,34 @@
 
   <ItemGroup>
     <PackageReference Include="CS-Script.Core" Version="1.2.3.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="JWT" Version="5.3.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="JWT" Version="6.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.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" />
     <PackageReference Include="HtmlAgilityPack.NetCore" Version="1.5.0.1" />
-    <PackageReference Include="MailKit" Version="2.4.1" />
+    <PackageReference Include="MailKit" Version="2.5.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc5" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0-rc5" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.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.8" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.9" />
     <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/Application/Models/ApiResponse.cs b/projects/IoT.Shared/Application/Models/ApiResponse.cs
index e9401045..9ce34bb8 100644
--- a/projects/IoT.Shared/Application/Models/ApiResponse.cs
+++ b/projects/IoT.Shared/Application/Models/ApiResponse.cs
@@ -1,10 +1,13 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace Application.Models
 {
     public class ApiResponse
     {
+        [Display(Name = "ÀàÐÍ")]
         public int type { get; set; }
+
         public int code { get; set; }
         public string message { get; set; }
         public object data { get; set; }
diff --git a/projects/IoT.Shared/IoT.Shared.csproj b/projects/IoT.Shared/IoT.Shared.csproj
index ce0c2921..706db4c4 100644
--- a/projects/IoT.Shared/IoT.Shared.csproj
+++ b/projects/IoT.Shared/IoT.Shared.csproj
@@ -8,14 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <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.Extensions.FileProviders.Embedded" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.1" />
     <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.7.0" />
-    <PackageReference Include="Vibrant.InfluxDB.Client" Version="4.0.1" />
+    <PackageReference Include="Vibrant.InfluxDB.Client" Version="4.0.2" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
diff --git a/projects/IoT.Shared/Services/IoTNode/IoTNodeClient.cs b/projects/IoT.Shared/Services/IoTNode/IoTNodeClient.cs
index 80ed29cf..7f76e657 100644
--- a/projects/IoT.Shared/Services/IoTNode/IoTNodeClient.cs
+++ b/projects/IoT.Shared/Services/IoTNode/IoTNodeClient.cs
@@ -26,13 +26,11 @@ namespace IoT.Shared.Services
         private HubConnection Connection;
         private readonly IServiceProvider applicationServices;
         private readonly IConfiguration _cfg;
-        public string ConnectionId { get; private set; }
 
         public IoTNodeClient(IServiceProvider applicationServices, IConfiguration configuration)
         {
             this.applicationServices = applicationServices;
             this._cfg = configuration;
-            this.ConnectionId = Guid.NewGuid().ToBase62();
         }
 
         public Task StartAsync(CancellationToken cancellationToken)
diff --git a/projects/IoTNode/IoTNode.csproj b/projects/IoTNode/IoTNode.csproj
index 91e64e0c..463517f6 100644
--- a/projects/IoTNode/IoTNode.csproj
+++ b/projects/IoTNode/IoTNode.csproj
@@ -4,7 +4,7 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
diff --git a/projects/UserCenter/UserCenter.csproj b/projects/UserCenter/UserCenter.csproj
index e7baa364..759e4b56 100644
--- a/projects/UserCenter/UserCenter.csproj
+++ b/projects/UserCenter/UserCenter.csproj
@@ -7,9 +7,9 @@
     <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.0.0" />
     <PackageReference Include="AspNet.Security.OAuth.QQ" Version="3.0.0" />
     <PackageReference Include="FaceRecognitionDotNet" Version="1.2.3.13" />
-    <PackageReference Include="IdentityServer4" Version="3.1.0" />
-    <PackageReference Include="IdentityServer4.EntityFramework" Version="3.1.0" />
-    <PackageReference Include="RavenDB.Embedded" Version="4.2.6" />
+    <PackageReference Include="IdentityServer4" Version="3.1.1" />
+    <PackageReference Include="IdentityServer4.EntityFramework" Version="3.1.1" />
+    <PackageReference Include="RavenDB.Embedded" Version="4.2.8" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />