From 48fad3582d81dd79423db1db5402d9f47fd5f30f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 09 二月 2023 14:13:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index ebfa0c6..6b8550d 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -135,14 +135,8 @@
MediaServerItem mediaServerItemInDatabase = mediaServerService.getOne(mediaServerItem.getId());
if (mediaServerItemInDatabase != null) {
- if (ObjectUtils.isEmpty(mediaServerItemInDatabase.getSendRtpPortRange()) && ObjectUtils.isEmpty(mediaServerItem.getSendRtpPortRange())) {
- mediaServerItem.setSendRtpPortRange("30000,30500");
- }
mediaServerService.update(mediaServerItem);
} else {
- if (ObjectUtils.isEmpty(mediaServerItem.getSendRtpPortRange())) {
- mediaServerItem.setSendRtpPortRange("30000,30500");
- }
mediaServerService.add(mediaServerItem);
}
}
--
Gitblit v1.8.0