perf(streamInfo): 优化点播接口返回流信息中的 RTMP/RTSP/RTC 链接

xiaoQQya
1 parent 0772f698
Showing 1 changed file with 4 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.common;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
+import java.util.Objects;
 @Schema(description = "流信息")
 public class StreamInfo implements Serializable, Cloneable{
@@ -168,7 +169,7 @@ public class StreamInfo implements Serializable, Cloneable{
     }
     public void setRtmp(String host, int port, int sslPort, String app, String stream, String callIdParam) {
-        String file = String.format("%s/%s/%s", app, stream, callIdParam);
+        String file = String.format("%s/%s%s", app, stream, callIdParam);
         if (port > 0) {
             this.rtmp = new StreamURL("rtmp", host, port, file);
         }
@@ -178,7 +179,7 @@ public class StreamInfo implements Serializable, Cloneable{
     }
     public void setRtsp(String host, int port, int sslPort, String app, String stream, String callIdParam) {
-        String file = String.format("%s/%s/%s", app, stream, callIdParam);
+        String file = String.format("%s/%s%s", app, stream, callIdParam);
         if (port > 0) {
             this.rtsp = new StreamURL("rtsp", host, port, file);
         }
@@ -237,6 +238,7 @@ public class StreamInfo implements Serializable, Cloneable{
     }
     public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam) {
+        callIdParam = Objects.equals(callIdParam, "") ? callIdParam : callIdParam.replace("?", "&");
         String file = String.format("index/api/webrtc?app=%s&stream=%s&type=play%s", app, stream, callIdParam);
         if (port > 0) {
             this.rtc = new StreamURL("http", host, port, file);