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

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

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

src/main/java/com/genersoft/iot/vmp/service/impl/RtpServerServiceImpl.java

@@ -409,7 +409,10 @@ public class RtpServerServiceImpl implements IReceiveRtpServerService {
         hookResultForOnPublish.setStream_replace(streamReplace);
         hookResultForOnPublish.setEnable_audio(enableAudio);
         hookResultForOnPublish.setEnable_mp4(enableMp4);
-        hookResultForOnPublish.setMp4_max_second(mp4MaxSecond);
+        if (mp4MaxSecond != null) {
+            // mp4MaxSecond 需要比实际的流时长略长一些，避免因为流时长超过mp4MaxSecond而生成文件切片
+            hookResultForOnPublish.setMp4_max_second(mp4MaxSecond + 10);
+        }
 
         String key = String.format("%s:%s", VideoManagerConstants.RTP_AUTHENTICATE, streamId);
         // 存储认证信息，过期时间为60秒， 过期则无法通过认证

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