diff --git a/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml b/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml
index 86bf5941..c3bd5c28 100644
--- a/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml
+++ b/projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml
@@ -72,6 +72,9 @@
                 </noscript>
                 @RenderBody()
             </section>
+            <a id="back-to-top" href="#" class="btn btn-primary back-to-top" role="button" aria-label="Scroll to top">
+                <i class="fas fa-chevron-up"></i>
+            </a>
         </div>
         <footer class="main-footer">
             <strong>
diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj
index 3883636b..d9fd864d 100644
--- a/projects/Infrastructure/Infrastructure.csproj
+++ b/projects/Infrastructure/Infrastructure.csproj
@@ -40,24 +40,5 @@
   </ItemGroup>
    <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
-  </ItemGroup><ItemGroup>
-  <Content Remove="wwwroot\lib\fontawesome-free\css\all.min.css" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.eot" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.svg" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.ttf" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.woff" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.woff2" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.eot" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.svg" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.ttf" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.woff" />
-  <Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.woff2" />
-  <Content Remove="wwwroot\lib\ionicons\css\ionicons.min.css" />
-  <Content Remove="wwwroot\lib\ionicons\fonts\ionicons.eot" />
-  <Content Remove="wwwroot\lib\ionicons\fonts\ionicons.svg" />
-  <Content Remove="wwwroot\lib\ionicons\fonts\ionicons.ttf" />
-  <Content Remove="wwwroot\lib\jquery\jquery.min.js" />
-</ItemGroup><ItemGroup>
-  <Folder Include="wwwroot\lib\admin-lte\" />
-</ItemGroup>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/Infrastructure/Views/Account/_Layout.cshtml b/projects/Infrastructure/Views/Account/_Layout.cshtml
index d067d90a..044377cf 100644
--- a/projects/Infrastructure/Views/Account/_Layout.cshtml
+++ b/projects/Infrastructure/Views/Account/_Layout.cshtml
@@ -72,6 +72,9 @@
                 </noscript>
                 @RenderBody()
             </section>
+            <a id="back-to-top" href="#" class="btn btn-primary back-to-top" role="button" aria-label="Scroll to top">
+                <i class="fas fa-chevron-up"></i>
+            </a>
         </div>
         <footer class="main-footer">
             <strong>
diff --git a/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml b/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml
index 895882ef..22d59043 100644
--- a/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml
+++ b/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml
@@ -15,18 +15,18 @@
     {
         var uihit = prop.TemplateHint ?? prop.DataTypeName;
         var isRequired = prop.IsRequired && prop.ModelType != typeof(bool);
-        var htmlClass = "col-sm-2 control-label";
+        var htmlClass = "col-sm-2 col-form-label";
         htmlClass += isRequired ? " required" : "";
-        <div class="form-group">
-            @if (prop.ModelType == typeof(bool))
+        <div class="form-group row">
+            @if (prop.ModelType != typeof(bool))
             {
-                <div class="col-sm-2"></div>
+                @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = htmlClass })
             }
             else
             {
-                @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = htmlClass })
+                <div class="col-sm-2"></div>
             }
-            <div class="col-sm-6">
+            <div class="col-sm-8">
                 @if (metadata.Attributes.Attributes.Any(o => o.GetType() == typeof(System.ComponentModel.ReadOnlyAttribute)))
                 {
                     <div class="form-control form-control-display">
@@ -57,8 +57,9 @@
                     }
                     else if (prop.ModelType == typeof(bool))
                     {
-                        <div class="checkboxfix">
-                            @Html.CheckBox(prop.PropertyName) <span>@prop.GetDisplayName()</span>
+                        <div class="col-sm-10 form-check">
+                            @Html.CheckBox(prop.PropertyName, new { @class = "form-check-input" })
+                            @Html.Label(prop.PropertyName, prop.GetDisplayName() + "：", new { @class = "form-check-label" })
                         </div>
                     }
                     else
diff --git a/projects/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml b/projects/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml
index 962f6a9b..6acef87d 100644
--- a/projects/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml
+++ b/projects/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml
@@ -9,39 +9,30 @@
         <h3 class="card-title">@HtmlTitle</h3>
     </div>
     <form action="@url" method="post" class="form-horizontal">
-        <div class="card-header">
+        <div class="card-body">
             @Html.AntiForgeryToken()
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="form-group">
-                        <div class="col-sm-2"></div>
-                        @Html.ValidationSummary(true, "错误:", new { @class = "text-danger col-sm-8" }, "div")
-                    </div>
-                    @(await Html.PartialAsync("/Views/Shared/EditorTemplates/Input.cshtml"))
-                </div>
+            <div class="form-group row">
+                <div class="col-sm-2 col-form-label"></div>
+                @Html.ValidationSummary(true, "错误:", new { @class = "text-danger col-sm-8" }, "div")
             </div>
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="form-group">
-                        <div class="col-sm-2"> </div>
-                        <div class="col-sm-6">
-                            @if (!DisableBackUrl && string.IsNullOrEmpty(BackUrl))
-                            {
-                                BackUrl = Url.Action("Index", null);
-                                <a class="btn btn-default" href="@BackUrl">
-                                    返回
-                                </a>
-                            }
-                            <button class="btn btn-primary" type="submit">
-                                确定
-                            </button>
-                            @if (controller == "Account" && action == "Login")
-                            {
-                                <a href="@Url.Action("ForgotPassword")">忘记密码?</a>
-                            }
-                        </div>
-                        <div class="col-sm-2"> </div>
-                    </div>
+            @(await Html.PartialAsync("/Views/Shared/EditorTemplates/Input.cshtml"))
+            <div class="form-group row">
+                <div class="col-sm-2"> </div>
+                <div class="col-sm-8">
+                    @if (!DisableBackUrl && string.IsNullOrEmpty(BackUrl))
+                    {
+                        BackUrl = Url.Action("Index", null);
+                        <a class="btn btn-default" href="@BackUrl">
+                            返回
+                        </a>
+                    }
+                    <button class="btn btn-primary" type="submit">
+                        确定
+                    </button>
+                    @if (controller == "Account" && action == "Login")
+                    {
+                        <a href="@Url.Action("ForgotPassword")">忘记密码?</a>
+                    }
                 </div>
             </div>
         </div>
