Former-commit-id: b1e90b3ddb1b3d5b98312bc36f031cd0c4b5a0f9
Former-commit-id: d1a4d5e917bcbb33b4e0a4a2467ee3c575ec16c6
1.0
wanggang 4 years ago
parent b3908edae0
commit 2617173a4c

@ -15,9 +15,6 @@
<PackageReference Include="Vibrant.InfluxDB.Client" Version="4.0.4" />
<PackageReference Include="UoN.ExpressiveAnnotations.NetCore" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Application\Application.csproj" />
</ItemGroup>

@ -3,7 +3,8 @@
<TargetFramework>net5.0</TargetFramework>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<Version>1.0.0.0</Version>
<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
<Version>2.0.0.0</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Kveer.XmlRPC" Version="1.1.1" />
@ -14,7 +15,4 @@
<ItemGroup>
<Folder Include="wwwroot\upload\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
</ItemGroup>
</Project>

@ -2,6 +2,7 @@ using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Serilog;
using Serilog.Settings.Configuration;
using System;
using System.IO;
using System.Text;
@ -21,7 +22,7 @@ namespace IoTDameon
.ConfigureLogging((c, o) =>
{
Log.Logger = new LoggerConfiguration()
.ReadFrom.Configuration(config)
.ReadFrom.Configuration(config, ConfigurationAssemblySource.AlwaysScanDllFiles)
.WriteTo.Console()
.WriteTo.File("logs/log.txt", rollOnFileSizeLimit: true, fileSizeLimitBytes: 100 * 1024 * 1024, rollingInterval: RollingInterval.Infinite)
.CreateLogger();

@ -1,10 +1,8 @@
using Infrastructure.Extensions;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using System;
namespace IoTDameon
{
@ -44,7 +42,7 @@ namespace IoTDameon
app.UseExceptionHandler("/Error");
}
string basePath = this.Configuration.GetAppSetting("BasePath");
string basePath = this.Configuration.GetSection("AppSettings").GetValue<string>("BasePath");
if (!string.IsNullOrEmpty(basePath))
{
app.UsePathBase(basePath);
@ -73,4 +71,4 @@ namespace IoTDameon
});
}
}
}
}

@ -5,7 +5,6 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
<Version>2.0.0.0</Version>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.20" />

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1618380920757" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2799" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M832 864H192c-53.12 0-96-42.88-96-96V256c0-53.12 42.88-96 96-96h216.32c36.48 0 69.76 20.48 85.76 53.12l60.8 120.96c5.76 10.88 16.64 17.92 28.8 17.92H832c53.12 0 96 42.88 96 96v320c0 53.12-42.88 96-96 96zM192 224c-17.92 0-32 14.08-32 32v512c0 17.92 14.08 32 32 32h640c17.92 0 32-14.08 32-32V448c0-17.92-14.08-32-32-32H583.68c-36.48 0-69.76-20.48-85.76-53.12l-60.8-120.96a32.768 32.768 0 0 0-28.8-17.92H192z" fill="#1296db" p-id="2800"></path></svg>

After

Width:  |  Height:  |  Size: 824 B

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1618380920757" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2799" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css"></style></defs><path d="M832 864H192c-53.12 0-96-42.88-96-96V256c0-53.12 42.88-96 96-96h216.32c36.48 0 69.76 20.48 85.76 53.12l60.8 120.96c5.76 10.88 16.64 17.92 28.8 17.92H832c53.12 0 96 42.88 96 96v320c0 53.12-42.88 96-96 96zM192 224c-17.92 0-32 14.08-32 32v512c0 17.92 14.08 32 32 32h640c17.92 0 32-14.08 32-32V448c0-17.92-14.08-32-32-32H583.68c-36.48 0-69.76-20.48-85.76-53.12l-60.8-120.96a32.768 32.768 0 0 0-28.8-17.92H192z" fill="#1296db" p-id="2800"></path></svg>

After

Width:  |  Height:  |  Size: 824 B

@ -6,7 +6,7 @@ services:
image: netdata/netdata:v1.30.0
restart: always
ports:
- 19999:19999
- 9999:19999
cap_add:
- SYS_PTRACE
security_opt:
@ -125,12 +125,13 @@ services:
- 9200:9200
- 9300:9300
volumes:
#chmod 777 elasticsearch
- ./data/elasticsearch:/usr/share/elasticsearch/data
#Kibana
kibana:
image: kibana:7.12.0
restart: always
ports:
- 5601:5601
- 9601:5601
depends_on:
- elasticsearch
Loading…
Cancel
Save