Refine docker console, preview by players at the same server. v4.0.236

ossrs · Jan 30, 2022 · 1d4fac0 · 1d4fac0
1 parent ba0b62f
commit 1d4fac0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
@@ -8,6 +8,7 @@ The changelog for SRS.
 
 ## SRS 4.0 Changelog
 
+* v4.0, 2022-01-30, Refine docker console, preview by players at the same server. v4.0.236
 * v4.0, 2022-01-30, For docker, always use the console for logging. v4.0.235
 * v4.0, 2022-01-29, Merge [#2896](https://github.com/ossrs/srs/pull/2896): SRT: Reduce the SRT bug by limit the max times for retry. (#2896). v4.0.234
 * v4.0, 2022-01-23, Merge [#2886](https://github.com/ossrs/srs/pull/2886): Fix bug when free addrinfo. (#2886). v4.0.233

diff --git a/trunk/research/console/js/srs.console.js b/trunk/research/console/js/srs.console.js
@@ -570,7 +570,7 @@ scApp.filter('sc_filter_style_error', function(){
 
 scApp.filter('sc_filter_preview_url', ['$sc_server', function($sc_server){
     return function(v){
-        var page = $sc_server.schema + "://ossrs.net/players/srs_player.html";
+        var page = $sc_server.schema + `://${$sc_server.host}:${$sc_server.http}/players/srs_player.html`;
         var http = $sc_server.http[$sc_server.http.length - 1];
         var query = "vhost=" + v.owner.name + "&app=" + v.app + "&stream=" + v.name + ".flv";
         query += "&server=" + $sc_server.host +"&port=" + http + "&autostart=true&schema=" + $sc_server.schema;
@@ -685,6 +685,10 @@ scApp.provider("$sc_server", [function(){
                 } else {
                     self.port = $location.port();
                 }
+
+                if ($location.search().http) {
+                    self.http = [$location.search().http];
+                }
             }
         };
         return self;

diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       4
 #define VERSION_MINOR       0
-#define VERSION_REVISION    235
+#define VERSION_REVISION    236
 
 #endif