wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source 
Former-commit-id: 9d5a0221e8a6c4db6a9370a0b7851512c4777dfc
TangShanKaiPing
wanggang 6 years ago
parent a780f98c10
commit 16cf409720
12 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File

2
projects/ApiGateway/ApiGateway.csproj
Unescape View File

@ -12,4 +12,4 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
</Project>

2
projects/Infrastructure/Areas/Admin/Views/Shared/_Layout.cshtml
Unescape View File

@ -90,7 +90,7 @@
@Html.Raw(cfg["copyright"].Replace("{now}", DateTime.Now.Year.ToString()))
</strong>
<div class="float-right d-none d-sm-inline-block">
<b>Version</b> @Html.Raw(cfg["version"])
<b>v @Helper.Instance.GetVersion()</b>
</div>
</footer>
</div>

9
projects/Infrastructure/Extensions/HelperExtensions.cs
Unescape View File

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@ -6,15 +5,19 @@ using System.Management;
using System.Net;
using System.Net.NetworkInformation;
using System.Net.Sockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
namespace Infrastructure.Extensions
{
public static class HelperExtensions
{
public static string GetVersion(this Helper helper)
{
return Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
}
public static string GetCPUNumber(this Helper helper)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))

2
projects/Infrastructure/Views/Account/_Layout.cshtml
Unescape View File

@ -90,7 +90,7 @@
@Html.Raw(cfg["copyright"].Replace("{now}", DateTime.Now.Year.ToString()))
</strong>
<div class="float-right d-none d-sm-inline-block">
<b>Version</b> @Html.Raw(cfg["version"])
<b>v @Helper.Instance.GetVersion()</b>
@if (User.Identity.IsAuthenticated)
{
<a href="@Url.Action("Index","Home",new { area="Admin" })">管理</a>

2
projects/Infrastructure/Views/Shared/_Layout.cshtml
Unescape View File

@ -87,7 +87,7 @@
@Html.Raw(cfg["copyright"].Replace("{now}", DateTime.Now.Year.ToString()))
</strong>
<div class="float-right d-none d-sm-inline-block">
<b>Version</b> @Html.Raw(cfg["version"])
<b>v @Helper.Instance.GetVersion()</b>
@if (User.Identity.IsAuthenticated)
{
<a href="@Url.Action("Index","Home",new { area="Admin" })">管理</a>

4
projects/IoTCenter/IoTCenter.csproj
Unescape View File

@ -2,12 +2,10 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<Version>1.0.0-alpha.214</Version>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
<ProjectReference Include="..\IoT.Shared\IoT.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\upload\" />
</ItemGroup>
</Project>

1
projects/IoTCenter/appsettings.json
Unescape View File

@ -1,5 +1,4 @@
{
"version": "1.0.0-alpha.214",
"Logging": {
"LogLevel": {
"Default": "Warning",

1
projects/IoTKeyGen/IoTKeyGen.csproj
Unescape View File

@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>

2
projects/ManagementCenter/ManagementCenter.csproj
Unescape View File

@ -6,4 +6,4 @@
<ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
</ItemGroup>
</Project>
</Project>

1
projects/WebApp/WebApp.csproj
Unescape View File

@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

2
projects/WebUI/WebUI.csproj
Unescape View File

@ -3,4 +3,4 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
</PropertyGroup>
</Project>
</Project>

32
projects/projects.sln
Unescape View File

@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTNode", "IoTNode\IoTNode.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoT.Shared", "IoT.Shared\IoT.Shared.csproj", "{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTKeyGen", "IoTKeyGen\IoTKeyGen.csproj", "{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{48C7AE84-0BDC-4F8A-89ED-C6B82EC46C9F}"
ProjectSection(SolutionItems) = preProject
NuGet.config = NuGet.config
@ -34,11 +32,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IoT", "IoT", "{AE34E06D-C5C
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebUI", "WebUI\WebUI.csproj", "{B662B063-A311-4678-ADA4-83AD1A2F9C47}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiGateway", "ApiGateway\ApiGateway.csproj", "{85B06C97-E253-4ECE-8FAB-8823414BA4C9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagementCenter", "ManagementCenter\ManagementCenter.csproj", "{5F0FAEDB-C0F6-44F1-AA06-424AB759AF15}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApp", "WebApp\WebApp.csproj", "{6BCC9220-0B03-4BDB-BE70-814F6B16ECCE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp", "WebApp\WebApp.csproj", "{6BCC9220-0B03-4BDB-BE70-814F6B16ECCE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -122,18 +118,6 @@ Global
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Release|iPhone.Build.0 = Release|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Debug|iPhone.Build.0 = Debug|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Release|Any CPU.Build.0 = Release|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Release|iPhone.ActiveCfg = Release|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Release|iPhone.Build.0 = Release|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{B662B063-A311-4678-ADA4-83AD1A2F9C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B662B063-A311-4678-ADA4-83AD1A2F9C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B662B063-A311-4678-ADA4-83AD1A2F9C47}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@ -146,18 +130,6 @@ Global
{B662B063-A311-4678-ADA4-83AD1A2F9C47}.Release|iPhone.Build.0 = Release|Any CPU
{B662B063-A311-4678-ADA4-83AD1A2F9C47}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B662B063-A311-4678-ADA4-83AD1A2F9C47}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Debug|iPhone.Build.0 = Debug|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Release|Any CPU.Build.0 = Release|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Release|iPhone.ActiveCfg = Release|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Release|iPhone.Build.0 = Release|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{85B06C97-E253-4ECE-8FAB-8823414BA4C9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{5F0FAEDB-C0F6-44F1-AA06-424AB759AF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F0FAEDB-C0F6-44F1-AA06-424AB759AF15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F0FAEDB-C0F6-44F1-AA06-424AB759AF15}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@ -190,9 +162,9 @@ Global
{264A3E6B-80A1-488D-841D-930B810B85D2} = {6044D20E-13BA-47BF-BD42-CCC5267ACCEF}
{F48CA65D-B2D6-4DB8-A396-A3FE913804FB} = {AE34E06D-C5C7-44BC-B168-85808318516C}
{BE6DEBC5-004F-4811-8BDC-67C74D9E8C2F} = {AE34E06D-C5C7-44BC-B168-85808318516C}
{F01F3FEA-A8A8-4239-865F-E69773CEB2F3} = {AE34E06D-C5C7-44BC-B168-85808318516C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B7095FB-5E70-4EF8-805A-CB4A91AE4B0A}
BuildVersion_StartDate = 2000/1/1
EndGlobalSection
EndGlobal

Write Preview
Loading…
Cancel
Save