1.0.0.428

Former-commit-id: 49660a3e76d0c82a96331829461306851c383eaa

projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml

@@ -95,7 +95,7 @@
                 @Html.Raw(string.Format(copyright, DateTime.Now.Year.ToString()))
             </strong>
             <div class="float-right d-none d-sm-inline-block">
-                <b>v @Helper.Instance.GetVersion()</b>
+                <b>v @Helper.Instance.GetVersion() build @Helper.Instance.GetAssemblyVersion()</b>
             </div>
         </footer>
     </div>

projects/Infrastructure/Extensions/HelperExtensions.cs

@@ -17,6 +17,11 @@ namespace Infrastructure.Extensions
             return Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
         }
 
+        public static string GetAssemblyVersion(this Helper helper)
+        {
+            return Assembly.GetEntryAssembly().GetName().Version?.ToString();
+        }
+
         public static string GetMacAddress(this Helper helper)
         {
             return NetworkInterface

projects/Infrastructure/Infrastructure.csproj

@@ -5,7 +5,8 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <Version>1.0.0.427</Version>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
 
   <ItemGroup>
@@ -49,5 +50,7 @@
   </ItemGroup>
    <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
+  </ItemGroup><ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
   </ItemGroup>
 </Project>

projects/Infrastructure/Web/SignalR/BasePageHub.cs

@@ -9,21 +9,38 @@ namespace Infrastructure.Web.SignalR
     public class BasePageHub : Hub
     {
         public override Task OnConnectedAsync()
+        {
+            this.OnConnected();
+            return base.OnConnectedAsync();
+        }
+
+        protected void OnConnected()
         {
             Debug.WriteLine($"{Context.ConnectionId} has connected which request url is {Context.GetHttpContext().Request.GetUrl()}");
             this.Groups.AddToGroupAsync(Context.ConnectionId, Context.ConnectionId);
-            if (Context.GetHttpContext().Request.Query.Keys.Contains("group"))
+            var group = Context.GetHttpContext().Request.Query["group"].ToString();
+            if (!string.IsNullOrEmpty(group))
+            {
+                this.Groups.AddToGroupAsync(Context.ConnectionId, group);
+                Context.Items["group"] = group;
+            }
+            var type = Context.GetHttpContext().Request.Query["type"].ToString();
+            if (!string.IsNullOrEmpty(type))
             {
-                this.Groups.AddToGroupAsync(Context.ConnectionId, Context.GetHttpContext().Request.Query["group"]);
+                Context.Items["type"] = type;
             }
             this.Clients.Group(Context.ConnectionId).SendAsync("Connected", Context.ConnectionId);
-            return base.OnConnectedAsync();
         }
 
         public override Task OnDisconnectedAsync(Exception exception)
         {
-            Debug.WriteLine($"{Context.ConnectionId} has disconnected which request url is {Context.GetHttpContext().Request.GetUrl()}");
+            this.OnDisconnected(exception);
             return base.OnDisconnectedAsync(exception);
         }
+
+        protected void OnDisconnected(Exception exception)
+        {
+            Debug.WriteLine($"{Context.ConnectionId} has disconnected which request url is {Context.GetHttpContext().Request.GetUrl()}");
+        }
     }
 }

projects/IoT.Shared/Application/Domain/Entities/Node.cs

@@ -14,6 +14,9 @@ namespace Application.Domain.Entities
         [Required]
         public string Number { get; set; }
 
+        [Display(Name = "在线")]
+        public bool IsOnline { get; set; }
+
         [Display(Name = "图片")]
         public string Image { get; set; }
 

projects/IoT.Shared/Application/Models/EditNodeModel.cs

@@ -16,6 +16,10 @@ namespace Application.Models
         [Required(ErrorMessage = nameof(RequiredAttribute))]
         public string Number { get; set; }
 
+        [Display(Name = "在线")]
+        [ReadOnly(true)]
+        public bool IsOnline { get; set; }
+
         [Display(Name = "图片")]
         [DataType(DataType.ImageUrl)]
         public string Image { get; set; }

projects/IoT.Shared/IoT.Shared.csproj

@@ -5,7 +5,8 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-    <Version>1.0.0.427</Version>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,6 +22,9 @@
   <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
   </ItemGroup>

projects/IoT.Shared/Services/IoTCenter/IoTCenterHub.cs

@@ -70,6 +70,42 @@ namespace IoTCenter.Services
             this._httpClientFactory = httpClientFactory;
         }
 
