update

Former-commit-id: 016170bf020d16960fdfe4654fb42d317b217e80

projects/Infrastructure/wwwroot/js/site.js

@@ -182,7 +182,7 @@ function InitEditor(K) {
         var uploadUrl = $(this).attr('data-uploadUrl');
         var emtpyImage = $(this).attr('data-emptyImage');
         var baseUrl = $(this).attr('data-baseUrl');
-        var isRequired = $(this).attr('data-val-required') != undefined;
+        var isRequired = $(this).attr('data-val-required') !== undefined;
         var editor = K.editor({
             allowImageUpload: true,
             formatUploadUrl: false,
@@ -218,7 +218,7 @@ function InitEditor(K) {
         var rest_id = '#rest_' + id;
         var uploadUrl = $(this).attr('data-uploadUrl');
         var baseUrl = $(this).attr('data-baseUrl');
-        var isRequired = $(this).attr('data-val-required') != undefined;
+        var isRequired = $(this).attr('data-val-required') !== undefined;
         var editor = K.editor({
             allowImageUpload: true,
             formatUploadUrl: false,
@@ -299,7 +299,7 @@ $('body').on('click', '.cmd', function () {
 
 function update(url, parent, targetId) {
     $(targetId).find('option').not('[value=""]').remove();
-    if (url != null) {
+    if (url !== null) {
         url += '?parentId=' + encodeURI(parent);
         $.getJSON(url, function (data) {
             $.each(data, function (i, v) {

projects/IoTCenter/wwwroot/js/device.js

@@ -8,13 +8,13 @@ data = function data() {
         token: localStorage.getItem('token'),
         model: null
     };
-}
+};
 loadDataSuccess = function () {
     Vue.nextTick(function () {
         UpdateCamera();
         UpdateChart();
     });
-}
+};
 methods = {
     VolumeChange(e) {
         muted = e.target.muted;
@@ -32,7 +32,7 @@ methods = {
     },
     GetDeviceDataAttr(name, attr) {
         var data = Enumerable.from(this.model.data).where(o => o.name === name).firstOrDefault();
-        if (data != null) {
+        if (data !== null) {
             return data[attr];
         }
         return null;
@@ -44,7 +44,7 @@ methods = {
         var data = Enumerable.from(this.model.data)
             .where(function (o) { return o.key.toLowerCase() === key; })
             .firstOrDefault();
-        if (data != null) {
+        if (data !== null) {
             return data.value;
         }
         return null;
@@ -53,7 +53,7 @@ methods = {
         return Enumerable.from(this.model.product.apis).where(function (o) { return o.parameters.length === 1; }).orderBy(function (o) { return o.name;}).toArray();
     },
     GetParameter(api,name) {
-        return Enumerable.from(api.parameters).where(function (o) { return o.name == name;}).firstOrDefault();
+        return Enumerable.from(api.parameters).where(function (o) { return o.name === name;}).firstOrDefault();
     },
     CallCommand(id) {
         ajax('/App/ExecCommand', { token: token, connectionId: connectionId, id: id }, 'post');
@@ -63,9 +63,9 @@ methods = {
     },
     AjaxSubmit(event, deviceNumber, dataName) {
         var data = Enumerable.from(this.model.data)
-            .where(function (o) { return o.name == dataName })
+            .where(function (o) { return o.name === dataName; })
             .firstOrDefault();
-        if (data != null) {
+        if (data !== null) {
             data.value = $(event.target).val();
         }
         var form = $(event.target).parents('form');
@@ -90,7 +90,7 @@ methods = {
     },
     AddSPButton() {
         var data = Enumerable.from(this.model.data)
-            .where(function (o) { return o.name === "指令" })
+            .where(function (o) { return o.name === "指令"; })
             .firstOrDefault();
         var buttons = this.GetButtons();
         var newBtn = { "name": "测试", "portName": "/dev/ttyS0", "baudRate": 9600, "parity": 0, "dataBits": 8, "stopBits": 1, "message": "0123456789ABCDEF", "order": 100 };
@@ -99,11 +99,11 @@ methods = {
     },
     RemoveSPButton(name) {
         var data = Enumerable.from(this.model.data)
-            .where(function (o) { return o.name === "指令" })
+            .where(function (o) { return o.name === "指令"; })
             .firstOrDefault();
         var buttons = this.GetButtons();
         for (var i = buttons.length - 1; i >= 0; i--) {
-            if (buttons[i].name == name) {
+            if (buttons[i].name === name) {
                 buttons.splice(i, 1);
                 break;
             }
@@ -137,7 +137,7 @@ methods = {
     },
     AddButton() {
         var data = Enumerable.from(this.model.data)
-            .where(function (o) { return o.name === "指令" })
+            .where(function (o) { return o.name === "指令"; })
             .firstOrDefault();
         var buttons = this.GetButtons();
         var newBtn = { name:"测试", value:"603",order:100};
@@ -146,11 +146,11 @@ methods = {
     },
     RemoveButton(name) {
         var data = Enumerable.from(this.model.data)
-            .where(function (o) { return o.name === "指令" })
+            .where(function (o) { return o.name === "指令"; })
             .firstOrDefault();
         var buttons = this.GetButtons();
         for (var i = buttons.length - 1; i >= 0; i--) {
-            if (buttons[i].name == name) {
+            if (buttons[i].name === name) {
                 buttons.splice(i, 1);
                 break;
             }
@@ -178,7 +178,7 @@ methods = {
         var url = form.attr('action') + '?' + form.serialize();
         var code = form.find('#Code').val();
         if (form.hasClass('type1')) {
-            if (event.target.name == "power" && event.target.value == "1") {
+            if (event.target.name === "power" && event.target.value === "1") {
                 code = 1;
             }
             else {
@@ -210,16 +210,15 @@ function onMessage(method, json, to, from) {
     debug(method + ':' + json);
     var item = JSON.parse(json);
     console.log(method + ':' + json);
-    var item = JSON.parse(json);
+    if (method === 'DeviceEntityInserted' ||
-    if (method == 'DeviceEntityInserted' ||
+        method === 'DeviceEntityUpdated' ||
-        method == 'DeviceEntityUpdated' ||
+        method === 'DeviceEntityDeleted') {
-        method == 'DeviceEntityDeleted') {
         loadData();
     }
-    else if (method == 'DataEntityInserted' ||
+    else if (method === 'DataEntityInserted' ||
-        method == 'DataEntityUpdated' ||
+        method === 'DataEntityUpdated' ||
-        method == 'DataEntityDeleted') {
+        method === 'DataEntityDeleted') {
-        var device = vm.model.id == item.deviceId ? vm.model : null;
+        var device = vm.model.id === item.deviceId ? vm.model : null;
         if (device) {
             updateItem(device.data, item);
             toastr.info(device.displayName + '更新');

projects/UserCenter/Api/TokenController.cs

@@ -33,7 +33,6 @@ namespace UserCenter.Controllers
         [HttpPost]
         public ActionResult GetToken([FromBody]LoginModel model)
         {
-            var success = false;
             try
             {
                 var user = this._userRepo.Table().FirstOrDefault(o => o.UserName == model.UserName);
@@ -63,7 +62,6 @@ namespace UserCenter.Controllers
                             {
                                 user.LockoutEnd = null;
                                 user.AccessFailedCount = 0;
-                                success = true;
                             }
                             else
                             {