Skip to content

IoTSharp
IoTSharp

IoTSharp / IoTSharp
11 个月 前同步成功

通知 15
Star 2
Fork 0
IoTSharp
IoTSharp

体验新版 GitCode，发现更多精彩内容 >>

提交 cf872a0b 编写于 作者: 麦壳饼's avatar 麦壳饼
浏览文件
操作

使用mqttnet 4.0

上级 f8660edc
显示空白变更内容
内联 并排
Showing with 31 addition and 29 deletion
IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj
浏览文件 @ cf872a0b
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
<PackageReference Include="EFCore.Sharding.MySql" Version="6.0.0" /> <PackageReference Include="EFCore.Sharding.MySql" Version="6.0.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="6.0.1" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="6.0.1" />
</ItemGroup> </ItemGroup>
......
IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj
浏览文件 @ cf872a0b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<PackageReference Include="AspNetCore.HealthChecks.Oracle" Version="6.0.1" /> <PackageReference Include="AspNetCore.HealthChecks.Oracle" Version="6.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" /> <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.2" /> <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.2" />
<PackageReference Include="EFCore.Sharding.Oracle" Version="6.0.0" /> <PackageReference Include="EFCore.Sharding.Oracle" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.5" /> <PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
......
IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj
浏览文件 @ cf872a0b
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" />
<PackageReference Include="Npgsql" Version="6.0.2" /> <PackageReference Include="Npgsql" Version="6.0.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
<PackageReference Include="EFCore.Sharding.PostgreSql" Version="6.0.0" /> <PackageReference Include="EFCore.Sharding.PostgreSql" Version="6.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.2" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.3" />
<PackageReference Include="Npgsql.Json.NET" Version="6.0.2" /> <PackageReference Include="Npgsql.Json.NET" Version="6.0.3" />
<PackageReference Include="Npgsql.NodaTime" Version="6.0.2" /> <PackageReference Include="Npgsql.NodaTime" Version="6.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj
浏览文件 @ cf872a0b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.1" /> <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" /> <PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.SqlServer.Storage" Version="6.0.2" /> <PackageReference Include="AspNetCore.HealthChecks.UI.SqlServer.Storage" Version="6.0.2" />
<PackageReference Include="EFCore.Sharding.SqlServer" Version="6.0.0" /> <PackageReference Include="EFCore.Sharding.SqlServer" Version="6.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
</ItemGroup> </ItemGroup>
......
IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj
浏览文件 @ cf872a0b
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" /> <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.1" />
<PackageReference Include="EFCore.Sharding.SQLite" Version="6.0.0" /> <PackageReference Include="EFCore.Sharding.SQLite" Version="6.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\IoTSharp.Data\IoTSharp.Data.csproj" /> <ProjectReference Include="..\IoTSharp.Data\IoTSharp.Data.csproj" />
......
IoTSharp.Data/IoTSharp.Data.csproj
浏览文件 @ cf872a0b
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="EFCore.Sharding" Version="6.0.0" /> <PackageReference Include="EFCore.Sharding" Version="6.0.2" />
</ItemGroup> </ItemGroup>
......
IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj
浏览文件 @ cf872a0b
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MQTTnet" Version="3.1.1" /> <PackageReference Include="MQTTnet" Version="4.0.0-preview3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup> </ItemGroup>
......
IoTSharp/Dtos/DeviceDetailDto.cs
浏览文件 @ cf872a0b
...@@ -48,9 +48,9 @@ namespace IoTSharp.Dtos ...@@ -48,9 +48,9 @@ namespace IoTSharp.Dtos
public string IdentityValue { get; set; } public string IdentityValue { get; set; }
public string IdentityId { get; set; } public string IdentityId { get; set; }
#nullable enable
public DeviceModel? Model { get; set; } public DeviceModel? Model { get; set; }
#nullable disable
} }
} }
IoTSharp/Extensions/MqttExtension.cs
浏览文件 @ cf872a0b
...@@ -46,6 +46,7 @@ namespace IoTSharp ...@@ -46,6 +46,7 @@ namespace IoTSharp
{ {
options.WithoutEncryptedEndpoint(); options.WithoutEncryptedEndpoint();
} }
options.WithDefaultCommunicationTimeout(TimeSpan.FromSeconds(5));
options.WithPersistentSessions(); options.WithPersistentSessions();
options.Build(); options.Build();
}).AddMqttConnectionHandler() }).AddMqttConnectionHandler()
......
IoTSharp/Handlers/MQTTServerHandler.cs
浏览文件 @ cf872a0b
...@@ -52,7 +52,7 @@ namespace IoTSharp.Handlers ...@@ -52,7 +52,7 @@ namespace IoTSharp.Handlers
static long clients = 0; static long clients = 0;
internal Task Server_ClientConnectedAsync(ClientConnectedEventArgs e) internal Task Server_ClientConnectedAsync(ClientConnectedEventArgs e)
{ {
_logger.LogInformation($"Client [{e.ClientId}] connected"); _logger.LogInformation($"Client [{e.ClientId}] {e.Endpoint} {e.UserName} connected");
clients++; clients++;
return Task.CompletedTask; return Task.CompletedTask;
} }
...@@ -366,7 +366,7 @@ namespace IoTSharp.Handlers ...@@ -366,7 +366,7 @@ namespace IoTSharp.Handlers
var devtmp = _dbContext.Device.FirstOrDefault(d => d.Id == dev.Id); var devtmp = _dbContext.Device.FirstOrDefault(d => d.Id == dev.Id);
devtmp.LastActive = DateTime.Now; devtmp.LastActive = DateTime.Now;
devtmp.Online = false; devtmp.Online = false;
_dbContext.SaveChanges(); await _dbContext.SaveChangesAsync();
_logger.LogInformation($"Server_ClientDisconnected ClientId:{args.ClientId} DisconnectType:{args.DisconnectType} Device is {devtmp.Name }({devtmp.Id}) "); _logger.LogInformation($"Server_ClientDisconnected ClientId:{args.ClientId} DisconnectType:{args.DisconnectType} Device is {devtmp.Name }({devtmp.Id}) ");
} }
} }
......
IoTSharp/IoTSharp.csproj
浏览文件 @ cf872a0b
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<PackageReference Include="EasyCaching.LiteDB" Version="1.5.0" /> <PackageReference Include="EasyCaching.LiteDB" Version="1.5.0" />
<PackageReference Include="EasyCaching.Redis" Version="1.5.0" /> <PackageReference Include="EasyCaching.Redis" Version="1.5.0" />
<PackageReference Include="hyjiacan.pinyin4net" Version="4.1.0" /> <PackageReference Include="hyjiacan.pinyin4net" Version="4.1.0" />
<PackageReference Include="InfluxDB.Client" Version="3.2.0" /> <PackageReference Include="InfluxDB.Client" Version="3.3.0" />
<PackageReference Include="IoTSharp.CoAP.NET" Version="2.0.8" /> <PackageReference Include="IoTSharp.CoAP.NET" Version="2.0.8" />
<PackageReference Include="IoTSharp.X509Extensions" Version="1.4.27" /> <PackageReference Include="IoTSharp.X509Extensions" Version="1.4.27" />
<PackageReference Include="Jdenticon-net" Version="3.1.2" /> <PackageReference Include="Jdenticon-net" Version="3.1.2" />
...@@ -89,14 +89,14 @@ ...@@ -89,14 +89,14 @@
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.1" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.1" />
<PackageReference Include="MQTTnet" Version="4.0.0-preview1" /> <PackageReference Include="MQTTnet" Version="4.0.0-preview3" />
<PackageReference Include="MQTTnet.AspNetCore" Version="4.0.0-preview1" /> <PackageReference Include="MQTTnet.AspNetCore" Version="4.0.0-preview3" />
<PackageReference Include="MQTTnet.Extensions.Rpc" Version="4.0.0-preview1" /> <PackageReference Include="MQTTnet.Extensions.Rpc" Version="4.0.0-preview3" />
<PackageReference Include="NetMQ" Version="4.0.1.6" /> <PackageReference Include="NetMQ" Version="4.0.1.8" />
<PackageReference Include="Npgsql" Version="6.0.2" /> <PackageReference Include="Npgsql" Version="6.0.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.3" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.2" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.3" />
<PackageReference Include="NSwag.AspNetCore" Version="13.15.5" /> <PackageReference Include="NSwag.AspNetCore" Version="13.15.7" />
<PackageReference Include="PinusDB" Version="1.0.10" /> <PackageReference Include="PinusDB" Version="1.0.10" />
<PackageReference Include="PinusDB.HealthChecks" Version="1.0.10" /> <PackageReference Include="PinusDB.HealthChecks" Version="1.0.10" />
<PackageReference Include="ProxyKit" Version="2.3.4" /> <PackageReference Include="ProxyKit" Version="2.3.4" />
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.0.0-preview1" /> <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.0.0-preview3" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.1" /> <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.1" /> <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.1" />
......
IoTSharp/Models/Graph/DeviceProp.cs
浏览文件 @ cf872a0b
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
{ {
public class DeviceProp public class DeviceProp
{ {
#nullable enable
public Body? body { get; set; } public Body? body { get; set; }
public Position? position { get; set; } public Position? position { get; set; }
public Size? size { get; set; } public Size? size { get; set; }
public Text? text { get; set; } public Text? text { get; set; }
#nullable disable
} }
} }
\ No newline at end of file
IoTSharp/Models/Graph/Shape.cs
浏览文件 @ cf872a0b
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
public long[] incomes { get; set; } public long[] incomes { get; set; }
public long[] outgoings { get; set; } public long[] outgoings { get; set; }
#nullable enable
public DeviceProp? prop { get; set; } public DeviceProp? prop { get; set; }
#nullable disable
} }
} }
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或