1.0.0-rc.1

Former-commit-id: e1486bfed17e3523daf57d616e75997b4a514e78

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);

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()
         {

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",

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;

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()));

projects/IoTCenter/appsettings.json

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

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">

projects/StudyCenter/appsettings.json

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

projects/UserCenter/appsettings.json

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