Pre Merge pull request !36 from 阿斌/N/A

行政规划错误。江苏南通海门市，修改为海门区，浙江杭州删除下城区、江干区，新增钱塘区，临平区

Signed-off-by: 阿斌 <38912748@qq.com>

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

@@ -375,6 +375,7 @@ 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);
         }
@@ -410,6 +411,7 @@ 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");
@@ -436,7 +438,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,5 +1,8 @@
 package com.genersoft.iot.vmp.service.bean;
 
+import lombok.Data;
+
+@Data
 public class DownloadFileInfo {
 
     private String httpPath;
@@ -7,35 +10,4 @@ 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;
-    }
 }

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301