1.0.0-rc.21

Former-commit-id: ff261c4cff0fb7ab28a7c6a2a7ce556a828c95d0
TangShanKaiPing
wanggang 6 years ago
parent 832718ad09
commit 33ca2422e8

@ -227,41 +227,38 @@ namespace IoTCenter.Services
private void TiggerHandle(BaseEvent<Data> message) private void TiggerHandle(BaseEvent<Data> message)
{ {
var data = message.Data; try
using var scope = this._sp.CreateScope();
Task.Run(() =>
{ {
try using var scope = this._sp.CreateScope();
var job = scope.ServiceProvider.GetService<IoTCenterJob>();
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; var methodText = $"bool Valid(string name,string key,{data.Type.ToString().ToLower()} value,string description){{ return {tigger.Condition};}}";
if (tigger.DataId == data.Id) try
{ {
var methodText = $"bool Valid(string name,string key,{data.Type.ToString().ToLower()} value,string description){{ return {tigger.Condition};}}"; dynamic method = CSScript.Evaluator.LoadMethod(methodText);
try dynamic value = data.GetValue();
{ var result = method.Valid(data.Name, data.Key, value, data.Description);
dynamic method = CSScript.Evaluator.LoadMethod(methodText); if (result)
dynamic value = data.GetValue();
var result = method.Valid(data.Name, data.Key, value, data.Description);
if (result)
{
var job = scope.ServiceProvider.GetService<IoTCenterJob>();
job.TiggerHandle(tigger.Id);
}
}
catch (Exception ex)
{ {
ex.PrintStack(); job.TiggerHandle(tigger.Id);
} }
} }
catch (Exception ex)
{
ex.PrintStack();
}
} }
} }
catch (Exception ex) }
{ catch (Exception ex)
ex.PrintStack(); {
} ex.PrintStack();
}); }
} }
private void Notify<T>(BaseEvent<T> message) private void Notify<T>(BaseEvent<T> message)

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-rc.20", "version": "1.0.0-rc.21",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Warning", "Default": "Warning",

Binary file not shown.

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-rc.20", "version": "1.0.0-rc.21",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Warning", "Default": "Warning",

Binary file not shown.

Binary file not shown.

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-rc.20", "version": "1.0.0-rc.21",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Warning" "Default": "Warning"

Loading…
Cancel
Save