Skip to content

IoTSharp
IoTSharp

IoTSharp / IoTSharp
10 个月 前同步成功

通知 15
Star 2
Fork 0
IoTSharp
IoTSharp

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

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

裁剪引用。

上级 f245b15f
隐藏空白更改
内联 并排
Showing with 23 addition and 131 deletion
IoTSharp.Data.Cassandra/IoTSharp.Data.Cassandra.csproj
浏览文件 @ e216ccba
......@@ -9,13 +9,6 @@
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
<PackageReference Include="EFCore.Cassandra" Version="2.0.5" />
<PackageReference Include="IoTSharp.HealthChecks.Cassandra" Version="1.0.16" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.7" />
</ItemGroup>
<ItemGroup>
......
IoTSharp.Data.Cassandra/IoTSharpDataBuilderExtensions.cs
浏览文件 @ e216ccba

using EFCore.Sharding;
using IoTSharp.Data;
using Microsoft.EntityFrameworkCore;
......
IoTSharp.Data.InMemory/IoTSharp.Data.InMemory.csproj
浏览文件 @ e216ccba
......@@ -11,14 +11,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.7" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.7" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\IoTSharp.Data\IoTSharp.Data.csproj" />
......
IoTSharp.Data.InMemory/IoTSharpDataBuilderExtensions.cs
浏览文件 @ e216ccba

