Former-commit-id: bb3f3e64d8a7d10a775298886543bb970fdbfaef
Former-commit-id: b7a3266cf55bbc0d72652905ff0ab43623235e1b
1.0
wanggang 4 years ago
parent 4ecee62504
commit 409495a2b1

@ -67,7 +67,7 @@ namespace IoTNode
public override void ConfigureOptions(IServiceCollection services)
{
//services.ConfigureOptions(new FileConfigureOptions(Env, new List<string> { "IoT.Shared" }));
services.ConfigureOptions(new FileConfigureOptions(Env, new List<string> {}));
}
public override void AddDbContext(IServiceCollection services)
{

@ -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<SceneTiggerService>();
services.AddTransient<ISceneTiggerService, CachedSceneTiggerService>();
services.AddTransient<IExecApiService,ExecApiService>();
services.AddTransient<IExecApiService, ExecApiService>();
services.AddTransient<IUserService, UserService>();
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<string> { "IoT.Shared" }));
services.ConfigureOptions(new FileConfigureOptions(Env, new List<string> { }));
}
public override void UseSignalR(IEndpointRouteBuilder endpoints)
@ -119,4 +121,4 @@ namespace Platform
this.AddDbContext<PlatformDbContext>(services);
}
}
}
}

@ -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 {

Loading…
Cancel
Save