| 
					
				 | 
			
			
				@@ -28,27 +28,40 @@ public class MediaServiceImpl implements IMediaService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public StreamInfo getStreamInfoByAppAndStream(String app, String stream, JSONArray tracks) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return getStreamInfoByAppAndStream(app, stream, tracks, null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return getStreamInfoByAppAndStreamWithCheck(app, stream, null); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public StreamInfo getStreamInfoByAppAndStream(String app, String stream, JSONArray tracks, String addr) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         StreamInfo streamInfoResult = new StreamInfo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         streamInfoResult.setStreamId(stream); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         streamInfoResult.setApp(app); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setRtmp(String.format("rtmp://%s:%s/%s/%s", mediaInfo.getStreamIp(), mediaInfo.getRtmpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setRtsp(String.format("rtsp://%s:%s/%s/%s", mediaInfo.getStreamIp(), mediaInfo.getRtspPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setFlv(String.format("http://%s:%s/%s/%s.flv", mediaInfo.getStreamIp(), mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setWs_flv(String.format("ws://%s:%s/%s/%s.flv", mediaInfo.getStreamIp(), mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setHls(String.format("http://%s:%s/%s/%s/hls.m3u8", mediaInfo.getStreamIp(), mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setWs_hls(String.format("ws://%s:%s/%s/%s/hls.m3u8", mediaInfo.getStreamIp(), mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setFmp4(String.format("http://%s:%s/%s/%s.live.mp4", mediaInfo.getStreamIp(), mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setWs_fmp4(String.format("ws://%s:%s/%s/%s.live.mp4", mediaInfo.getStreamIp(), mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setTs(String.format("http://%s:%s/%s/%s.live.ts", mediaInfo.getStreamIp(), mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        streamInfoResult.setWs_ts(String.format("ws://%s:%s/%s/%s.live.ts", mediaInfo.getStreamIp(), mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (addr == null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            addr = mediaInfo.getStreamIp(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setRtmp(String.format("rtmp://%s:%s/%s/%s", addr, mediaInfo.getRtmpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setRtsp(String.format("rtsp://%s:%s/%s/%s", addr, mediaInfo.getRtspPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setFlv(String.format("http://%s:%s/%s/%s.flv", addr, mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setWs_flv(String.format("ws://%s:%s/%s/%s.flv", addr, mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setHls(String.format("http://%s:%s/%s/%s/hls.m3u8", addr, mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setWs_hls(String.format("ws://%s:%s/%s/%s/hls.m3u8", addr, mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setFmp4(String.format("http://%s:%s/%s/%s.live.mp4", addr, mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setWs_fmp4(String.format("ws://%s:%s/%s/%s.live.mp4", addr, mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setTs(String.format("http://%s:%s/%s/%s.live.ts", addr, mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        streamInfoResult.setWs_ts(String.format("ws://%s:%s/%s/%s.live.ts", addr, mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         streamInfoResult.setRtc(String.format("http://%s:%s/index/api/webrtc?app=%s&stream=%s&type=play", mediaInfo.getStreamIp(), mediaInfo.getHttpPort(), app,  stream)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         streamInfoResult.setTracks(tracks); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return streamInfoResult; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public StreamInfo getStreamInfoByAppAndStreamWithCheck(String app, String stream, String addr) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         StreamInfo streamInfo = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         JSONObject mediaList = zlmresTfulUtils.getMediaList(app, stream); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (mediaList != null) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -57,7 +70,7 @@ public class MediaServiceImpl implements IMediaService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (data == null) return null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 JSONObject mediaJSON = JSON.parseObject(JSON.toJSONString(data.get(0)), JSONObject.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 JSONArray tracks = mediaJSON.getJSONArray("tracks"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                streamInfo = getStreamInfoByAppAndStream(app, stream, tracks); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                streamInfo = getStreamInfoByAppAndStream(app, stream, tracks, addr); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return streamInfo; 
			 |