From 2617173a4c15e0847b706def4b6d8a99edb31e58 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 14 Apr 2021 14:19:05 +0800
Subject: [PATCH] update
Former-commit-id: b1e90b3ddb1b3d5b98312bc36f031cd0c4b5a0f9
Former-commit-id: d1a4d5e917bcbb33b4e0a4a2467ee3c575ec16c6
---
projects/IoT.Shared/IoT.Shared.csproj | 3 ---
projects/IoTDameon/IoTDameon.csproj | 6 ++----
projects/IoTDameon/Program.cs | 3 ++-
projects/IoTDameon/Startup.cs | 8 +++-----
projects/Platform/Platform.csproj | 1 -
projects/Platform/wwwroot/images/empty.svg | 1 +
projects/WebMVC/wwwroot/images/empty.svg | 1 +
.../publish/supervisor/{srs.conf => srs.conf.bk} | 0
publish/src/linux-x64/publish/docker-compose.yml | 5 +++--
9 files changed, 12 insertions(+), 16 deletions(-)
create mode 100644 projects/Platform/wwwroot/images/empty.svg
create mode 100644 projects/WebMVC/wwwroot/images/empty.svg
rename publish/src/linux-arm64/publish/supervisor/{srs.conf => srs.conf.bk} (100%)
diff --git a/projects/IoT.Shared/IoT.Shared.csproj b/projects/IoT.Shared/IoT.Shared.csproj
index 189fc6c1..6c3c7c85 100644
--- a/projects/IoT.Shared/IoT.Shared.csproj
+++ b/projects/IoT.Shared/IoT.Shared.csproj
@@ -15,9 +15,6 @@
-
-
-
diff --git a/projects/IoTDameon/IoTDameon.csproj b/projects/IoTDameon/IoTDameon.csproj
index b7dec01a..938c5129 100644
--- a/projects/IoTDameon/IoTDameon.csproj
+++ b/projects/IoTDameon/IoTDameon.csproj
@@ -3,7 +3,8 @@
net5.0
true
en
- 1.0.0.0
+ true
+ 2.0.0.0
@@ -14,7 +15,4 @@
-
-
-
\ No newline at end of file
diff --git a/projects/IoTDameon/Program.cs b/projects/IoTDameon/Program.cs
index 26fb9b95..cb86107c 100644
--- a/projects/IoTDameon/Program.cs
+++ b/projects/IoTDameon/Program.cs
@@ -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();
diff --git a/projects/IoTDameon/Startup.cs b/projects/IoTDameon/Startup.cs
index dffe0464..337fd35c 100644
--- a/projects/IoTDameon/Startup.cs
+++ b/projects/IoTDameon/Startup.cs
@@ -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("BasePath");
if (!string.IsNullOrEmpty(basePath))
{
app.UsePathBase(basePath);
@@ -73,4 +71,4 @@ namespace IoTDameon
});
}
}
-}
+}
\ No newline at end of file
diff --git a/projects/Platform/Platform.csproj b/projects/Platform/Platform.csproj
index 120f17fe..9d765460 100644
--- a/projects/Platform/Platform.csproj
+++ b/projects/Platform/Platform.csproj
@@ -5,7 +5,6 @@
true
true
2.0.0.0
- Linux
diff --git a/projects/Platform/wwwroot/images/empty.svg b/projects/Platform/wwwroot/images/empty.svg
new file mode 100644
index 00000000..ef661c21
--- /dev/null
+++ b/projects/Platform/wwwroot/images/empty.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/images/empty.svg b/projects/WebMVC/wwwroot/images/empty.svg
new file mode 100644
index 00000000..ef661c21
--- /dev/null
+++ b/projects/WebMVC/wwwroot/images/empty.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/publish/src/linux-arm64/publish/supervisor/srs.conf b/publish/src/linux-arm64/publish/supervisor/srs.conf.bk
similarity index 100%
rename from publish/src/linux-arm64/publish/supervisor/srs.conf
rename to publish/src/linux-arm64/publish/supervisor/srs.conf.bk
diff --git a/publish/src/linux-x64/publish/docker-compose.yml b/publish/src/linux-x64/publish/docker-compose.yml
index 443db36e..93a4f565 100644
--- a/publish/src/linux-x64/publish/docker-compose.yml
+++ b/publish/src/linux-x64/publish/docker-compose.yml
@@ -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
\ No newline at end of file