Skip to content

IoTSharp
IoTSharp

IoTSharp / IoTSharp
大约 1 年 前同步成功

通知 15
Star 2
Fork 0
IoTSharp
IoTSharp

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

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

加入更多处理是否在线问题

上级 afae0e11
隐藏空白更改
内联 并排
Showing with 143 addition and 128 deletion
IoTSharp/Handlers/MQTTServerHandler.cs
浏览文件 @ cbab5d84
......@@ -151,6 +151,7 @@ namespace IoTSharp.Handlers
}
}
}
}
else
......@@ -295,17 +296,23 @@ namespace IoTSharp.Handlers
devicedatato = new Device() { Id = Guid.NewGuid(), Name = tpary[1], DeviceType = DeviceType.Device, Tenant = gw.Tenant, Customer = gw.Customer, Owner = gw, LastActive = DateTime.Now, Timeout = 300 };
gw.Children.Add(devicedatato);
_dbContext.AfterCreateDevice(devicedatato);
_dbContext.SaveChangesAsync();
gw.LastActive = DateTime.Now;
gw.Online = true;
}
else
{
devicedatato = subdev.FirstOrDefault();
devicedatato.LastActive = DateTime.Now;
devicedatato.Online = true;
}
}
else
{
devicedatato = _dbContext.Device.Find(device.Id);
devicedatato.LastActive = DateTime.Now;
devicedatato.Online = true;
}
_dbContext.SaveChangesAsync();
}
return devicedatato;
}
......
IoTSharp/IoTSharp.csproj
浏览文件 @ cbab5d84
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
<IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
<Company>IoT#</Company>
<Product>IoTSharp</Product>
<Authors>IoT#</Authors>
<PackageProjectUrl>https://github.com/IoTSharp/IoTSharp</PackageProjectUrl>
<PackageLicenseUrl></PackageLicenseUrl>
<RepositoryUrl>https://github.com/IoTSharp/IoTSharp</RepositoryUrl>
<PackageReleaseNotes>Open-source IoT Platform - Device management, data collection, processing and visualization. https://www.iotsharp.net</PackageReleaseNotes>
<Description>Open-source IoT Platform - Device management, data collection, processing and visualization.</Description>
<PackageId>IoTSharp</PackageId>
<UserSecretsId>18970590-05bf-4a1f-a70b-3c8a120d12cb</UserSecretsId>
<Version>1.0.1</Version>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<RepositoryType>git</RepositoryType>
<PackageTags>IoT</PackageTags>
<PackageIcon>https:\avatars2.githubusercontent.com\u\200x200.png</PackageIcon>
<ApplicationIcon>Resources\Logo.ico</ApplicationIcon>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<PackageIconUrl />
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
<IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
<Company>MaiKebing</Company>
<Product>IoTSharp</Product>
<Authors>Maikebing</Authors>
<PackageProjectUrl>https://github.com/IoTSharp/IoTSharp</PackageProjectUrl>
<RepositoryUrl>https://github.com/IoTSharp/IoTSharp</RepositoryUrl>
<PackageReleaseNotes>Open-source IoT Platform - Device management, data collection, processing and visualization. https://www.iotsharp.net</PackageReleaseNotes>
<Description>Open-source IoT Platform - Device management, data collection, processing and visualization.</Description>
<PackageId>IoTSharp</PackageId>
<UserSecretsId>18970590-05bf-4a1f-a70b-3c8a120d12cb</UserSecretsId>
<Version>1.0.1</Version>
<RepositoryType>git</RepositoryType>
<PackageTags>IoT</PackageTags>
<ApplicationIcon>Resources\Logo.ico</ApplicationIcon>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IsPackable>true</IsPackable>
<PackageLicenseExpression></PackageLicenseExpression>
<Copyright>Copyright 2018-2020 Yanhong Ma</Copyright>
<AssemblyVersion>1.15.1.0</AssemblyVersion>
<FileVersion>1.15.1.0</FileVersion>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<DocumentationFile>IoTSharp.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<DocumentationFile>IoTSharp.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="3.1.1" />
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="3.1.4" />
<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.PostgreSQL.Storage" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.Kafka" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.MongoDB" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="3.1.1" />
<PackageReference Include="EasyCaching.Core" Version="0.9.0" />
<PackageReference Include="EasyCaching.InMemory" Version="0.9.0" />
<PackageReference Include="EasyCaching.LiteDB" Version="0.9.0" />
<PackageReference Include="EasyCaching.Redis" Version="0.9.0" />
<PackageReference Include="EFCore.Sharding" Version="3.1.8.4" />
<PackageReference Include="EFCore.Sharding.PostgreSql" Version="3.1.8.4" />
<PackageReference Include="hyjiacan.py4n" Version="4.0.0" />
<PackageReference Include="IoTSharp.CoAP.NET" Version="2.0.8" />
<PackageReference Include="IoTSharp.X509Extensions" Version="1.4.19" />
<PackageReference Include="kimbus" Version="2.0.1" />
<PackageReference Include="LiteDB" Version="5.0.9" />
<PackageReference Include="MaiKeBing.CAP.LiteDB" Version="1.0.19" />
<PackageReference Include="MaiKeBing.CAP.ZeroMQ" Version="1.0.19" />
<PackageReference Include="Maikebing.Data.Taos" Version="2.0.168" />
<PackageReference Include="Maikebing.HealthChecks.Taos" Version="2.0.168" />
<PackageReference Include="MaiKeBing.HostedService.ZeroMQ" Version="1.0.19" />
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="3.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.9" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.4" />
<PackageReference Include="MQTTnet" Version="3.0.13" />
<PackageReference Include="MQTTnet.AspNetCore" Version="3.0.13" />
<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.0.13" />
<PackageReference Include="NetMQ" Version="4.0.1.6" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
<PackageReference Include="NSwag.AspNetCore" Version="13.8.2" />
<PackageReference Include="ProxyKit" Version="2.3.4" />
<PackageReference Include="Quartz.Serialization.Json" Version="3.2.2" />
<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="3.0.0" />
<PackageReference Include="Silkier" Version="1.0.233" />
<PackageReference Include="Silkier.AspNetCore" Version="1.0.233" />
<PackageReference Include="Silkier.EFCore" Version="1.0.233" />
<PackageReference Include="SilkierQuartz" Version="1.0.46" />
<PackageReference Include="SilkierQuartz.Plugins.RecentHistory" Version="1.0.46" />
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.9" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.9" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.9" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.9" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="3.1.9" />
<PackageReference Include="MQTTnet.AspNetCoreEx" Version="3.0.11" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.13" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Migrations\**" />
<Content Remove="Migrations\**" />
<EmbeddedResource Remove="Migrations\**" />
<None Remove="Migrations\**" />
<None Remove=".gitignore" />
<None Remove="healthchecksdb" />
<None Remove="healthchecksdb-shm" />
<None Remove="IoTSharp.xml" />
<Content Include="IoTSharp.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="..\docs\images\200x200.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
<None Include="..\LICENSE.txt">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="3.1.1" />
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="3.1.4" />
<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.PostgreSQL.Storage" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="3.1.2" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="3.1.3" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.Kafka" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.MongoDB" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="3.1.1" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="3.1.1" />
<PackageReference Include="EasyCaching.Core" Version="0.9.0" />
<PackageReference Include="EasyCaching.InMemory" Version="0.9.0" />
<PackageReference Include="EasyCaching.LiteDB" Version="0.9.0" />
<PackageReference Include="EasyCaching.Redis" Version="0.9.0" />
<PackageReference Include="EFCore.Sharding" Version="3.1.8.4" />
<PackageReference Include="EFCore.Sharding.PostgreSql" Version="3.1.8.4" />
<PackageReference Include="hyjiacan.py4n" Version="4.0.0" />
<PackageReference Include="IoTSharp.CoAP.NET" Version="2.0.8" />
<PackageReference Include="IoTSharp.X509Extensions" Version="1.4.19" />
<PackageReference Include="kimbus" Version="2.0.1" />
<PackageReference Include="LiteDB" Version="5.0.9" />
<PackageReference Include="MaiKeBing.CAP.LiteDB" Version="1.0.19" />
<PackageReference Include="MaiKeBing.CAP.ZeroMQ" Version="1.0.19" />
<PackageReference Include="Maikebing.Data.Taos" Version="2.0.168" />
<PackageReference Include="Maikebing.HealthChecks.Taos" Version="2.0.168" />
<PackageReference Include="MaiKeBing.HostedService.ZeroMQ" Version="1.0.19" />
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="3.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.9" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.4" />
<PackageReference Include="MQTTnet" Version="3.0.13" />
<PackageReference Include="MQTTnet.AspNetCore" Version="3.0.13" />
<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.0.13" />
<PackageReference Include="NetMQ" Version="4.0.1.6" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
<PackageReference Include="NSwag.AspNetCore" Version="13.8.2" />
<PackageReference Include="ProxyKit" Version="2.3.4" />
<PackageReference Include="Quartz.Serialization.Json" Version="3.2.2" />
<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="3.0.0" />
<PackageReference Include="Silkier" Version="1.0.233" />
<PackageReference Include="Silkier.AspNetCore" Version="1.0.233" />
<PackageReference Include="Silkier.EFCore" Version="1.0.233" />
<PackageReference Include="SilkierQuartz" Version="1.0.46" />
<PackageReference Include="SilkierQuartz.Plugins.RecentHistory" Version="1.0.46" />
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.9" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.9" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.9" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.9" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.1.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="3.1.9" />
<PackageReference Include="MQTTnet.AspNetCoreEx" Version="3.0.11" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.13" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Migrations\**" />
<Content Remove="Migrations\**" />
<EmbeddedResource Remove="Migrations\**" />
<None Remove="Migrations\**" />
<Content Remove="wwwroot\lib\jquery-validation-unobtrusive\LICENSE.txt" />
<Content Remove="wwwroot\lib\jquery\LICENSE.txt" />
<None Remove=".gitignore" />
<None Remove="healthchecksdb" />
<None Remove="healthchecksdb-shm" />
<None Remove="IoTSharp.xml" />
<Content Include="..\LICENSE.txt" Link="LICENSE.txt" />
<Content Include="IoTSharp.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="..\docs\images\200x200.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
<None Include="..\LICENSE.txt">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
<None Include="LICENSE.txt">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
</Project>
\ No newline at end of file
LICENSE.txt
浏览文件 @ cbab5d84
MIT License
Copyright (c) 2018 IoT#
Copyright (c) 2018-2020 IoT#
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或