Pre Merge pull request !39 from 田朝盛/N/A

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java

@@ -375,7 +375,6 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
         param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
         param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
         param.put("recv_stream_id", sendRtpItem.getReceiveStream());
-        param.put("enable_origin_recv_limit", "1");
         if (timeout  != null) {
             param.put("close_delay_ms", timeout);
         }
@@ -411,7 +410,6 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
         param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");
         param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
         param.put("is_udp", sendRtpItem.isTcp() ? "0" : "1");
-        param.put("enable_origin_recv_limit", "1");
         if (!sendRtpItem.isTcp()) {
             // udp模式下开启rtcp保活
             param.put("udp_rtcp_timeout", sendRtpItem.isRtcp() ? "500" : "0");
@@ -438,7 +436,7 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
         param.put("type", sendRtpItem.isUsePs() ? "1" : "0");
         param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");
         param.put("recv_stream_id", sendRtpItem.getReceiveStream());
-        param.put("enable_origin_recv_limit", "1");
+
         JSONObject jsonObject = zlmServerFactory.startSendRtpTalk(mediaServer, param, null);
         if (jsonObject == null || jsonObject.getInteger("code") != 0 ) {
             log.error("启动监听TCP被动推流失败: {}, 参数：{}", jsonObject.getString("msg"), JSON.toJSONString(param));

src/main/java/com/genersoft/iot/vmp/service/bean/DownloadFileInfo.java

@@ -1,8 +1,5 @@
 package com.genersoft.iot.vmp.service.bean;
 
-import lombok.Data;
-
-@Data
 public class DownloadFileInfo {
 
     private String httpPath;
@@ -10,4 +7,35 @@ public class DownloadFileInfo {
     private String httpDomainPath;
     private String httpsDomainPath;
 
+    public String getHttpPath() {
+        return httpPath;
+    }
+
+    public void setHttpPath(String httpPath) {
+        this.httpPath = httpPath;
+    }
+
+    public String getHttpsPath() {
+        return httpsPath;
+    }
+
+    public void setHttpsPath(String httpsPath) {
+        this.httpsPath = httpsPath;
+    }
+
+    public String getHttpDomainPath() {
+        return httpDomainPath;
+    }
+
+    public void setHttpDomainPath(String httpDomainPath) {
+        this.httpDomainPath = httpDomainPath;
+    }
+
+    public String getHttpsDomainPath() {
+        return httpsDomainPath;
+    }
+
+    public void setHttpsDomainPath(String httpsDomainPath) {
+        this.httpsDomainPath = httpsDomainPath;
+    }
 }