From 984f035e41344785bef7b5b75b13247dcc81df6f Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Mon, 23 Sep 2019 09:17:00 +0800
Subject: [PATCH] 1.0.0-rc.1

Former-commit-id: e1486bfed17e3523daf57d616e75997b4a514e78
---
 .../IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs  |  5 +----
 projects/IoT/IoTNode/Controllers/HomeController.cs     |  2 +-
 projects/IoT/IoTNode/appsettings.json                  |  2 +-
 projects/IoTCenter/Controllers/AppController.cs        |  2 ++
 projects/IoTCenter/Controllers/HomeController.cs       |  3 ++-
 projects/IoTCenter/appsettings.json                    |  2 +-
 projects/IoTCenter/wwwroot/node.default.html           | 10 +++++-----
 projects/StudyCenter/appsettings.json                  |  2 +-
 projects/UserCenter/appsettings.json                   |  2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
index 16fa3111..893687ca 100644
--- a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
+++ b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
@@ -76,10 +76,7 @@ namespace IoT.Shared.DeviceServices.FBee
                         catch (Exception ex)
                         {
                             ex.PrintStack();
-                            if (!item.Value.Client.Connected)
-                            {
-                                this.Connect(item.Value);
-                            }
+                            this.Connect(item.Value);
                         }
                     }
                     await Task.Delay(1000 * 60);
diff --git a/projects/IoT/IoTNode/Controllers/HomeController.cs b/projects/IoT/IoTNode/Controllers/HomeController.cs
index f5aa192c..03315864 100644
--- a/projects/IoT/IoTNode/Controllers/HomeController.cs
+++ b/projects/IoT/IoTNode/Controllers/HomeController.cs
@@ -11,6 +11,7 @@ using System.Linq;
 
 namespace IoTNode.Controllers
 {
+    [Device]
     public class HomeController : Controller
     {
         private readonly IRepository<Node> _nodeRepo;
@@ -22,7 +23,6 @@ namespace IoTNode.Controllers
             this._deviceRepo = deviceRepo;
         }
 
-        [Device]
         [Authorize]
         public IActionResult Index()
         {
diff --git a/projects/IoT/IoTNode/appsettings.json b/projects/IoT/IoTNode/appsettings.json
index 125fc6e6..8120d525 100644
--- a/projects/IoT/IoTNode/appsettings.json
+++ b/projects/IoT/IoTNode/appsettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.108",
+  "version": "1.0.0-rc.1",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",
diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs
index ada94b00..9d5b0980 100644
--- a/projects/IoTCenter/Controllers/AppController.cs
+++ b/projects/IoTCenter/Controllers/AppController.cs
@@ -3,6 +3,7 @@ using Application.Models;
 using Infrastructure.Data;
 using Infrastructure.Extensions;
 using Infrastructure.Jwt;
+using Infrastructure.Web;
 using IoTCenter.Services;
 using IoTShared.Services;
 using Microsoft.AspNetCore.Authorization;
@@ -20,6 +21,7 @@ using Vibrant.InfluxDB.Client.Rows;
 
 namespace IoTCenter.Controllers
 {
+    [Device]
     public class AppController : Controller
     {
         private readonly IConfiguration _configuration;
diff --git a/projects/IoTCenter/Controllers/HomeController.cs b/projects/IoTCenter/Controllers/HomeController.cs
index 292f77e0..d6c3da52 100644
--- a/projects/IoTCenter/Controllers/HomeController.cs
+++ b/projects/IoTCenter/Controllers/HomeController.cs
@@ -16,6 +16,7 @@ using Vibrant.InfluxDB.Client.Rows;
 
 namespace IoTCenter.Controllers
 {
+    [Device]
     public class HomeController : Controller
     {
         private readonly IConfiguration _cfg;
@@ -43,7 +44,7 @@ namespace IoTCenter.Controllers
             this._eventPublisher = eventPublisher;
         }
 
-        [Authorize, Device]
+        [Authorize]
         public IActionResult Index()
         {
             //this._eventPublisher.Publish(new EntityInsertedEvent<Node>(new Node()));
diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json
index cab78878..a4d65b13 100644
--- a/projects/IoTCenter/appsettings.json
+++ b/projects/IoTCenter/appsettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.108",
+  "version": "1.0.0-rc.1",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",
diff --git a/projects/IoTCenter/wwwroot/node.default.html b/projects/IoTCenter/wwwroot/node.default.html
index 26590393..7fb02383 100644
--- a/projects/IoTCenter/wwwroot/node.default.html
+++ b/projects/IoTCenter/wwwroot/node.default.html
@@ -188,7 +188,7 @@
                             <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/Socket/On')" src="/images/off.png" />
                         </div>
                         <div class="row" style="text-align:center;">
-                            {{device.Name||device.DisplayName}}
+                            {{device.DisplayName||device.Name}}
                         </div>
                         <br />
                     </div>
@@ -217,7 +217,7 @@
                             <img v-if="GetDataValue(device.Number,'L3状态')=='关'" @click="CallApi(device.Number,'/Switch3/L3On')" src="/images/off.png" />
                         </div>
                         <div class="row" style="text-align:center;">
-                            {{device.Name||device.DisplayName}}
+                            {{device.DisplayName||device.Name}}
                         </div>
                         <br />
                     </div>
@@ -242,7 +242,7 @@
                             <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/Socket/On')" src="/images/off.png" />
                         </div>
                         <div class="row" style="text-align:center;">
-                            {{device.Name||device.DisplayName}}
+                            {{device.DisplayName||device.Name}}
                         </div>
                         <br />
                     </div>
@@ -254,7 +254,7 @@
         <div class="col-md-6">
             <div class="box box-solid">
                 <div class="box-header with-border">
-                    <h3 class="box-title"><img src="/images/light2.png" style="height:18px;margin-right:10px;" />{{device.Name||device.DisplayName}}</h3>
+                    <h3 class="box-title"><img src="/images/light2.png" style="height:18px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
                     <div class="box-tools pull-right">
                         <img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/ColorLight/Off')" src="/images/on.png" />
                         <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/ColorLight/On')" src="/images/off.png" />
@@ -301,7 +301,7 @@
         <div class="col-md-6">
             <div class="box box-solid btns">
                 <div class="box-header with-border">
-                    <h3 class="box-title"><img src="/images/control.png" style="height:18px;margin-right:10px;" />{{device.Name||device.DisplayName}}</h3>
+                    <h3 class="box-title"><img src="/images/control.png" style="height:18px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
                 </div>
                 <div class="row" style="background-color:#fff;border:1px solid #eee;border-radius:5px;text-align:center;padding:10px 0;margin:10px 0">
                     <form class="device KeyCodeType1 ir" method="get" action="/App/Exec">
diff --git a/projects/StudyCenter/appsettings.json b/projects/StudyCenter/appsettings.json
index 55da75fa..261d92d9 100644
--- a/projects/StudyCenter/appsettings.json
+++ b/projects/StudyCenter/appsettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.108",
+  "version": "1.0.0-rc.1",
   "Logging": {
     "LogLevel": {
       "Default": "Warning"
diff --git a/projects/UserCenter/appsettings.json b/projects/UserCenter/appsettings.json
index e20a5425..4edd5d1f 100644
--- a/projects/UserCenter/appsettings.json
+++ b/projects/UserCenter/appsettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.108",
+  "version": "1.0.0-rc.1",
   "Logging": {
     "LogLevel": {
       "Default": "Warning"