Former-commit-id: f97bf3a862d3e834d0828a9bfa6fdc16d7a1dd88
Former-commit-id: 2316a6317a2aad4e23e0a1eed81fb7f274bae0ed
1.0
wanggang 4 years ago
parent 8ee9e3c8bb
commit 6ef95816d5

@ -5,11 +5,13 @@
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
<Version>1.1.1.1</Version>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.20" />
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
<PackageReference Include="Hangfire.Storage.SQLite" Version="0.3.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
<PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
<PackageReference Include="Serilog.Sinks.SQLite" Version="5.0.0" />

@ -18,18 +18,15 @@ namespace Platform
Console.OutputEncoding = Encoding.UTF8;
var config = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json", optional: true)
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
.AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json", optional: true, reloadOnChange: true)
.Build();
var logConfig = new LoggerConfiguration()
Log.Logger = new LoggerConfiguration()
.ReadFrom.Configuration(config, ConfigurationAssemblySource.AlwaysScanDllFiles)
.WriteTo.Console();
logConfig = config.GetSection("AppSettings").GetValue("Log", "File") == "File"
? logConfig.WriteTo.File("logs/log.txt", rollOnFileSizeLimit: true, fileSizeLimitBytes: 100 * 1024 * 1024, rollingInterval: RollingInterval.Infinite)
: logConfig.WriteTo.SQLite(Path.Combine(Directory.GetCurrentDirectory(), "log.db"), rollOver: false);
Log.Logger = logConfig.CreateLogger();
.WriteTo.Console()
//.WriteTo.File("logs/log.txt", rollOnFileSizeLimit: true, fileSizeLimitBytes: 100 * 1024 * 1024, rollingInterval: RollingInterval.Infinite)
.CreateLogger();
try
{

@ -1,6 +1,6 @@
<ul class="nav nav-pills nav-sidebar flex-column nav-flat" data-widget="treeview" role="menu" data-accordion="false">
<li class="nav-header">智慧校园</li>
<li class="nav-item"><a href="@Url.Action("Index","Home")" class="@GetLinkClass("Home","Index")"><i class="far fa-circle nav-icon"></i><p>机构概览</p></a></li>
<li class="nav-item"><a href="@Url.Content("~/")" class="@GetLinkClass("Home","Index")"><i class="far fa-circle nav-icon"></i><p>机构概览</p></a></li>
<li class="nav-item"><a href="@Url.Action("Building","Home")" class="@GetLinkClass("Home","Device")"><i class="far fa-circle nav-icon"></i><p>设备中心</p></a></li>
<li class="nav-item"><a href="@Url.Action("Alarm","Home")" class="@GetLinkClass("Home","Alarm")"><i class="far fa-circle nav-icon"></i><p>告警中心</p></a></li>
<li class="nav-header">业务系统</li>

@ -4,7 +4,7 @@
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fas fa-bars"></i></a>
</li>
<li class="nav-item d-none d-sm-inline-block">
<a href="@Url.Action("Index", "Home", new { area = "" })" class="@GetLinkClass(area: "")">首页</a>
<a href="@Url.Content("~/")" class="@GetLinkClass(area: "")">首页</a>
</li>
@{
var modules = this.Context.Request.HttpContext.Items["modules"] as List<AppModule>;

@ -15,7 +15,7 @@
"TablePrefix": "",
"Database": "MySQL",
"JobDatabase": "MySQL",
"Log": "SQLite",
"Log": "File",
"FileServer": "MinIO",
"Cache": "Redis",
"Profiler": false,

@ -32,7 +32,7 @@ services:
# - ./conf/website/edusoa.pem:/etc/nginx/edusoa.pem
# - ./conf/website/edusoa.key:/etc/nginx/edusoa.key
- ./log/website:/var/log/nginx
- ./apps/WebMVC/wwwroot:/root/nginx/html/desktop
- ./apps/Platform/wwwroot:/root/nginx/html/desktop
- ./apps/WebSPA/wwwroot:/root/nginx/html/mobile
networks:
default:

Loading…
Cancel
Save