update

Former-commit-id: c0912e214d8da8650b09d6a908e794c06e869c55
6 years ago · ac7450c3c3
parent da7557ed1e
commit ac7450c3c3
85 changed files with 525 additions and 54 deletions
--- a/projects/Infrastructure/Infrastructure.csproj
+++ b/projects/Infrastructure/Infrastructure.csproj
@ -9,7 +9,7 @@

  <ItemGroup>
    <PackageReference Include="CS-Script.Core" Version="1.2.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@ -23,7 +23,7 @@
    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
    <PackageReference Include="DotNetCore.NPOI" Version="1.2.2" />
    <PackageReference Include="HtmlAgilityPack.NetCore" Version="1.5.0.1" />
-    <PackageReference Include="MailKit" Version="2.3.2" />
+    <PackageReference Include="MailKit" Version="2.4.0.1" />
    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
@ -34,13 +34,11 @@
    <PackageReference Include="System.Management" Version="4.6.0" />
    <PackageReference Include="ValueInjecter" Version="3.2.0" />
    <PackageReference Include="Flurl" Version="2.8.2" />
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.6" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.7" />
    <PackageReference Include="Hangfire.MemoryStorage" Version="1.6.3" />
    <PackageReference Include="Cronos" Version="0.7.0" />
  </ItemGroup>
   <ItemGroup>
    <EmbeddedResource Include="wwwroot\**\*" />
-  </ItemGroup><ItemGroup>
-    <Folder Include="wwwroot\lib\pace-js\themes\" />
  </ItemGroup>
 </Project>
--- a/projects/Infrastructure/wwwroot/css/site.css
+++ b/projects/Infrastructure/wwwroot/css/site.css
@ -20,6 +20,9 @@
    text-align:right;
 }
 /*表单验证提示信息*/
+.form-control.input-validation-error {
+    border-color: #dc3545;
+}
 .validation-summary-errors ul {
    color: red;
    padding-left: 0;
--- a/projects/IoT.Shared/IoT.Shared.csproj
+++ b/projects/IoT.Shared/IoT.Shared.csproj
@ -8,7 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/projects/IoTCenter/IoTCenter.csproj
+++ b/projects/IoTCenter/IoTCenter.csproj
@ -4,7 +4,7 @@
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@ -266,8 +266,8 @@
        </div>
        <div class="row">
            <!--摄像头-->
-            <div class="col-md-6">
-                <template v-if="HasDevices('摄像头')">
+            <template v-if="HasDevices('摄像头')">
+                <div class="col-md-6">
                    <div class="row">
                        <div class="col-md-12">
                            <div class="card">
@ -280,6 +280,8 @@
                            </div>
                        </div>
                    </div>
+                </div>
+                <div class="col-md-6">
                    <div class="row" id="ptz">
                        <div class="col-md-12">
                            <div class="card" style="height:220px;">
@ -314,8 +316,8 @@
                            </div>
                        </div>
                    </div>
-                </template>
-            </div>
+                </div>
+            </template>
            <!--调色灯-->
            <div class="col-md-6" v-for="device in GetDevices('调色灯')">
                <div class="row">
--- a/projects/IoTCenter/Views/Home/Product.cshtml
+++ b/projects/IoTCenter/Views/Home/Product.cshtml
@ -15,14 +15,26 @@
        </div>
    </div>
    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-body">
+                    <label><input type="checkbox" class="checkall" v-on:change="SelectDevice($event)" />全选</label>
+                    <button class="btn btn-sm btn-info uncheck" v-on:click="SelectDevice($event)">反选</button>
+                </div>
+            </div>
+        </div>
        <div class="col-md-2 col-sm-4 col-xs-6" v-for="item in model.Devices">
            <div class="card">
                <div class="card-header">
                    <h3 class="card-title">{{item.Name}}</h3>
-                    <div class="card-tools"></div>
+                    <div class="card-tools">
+                        <div class="custom-control custom-switch">
+                            <input type="checkbox" name="id[]" class="item" :value="item.Number" v-on:change="SelectDevice($event)">
+                        </div>
+                    </div>
                </div>
                <a class="box-body" :href="'/Home/Device?number='+item.Number" style="display:block;text-align:center;">
-                    <img :alt="item.Name" :src="model.Image" style="margin:0 auto;max-width:100%;" />
+                    <img :alt="item.Name" :src="model.Image" style="margin:0 auto;max-width:64px;" />
                </a>
            </div>
        </div>
--- a/projects/IoTCenter/iotcenter.db
+++ b/projects/IoTCenter/iotcenter.db
--- a/projects/IoTClient/Assets/StreamingAssets/libman.json.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/libman.json.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0c053ac43a8608844ac4f77035005bf1
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
@ -15,6 +15,9 @@
    <div id="app">
        <f7-app :params="$root.f7params">
            <f7-view main>
+                <f7-col>
+                    <f7-preloader></f7-preloader>
+                </f7-col>
                <f7-page>
                    <f7-navbar title="产品">
                        <f7-nav-right>
@ -125,6 +128,7 @@
                }
                this.$f7ready((f7) => {
                    app = this.$f7;
+                    app.preloader.show();
                });
                connect();
                this.load();
@ -142,6 +146,9 @@
                        })
                        .catch(function (error) {
                            app.dialog.alert(error, '警告', function () { })
+                        })
+                        .then(function () {
+                            app.preloader.hide();
                        });
                }
            }
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
@ -318,11 +318,13 @@ function init() {
                }
                this.$f7ready((f7) => {
                    app = this.$f7;
+                    app.preloader.show();
                });
            }
            connect();
            this.$nextTick(function () {
                UpdateCamera();
+                app.preloader.hide();
            });
        },
        methods: {
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/product.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/product.js
@ -310,6 +310,34 @@ function init() {
            });
        },
        methods: {
+            SelectDevice(e) {
+                var checkbox = $(e.target);
+                if (checkbox.hasClass('checkall')) {
+                    if (e.target.checked) {
+                        $('input.item').not(':checked').prop("checked", true);
+                    }
+                    else {
+                        $('input.item').filter(':checked').prop("checked", false);
+                    }
+                }
+                else if (checkbox.hasClass('uncheck')) {
+                    $('input.item').each(function () {
+                        $(this).prop("checked", !$(this).prop("checked")).change();
+                    });
+                }
+                var parent = $('input.checkall');
+                if ($('input.item').not(':checked').length === 0) {
+                    parent.prop("indeterminate", false);
+                    parent.prop("checked", true);
+                }
+                else if ($('input.item').filter(':checked').length === 0) {
+                    parent.prop("indeterminate", false);
+                    parent.prop("checked", false);
+                }
+                else {
+                    parent.prop("indeterminate", true);
+                }
+            },
            HasDevices(name) {
                return Enumerable
                    .from(this.model.Devices)
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/product.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/product.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ed5813ef20eca1a4a9e9df2b5df41812
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/Chart.js/Chart.bundle.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/Chart.js/Chart.bundle.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d7872965a1fa8cf4e92ef7aea1244d2b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/axios/axios.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/axios/axios.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: afc05fcf1c6518e42a13accb73ca7695
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/flv.js/flv.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/flv.js/flv.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1d51325f1d33f744fa3608e9b3eb5147
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6a1ec83032971f442b2e44c936e6f35d
+guid: a24d89c20722ad1469325b1025d0d38a
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/css.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/css.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b0e8697b49c6624458660d7c73c9abcb
+guid: dcc8a34d278fbab42bf203e4015d2c0f
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/css/all.min.css.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/css/all.min.css.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7b4cf22200238144886f901391d06b9d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 76f365a5df8ca044aa8cd21859124540
+guid: 9c3d069047a8ccc43bbaaf4702d8ee11
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.eot.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.eot.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 056e640f93d6cd24f83b10e4ba060759
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.svg.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.svg.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a8757abe67b467343af726a740abcb8c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.ttf.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.ttf.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c7ea5c75e9d9c774ca19e92b2d8ba8e9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.woff.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.woff.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c6c53290adc4eaf41acf99e4c57dd8a8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.woff2.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-brands-400.woff2.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 67de8bcce3f865242ae517299c0f6336
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.eot.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.eot.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3122cf2b4fba38c40a65a69ef36ed9c0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.svg.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.svg.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 61cf0479fd6b03342b411a7564ba4729
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.ttf.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.ttf.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c96ed3d24a6344c478356cedfc40fa78
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.woff.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.woff.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5a72d148a9175b3479ffe432643fba70
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.woff2.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-regular-400.woff2.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 703977fca30e6b34bb220db37155e13f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.eot.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.eot.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 517dd52b779ddd5439b1b7f9d9b746fb
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.svg.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.svg.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4aec75b031f79334fbc1f062eddfc9e2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.ttf.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.ttf.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 203a16fc753df2149bba3486e8337fd8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.woff.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.woff.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c8f1c323b86e4994eb7880d7b58207aa
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.woff2.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/fontawesome-free/webfonts/fa-solid-900.woff2.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4138f74ef3738c04b8de78c3e2308fed
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery.validation.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery.validation.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bff49c7e4b09b894dbda71dc8766f256
+guid: 4ec06047070eb834b98d3f6142a54c5a
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/css/framework7.bundle.min.css.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/css/framework7.bundle.min.css.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c8ef7daafc523b64c9b283a91c28a910
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ddbc5f7a20b285c4aa41e4e616a30d70
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7-vue.bundle.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7-vue.bundle.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 361f3fcc36923cc4390456f44a3bb6a1
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7.bundle.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/framework7/js/framework7.bundle.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d294e4f10a0afac478de9656de17d849
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d931cb8cd1d4f404e855736e8a6d87b0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/css.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/css.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3a5e87812d6db0a40b6307481940b941
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/css/ionicons.min.css.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/css/ionicons.min.css.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 35160c0f0fcfcb7418b72df9f7f68450
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3b510891bfd8724dba3c8ca484ab075
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.eot.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.eot.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 10fbb3cbc418fe74f9b915e667e11553
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.svg.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.svg.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e3e97007707a43d4ea68865470e807ce
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.ttf.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.ttf.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c00f1080544f0ac4b9211012add3262c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.woff.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.woff.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8331319e53785fc449f99dcae2dc2c63
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.woff2.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/ionicons/fonts/ionicons.woff2.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ee66beb60fecde543857ff3e28a7a7bf
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation-unobtrusive.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation-unobtrusive.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 291031b3eaae15a4689d87501bc0bd12
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3457eefd59e62414abcc73030b2c93dd
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7f1c232a949c5d745be8d491b9c9f752
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation/jquery.validate.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation/jquery.validate.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7fd467d4a95b85a44a5054d2ed356e2d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation/localization.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation/localization.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a9cb7490947dc34d99d605f5a6b5bc7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation/localization/messages_zh.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery-validation/localization/messages_zh.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e9ddd2aa2a7fbf74089c469ee058e5ba
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery.validation.unobtrusive.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery.validation.unobtrusive.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: aed50a0244b033040be6c990ca021a91
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery/jquery.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/jquery/jquery.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 90b78dda59ee2ee42b4c6f9abceb7824
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.js.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e84ceda1fa28213429ba8fda16968da3
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c25d90a0df9754543afb7617f8b4f55a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq/linq.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/linq/linq.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 30764912281437945b31a001737c26e8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/lodash/lodash.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/lodash/lodash.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3eec12d5c39d3a14cb1230d8d656a736
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b53d23199db3c744798c0dea072b93ae
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/css.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/css.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eb1b3f46386f3044997e657ae8dc00ac
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/css/metro-all.min.css.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/css/metro-all.min.css.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 87ab1ed4d166fbd4ca573182d4d80217
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/js.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 03b309a66a8071e4189556efd6b98c83
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/js/metro.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/js/metro.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b82faaabd33c9e546ae4f165133b67b9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 39a838ee4a0497441b46b761d20d9ce3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif/metro.json.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif/metro.json.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a2588ba5652c83148b13291106709239
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif/metro.svg.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif/metro.svg.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 860f942cc8ef42b46b278f30a3519432
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif/metro.ttf.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif/metro.ttf.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 719b806ff4e2b1448ac56875f48251a4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif/metro.woff.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/metro4/mif/metro.woff.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 22ef4c8cda816a149986adb6a19fdaa7
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/mobile-detect.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/mobile-detect.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 583a0297962c7664da4d9e392ec89f6a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/mobile-detect/mobile-detect.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/mobile-detect/mobile-detect.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ad9cb38c12a4b8c4c8592f3ef02f9d76
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/mobile.detect.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/mobile.detect.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0e25d8f24e9fddf4893777d28085e911
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/signalr/signalr.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/signalr/signalr.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 04a2cd7f5d2abed4e9d1197b6696f517
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/urijs.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/urijs.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d097a0b24b1d91c40a0584f51916cb1d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/urijs/URI.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/urijs/URI.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c50eb3113cf02ab4088faccdbd91a31c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/vue/vue.min.js.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/vue/vue.min.js.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6d856888e423cd248a654365a151bb93
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/weui.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/lib/weui.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 181df7b787b554f49b9a26fade15a55f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
@ -13,6 +13,9 @@
    <div id="app">
        <f7-app :params="$root.f7params">
            <f7-view main>
+                <f7-col>
+                    <f7-preloader></f7-preloader>
+                </f7-col>
                <f7-page>
                    <f7-navbar :title="model?model.Name:'节点'">
                        <a href="nodes.html" slot="nav-left" class="link external"><i class="icon icon-back"></i></a>
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/nodes.html
@ -15,6 +15,9 @@
    <div id="app">
        <f7-app :params="$root.f7params">
            <f7-view main>
+                <f7-col>
+                    <f7-preloader></f7-preloader>
+                </f7-col>
                <f7-page>
                    <f7-navbar title="节点">
                        <f7-nav-right>
@ -127,6 +130,7 @@
                }
                this.$f7ready((f7) => {
                    app = this.$f7;
+                    app.preloader.show();
                });
                this.load();
                connect();
@ -144,6 +148,9 @@
                        })
                        .catch(function (error) {
                            app.dialog.alert(error, '警告', function () { })
+                        })
+                        .then(function () {
+                            app.preloader.hide();
                        });
                }
            }
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/product.html.meta
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/product.html.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6a626d04261d28c4ab3a6528909f173b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/projects/IoTKeyGen/IoTKeyGen.csproj
+++ b/projects/IoTKeyGen/IoTKeyGen.csproj
@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/projects/IoTNode/IoTNode.csproj
+++ b/projects/IoTNode/IoTNode.csproj
@ -4,7 +4,7 @@
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/projects/IoTNode/iotnode.db
+++ b/projects/IoTNode/iotnode.db
--- a/projects/UserCenter/UserCenter.csproj
+++ b/projects/UserCenter/UserCenter.csproj
@ -5,15 +5,15 @@
    <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.6">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.0.0" />
    <PackageReference Include="AspNet.Security.OAuth.QQ" Version="3.0.0" />
    <PackageReference Include="FaceRecognitionDotNet" Version="1.2.3.13" />
-    <PackageReference Include="IdentityServer4" Version="3.0.1" />
-    <PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.1" />
+    <PackageReference Include="IdentityServer4" Version="3.0.2" />
+    <PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.2" />
    <PackageReference Include="RavenDB.Embedded" Version="4.2.4" />
  </ItemGroup>
  <ItemGroup>