diff --git a/projects/IoTNode/Startup.cs b/projects/IoTNode/Startup.cs index 682a6c3a..aae81328 100644 --- a/projects/IoTNode/Startup.cs +++ b/projects/IoTNode/Startup.cs @@ -67,7 +67,7 @@ namespace IoTNode public override void ConfigureOptions(IServiceCollection services) { - //services.ConfigureOptions(new FileConfigureOptions(Env, new List { "IoT.Shared" })); + services.ConfigureOptions(new FileConfigureOptions(Env, new List {})); } public override void AddDbContext(IServiceCollection services) { diff --git a/projects/Platform/Startup.cs b/projects/Platform/Startup.cs index 396381ac..14f79b40 100644 --- a/projects/Platform/Startup.cs +++ b/projects/Platform/Startup.cs @@ -33,15 +33,17 @@ namespace Platform public override void ConfigureServices(IServiceCollection services) { - services.AddMiniProfiler(o => { + services.AddMiniProfiler(o => + { o.RouteBasePath = "/profiler";// /profiler/results-index /profiler/results - o.ResultsAuthorize = o => { + o.ResultsAuthorize = o => + { return Configuration.GetAppSetting("Profiler", false) == true; }; }).AddEntityFramework(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); if (Env.IsDevelopment()) { @@ -88,7 +90,7 @@ namespace Platform { Authorization = new[] { new MyDashboardAuthorizationFilter() }, IsReadOnlyFunc = o => o.GetHttpContext().User.Identity.Name != "super", - DashboardTitle="定时任务看板" + DashboardTitle = "定时任务看板" }; app.UseHangfireDashboard("/job", options); @@ -106,7 +108,7 @@ namespace Platform public override void ConfigureOptions(IServiceCollection services) { - //services.ConfigureOptions(new FileConfigureOptions(Env, new List { "IoT.Shared" })); + services.ConfigureOptions(new FileConfigureOptions(Env, new List { })); } public override void UseSignalR(IEndpointRouteBuilder endpoints) @@ -119,4 +121,4 @@ namespace Platform this.AddDbContext(services); } } -} +} \ No newline at end of file diff --git a/publish/src/linux-x64/publish/conf/srs/conf/srs.dev.conf b/publish/src/linux-x64/publish/conf/srs/conf/srs.dev.conf index dbda3adf..e55f73ef 100644 --- a/publish/src/linux-x64/publish/conf/srs/conf/srs.dev.conf +++ b/publish/src/linux-x64/publish/conf/srs/conf/srs.dev.conf @@ -22,9 +22,9 @@ stats { network 0; disk sda sdb xvda xvdb; } -rtc_server{ - enabled on; - listen 8000; +rtc_server { + enabled on; + listen 8000; candidate *; } vhost __defaultVhost__ { @@ -32,12 +32,11 @@ vhost __defaultVhost__ { enabled on; bframe discard; } - tcp_nodelay on - min_latency on; + tcp_nodelay on min_latency on; play { - gop_cache off; - queue_length 10; - mw_latency 100; + gop_cache off; + queue_length 10; + mw_latency 100; } publish { mr off; @@ -60,26 +59,23 @@ vhost __defaultVhost__ { output ./objs/nginx/html/[app]/[stream].png; } engine ff { - enabled off; - vfilter { - } - vcodec libx264; - vbitrate 500; - vfps 25; - vwidth 768; - vheight 320; - vthreads 12; - vprofile main; - vpreset medium; - vparams { - } - acodec libfdk_aac; - abitrate 70; - asample_rate 44100; - achannels 2; - aparams { - } - output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine]; + enabled off; + vfilter; + vcodec libx264; + vbitrate 500; + vfps 25; + vwidth 768; + vheight 320; + vthreads 12; + vprofile main; + vpreset medium; + vparams; + acodec libfdk_aac; + abitrate 70; + asample_rate 44100; + achannels 2; + aparams; + output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine]; } } http_remux {