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)
@@ -119,4 +121,4 @@ namespace Platform
             this.AddDbContext<PlatformDbContext>(services);
         }
     }
-}
+}

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{
+rtc_server {
-    enabled    on;
+    enabled on;
-    listen    8000;
+    listen 8000;
     candidate *;
 }
 vhost __defaultVhost__ {
@@ -32,12 +32,11 @@ vhost __defaultVhost__ {
         enabled on;
         bframe discard;
     }
-    tcp_nodelay     on
+    tcp_nodelay on min_latency on;
-    min_latency     on;
     play {
-        gop_cache       off;
+        gop_cache off;
-        queue_length    10;
+        queue_length 10;
-        mw_latency      100;
+        mw_latency 100;
     }
     publish {
         mr off;
@@ -60,26 +59,23 @@ vhost __defaultVhost__ {
             output ./objs/nginx/html/[app]/[stream].png;
         }
         engine ff {
-            enabled         off;
+            enabled off;
-            vfilter {
+            vfilter;
-            }
+            vcodec libx264;
-            vcodec          libx264;
+            vbitrate 500;
-            vbitrate        500;
+            vfps 25;
-            vfps            25;
+            vwidth 768;
-            vwidth          768;
+            vheight 320;
-            vheight         320;
+            vthreads 12;
-            vthreads        12;
+            vprofile main;
-            vprofile        main;
+            vpreset medium;
-            vpreset         medium;
+            vparams;
-            vparams {
+            acodec libfdk_aac;
-            }
+            abitrate 70;
-            acodec          libfdk_aac;
+            asample_rate 44100;
-            abitrate        70;
+            achannels 2;
-            asample_rate    44100;
+            aparams;
-            achannels       2;
+            output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
-            aparams {
-            }
-            output          rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
         }
     }
     http_remux {