From 9fd8f5c96badfff280db0ebce41bcdecf44c29df Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 5 Nov 2019 08:38:53 +0800
Subject: [PATCH] update

Former-commit-id: d40fd32426a5f919b9d7fb86aeb0d956a87313f7
---
 .../Areas/Admin/Views/Shared/_Layout.cshtml   |   3 +
 projects/Infrastructure/Infrastructure.csproj |  21 +------
 .../Views/Account/_Layout.cshtml              |   3 +
 .../Views/Shared/EditorTemplates/Input.cshtml |  17 +++---
 .../Shared/EditorTemplates/Object.cshtml      |  53 ++++++++----------
 .../Views/Shared/_Layout.cshtml               |   4 +-
 projects/Infrastructure/wwwroot/css/site.css  |   3 +
 projects/Infrastructure/wwwroot/js/site.js    |  41 +++++++-------
 projects/IoTCenter/IoTCenter.csproj           |   3 -
 projects/IoTCenter/iotcenter.db               | Bin 462848 -> 462848 bytes
 .../StreamingAssets/IoT.Resources.csproj      |   5 --
 projects/IoTNode/iotnode.db                   | Bin 499712 -> 499712 bytes
 12 files changed, 63 insertions(+), 90 deletions(-)

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 258ff314ee2a4c6127a5c95021db3b29d37d949f..7f9a97eb15bbf604ef6188eb96bf282426f55cbe 100644
GIT binary patch
delta 169
zcmZozAkzRuEsQNpEzB(}Ev#GEv=ta<ZP!s?o6o^`Y5Exrw)1R;JfRHYg41^^uo*HM
zPk*PtX0n}Ki;evn6L0=j0rrn9tcI3)hUU{Ju&|r3vB@#8v96u&z{;M>0%Ye--^j|o
ziPgwR&%|_k1{-@etC6vuq2cx$Z0sVetcDhP7UtVOa<f-4a<elii{?0hY!aTng_Yfa
T+0evz`ZHE`lkInT*_D|9RWB=W

delta 162
zcmZozAkzRuEsQNpEzB(}Ev#GEv=ta<Z`V;^o6o^`dHNX*w)5;+hCHDR;{4MWYO)zl
zf2Y7^vYlOvjr|%E>)NdX>>pWJjSTdRjiygvVK-r8lVbql=?<*yxh&ZZJfYJ!va)Yt
zH8jyPHJhHn#-7b;Xr^auy!{3ny9g_*k)fV};r5T*>{W~`r3}iV(@(Roo3Q{*GXWd6
K{Vp%NG7|uE@hZgt

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 68cc286a7868c5b997cd66995bb8886c3a03389d..1888cd61508c9e55342a3c8c9a597061fde23ecc 100644
GIT binary patch
delta 570
zcmX|+PiPZS5XSet?7rD-c9X6x^q?(9TT&$5W;co1SkM~(9MXe$sAy|M+a{u^x*KDS
zDA+&_<{;$cND#3HJt!VT<$-t*6uby+@eqliUc46s&+f9|%p7JunE8FP_F;6*s}^a|
zR;VSmq&Mu|IN8tJ<E&9+q2t1CT19Z!fzS_H<wqTspx~ZS=Y)igR~%+j%f@F8v!Hz1
z6L;$P%Ny`jjTw^QMU5A)Go6q{ezwk@E=<BHVXweL(a+Iy+Fz}sjjCKd5&0dt6B#0H
zWj*{gTn!5{%2P2D-g9G<O%iHXu(ZXJP`(-v-u9WLSa#t;y<V=}Qjn~(F}}UUDw3#7
z3l*I2u|;rK1COPi?=g=Ldd%We-&mi>*-9$sWghiD+b4P^D|o2yuUrdO3jN@%+a8Ax
zeP<&gly3y+P49|g<^QAg#~%9OPj=~ioE{P4WJ8K|V@C8-bb-Dg8`>YOt&OO!)uQq!
zBJw>m5T`!xBHo{YCH}ks^Hk0)r*cc#l+D#+(2>M)bBBsgim)uZ&B4HrHVZa(4nu}F
zW}!V6CSyWecqx)DDh}+TRK^JhK1!x-*g4#GAmcMual(bm1AaFr4C~cq(mOV+W6}ka
zq_N~eMqX)7`{E#WT}Xw@Od7v<GTyAgLCMS;W{$tB!AVK7(uQf`Km%4J%Q7-q-fY0#
F#6QN~o4)`6

delta 596
zcmX|-PiPZS5QpE}?#|mycC$^5RH!M&q_jx7-QBclu%P{;9@0Y*jA*K&ZQ5#E+Sjz!
z6hs@y!5oCpgCioP9=s@upyh!lK|wr7jUJQ~i5Kq`K|H!v5auv2eDlrxR$sNQdR3w&
zsnk%COUetl)kb?oxeW?wAcP!{>c}`8Zm2h$5XU&QOSrKB2J=SmNlOsFad5GD5iB`(
zM$h0^4&yREt7k-d5rULD;@lEE9POlK5+y<jybWA1ei;>`RTuh*|GWRXKjeGr>(f4I
zGa6A*?PBlPX<>bUPAWM`JYR*lYC2>pL)uOJU4;~m#K6S<kFZbdRAEw)`Ld_Yeul9-
z>!7P<?y8<4EheVw;8GiB>kt=RU!X?SM30?HI(8C+H8>>mc@H~UgE8dWyWHGAu2Kb8
zvj;CNEluQCd`KTaOoX-}EC;-gr%2cgQ$kcNgOzm_Ys${gO`KZc6Yl>8f2=`N+^xfv
zixJ;_5}{jQ-ZQPho4}~_m~I(Ajj|EepX+I9$ghZl{VXEMxnh%!xBJ<+cr?hek~(SI
zy<@iBBlP2}qR5{3GH#?<P9way$2-%DLLX)+ys_{%iUHP$&jwgX6oy$jrb(1U$P=J3
z^l`RdqHEZ}*=xmhEZe~y&bsC4VqC|L1vahD6#Kk&%|UF;Gh1?99Llq9&GV7v42kZ=
uP0o_C>spCj5U=Ig5yiEwgezX=*-1rll2#&tjRiKVINerHQWOj9X8Rw)!lefQ