Merge branch 'master' of https://github.com/IoTSharp/IoTSharp

IoTSharp.SDKs/IoTSharp.Sdk.MQTT/IoTSharp.Sdk.MQTT.csproj

@@ -19,7 +19,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MQTTnet" Version="4.0.0.159" />
+		<PackageReference Include="MQTTnet" Version="4.0.0.162" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	</ItemGroup>
 

IoTSharp/Handlers/EventBusHandler.cs

@@ -233,7 +233,14 @@ namespace IoTSharp.Handlers
                 {
                     rules.Value.ToList().ForEach(async g =>
                     {
-                        await _flowRuleProcessor.RunFlowRules(g, obj, devid, EventType.Normal, null);
+                        try
+                        {
+                            await _flowRuleProcessor.RunFlowRules(g, obj, devid, EventType.Normal, null);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.LogError(ex,$"为设备{devid}执行规则链{g}时遇到错误{ex.Message}");
+                        }
                     });
                 }
                 else

IoTSharp/IoTSharp.csproj

@@ -80,10 +80,10 @@
 		<PackageReference Include="DotNetCore.CAP.NATS" Version="6.0.1" />
 		<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="6.0.1" />
 		<PackageReference Include="DotNetCore.CAP.Pulsar" Version="6.0.1" />
-		<PackageReference Include="EasyCaching.Core" Version="1.5.1" />
-		<PackageReference Include="EasyCaching.InMemory" Version="1.5.1" />
-		<PackageReference Include="EasyCaching.LiteDB" Version="1.5.1" />
-		<PackageReference Include="EasyCaching.Redis" Version="1.5.1" />
+		<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.1.0" />
 		<PackageReference Include="IoTSharp.CoAP.NET" Version="2.0.8" />
@@ -107,9 +107,9 @@
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.3" />
-		<PackageReference Include="MQTTnet" Version="4.0.0.159" />
-		<PackageReference Include="MQTTnet.AspNetCore" Version="4.0.0.159" />
-		<PackageReference Include="MQTTnet.Extensions.Rpc" Version="4.0.0.159" />
+		<PackageReference Include="MQTTnet" Version="4.0.0.162" />
+		<PackageReference Include="MQTTnet.AspNetCore" Version="4.0.0.162" />
+		<PackageReference Include="MQTTnet.Extensions.Rpc" Version="4.0.0.162" />
 		<PackageReference Include="NetMQ" Version="4.0.1.8" />
 		<PackageReference Include="Npgsql" Version="6.0.4" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
@@ -141,7 +141,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.0.159" />
+		<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.0.0.162" />
 		<PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.4" />
 		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.4" />
 		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.4" />