+        public override Task OnConnectedAsync()
+        {
+            this.OnConnected();
+            this.UpdateNodeStatus(true);
+            return Task.CompletedTask;
+        }
+
+        public override Task OnDisconnectedAsync(Exception exception)
+        {
+            this.OnDisconnected(exception);
+            this.UpdateNodeStatus(false);
+            return Task.CompletedTask;
+        }
+
+        private void UpdateNodeStatus(bool status)
+        {
+            var type = Context.Items["type"] as string;
+            if (!string.IsNullOrEmpty(type) && type == "node")
+            {
+                var group = Context.Items["group"].ToString();
+                var node = this._nodeRepo.Table().FirstOrDefault(o => o.Number == group);
+                if (node != null)
+                {
+                    node.IsOnline = status;
+                    try
+                    {
+                        this._nodeRepo.SaveChanges();
+                    }
+                    catch (Exception ex)
+                    {
+                        this._logger.LogError(ex.ToString());
+                    }
+                }
+            }
+        }
+
         public void ServerToClient(string method, string message, string toClient, string fromClient = null)
         {
             Clients.Group(toClient).SendAsync(Methods.ServerToClient, method, message, toClient, fromClient);

projects/IoT.Shared/Services/IoTNode/IoTNodeClient.cs

@@ -132,7 +132,7 @@ namespace IoT.Shared.Services
         private void InitConnection()
         {
             this._notifyHost = GetSetting("notify:host");
-            var url = $"{this._notifyHost}/hub?group={GetSetting("sn")}";
+            var url = $"{this._notifyHost}/hub?type=node&group={GetSetting("sn")}";
             this._logger.LogDebug($"init connection for {url}");
             if (this.Connection != null)
             {

projects/IoTCenter/IoTCenter.csproj

@@ -2,8 +2,12 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <Version>1.0.0.427</Version>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
     <ProjectReference Include="..\IoT.Shared\IoT.Shared.csproj" />

projects/IoTCenter/db.sql

@@ -20,6 +20,7 @@ CREATE TABLE "iot_Node" (
     "IsDeleted" TEXT NULL,
     "Name" TEXT NULL,
     "Number" TEXT NOT NULL,
+    "IsOnline" INTEGER NOT NULL,
     "Image" TEXT NULL,
     "Longitude" TEXT NOT NULL,
     "Latitude" TEXT NOT NULL,

projects/IoTNode/DbConfig.cs

@@ -97,6 +97,7 @@ namespace IoTNode
                 Id = $"nodeid-{sn}".ToGuid(),
                 Name = "节点",
                 Number = sn,
+                IsOnline = true,
                 Image = "/images/classroom.png"
             });
             db.SaveChanges();

projects/IoTNode/IoTNode.csproj

@@ -2,8 +2,12 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <Version>1.0.0.427</Version>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Hangfire.Core" Version="1.7.11" />
     <PackageReference Include="Hangfire.AspNetCore" Version="1.7.11" />

projects/IoTNode/db.sql

@@ -20,6 +20,7 @@ CREATE TABLE "iot_Node" (
     "IsDeleted" TEXT NULL,
     "Name" TEXT NULL,
     "Number" TEXT NOT NULL,
+    "IsOnline" INTEGER NOT NULL,
     "Image" TEXT NULL,
     "Longitude" TEXT NOT NULL,
     "Latitude" TEXT NOT NULL,

projects/JobServer/JobServer.csproj

@@ -3,9 +3,14 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <Version>1.0.0.427</Version>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Hangfire.AspNetCore" Version="1.7.11" />
     <PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />

projects/StudyCenter/StudyCenter.csproj

@@ -2,8 +2,12 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <Version>1.0.0.427</Version>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>

projects/UserCenter/UserCenter.csproj

@@ -2,8 +2,12 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <Version>1.0.0.427</Version>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <Deterministic>false</Deterministic>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.0" />
     <PackageReference Include="AspNet.Security.OAuth.QQ" Version="3.1.0" />

projects/Version.cs

@@ -0,0 +1,4 @@
+using System.Reflection;
+
+[assembly: AssemblyVersion("1.0.0.*")]
+[assembly: AssemblyInformationalVersion("1.0.0.428")]

projects/WebMVC/WebMVC.csproj

@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.0.0.427</Version>
   </PropertyGroup>
 
   <ItemGroup>

projects/WebSPA/WebSPA.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>1.0.0.427</Version>
   </PropertyGroup>
 
   <ItemGroup>

projects/projects.sln

@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NuGet.config = NuGet.config
 		lib\package.json = lib\package.json
 		..\README.md = ..\README.md
+		Version.cs = Version.cs
 	EndProjectSection
 	ProjectSection(FolderGlobals) = preProject
 		C_5_4Users_4wg_4Desktop_4ZHXY_4projects_4lib_4package_1json__JsonSchema = http://json.schemastore.org/project-1.0.0-beta4
@@ -39,7 +40,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{11BCB5F9-0020-
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSPA", "WebSPA\WebSPA.csproj", "{6F839910-580D-4CD1-A0C0-6FAF542B4480}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JobServer", "JobServer\JobServer.csproj", "{6E2766D8-9ECF-469E-8662-A20F673E52CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JobServer", "JobServer\JobServer.csproj", "{6E2766D8-9ECF-469E-8662-A20F673E52CC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -175,7 +176,7 @@ Global
 		{6E2766D8-9ECF-469E-8662-A20F673E52CC} = {E1681DC3-9AC2-4FF6-B3DE-37EF826E6F8A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		BuildVersion_StartDate = 2000/1/1
 		SolutionGuid = {0B7095FB-5E70-4EF8-805A-CB4A91AE4B0A}
+		BuildVersion_StartDate = 2000/1/1
 	EndGlobalSection
 EndGlobal