1.0.0-rc.1218

Former-commit-id: 79f96c3bc164d990e0f7015bbae474394239a9a4

projects/Infrastructure/Infrastructure.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.1" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="DotNetCore.NPOI" Version="1.2.2" />

projects/Infrastructure/Views/Shared/_Header.cshtml

@@ -1,5 +1,6 @@
 <meta charset="utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+<meta name="renderer" content="webkit" />
 <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport" />
 <link rel="shortcut icon" href="/favicon.ico" />
 <link rel="stylesheet" href="~/lib/fontawesome-free/css/all.min.css" />

projects/IoTCenter/Application/Models/EditGlobalIoTTimerModel.cs

@@ -12,6 +12,7 @@ namespace IoTCenter.Application.Models
         public string Name { get; set; }
 
         [Display(Name = "定时器规则")]
+        [UIHint("Cron")]
         [Remote("CronValid", "Ajax", "Admin")]
         [Required(ErrorMessage = nameof(RequiredAttribute))]
         public string Cron { get; set; }

projects/IoTCenter/Areas/Admin/Views/Shared/_Menu.cshtml

@@ -23,7 +23,7 @@
     <li class="nav-item"><a class="nav-link @GetClass("GlobalSceneCommand")" href="@Url.Action("Index","GlobalSceneCommand")"><i class="nav-icon far fa-circle"></i><span>平台场景命令管理</span></a></li>
     <li class="nav-item"><a class="nav-link @GetClass("GlobalIoTTimer")" href="@Url.Action("Index","GlobalIoTTimer")"><i class="nav-icon far fa-clock"></i><span>平台定时器管理</span></a></li>
     <li class="nav-item"><a class="nav-link @GetClass("GlobalIoTTimerCommand")" href="@Url.Action("Index","GlobalIoTTimerCommand")"><i class="nav-icon far fa-circle"></i><span>平台定时器命令管理</span></a></li>
-    <li class="nav-item"><a class="nav-link @GetClass("GlobalScene")" href="@Url.Action("Index","GlobalIoTTigger")"><i class="nav-icon fa fa-fire"></i><span>平台触发器管理</span></a></li>
+    <li class="nav-item"><a class="nav-link @GetClass("GlobalIoTTigger")" href="@Url.Action("Index","GlobalIoTTigger")"><i class="nav-icon fa fa-fire"></i><span>平台触发器管理</span></a></li>
     <li class="nav-item"><a class="nav-link @GetClass("GlobalIoTTiggerCommand")" href="@Url.Action("Index","GlobalIoTTiggerCommand")"><i class="nav-icon far fa-circle"></i><span>平台触发器命令管理</span></a></li>
 </ul>
 

projects/IoTCenter/appsettings.json

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

projects/UserCenter/UserCenter.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="FaceRecognitionDotNet" Version="1.2.3.13" />
     <PackageReference Include="IdentityServer4" Version="3.0.2" />
     <PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.2" />
-    <PackageReference Include="RavenDB.Embedded" Version="4.2.5" />
+    <PackageReference Include="RavenDB.Embedded" Version="4.2.6" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />