From 33ca2422e846dfec12c082442d491cfbee88bbbd Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Mon, 28 Oct 2019 11:16:05 +0800
Subject: [PATCH] 1.0.0-rc.21

Former-commit-id: ff261c4cff0fb7ab28a7c6a2a7ce556a828c95d0
---
 .../Services/IoTCenterEventHandler.cs         |  49 ++++++++----------
 projects/IoTCenter/appsettings.json           |   2 +-
 projects/IoTCenter/iotcenter.db               | Bin 544768 -> 544768 bytes
 projects/IoTNode/appsettings.json             |   2 +-
 projects/IoTNode/configuration.db             | Bin 12288 -> 12288 bytes
 projects/IoTNode/iotnode.db                   | Bin 491520 -> 495616 bytes
 projects/UserCenter/appsettings.json          |   2 +-
 7 files changed, 26 insertions(+), 29 deletions(-)

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<Data> 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<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;
-                        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<IoTCenterJob>();
-                                    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<T>(BaseEvent<T> 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 4e3b429e7ee556b98a4063be3010871c32521c43..22499a71012c32f5cca81b69b1518f406e69ec23 100644
GIT binary patch
delta 2378
zcma);Z*0_L9LM{#z20qJ``lpU7)rQ}n-1~W`seAjRR-7gu7C!zOzSI^O*jTYbg;u2
zX2J$)f`+)cgbL9x17R8x2CH0MA~>_eM1u)02?8SVz!xLv8>0y^K6evi1d{eHebGMo
z{r&vDzYdNy4vsaR;yT#96x{3A4Zi`oH-X?%50CEOfPv(n-LQIap}@~j!b)L^pM?`b
zkFY=(h7Uo^&-jb3jq}S|7#Em|p3hrG9vNEBLO6#tq^pXAl)Pvgj%3=VnHT)oTMKCp
zz%vv)bEXcQfX}Q2QI}f2JVq%FIizC)WgJIFSg{>snW~I5!<J-Iw;UVe@|0hG|5W+p
z;TvA5eCSiLO%YR%|MOdwDy6^`h(eg*DRLz!3Z5V_9E0A;CE$6s^1x4BJJ0)KB1(gn
z;Bp&i8IC36ofJPC?+j|EffKK0DygPnI|@chCL<x7aU^7kj)_F9XqF|(QqB^S!N7U2
z-;U8R0^mLv@#{MN6x0E_#-$o!G0Jr%EM~AK%Sg`|BEmXJSC>^ADW<JDlBMLOyjXtQ
zzd1DFoxaJWz1yFIbcPxL{~B<_jAqNWgffOi>Sd~VQm?#<Bt?|%Ob+XYj>}&TRt!Ax
z6*p&Ka?FS8!g!`1W89iB9!et3CK#9A<VCae2u*JaKFreJ0dL|p5J_XwP|dWFgXKI)
z(Nd5usv5FI6&s{YPR_C1;DAN<^8|?l6g=S9P49zyc7TXWD&$y(P0nRVN97#Cj-5xk
zq+3YL<aJrL6wMITFwlfaqm}>x;6;l3DL>wI0j9%vFZI%_NJ1Z_;3x@wKU}*F#0bsJ
z<Yrh{vkXkoFmn#VA{LRJC*8`)<W2x0qhikC{LA?9^7|tM=hwSm*;Qz7Zz5f5@;cUV
z>B+9kur-XK3efkfprd6pD`z4tFB@c}#0qVWjvPhObj8A^W~*V$hau)Z6%66Mbd6?H
zK07@Dy^lWw=}48kDzB5%KJ<#qn7hv^{Lia6A*@lg^|AA@qp{rtw?vBRq(hG-!L5nu
z=c`i<FTx2gm0})c;{)+dzcKMh+#6WIw1A|yqn&99j;>(3nOKr9Qt%RA3~IB?7QSgQ
zvkFKOmNv_}gv9?{$;w;r>{YHIm{>=KB2^WS!@|n=0DMsx=4ayH^K1B7;d=a-Fctru
zh)Poj(>f<AVdOJ8I(v)6^#X~@XS*)KDkQaYmA^y5J4DTH!zif{!%#JoU02}J5F!&A
zvIqLPOr|A-7**wYX$W~PU0~SW>c)Xs=&5d;>ty3h3B$rlekNFyWyg7Mcs<(^5h{yk
z^y?+*png63E8qlJPr>>i*1^`ox&+e<HosgbJW0AFlbaAUZ(x5E?-6>h`wNhMXN)b4
zMYu8g2<yeN99poO{fX_Tj<7t4GsnSij6#1)Zys$-xY2D|+@+Fr-n<+q(inSoj>Fz3
zSx#d#MfHBja#$#0a%5?;0n8_2?|P?K)9J)>h3&nCo!!M<I}5VhDrUS6lfyBp@2Ses
z1>SomF(9`Z!8azi0<dbUC<UC&MS$0z<Hl)K3sQOR=ck1TI7rqs1Buwi!9hapTcEQj
z5W#6^mMAw2MMPf6V)<`n+O}@*?kV)O_4RKpZrsw^`)ZH((h)8l#6RHvXs>1Xa}>-9
zJNa|O+bMp}kd&N9+^t&NK-Dx5*eH^s8)hfYIey^u+<h^3Y%Z4j<WqOgS4E|P%|YK)
zZe)Z>Mz9y{jUqaNNwj~lg^g~dTk{)0HO^d!mGo?}yI3d>eRT8P(v86(IZS53p<U6Q
GOMe3;KVR|y

delta 671
zcmZ8eT}V?=0KVsE=Z<;qIa|${U~Ohn5YDUKQp)VAr4bZTt$IjS54GrNtYXw&Rz}o=
zaCOi@pEeBlAhh732SFj~AqayWOUO)myn;{R!-DSJUZRHs=X`wM$M=0FUu?}6Ti=o~
zJfZLjJ7hiLBnMbRX)e4-8un^(G#}A4M_~hOS#x-WrC1}gcmp@=md&zO(1S;9XL}!%
zI1gbAFDQIrF$78+T?VRn69rcnG5E&i_fBxwA`zNXG)K~RV1#-~nOg%dhdpUEx}-xK
zL|5RXP)#@`XHEDC)HstvFspf-KT!$N5b0(29;=I9SrC`;=D$zsS}1|Af6YJVe=PUJ
z&?Q*6If$|vauWzuM;&%+aFmKlC-jMH{isdO^`l#eM6_vzuS;s8yI!*x-j7ZLvARK;
zW#s}&zyq}cvuuFo_&Bq)5A?HkPIK56ea)8XZ+U18#cRb1&h`;Gcf<9p=bX1-@c&cK
z{spCL`*MS&YWr@v`z|w!4agP~*9R_CD!#(|XqyaQ#5(|Myj_ujF&yA-#=WvViGS!e
zzFFnZi+HK%BSlz3!f%p}FvmY}7B`@hQbH%dGx!mX0}<MR*99FUy{PZFE=C54q24!W
zLTPIhPdv0M-Xm5#^ub9FZ4$dKihJUHhU^|9{Q!5zy9}8bCO)9v>vbtjT+Ew92gk%$
zlNcg<hLoX8j-4gH&QlDj!k;1zryzAluL4P@$?hpXWEq8<EaPH#n9OXD=_wTP%?LHE
OdY^OKCubh2srA1ZF2e@^

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 a41bf9e641cdf8d96483e121fbb53273b6c43942..8b8942d6a5012e6a6821f999bab1eda7b4bc9a73 100644
GIT binary patch
delta 133
zcmZojXh_(=D8R<Eh(VV7-DGwFQzq_ro9zTPaK}VRvx+h{>L%x>q;k1gSh$&3S{OST
z7&}{-n;N^CT9~?6ni#tnxEi~;nHjrTI$IhWm^wR|TbjE#nOd4z7#q7dyEz*g88|vy
lx*8i=7&sX^8e1Bg7#NtExj0Yul8InpU|`VSyi6ua7y$EsAd~<A

delta 43
zcmZojXh_(=D8R<Rz#z-xHJM$&l!<52W;=lm+!GsOCVR<5u;@y&h;Cjc6D14)^8O1;

diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index 11d7385d32ceb161a99db973f0658ca9b8426518..f921735a84a53d4de765c42a9909fe3a376e2890 100644
GIT binary patch
delta 3297
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

delta 1113
zcmXAnZA@H66ozN+%$-^G&YfAo0^1@imL)8fWedwkKLn&!nl`0N>DCxnKBTmb_@e?*
zgqlFnrZo+Lf*I5JV-1ZTDT1)JBQZ_4AvBuUv`K5)DA9`Hhjyt|12sylm*vkSb8^nf
z`#$IG4X5|^rVnn=lK=o+L#}d|G}-jgKHLvPf8+_@n}YN}9t6(eQ;q(}<;JSsWYdfR
zUdE@*n3&*4_&Po)4B?NY-TT-a_Bo!3#1>PZCQw`e;)1o{LxE}`mE#%kU<5ba6>2UY
z<_wZ#)&tC#Vo~@4Tb;r=C<x`lF_NW5zlF^^BG|W*k*r&qbg^K);C1n@SQdYX`(i;Q
zyT}cp7Rt4ZXuR)|3t<PcR!Ztad67&<6&s$I(B+HU(MC189W^78Y@P+;d&Mfy(N&c$
z{1hsO@^UqGs)@ZQsHMjRo#SP!M}+viIm51-yUZA$X6N}JTUJ>C<c$j*jxFY>(R$SU
zOB{so^CNK(^A?C{KFG^dS_NJs5%)BFH6u$sS&bh;Yzj9}_5ijEOF@!yH{zds7Lyfm
zGK?>Ub@I7Z2c#`PDjgbuBQOulg1S}f0H}f*vK7i`fV9h(0_3oKbw3HiVrABn&+M$o
z=i5@+>T7wvxwBcm)=1pyeuy|L*YCnDK->}I;vG>h3Wc5j%)jIV{1D$Ny<yVrz}s*l
z`W0P4@1ZvI97<K6gh`twqY;8-nj7WHuf8B&d0>*brF)XxkdHql9(CqC>DmATQjd~=
z7}vgr)rQy5VHY}QpOZ(UBwe10l5C<k=_NW><5A*7@HcsUj%2F`Go%vI9Xkt)i~Mb}
z?K|R;J8u&YwhTU!dvB3UH9kuY+HJeR9UI&PZ%clYoaB0inNG(bWJ~q|d#eiHBvVvF
zNKSTBk9zAaIibn?I+7sUkJCNaW1Ui7sij$}=Ld2cGpsQnP9UKTY0S#S3RG;KWTe4T
zwdp^ylxusr)psb4?P?Bnt7;D&KxR>auXIbxTD?FHU9@=eJi44{(|9`&6};VAbeOC5
zYB~b<1$7}sHkgG|7TZ1MJrFdz;5HMn_nF_gW`ykj*w5Hq2^SOA+fLgO=?G0F{e<cr
z_-{OfbI}Z{*Os&aEjxZ@0OYj*Ek&ipJ_&26KLK>~<+C8zxK2J>Lrc(RZ=vk6>bB0l
z;?;7BBq3UY3%#X&SrMXsIn_YRH0$$c1NE!18tOD~fp@cCep642WM_!pvc1w*U`?h7
z*%Y8YSR~H|tg)&F+J;tRmfc8ybdW+iYvo3=V>HWUrmzR}cQ(sDU>$5X%QPMt*Nsu5
g+vYTCj2!!8b>JBNi&%MndyW0O`z`j1Z_p&${~D4(+W-In

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"