2.0

Former-commit-id: bb3f3e64d8a7d10a775298886543bb970fdbfaef
Former-commit-id: b7a3266cf55bbc0d72652905ff0ab43623235e1b

projects/IoTNode/Startup.cs

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

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<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)

publish/src/linux-x64/publish/conf/srs/conf/srs.dev.conf

@@ -22,7 +22,7 @@ stats {
     network 0;
     disk sda sdb xvda xvdb;
 }
-rtc_server{
+rtc_server {
     enabled on;
     listen 8000;
     candidate *;
@@ -32,8 +32,7 @@ vhost __defaultVhost__ {
         enabled on;
         bframe discard;
     }
-    tcp_nodelay     on
+    tcp_nodelay on min_latency on;
-    min_latency     on;
     play {
         gop_cache off;
         queue_length 10;
@@ -61,8 +60,7 @@ vhost __defaultVhost__ {
         }
         engine ff {
             enabled off;
-            vfilter {
+            vfilter;
-            }
             vcodec libx264;
             vbitrate 500;
             vfps 25;
@@ -71,14 +69,12 @@ vhost __defaultVhost__ {
             vthreads 12;
             vprofile main;
             vpreset medium;
-            vparams {
+            vparams;
-            }
             acodec libfdk_aac;
             abitrate 70;
             asample_rate 44100;
             achannels 2;
-            aparams {
+            aparams;
-            }
             output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
         }
     }