From 8fdd10d1c2723ead1d2c3b232f64f292ba3ce1cc Mon Sep 17 00:00:00 2001
From: che_shuai <che_shuai@massclouds>
Date: 星期一, 24 七月 2023 14:10:46 +0800
Subject: [PATCH] 修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 28 ----------------------------
1 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index a79b410..142b810 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -119,34 +119,6 @@
if (ssrcFactory.hasMediaServerSSRC(mediaServerItem.getId())) {
ssrcFactory.initMediaServerSSRC(mediaServerItem.getId(), null);
}
- if (userSetting.getGbSendStreamStrict()) {
- int startPort = 50000;
- int endPort = 60000;
- String sendRtpPortRange = mediaServerItem.getSendRtpPortRange();
- if (sendRtpPortRange == null) {
- logger.warn("[zlm] ] 鏈厤缃彂娴佺鍙ｈ寖鍥达紝榛樿浣跨敤50000鍒�60000");
- }else {
- String[] sendRtpPortRangeArray = sendRtpPortRange.trim().split(",");
- if (sendRtpPortRangeArray.length != 2) {
- logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岄粯璁や娇鐢�50000鍒�60000");
- }else {
- try {
- startPort = Integer.parseInt(sendRtpPortRangeArray[0]);
- endPort = Integer.parseInt(sendRtpPortRangeArray[1]);
- if (endPort <= startPort) {
- logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岀粨鏉熺鍙ｅ簲澶т簬寮�濮嬬鍙�,浣跨敤榛樿绔彛");
- startPort = 50000;
- endPort = 60000;
- }
-
- }catch (NumberFormatException e) {
- logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岄粯璁や娇鐢�50000鍒�60000");
- }
- }
- }
- logger.info("[[zlm] ] 閰嶇疆鍙戞祦绔彛鑼冨洿锛寋}-{}", startPort, endPort);
- sendRtpPortManager.initServerPort(mediaServerItem.getId(), startPort, endPort);
- }
// 鏌ヨredis鏄惁瀛樺湪姝ediaServer
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
Boolean hasKey = redisTemplate.hasKey(key);
--
Gitblit v1.8.0