Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
IoTSharp
IoTSharp
提交
174c69f5
IoTSharp
项目概览
IoTSharp
/
IoTSharp
12 个月 前同步成功
通知
15
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
IoTSharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
174c69f5
编写于
5月 14, 2020
作者:
麦壳饼
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
升级动态库
上级
7887880a
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
38 addition
and
39 deletion
+38
-39
Clients/MQTTClient/MQTTClient.csproj
Clients/MQTTClient/MQTTClient.csproj
+1
-1
IoTSharp.Test/IoTSharp.Test.csproj
IoTSharp.Test/IoTSharp.Test.csproj
+4
-4
IoTSharp/Extensions/MqttExtension.cs
IoTSharp/Extensions/MqttExtension.cs
+6
-6
IoTSharp/IoTSharp.csproj
IoTSharp/IoTSharp.csproj
+26
-26
IoTSharp/Startup.cs
IoTSharp/Startup.cs
+1
-2
未找到文件。
Clients/MQTTClient/MQTTClient.csproj
浏览文件 @
174c69f5
...
...
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MQTTnet" Version="3.0.
8
" />
<PackageReference Include="MQTTnet" Version="3.0.
9
" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
...
...
IoTSharp.Test/IoTSharp.Test.csproj
浏览文件 @
174c69f5
...
...
@@ -7,10 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.
3
" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.
5.0
" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.
0
" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.
0
" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.
4
" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.
6.1
" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.
1
" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.
1
" />
</ItemGroup>
<ItemGroup>
...
...
IoTSharp/Extensions/MqttExtension.cs
浏览文件 @
174c69f5
...
...
@@ -73,23 +73,23 @@ namespace IoTSharp
var
logger
=
_loggerFactory
.
CreateLogger
<
IMqttNetLogger
>();
mqttNetLogger
.
LogMessagePublished
+=
(
object
sender
,
MqttNetLogMessagePublishedEventArgs
e
)
=>
{
var
message
=
$"ID:
{
e
.
TraceMessage
.
LogId
}
,ThreadId:
{
e
.
TraceMessage
.
ThreadId
}
,Source:
{
e
.
TraceMessage
.
Source
}
,Timestamp:
{
e
.
TraceMessage
.
Timestamp
}
,Message:
{
e
.
Trace
Message
.
Message
}
"
;
switch
(
e
.
Trace
Message
.
Level
)
var
message
=
$"ID:
{
e
.
LogMessage
.
LogId
}
,ThreadId:
{
e
.
LogMessage
.
ThreadId
}
,Source:
{
e
.
LogMessage
.
Source
}
,Timestamp:
{
e
.
LogMessage
.
Timestamp
}
,Message:
{
e
.
Log
Message
.
Message
}
"
;
switch
(
e
.
Log
Message
.
Level
)
{
case
MqttNetLogLevel
.
Verbose
:
logger
.
LogTrace
(
e
.
Trace
Message
.
Exception
,
message
);
logger
.
LogTrace
(
e
.
Log
Message
.
Exception
,
message
);
break
;
case
MqttNetLogLevel
.
Info
:
logger
.
LogInformation
(
e
.
Trace
Message
.
Exception
,
message
);
logger
.
LogInformation
(
e
.
Log
Message
.
Exception
,
message
);
break
;
case
MqttNetLogLevel
.
Warning
:
logger
.
LogWarning
(
e
.
Trace
Message
.
Exception
,
message
);
logger
.
LogWarning
(
e
.
Log
Message
.
Exception
,
message
);
break
;
case
MqttNetLogLevel
.
Error
:
logger
.
LogError
(
e
.
Trace
Message
.
Exception
,
message
);
logger
.
LogError
(
e
.
Log
Message
.
Exception
,
message
);
break
;
default
:
...
...
IoTSharp/IoTSharp.csproj
浏览文件 @
174c69f5
...
...
@@ -35,48 +35,48 @@
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="3.0.1" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="3.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="3.
0.3
" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="3.
0.11
" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="3.
0.0
" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="3.
0
.1" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="3.
1.1
" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="3.
1.0
" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="3.
1.1
" />
<PackageReference Include="AspNetCore.HealthChecks.Network" Version="3.
1
.1" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="3.
0.0
" />
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="3.
1.1
" />
<PackageReference Include="IoTSharp.X509Extensions" Version="1.4.9" />
<PackageReference Include="LiteDB" Version="5.0.
5
" />
<PackageReference Include="LiteDB" Version="5.0.
8
" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.
9.10
" />
<PackageReference Include="MQTTnet" Version="3.0.
8
" />
<PackageReference Include="MQTTnet.AspNetCore" Version="3.0.
8
" />
<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.0.
8
" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.
10.8
" />
<PackageReference Include="MQTTnet" Version="3.0.
9
" />
<PackageReference Include="MQTTnet.AspNetCore" Version="3.0.
9
" />
<PackageReference Include="MQTTnet.Extensions.Rpc" Version="3.0.
9
" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.3" />
<PackageReference Include="NSwag.AspNetCore" Version="13.
3
.0" />
<PackageReference Include="NSwag.AspNetCore" Version="13.
5
.0" />
<PackageReference Include="QuartzHostedServiceEx" Version="0.0.7" />
<PackageReference Include="Silkier" Version="1.0.23" />
<PackageReference Include="Silkier.AspNetCore" Version="1.0.23" />
<PackageReference Include="Silkier.EFCore" Version="1.0.23" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.
0
" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.
1
" />
<PackageReference Include="CoAP.NET.Core" Version="1.1.0" />
<PackageReference Include="Quartz.Plugins.RecentHistory" Version="1.0.3" />
<PackageReference Include="QuartzminFork" Version="1.0.15" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.
3
" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.
3
" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.
3
" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.
3
" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.1.
3
" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.
3
" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.
3
" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.
3
" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.
3
" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.
3
" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.
3
" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="3.1.
3
" />
<PackageReference Include="MQTTnet.AspNetCoreEx" Version="3.0.
8
" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.
8
" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.
4
" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.
4
" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.
4
" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.
4
" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="3.1.
4
" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.
4
" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.
4
" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.
4
" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.
4
" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.
4
" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.
4
" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="3.1.
4
" />
<PackageReference Include="MQTTnet.AspNetCoreEx" Version="3.0.
9
" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.
9
" />
</ItemGroup>
<ItemGroup>
...
...
IoTSharp/Startup.cs
浏览文件 @
174c69f5
...
...
@@ -36,7 +36,7 @@ using System.Linq;
using
System.Reflection
;
using
System.Text
;
using
System.Threading.Tasks
;
using
MQTTnet.Server
;
namespace
IoTSharp
{
public
class
Startup
...
...
@@ -178,7 +178,6 @@ namespace IoTSharp
{
endpoints
.
MapControllers
();
});
app
.
UseSwaggerUi3
();
app
.
UseOpenApi
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录