wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: b50c7b1a213c5eadf00dadce68e73234fb5ecede
TangShanKaiPing
wanggang 6 years ago
parent ad800eb13d
commit cdec4603de
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File

20
projects/Infrastructure/Infrastructure.csproj
Unescape View File

@ -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" />

3
projects/IoT.Shared/Application/Models/ApiResponse.cs
Unescape View File

@ -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; }

8
projects/IoT.Shared/IoT.Shared.csproj
Unescape View File

@ -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\**\*" />

2
projects/IoT.Shared/Services/IoTNode/IoTNodeClient.cs
Unescape View File

@ -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)

2
projects/IoTNode/IoTNode.csproj
Unescape View File

@ -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" />

6
projects/UserCenter/UserCenter.csproj
Unescape View File

@ -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" />

Write Preview
Loading…
Cancel
Save