diff --git a/projects/IoTCenter/Services/IoTCenterEventHandler.cs b/projects/IoTCenter/Services/IoTCenterEventHandler.cs index 4ab57fa4..33f464e4 100644 --- a/projects/IoTCenter/Services/IoTCenterEventHandler.cs +++ b/projects/IoTCenter/Services/IoTCenterEventHandler.cs @@ -227,41 +227,38 @@ namespace IoTCenter.Services private void TiggerHandle(BaseEvent message) { - var data = message.Data; - using var scope = this._sp.CreateScope(); - Task.Run(() => + try { - try + using var scope = this._sp.CreateScope(); + var job = scope.ServiceProvider.GetService(); + foreach (var item in Tiggers) { - foreach (var item in Tiggers) + var data = message.Data; + var tigger = item.Value; + if (tigger.DataId == data.Id) { - var tigger = item.Value; - if (tigger.DataId == data.Id) + var methodText = $"bool Valid(string name,string key,{data.Type.ToString().ToLower()} value,string description){{ return {tigger.Condition};}}"; + try { - var methodText = $"bool Valid(string name,string key,{data.Type.ToString().ToLower()} value,string description){{ return {tigger.Condition};}}"; - try - { - dynamic method = CSScript.Evaluator.LoadMethod(methodText); - dynamic value = data.GetValue(); - var result = method.Valid(data.Name, data.Key, value, data.Description); - if (result) - { - var job = scope.ServiceProvider.GetService(); - job.TiggerHandle(tigger.Id); - } - } - catch (Exception ex) + dynamic method = CSScript.Evaluator.LoadMethod(methodText); + dynamic value = data.GetValue(); + var result = method.Valid(data.Name, data.Key, value, data.Description); + if (result) { - ex.PrintStack(); + job.TiggerHandle(tigger.Id); } } + catch (Exception ex) + { + ex.PrintStack(); + } } } - catch (Exception ex) - { - ex.PrintStack(); - } - }); + } + catch (Exception ex) + { + ex.PrintStack(); + } } private void Notify(BaseEvent message) diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json index 5d0318be..7a438f4e 100644 --- a/projects/IoTCenter/appsettings.json +++ b/projects/IoTCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.20", + "version": "1.0.0-rc.21", "Logging": { "LogLevel": { "Default": "Warning", diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db index 4e3b429e..22499a71 100644 Binary files a/projects/IoTCenter/iotcenter.db and b/projects/IoTCenter/iotcenter.db differ diff --git a/projects/IoTNode/appsettings.json b/projects/IoTNode/appsettings.json index 2712c1b3..8e5d076e 100644 --- a/projects/IoTNode/appsettings.json +++ b/projects/IoTNode/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.20", + "version": "1.0.0-rc.21", "Logging": { "LogLevel": { "Default": "Warning", diff --git a/projects/IoTNode/configuration.db b/projects/IoTNode/configuration.db index a41bf9e6..8b8942d6 100644 Binary files a/projects/IoTNode/configuration.db and b/projects/IoTNode/configuration.db differ diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db index 11d7385d..f921735a 100644 Binary files a/projects/IoTNode/iotnode.db and b/projects/IoTNode/iotnode.db differ diff --git a/projects/UserCenter/appsettings.json b/projects/UserCenter/appsettings.json index a3ca305d..59a90501 100644 --- a/projects/UserCenter/appsettings.json +++ b/projects/UserCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.20", + "version": "1.0.0-rc.21", "Logging": { "LogLevel": { "Default": "Warning"