using EFCore.Sharding;
using IoTSharp.Data;
using IoTSharp.Data.InMemory;
using Microsoft.EntityFrameworkCore;
......
IoTSharp.Data.MySQL/IoTSharp.Data.MySQL.csproj
浏览文件 @ e216ccba
......@@ -8,15 +8,9 @@
<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI.MySql.Storage" Version="6.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.7" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
<PackageReference Include="EFCore.Sharding.MySql" Version="6.0.7" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="6.0.2" />
</ItemGroup>
<ItemGroup>
......
IoTSharp.Data.Oracle/IoTSharp.Data.Oracle.csproj
浏览文件 @ e216ccba
......@@ -6,15 +6,9 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Oracle" Version="6.0.3" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="6.0.5" />
<PackageReference Include="EFCore.Sharding.Oracle" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.61" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
......
IoTSharp.Data.PostgreSQL/IoTSharp.Data.PostgreSQL.csproj
浏览文件 @ e216ccba
......@@ -7,19 +7,7 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.PostgreSQL.Storage" Version="6.0.4" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.7" />
<PackageReference Include="Npgsql" Version="6.0.5" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5" />
<PackageReference Include="EFCore.Sharding.PostgreSql" Version="6.0.7" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.5" />
<PackageReference Include="Npgsql.Json.NET" Version="6.0.5" />
<PackageReference Include="Npgsql.NodaTime" Version="6.0.5" />
</ItemGroup>
<ItemGroup>
......
IoTSharp.Data.SqlServer/IoTSharp.Data.SqlServer.csproj
浏览文件 @ e216ccba
......@@ -6,7 +6,6 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI.SqlServer.Storage" Version="6.0.5" />
<PackageReference Include="EFCore.Sharding.SqlServer" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
......
IoTSharp.Data.Sqlite/IoTSharp.Data.Sqlite.csproj
浏览文件 @ e216ccba
......@@ -7,12 +7,6 @@
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Sqlite.Storage" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="6.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.7" />
<PackageReference Include="EFCore.Sharding.SQLite" Version="6.0.7" />
</ItemGroup>
......
IoTSharp.Data/IoTSharp.Data.csproj
浏览文件 @ e216ccba
......@@ -5,11 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="EFCore.Sharding" Version="6.0.7" />
</ItemGroup>
......
IoTSharp.Interpreter/IoTSharp.Interpreter.csproj
浏览文件 @ e216ccba
......@@ -7,15 +7,9 @@
<PackageReference Include="CLanguage" Version="0.18.42" />
<PackageReference Include="CS-Script" Version="4.4.6" />
<PackageReference Include="Jint" Version="3.0.0-beta-2037" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="4.2.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="IronPython" Version="3.4.0-alpha1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
......
IoTSharp.Interpreter/ScriptEnginesExtensions.cs
浏览文件 @ e216ccba
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using System;
......
IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj
浏览文件 @ e216ccba
......@@ -19,7 +19,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MQTTnet" Version="4.0.2.221" />
<PackageReference Include="MQTTnet" Version="4.1.0.247" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
......
IoTSharp.Test/IoTSharp.Test.csproj
浏览文件 @ e216ccba
......@@ -12,11 +12,7 @@
<ItemGroup>
<PackageReference Include="Ductus.FluentDocker" Version="2.10.55" />
<PackageReference Include="Ductus.FluentDocker.MsTest" Version="2.10.55" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
</ItemGroup>
......
IoTSharp/Handlers/MQTTServerHandler.cs
浏览文件 @ e216ccba
......@@ -545,16 +545,16 @@ namespace IoTSharp.Handlers
Uri uri = new Uri("mqtt://" + obj.Endpoint);
isLoopback = uri.IsLoopback;
}
if (isLoopback && !string.IsNullOrEmpty(e.ClientId) && e.ClientId == _mcsetting.MqttBroker && !string.IsNullOrEmpty(e.Username) )
if (isLoopback && !string.IsNullOrEmpty(e.ClientId) && e.ClientId == _mcsetting.MqttBroker && !string.IsNullOrEmpty(e.UserName) )
{
e.ReasonCode = MQTTnet.Protocol.MqttConnectReasonCode.Success;
}
else
{
_logger.LogInformation($"ClientId={obj.ClientId},Endpoint={obj.Endpoint},Username={obj.Username}，Password={obj.Password}");
_logger.LogInformation($"ClientId={obj.ClientId},Endpoint={obj.Endpoint},Username={obj.UserName}，Password={obj.Password}");
var mcr = _dbContextcv.DeviceIdentities.Include(d => d.Device).FirstOrDefault(mc =>
(mc.IdentityType == IdentityType.AccessToken && mc.IdentityId == obj.Username) ||
(mc.IdentityType == IdentityType.DevicePassword && mc.IdentityId == obj.Username && mc.IdentityValue == obj.Password));
(mc.IdentityType == IdentityType.AccessToken && mc.IdentityId == obj.UserName) ||
(mc.IdentityType == IdentityType.DevicePassword && mc.IdentityId == obj.UserName && mc.IdentityValue == obj.Password));
if (mcr != null)
{
try
......@@ -563,7 +563,7 @@ namespace IoTSharp.Handlers
e.SessionItems.Add(nameof(Device), device);
e.ReasonCode = MQTTnet.Protocol.MqttConnectReasonCode.Success;
_logger.LogInformation($"Device {device.Name}({device.Id}) is online !username is {obj.Username} and is endpoint{obj.Endpoint}");
_logger.LogInformation($"Device {device.Name}({device.Id}) is online !username is {obj.UserName} and is endpoint{obj.Endpoint}");
}
catch (Exception ex)
{
......@@ -574,35 +574,35 @@ namespace IoTSharp.Handlers
else if (_dbContextcv.AuthorizedKeys.Any(ak => ak.AuthToken == obj.Password))
{
var ak = _dbContextcv.AuthorizedKeys.Include(ak => ak.Customer).Include(ak => ak.Tenant).Include(ak => ak.Devices).FirstOrDefault(ak => ak.AuthToken == obj.Password);
if (ak != null && !ak.Devices.Any(dev => dev.Name == obj.Username))
if (ak != null && !ak.Devices.Any(dev => dev.Name == obj.UserName))
{
var devvalue = new Device() { Name = obj.Username, DeviceType = DeviceType.Device, Timeout = 300, LastActive = DateTime.Now };
var devvalue = new Device() { Name = obj.UserName, DeviceType = DeviceType.Device, Timeout = 300, LastActive = DateTime.Now };
devvalue.Tenant = ak.Tenant;
devvalue.Customer = ak.Customer;
_dbContextcv.Device.Add(devvalue);
ak.Devices.Add(devvalue);
_dbContextcv.AfterCreateDevice(devvalue, obj.Username, obj.Password);
_dbContextcv.AfterCreateDevice(devvalue, obj.UserName, obj.Password);
_dbContextcv.SaveChanges();
}
var mcp = _dbContextcv.DeviceIdentities.Include(d => d.Device).FirstOrDefault(mc => mc.IdentityType == IdentityType.DevicePassword && mc.IdentityId == obj.Username && mc.IdentityValue == obj.Password);
var mcp = _dbContextcv.DeviceIdentities.Include(d => d.Device).FirstOrDefault(mc => mc.IdentityType == IdentityType.DevicePassword && mc.IdentityId == obj.UserName && mc.IdentityValue == obj.Password);
if (mcp != null)
{
e.SessionItems.Add(nameof(Device), mcp.Device);
e.ReasonCode = MQTTnet.Protocol.MqttConnectReasonCode.Success;
_logger.LogInformation($"Device {mcp.Device.Name}({mcp.Device.Id}) is online !username is {obj.Username} and is endpoint{obj.Endpoint}");
_logger.LogInformation($"Device {mcp.Device.Name}({mcp.Device.Id}) is online !username is {obj.UserName} and is endpoint{obj.Endpoint}");
}
else
{
e.ReasonCode = MQTTnet.Protocol.MqttConnectReasonCode.BadUserNameOrPassword;
_logger.LogInformation($"Bad username or password/AuthToken {obj.Username},connection {obj.Endpoint} refused");
_logger.LogInformation($"Bad username or password/AuthToken {obj.UserName},connection {obj.Endpoint} refused");
}
}
else
{
e.ReasonCode = MQTTnet.Protocol.MqttConnectReasonCode.BadUserNameOrPassword;
_logger.LogInformation($"Bad username or password {obj.Username},connection {obj.Endpoint} refused");
_logger.LogInformation($"Bad username or password {obj.UserName},connection {obj.Endpoint} refused");
}
}
......
IoTSharp/IoTSharp.csproj
浏览文件 @ e216ccba
......@@ -53,30 +53,21 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AlterNats" Version="1.0.4" />
<PackageReference Include="Apache.IoTDB" Version="0.13.0.9-alpha" />
<PackageReference Include="Apache.IoTDB.Data" Version="0.13.0.9-alpha" />
<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="6.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" Version="6.0.2" />
<PackageReference Include="AspNetCore.HealthChecks.Redis" Version="6.0.4" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.5" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="6.0.3" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="6.0.3" />
<PackageReference Include="CAP.Extensions" Version="1.0.35" />
<PackageReference Include="DotNetCore.CAP" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.Kafka" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.MongoDB" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.SqlServer" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.AzureServiceBus" Version="6.1.0" />
......@@ -84,19 +75,16 @@
<PackageReference Include="DotNetCore.CAP.NATS" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="6.1.0" />
<PackageReference Include="DotNetCore.CAP.Pulsar" Version="6.1.0" />
<PackageReference Include="EasyCaching.Core" Version="1.6.0" />
<PackageReference Include="EasyCaching.InMemory" Version="1.6.0" />
<PackageReference Include="EasyCaching.LiteDB" Version="1.6.0" />
<PackageReference Include="EasyCaching.Redis" Version="1.6.0" />
<PackageReference Include="hyjiacan.pinyin4net" Version="4.1.1" />
<PackageReference Include="InfluxDB.Client" Version="4.3.0" />
<PackageReference Include="IoTSharp.CoAP.NET" Version="2.0.8" />
<PackageReference Include="IoTSharp.HealthChecks.InfluxDB" Version="1.0.16" />
<PackageReference Include="IoTSharp.HealthChecks.IoTDB" Version="1.0.16" />
<PackageReference Include="IoTSharp.X509Extensions" Version="2.0.36" />
<PackageReference Include="Jdenticon-net" Version="3.1.2" />
<PackageReference Include="Jdenticon.AspNetCore" Version="3.1.2" />
<PackageReference Include="kimbus" Version="2.0.1" />
<PackageReference Include="LiteDB" Version="5.0.12" />
<PackageReference Include="MaiKeBing.CAP.ZeroMQ" Version="1.0.35" />
<PackageReference Include="MaiKeBing.CAP.LiteDB" Version="1.0.35" />
......@@ -104,62 +92,28 @@
<PackageReference Include="IoTSharp.HealthChecks.Taos" Version="2.0.478" />
<PackageReference Include="MaiKeBing.HostedService.ZeroMQ" Version="1.0.35" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.7" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.2.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.16.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.7" />
<PackageReference Include="MQTTnet" Version="4.0.2.221" />
<PackageReference Include="MQTTnet.AspNetCore" Version="4.0.2.221" />
<PackageReference Include="MQTTnet.Extensions.Rpc" Version="4.0.2.221" />
<PackageReference Include="MQTTnet" Version="4.1.0.247" />
<PackageReference Include="MQTTnet.AspNetCore" Version="4.1.0.247" />
<PackageReference Include="NetMQ" Version="4.0.1.9" />
<PackageReference Include="Npgsql" Version="6.0.5" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="6.0.5" />
<PackageReference Include="NSwag.AspNetCore" Version="13.16.1" />
<PackageReference Include="PinusDB" Version="1.0.10" />
<PackageReference Include="PinusDB.HealthChecks" Version="1.0.10" />
<PackageReference Include="Quartz.Serialization.Json" Version="3.4.0" />
<PackageReference Include="RestSharp" Version="108.0.1" />
<PackageReference Include="Rin" Version="2.6.0" />
<PackageReference Include="Rin.Mvc" Version="2.6.0" />
<PackageReference Include="RulesEngine" Version="3.5.0" />
<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="6.0.0" />
<PackageReference Include="Silkier" Version="1.0.424" />
<PackageReference Include="Silkier.AspNetCore" Version="1.0.424" />
<PackageReference Include="Silkier.EFCore" Version="1.0.424" />
<PackageReference Include="Silkier" Version="1.0.592" />
<PackageReference Include="Silkier.AspNetCore" Version="1.0.592" />
<PackageReference Include="Silkier.EFCore" Version="1.0.592" />
<PackageReference Include="SilkierQuartz" Version="5.0.356" />
<PackageReference Include="SilkierQuartz.Plugins.RecentHistory" Version="5.0.356" />
<PackageReference Include="SkiaSharp" Version="2.88.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.0" />
<PackageReference Include="System.CodeDom" Version="6.0.0" />
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.21.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0">
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.0.2.221" />
<PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.7" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="6.0.7" />
</ItemGroup>
<ItemGroup>
......
IoTSharp/Startup.cs
浏览文件 @ e216ccba
......@@ -60,6 +60,7 @@ namespace IoTSharp
// This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services)
{
System.Text.Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
var settings = Configuration.Get<AppSettings>();
services.Configure((Action<AppSettings>)(setting =>
{
......
IoTSharp/Storage/PinusDBStorage.cs
浏览文件 @ e216ccba
......@@ -8,7 +8,6 @@ using Microsoft.Extensions.ObjectPool;
using Microsoft.Extensions.Options;
using Org.BouncyCastle.Utilities.Encoders;
using PinusDB.Data;
using Silkier;
using Silkier.EFCore;
using System;
using System.Collections.Generic;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或