diff --git a/projects/Infrastructure/Views/Shared/_Layout.cshtml b/projects/Infrastructure/Views/Shared/_Layout.cshtml
index 4c0a13fb..f594caff 100644
--- a/projects/Infrastructure/Views/Shared/_Layout.cshtml
+++ b/projects/Infrastructure/Views/Shared/_Layout.cshtml
@@ -77,6 +77,9 @@
                     @RenderBody()
                 </div>
             </div>
+            <a id="back-to-top" href="#" class="btn btn-primary back-to-top" role="button" aria-label="Scroll to top">
+                <i class="fas fa-chevron-up"></i>
+            </a>
         </div>
         <footer class="main-footer">
             <div class="container">
@@ -93,7 +96,6 @@
             </div>
         </footer>
     </div>
-    <a id="backTop" class="btn btn-back-top bg-light-blue-active"></a>
     @(await Html.PartialAsync("_Footer"))
     @RenderSection("scripts", required: false)
     <script src="~/js/site.js"></script>
diff --git a/projects/Infrastructure/wwwroot/css/site.css b/projects/Infrastructure/wwwroot/css/site.css
index 574aed40..a2f8c554 100644
--- a/projects/Infrastructure/wwwroot/css/site.css
+++ b/projects/Infrastructure/wwwroot/css/site.css
@@ -1,3 +1,6 @@
+.col-form-label{
+    text-align:right;
+}
 /*.content-header2 {
     overflow: hidden;
 }
diff --git a/projects/Infrastructure/wwwroot/js/site.js b/projects/Infrastructure/wwwroot/js/site.js
index 12495f45..c8b7f834 100644
--- a/projects/Infrastructure/wwwroot/js/site.js
+++ b/projects/Infrastructure/wwwroot/js/site.js
@@ -38,9 +38,6 @@ function updateSelectList(url, id) {
 		});
 	};
 }(jQuery));
-$(function () {
-	$('#backTop').backTop();
-});
 //ajax cache
 $(function () {
 	$.ajaxSetup({
@@ -260,28 +257,28 @@ $(function () {
 	$('select.search').select2({ language: "zh-CN" });
 });
 $('body').on('click', '.cmd', function () {
-    $.getJSON($(this).attr('href'), function (response) {
-        console.log(response);
-    }).fail(function (jqxhr, textStatus, error) {
-        var err = textStatus + ", " + error;
-        alert(err);
-    });
-    return false;
+	$.getJSON($(this).attr('href'), function (response) {
+		console.log(response);
+	}).fail(function (jqxhr, textStatus, error) {
+		var err = textStatus + ", " + error;
+		alert(err);
+	});
+	return false;
 });
 
 function update(url, parent, targetId) {
-    $(targetId).find('option').not('[value=""]').remove();
-    if (url != null) {
-        url += '?parentId=' + encodeURI(parent);
-        $.getJSON(url, function (data) {
-            $.each(data, function (i, v) {
-                $(targetId).append('<option value="' + v.Value + '">' + v.Text + '</option>');
-            });
-        });
-    }
+	$(targetId).find('option').not('[value=""]').remove();
+	if (url != null) {
+		url += '?parentId=' + encodeURI(parent);
+		$.getJSON(url, function (data) {
+			$.each(data, function (i, v) {
+				$(targetId).append('<option value="' + v.Value + '">' + v.Text + '</option>');
+			});
+		});
+	}
 }
 function reset() {
-    $('form').removeData('validator');
-    $('form').removeData('unobtrusiveValidation');
-    $.validator.unobtrusive.parse('form');
+	$('form').removeData('validator');
+	$('form').removeData('unobtrusiveValidation');
+	$.validator.unobtrusive.parse('form');
 }
\ No newline at end of file
diff --git a/projects/IoTCenter/IoTCenter.csproj b/projects/IoTCenter/IoTCenter.csproj
index 8496875e..5d9bbf86 100644
--- a/projects/IoTCenter/IoTCenter.csproj
+++ b/projects/IoTCenter/IoTCenter.csproj
@@ -16,7 +16,4 @@
     <ProjectReference Include="..\IoTClient\Assets\StreamingAssets\IoT.Resources.csproj" />
     <ProjectReference Include="..\IoT.Shared\IoT.Shared.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="logs\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db
index 258ff314..7f9a97eb 100644
Binary files a/projects/IoTCenter/iotcenter.db and b/projects/IoTCenter/iotcenter.db differ
diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
index d5ab2fbf..9139d5c3 100644
--- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
+++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
@@ -12,9 +12,4 @@
   <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
   </ItemGroup>
-  <ItemGroup>
-    <None Remove="wwwroot\js\node.js" />
-    <None Remove="wwwroot\js\product.js" />
-    <None Remove="wwwroot\product.html" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index 68cc286a..1888cd61 100644
Binary files a/projects/IoTNode/iotnode.db and b/projects/IoTNode/iotnode.db differ