From d51a3dac2150c28d9f12fe9f4fdab265d9618f92 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 29 Oct 2019 14:14:59 +0800 Subject: [PATCH] update Former-commit-id: b11adda2e0def2b884a29e3940627f1951b9c2c2 --- .../IoTCenter/Controllers/AppController.cs | 18 +- projects/IoTCenter/iotcenter.db | Bin 573440 -> 573440 bytes .../StreamingAssets/IoT.Resources.csproj | 7 + .../StreamingAssets/wwwroot/config.html | 2 +- .../wwwroot/lib/linq.js/linq.min.js | 68 +++++ .../Assets/StreamingAssets/wwwroot/node.html | 285 ++++++++++++++++++ .../Assets/StreamingAssets/wwwroot/nodes.html | 2 +- .../Assets/StreamingAssets/wwwroot/user.html | 3 - projects/IoTNode/iotnode.db | Bin 516096 -> 516096 bytes .../Controllers/AccountController.cs | 6 +- 10 files changed, 376 insertions(+), 15 deletions(-) create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js/linq.min.js create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs index 416c40d5..77752d8e 100644 --- a/projects/IoTCenter/Controllers/AppController.cs +++ b/projects/IoTCenter/Controllers/AppController.cs @@ -101,15 +101,6 @@ namespace IoTCenter.Controllers return Json(model); } - public IActionResult GetSceneList(string token) - { - var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString(); - var model = this._sceneRepo.ReadOnlyTable() - .Where(o => o.NodeId == null) - .ToList(); - return Json(model); - } - public IActionResult GetNode(string token, string number) { var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString(); @@ -123,6 +114,15 @@ namespace IoTCenter.Controllers return Json(model); } + public IActionResult GetSceneList(string token) + { + var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString(); + var model = this._sceneRepo.ReadOnlyTable() + .Where(o => o.NodeId == null) + .ToList(); + return Json(model); + } + public IActionResult GetDevice(string token, string number) { var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString(); diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db index 1fdb98810c4409a82cc86b0b3be054d4a8c5666f..2e6cc5f617b19db2a3438816da19dd0547359471 100644 GIT binary patch delta 5717 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 CD{CSE delta 3635 zcmcgvdvF!i89!&w?%8wqaW^EP@hW+do8)euH^~J81PCD^2nLdns}Mj^8mNNdVWC12 zntQ9DVR%K<4;VXQLFxk%EmPJqDj{lX5s=YpT4pRsr?xzN0U~vnLeK6^a{a?H?M&O* zxp#m2ecw6XW52WKcS51GP$+Ht9eNHzX!F1iclgHOoN&Xh8t}76MfY};2vRrpChXRy z8LE4txN$p?161r#Ah|1z$qANHZz~qa}t*?(k}6- z(MIFC@wIWuiuDVBGSp%&S-Y73EuLvzpCm|q83KR6#s~Z#wHqI>X5$Y=7dp;r_ZVY%iuFyIQYbTBIsUzw)ZGO<5vMl@i6T#COG?i|fQ{ zF_YXNACd!fD_txcmR+Qt_EAeiYA>>Wn?lCnr|MY@UIyK%#D|wgZudJk=-bLDtTA~- z>fl&A^WoXB>Lm8zTIlEXfxavv!7sNlFRq4|3@$J-xZsIA;)QK_995T4uT~8ijtlMFa&3VZ`=K+Rr}aoaxd-}-c``YUD+gvr zVOA8HLy&uOYLyA$OkUUwXDXZy7fn99Q<*f!)`26VFf|HOqA)oMlcF$j2;vbiF^^At z=soO(GCNCNgMl)C|0tIov$I^2OT1QLHu;+XMm|Xqd5b;!L+5xMyl$7aY zO0fqvRFSi`ndM18NQrEz-{Cnq@ctE4_>vhL<^$C;T|04 zu|qrkJa5IiK7%TVHwb~@L_&s@B?aq^ng_x*Ke*ZHSI=Q{VD>k7lH5}IyxOsDN4{tJEIQVg&Bj(YHDSnx5u*IL(03y2_$wGN!29-_F0+Z&TJq{hp?23J0&?#IV- zQ3AP)=n+~ceJ(vFjTB!K=a9=roqNB2O|R0PRlic()nujJ^$*vht{ApkJ|(B%HuOHa zpGTGt%T~(Okef;p#BkOM9fr+eFNk4txejm4Vb6=<%qAU{&Sm?>aLxld#MiTz#Bla9 z9p0>GORc3-={o{^Rz{atDG$lLlpD>};re>n3pZv88hmd$ZLwl1Xgxk0lJV(rJl5Os zMxy6vZJNi(QJa*bN{nj>JHm8%pRrxP=KhUbMBj1$fG(7-OHYdD#qngb&@Tk=p&Ck4xiQWOd4CYAnXdV zMdG3sEoj{gGPm#_r))c3s>7;z_JsHGX%go%gNTdn=g_~9osRJ;xB{8z3R2?P3AQ&v zA-T!*h^NE0?^*Y z8GQMCi&{uE2Z#G2Fq^}c2+ZP;6Ed5g zm>il89AF<(rm}=fc-WlmdbJbUUaeWH(R}I+_4n$FMyIjCm~Rvrio4(as(YJziF<-OUcadK z=(`{##7e9OLu{>!`@-E$PFCzDcAwzzcDz1vYjtk$)n@iwgxTJ*JuS|AN8&k+D1)y- z)=W##6%7f8@d#t1`_Ixb8iyeJX> zZJ)GLzR7v>c_CKqsIN!t4ZBz?4Bd-eQr-b?IS + @@ -22,8 +23,10 @@ + + @@ -32,6 +35,10 @@ true PreserveNewest + + true + PreserveNewest + true PreserveNewest diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html index 7a520597..c8a10bdd 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html @@ -10,7 +10,7 @@
- + diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js/linq.min.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js/linq.min.js new file mode 100644 index 00000000..37fda618 --- /dev/null +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js/linq.min.js @@ -0,0 +1,68 @@ +(function(B,p){var r=function(a){return a},C=function(){return!0},k=function(){},x=typeof p,A={"":r},e={createLambda:function(a){if(null==a)return r;if("string"===typeof a){var b=A[a];if(null!=b)return b;if(-1===a.indexOf("=>")){for(var c=RegExp("[$]+","g"),b=0,f;null!=(f=c.exec(a));)f=f[0].length,f>b&&(b=f);c=[];for(f=1;f<=b;f++){for(var d="",e=0;e(.*)/),b=new Function(b[1], +"return "+b[2]);return A[a]=b}return a},isIEnumerable:function(a){if(typeof Enumerator!==x)try{return new Enumerator(a),!0}catch(b){}return!1},defineProperty:null!=Object.defineProperties?function(a,b,c){Object.defineProperty(a,b,{enumerable:!1,configurable:!0,writable:!0,value:c})}:function(a,b,c){a[b]=c},compare:function(a,b){return a===b?0:a>b?1:-1},dispose:function(a){null!=a&&a.dispose()},hasNativeIteratorSupport:function(){return"undefined"!==typeof Symbol&&"undefined"!==typeof Symbol.iterator}}, +g=function(a,b,c){var f=new D,d=0;this.current=f.current;this.moveNext=function(){try{switch(d){case 0:d=1,a();case 1:if(b.apply(f))return!0;this.dispose();return!1;case 2:return!1}}catch(c){throw this.dispose(),c;}};this.dispose=function(){if(1==d)try{c()}finally{d=2}}},D=function(){var a=null;this.current=function(){return a};this.yieldReturn=function(b){a=b;return!0};this.yieldBreak=function(){return!1}},d=function(a){this.getEnumerator=a};d.Utils={};d.Utils.createLambda=function(a){return e.createLambda(a)}; +d.Utils.createEnumerable=function(a){return new d(a)};d.Utils.createEnumerator=function(a,b,c){return new g(a,b,c)};d.Utils.extendTo=function(a){var b=a.prototype;a===Array?(a=m.prototype,e.defineProperty(b,"getSource",function(){return this})):(a=d.prototype,e.defineProperty(b,"getEnumerator",function(){return d.from(this).getEnumerator()}));for(var c in a){var f=a[c];if(b[c]!=f){if(null!=b[c]&&(c+="ByLinq",b[c]==f))continue;f instanceof Function&&e.defineProperty(b,c,f)}}};d.choice=function(){var a= +arguments;return new d(function(){return new g(function(){a=a[0]instanceof Array?a[0]:null!=a[0].getEnumerator?a[0].toArray():a},function(){return this.yieldReturn(a[Math.floor(Math.random()*a.length)])},k)})};d.cycle=function(){var a=arguments;return new d(function(){var b=0;return new g(function(){a=a[0]instanceof Array?a[0]:null!=a[0].getEnumerator?a[0].toArray():a},function(){b>=a.length&&(b=0);return this.yieldReturn(a[b++])},k)})};d.empty=function(){return new d(function(){return new g(k,function(){return!1}, +k)})};d.from=function(a){if(null==a)return d.empty();if(a instanceof d)return a;if("number"==typeof a||"boolean"==typeof a)return d.repeat(a,1);if("string"==typeof a)return new d(function(){var b=0;return new g(k,function(){return b=b?this.yieldReturn(a):this.yieldBreak()},k)})};d.repeat=function(a,b){return null!=b?d.repeat(a).take(b):new d(function(){return new g(k,function(){return this.yieldReturn(a)},k)})};d.repeatWithFinalize=function(a,b){a=e.createLambda(a);b=e.createLambda(b);return new d(function(){var c;return new g(function(){c=a()},function(){return this.yieldReturn(c)}, +function(){null!=c&&(b(c),c=null)})})};d.generate=function(a,b){if(null!=b)return d.generate(a).take(b);a=e.createLambda(a);return new d(function(){return new g(k,function(){return this.yieldReturn(a())},k)})};d.toInfinity=function(a,b){null==a&&(a=0);null==b&&(b=1);return new d(function(){var c;return new g(function(){c=a-b},function(){return this.yieldReturn(c+=b)},k)})};d.toNegativeInfinity=function(a,b){null==a&&(a=0);null==b&&(b=1);return new d(function(){var c;return new g(function(){c=a+b}, +function(){return this.yieldReturn(c-=b)},k)})};d.unfold=function(a,b){b=e.createLambda(b);return new d(function(){var c=!0,f;return new g(k,function(){if(c)return c=!1,f=a,this.yieldReturn(f);f=b(f);return this.yieldReturn(f)},k)})};d.defer=function(a){return new d(function(){var b;return new g(function(){b=d.from(a()).getEnumerator()},function(){return b.moveNext()?this.yieldReturn(b.current()):this.yieldBreak()},function(){e.dispose(b)})})};d.prototype.traverseBreadthFirst=function(a,b){var c= +this;a=e.createLambda(a);b=e.createLambda(b);return new d(function(){var f,h=0,l=[];return new g(function(){f=c.getEnumerator()},function(){for(;;){if(f.moveNext())return l.push(f.current()),this.yieldReturn(b(f.current(),h));var c=d.from(l).selectMany(function(b){return a(b)});if(c.any())h++,l=[],e.dispose(f),f=c.getEnumerator();else return!1}},function(){e.dispose(f)})})};d.prototype.traverseDepthFirst=function(a,b){var c=this;a=e.createLambda(a);b=e.createLambda(b);return new d(function(){var f= +[],h;return new g(function(){h=c.getEnumerator()},function(){for(;;){if(h.moveNext()){var c=b(h.current(),f.length);f.push(h);h=d.from(a(h.current())).getEnumerator();return this.yieldReturn(c)}if(0>=f.length)return!1;e.dispose(h);h=f.pop()}},function(){try{e.dispose(h)}finally{d.from(f).forEach(function(a){a.dispose()})}})})};d.prototype.flatten=function(){var a=this;return new d(function(){var b,c=null;return new g(function(){b=a.getEnumerator()},function(){for(;;){if(null!=c){if(c.moveNext())return this.yieldReturn(c.current()); +c=null}if(b.moveNext())if(b.current()instanceof Array){e.dispose(c);c=d.from(b.current()).selectMany(r).flatten().getEnumerator();continue}else return this.yieldReturn(b.current());return!1}},function(){try{e.dispose(b)}finally{e.dispose(c)}})})};d.prototype.pairwise=function(a){var b=this;a=e.createLambda(a);return new d(function(){var c;return new g(function(){c=b.getEnumerator();c.moveNext()},function(){var b=c.current();return c.moveNext()?this.yieldReturn(a(b,c.current())):!1},function(){e.dispose(c)})})}; +d.prototype.scan=function(a,b){var c;null==b?(b=e.createLambda(a),c=!1):(b=e.createLambda(b),c=!0);var f=this;return new d(function(){var d,l,n=!0;return new g(function(){d=f.getEnumerator()},function(){if(n){n=!1;if(c)return this.yieldReturn(l=a);if(d.moveNext())return this.yieldReturn(l=d.current())}return d.moveNext()?this.yieldReturn(l=b(l,d.current())):!1},function(){e.dispose(d)})})};d.prototype.select=function(a){a=e.createLambda(a);if(1>=a.length)return new t(this,null,a);var b=this;return new d(function(){var c, +d=0;return new g(function(){c=b.getEnumerator()},function(){return c.moveNext()?this.yieldReturn(a(c.current(),d++)):!1},function(){e.dispose(c)})})};d.prototype.selectMany=function(a,b){var c=this;a=e.createLambda(a);null==b&&(b=function(a,b){return b});b=e.createLambda(b);return new d(function(){var f,h=p,l=0;return new g(function(){f=c.getEnumerator()},function(){if(h===p&&!f.moveNext())return!1;do{if(null==h){var c=a(f.current(),l++);h=d.from(c).getEnumerator()}if(h.moveNext())return this.yieldReturn(b(f.current(), +h.current()));e.dispose(h);h=null}while(f.moveNext());return!1},function(){try{e.dispose(f)}finally{e.dispose(h)}})})};d.prototype.where=function(a){a=e.createLambda(a);if(1>=a.length)return new u(this,a);var b=this;return new d(function(){var c,d=0;return new g(function(){c=b.getEnumerator()},function(){for(;c.moveNext();)if(a(c.current(),d++))return this.yieldReturn(c.current());return!1},function(){e.dispose(c)})})};d.prototype.choose=function(a){a=e.createLambda(a);var b=this;return new d(function(){var c, +d=0;return new g(function(){c=b.getEnumerator()},function(){for(;c.moveNext();){var b=a(c.current(),d++);if(null!=b)return this.yieldReturn(b)}return this.yieldBreak()},function(){e.dispose(c)})})};d.prototype.ofType=function(a){var b;switch(a){case Number:b="number";break;case String:b="string";break;case Boolean:b="boolean";break;case Function:b="function";break;default:b=null}return null===b?this.where(function(b){return b instanceof a}):this.where(function(a){return typeof a===b})};d.prototype.zip= +function(){var a=arguments,b=e.createLambda(arguments[arguments.length-1]),c=this;if(2==arguments.length){var f=arguments[0];return new d(function(){var a,l,n=0;return new g(function(){a=c.getEnumerator();l=d.from(f).getEnumerator()},function(){return a.moveNext()&&l.moveNext()?this.yieldReturn(b(a.current(),l.current(),n++)):!1},function(){try{e.dispose(a)}finally{e.dispose(l)}})})}return new d(function(){var f,l=0;return new g(function(){var b=d.make(c).concat(d.from(a).takeExceptLast().select(d.from)).select(function(a){return a.getEnumerator()}).toArray(); +f=d.from(b)},function(){if(f.all(function(a){return a.moveNext()})){var a=f.select(function(a){return a.current()}).toArray();a.push(l++);return this.yieldReturn(b.apply(null,a))}return this.yieldBreak()},function(){d.from(f).forEach(e.dispose)})})};d.prototype.merge=function(){var a=arguments,b=this;return new d(function(){var c,f=-1;return new g(function(){c=d.make(b).concat(d.from(a).select(d.from)).select(function(a){return a.getEnumerator()}).toArray()},function(){for(;0=c.length- +1?0:f+1;var a=c[f];if(a.moveNext())return this.yieldReturn(a.current());a.dispose();c.splice(f--,1)}return this.yieldBreak()},function(){d.from(c).forEach(e.dispose)})})};d.prototype.join=function(a,b,c,f,h){b=e.createLambda(b);c=e.createLambda(c);f=e.createLambda(f);h=e.createLambda(h);var l=this;return new d(function(){var n,q,k=null,m=0;return new g(function(){n=l.getEnumerator();q=d.from(a).toLookup(c,r,h)},function(){for(;;){if(null!=k){var a=k[m++];if(a!==p)return this.yieldReturn(f(n.current(), +a));m=0}if(n.moveNext())a=b(n.current()),k=q.get(a).toArray();else return!1}},function(){e.dispose(n)})})};d.prototype.groupJoin=function(a,b,c,f,h){b=e.createLambda(b);c=e.createLambda(c);f=e.createLambda(f);h=e.createLambda(h);var l=this;return new d(function(){var n=l.getEnumerator(),q=null;return new g(function(){n=l.getEnumerator();q=d.from(a).toLookup(c,r,h)},function(){if(n.moveNext()){var a=q.get(b(n.current()));return this.yieldReturn(f(n.current(),a))}return!1},function(){e.dispose(n)})})}; +d.prototype.all=function(a){a=e.createLambda(a);var b=!0;this.forEach(function(c){if(!a(c))return b=!1});return b};d.prototype.any=function(a){a=e.createLambda(a);var b=this.getEnumerator();try{if(0==arguments.length)return b.moveNext();for(;b.moveNext();)if(a(b.current()))return!0;return!1}finally{e.dispose(b)}};d.prototype.isEmpty=function(){return!this.any()};d.prototype.concat=function(){var a=this;if(1==arguments.length){var b=arguments[0];return new d(function(){var c,h;return new g(function(){c= +a.getEnumerator()},function(){if(null==h){if(c.moveNext())return this.yieldReturn(c.current());h=d.from(b).getEnumerator()}return h.moveNext()?this.yieldReturn(h.current()):!1},function(){try{e.dispose(c)}finally{e.dispose(h)}})})}var c=arguments;return new d(function(){var b;return new g(function(){b=d.make(a).concat(d.from(c).select(d.from)).select(function(a){return a.getEnumerator()}).toArray()},function(){for(;0=c)return null;d+=c;return{value:b,bound:d}}).toArray()},function(){if(0=a?e=g:b=g}return this.yieldReturn(c[e].value)}return this.yieldBreak()},k)})};d.prototype.groupBy=function(a,b,c,f){var h=this;a=e.createLambda(a);b=e.createLambda(b);null!=c&&(c=e.createLambda(c));f=e.createLambda(f);return new d(function(){var d;return new g(function(){d=h.toLookup(a,b,f).toEnumerable().getEnumerator()},function(){for(;d.moveNext();)return null==c?this.yieldReturn(d.current()):this.yieldReturn(c(d.current().key(), +d.current()));return!1},function(){e.dispose(d)})})};d.prototype.partitionBy=function(a,b,c,f){var h=this;a=e.createLambda(a);b=e.createLambda(b);f=e.createLambda(f);var l;null==c?(l=!1,c=function(a,b){return new y(a,b)}):(l=!0,c=e.createLambda(c));return new d(function(){var n,q,k,m=[];return new g(function(){n=h.getEnumerator();n.moveNext()&&(q=a(n.current()),k=f(q),m.push(b(n.current())))},function(){for(var h;!0==(h=n.moveNext());)if(k===f(a(n.current())))m.push(b(n.current()));else break;if(0< +m.length){var e=l?c(q,d.from(m)):c(q,m);h?(q=a(n.current()),k=f(q),m=[b(n.current())]):m=[];return this.yieldReturn(e)}return!1},function(){e.dispose(n)})})};d.prototype.buffer=function(a){var b=this;return new d(function(){var c;return new g(function(){c=b.getEnumerator()},function(){for(var b=[],d=0;c.moveNext();)if(b.push(c.current()),++d>=a)return this.yieldReturn(b);return 0c?a:c})};d.prototype.min=function(a){null==a&&(a=r);return this.select(a).aggregate(function(a,c){return aa(c)?b:c})};d.prototype.minBy=function(a){a=e.createLambda(a);return this.aggregate(function(b,c){return a(b)=a)return b.getEnumerator();var c,d=[];return new g(function(){c=b.getEnumerator()},function(){for(;c.moveNext();){if(d.length==a)return d.push(c.current()),this.yieldReturn(d.shift());d.push(c.current())}return!1},function(){e.dispose(c)})})};d.prototype.takeFromLast=function(a){if(0>=a||null==a)return d.empty();var b=this;return new d(function(){var c,f,h=[];return new g(function(){c= +b.getEnumerator()},function(){for(;c.moveNext();)h.length==a&&h.shift(),h.push(c.current());null==f&&(f=d.from(h).getEnumerator());return f.moveNext()?this.yieldReturn(f.current()):!1},function(){e.dispose(f)})})};d.prototype.indexOf=function(a){var b=null;"function"===typeof a?this.forEach(function(c,d){if(a(c,d))return b=d,!1}):this.forEach(function(c,d){if(c===a)return b=d,!1});return null!==b?b:-1};d.prototype.lastIndexOf=function(a){var b=-1;"function"===typeof a?this.forEach(function(c,d){a(c, +d)&&(b=d)}):this.forEach(function(c,d){c===a&&(b=d)});return b};d.prototype.cast=function(){return this};d.prototype.asEnumerable=function(){return d.from(this)};d.prototype.toArray=function(){var a=[];this.forEach(function(b){a.push(b)});return a};d.prototype.toLookup=function(a,b,c){a=e.createLambda(a);b=e.createLambda(b);c=e.createLambda(c);var d=new v(c);this.forEach(function(c){var e=a(c);c=b(c);var g=d.get(e);g!==p?g.push(c):d.add(e,[c])});return new E(d)};d.prototype.toObject=function(a,b){a= +e.createLambda(a);b=e.createLambda(b);var c={};this.forEach(function(d){c[a(d)]=b(d)});return c};d.prototype.toDictionary=function(a,b,c){a=e.createLambda(a);b=e.createLambda(b);c=e.createLambda(c);var d=new v(c);this.forEach(function(c){d.add(a(c),b(c))});return d};d.prototype.toJSONString=function(a,b){if(typeof JSON===x||null==JSON.stringify)throw Error("toJSONString can't find JSON.stringify. This works native JSON support Browser or include json2.js");return JSON.stringify(this.toArray(),a,b)}; +d.prototype.toJoinedString=function(a,b){null==a&&(a="");null==b&&(b=r);return this.select(b).toArray().join(a)};d.prototype.doAction=function(a){var b=this;a=e.createLambda(a);return new d(function(){var c,d=0;return new g(function(){c=b.getEnumerator()},function(){return c.moveNext()?(a(c.current(),d++),this.yieldReturn(c.current())):!1},function(){e.dispose(c)})})};d.prototype.forEach=function(a){a=e.createLambda(a);var b=0,c=this.getEnumerator();try{for(;c.moveNext()&&!1!==a(c.current(),b++);); +}finally{e.dispose(c)}};d.prototype.write=function(a,b){null==a&&(a="");b=e.createLambda(b);var c=!0;this.forEach(function(d){c?c=!1:document.write(a);document.write(b(d))})};d.prototype.writeLine=function(a){a=e.createLambda(a);this.forEach(function(b){document.writeln(a(b)+"
")})};d.prototype.force=function(){var a=this.getEnumerator();try{for(;a.moveNext(););}finally{e.dispose(a)}};d.prototype.letBind=function(a){a=e.createLambda(a);var b=this;return new d(function(){var c;return new g(function(){c= +d.from(a(b)).getEnumerator()},function(){return c.moveNext()?this.yieldReturn(c.current()):!1},function(){e.dispose(c)})})};d.prototype.share=function(){var a=this,b,c=!1;return new z(function(){return new g(function(){null==b&&(b=a.getEnumerator())},function(){if(c)throw Error("enumerator is disposed");return b.moveNext()?this.yieldReturn(b.current()):!1},k)},function(){c=!0;e.dispose(b)})};d.prototype.memoize=function(){var a=this,b,c,d=!1;return new z(function(){var e=-1;return new g(function(){null== +c&&(c=a.getEnumerator(),b=[])},function(){if(d)throw Error("enumerator is disposed");e++;return b.length<=e?c.moveNext()?this.yieldReturn(b[e]=c.current()):!1:this.yieldReturn(b[e])},k)},function(){d=!0;e.dispose(c);b=null})};e.hasNativeIteratorSupport()&&(d.prototype[Symbol.iterator]=function(){return{enumerator:this.getEnumerator(),next:function(){return this.enumerator.moveNext()?{done:!1,value:this.enumerator.current()}:{done:!0}}}});d.prototype.catchError=function(a){a=e.createLambda(a);var b= +this;return new d(function(){var c;return new g(function(){c=b.getEnumerator()},function(){try{return c.moveNext()?this.yieldReturn(c.current()):!1}catch(b){return a(b),!1}},function(){e.dispose(c)})})};d.prototype.finallyAction=function(a){a=e.createLambda(a);var b=this;return new d(function(){var c;return new g(function(){c=b.getEnumerator()},function(){return c.moveNext()?this.yieldReturn(c.current()):!1},function(){try{e.dispose(c)}finally{a()}})})};d.prototype.log=function(a){a=e.createLambda(a); +return this.doAction(function(b){typeof console!==x&&console.log(a(b))})};d.prototype.trace=function(a,b){null==a&&(a="Trace");b=e.createLambda(b);return this.doAction(function(c){typeof console!==x&&console.log(a,b(c))})};var s=function(a,b,c,d){this.source=a;this.keySelector=e.createLambda(b);this.descending=c;this.parent=d};s.prototype=new d;s.prototype.createOrderedEnumerable=function(a,b){return new s(this.source,a,b,this)};s.prototype.thenBy=function(a){return this.createOrderedEnumerable(a, +!1)};s.prototype.thenByDescending=function(a){return this.createOrderedEnumerable(a,!0)};s.prototype.getEnumerator=function(){var a=this,b,c,d=0;return new g(function(){b=[];c=[];a.source.forEach(function(a,d){b.push(a);c.push(d)});var d=w.create(a,null);d.GenerateKeys(b);c.sort(function(a,b){return d.compare(a,b)})},function(){return da?0:a},function(){return c=a.length){var b=this.prevPredicate;return new u(this.prevSource,function(c){return b(c)&&a(c)})}return d.prototype.where.call(this,a)};u.prototype.select=function(a){a=e.createLambda(a);return 1>=a.length?new t(this.prevSource,this.prevPredicate,a):d.prototype.select.call(this, +a)};u.prototype.getEnumerator=function(){var a=this.prevPredicate,b=this.prevSource,c;return new g(function(){c=b.getEnumerator()},function(){for(;c.moveNext();)if(a(c.current()))return this.yieldReturn(c.current());return!1},function(){e.dispose(c)})};var t=function(a,b,c){this.prevSource=a;this.prevPredicate=b;this.prevSelector=c};t.prototype=new d;t.prototype.where=function(a){a=e.createLambda(a);return 1>=a.length?new u(this,a):d.prototype.where.call(this,a)};t.prototype.select=function(a){a= +e.createLambda(a);if(1>=a.length){var b=this.prevSelector;return new t(this.prevSource,this.prevPredicate,function(c){return a(b(c))})}return d.prototype.select.call(this,a)};t.prototype.getEnumerator=function(){var a=this.prevPredicate,b=this.prevSelector,c=this.prevSource,d;return new g(function(){d=c.getEnumerator()},function(){for(;d.moveNext();)if(null==a||a(d.current()))return this.yieldReturn(b(d.current()));return!1},function(){e.dispose(d)})};var v=function(){var a=function(a){return null=== +a?"null":a===p?"undefined":"function"===typeof a.toString?a.toString():Object.prototype.toString.call(a)},b=function(a,b){this.key=a;this.value=b;this.next=this.prev=null},c=function(){this.last=this.first=null};c.prototype={addLast:function(a){null!=this.last?(this.last.next=a,a.prev=this.last,this.last=a):this.first=this.last=a},replace:function(a,b){null!=a.prev?(a.prev.next=b,b.prev=a.prev):this.first=b;null!=a.next?(a.next.prev=b,b.next=a.next):this.last=b},remove:function(a){null!=a.prev?a.prev.next= +a.next:this.first=a.next;null!=a.next?a.next.prev=a.prev:this.last=a.prev}};var e=function(a){this.countField=0;this.entryList=new c;this.buckets={};this.compareSelector=null==a?r:a};e.prototype={add:function(c,d){var e=this.compareSelector(c),f=a(e),g=new b(c,d);if(Object.prototype.hasOwnProperty.call(this.buckets,f)){for(var f=this.buckets[f],k=0;k + + + + + + + + +
+
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html index 94fd70c2..9e764a94 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html @@ -27,7 +27,7 @@
  • - +
    {{n.Name}} {{n.DeviceCount}} diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html index b74b1488..f928e835 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html @@ -4,8 +4,6 @@ -
    @@ -14,7 +12,6 @@ -     menu
      diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db index 776c56a1f08d6790b8e7bb783aac6c49ffb5d3b3..79fc6e8e94d4b694299926c9cfd5e7c5fabce9e4 100644 GIT binary patch delta 6130 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 CX~)3; delta 4397 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 bUAbHT56g4av!*qh9XZ|=Kj_5q9L#?K5|FDW diff --git a/projects/UserCenter/Controllers/AccountController.cs b/projects/UserCenter/Controllers/AccountController.cs index 647ba162..209e3d51 100644 --- a/projects/UserCenter/Controllers/AccountController.cs +++ b/projects/UserCenter/Controllers/AccountController.cs @@ -899,7 +899,11 @@ namespace UserCenter.Controllers [AllowAnonymous] public IActionResult ServerValid() { - return Content(this._cfg["name"]); + return Json(new + { + Name = this._cfg["name"], + Version = this._cfg["version"] + }); } [AllowAnonymous]