From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java | 138 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 109 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
old mode 100644
new mode 100755
index 8366a4a..3f28d02
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
@@ -1,12 +1,21 @@
package com.genersoft.iot.vmp.media.zlm;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetting;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaSendRtpPortInfo;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import org.apache.commons.lang3.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.support.atomic.RedisAtomicInteger;
import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Component
public class SendRtpPortManager {
@@ -19,37 +28,108 @@
@Autowired
private RedisTemplate<Object, Object> redisTemplate;
- private final String KEY = "VM_MEDIA_SEND_RTP_PORT_RANGE_";
+ private final String KEY = "VM_MEDIA_SEND_RTP_PORT_";
-
- public void initServerPort(String mediaServerId, int startPort, int endPort){
- String key = KEY + userSetting.getServerId() + "_" + mediaServerId;
- MediaSendRtpPortInfo mediaSendRtpPortInfo = new MediaSendRtpPortInfo(startPort, endPort, mediaServerId);
- redisTemplate.opsForValue().set(key, mediaSendRtpPortInfo);
- }
-
- public int getNextPort(String mediaServerId) {
- String key = KEY + userSetting.getServerId() + "_" + mediaServerId;
- MediaSendRtpPortInfo mediaSendRtpPortInfo = (MediaSendRtpPortInfo)redisTemplate.opsForValue().get(key);
- if (mediaSendRtpPortInfo == null) {
- logger.warn("[鍙戦�佺鍙ｇ鐞哴 鑾峰彇{}鐨勫彂閫佺鍙ｆ椂鏈壘鍒扮鍙ｄ俊鎭�", mediaSendRtpPortInfo);
- return 0;
+ public synchronized int getNextPort(MediaServerItem mediaServer) {
+ if (mediaServer == null) {
+ logger.warn("[鍙戦�佺鍙ｇ鐞哴 鍙傛暟閿欒锛宮ediaServer涓篘ULL");
+ return -1;
}
- int port;
- if (mediaSendRtpPortInfo.getCurrent() %2 != 0) {
- port = mediaSendRtpPortInfo.getCurrent() + 1;
- }else {
- port = mediaSendRtpPortInfo.getCurrent() + 2;
- }
- if (port > mediaSendRtpPortInfo.getEnd()) {
- if (mediaSendRtpPortInfo.getStart() %2 != 0) {
- port = mediaSendRtpPortInfo.getStart() + 1;
- }else {
- port = mediaSendRtpPortInfo.getStart();
+ String sendIndexKey = KEY + userSetting.getServerId() + "_" + mediaServer.getId();
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
+ + userSetting.getServerId() + "_*";
+ List<Object> queryResult = RedisUtil.scan(redisTemplate, key);
+ Map<Integer, SendRtpItem> sendRtpItemMap = new HashMap<>();
+
+ for (Object o : queryResult) {
+ SendRtpItem sendRtpItem = (SendRtpItem) redisTemplate.opsForValue().get(o);
+ if (sendRtpItem != null) {
+ sendRtpItemMap.put(sendRtpItem.getLocalPort(), sendRtpItem);
}
}
- mediaSendRtpPortInfo.setCurrent(port);
- redisTemplate.opsForValue().set(key, mediaSendRtpPortInfo);
- return port;
+ String sendRtpPortRange = mediaServer.getSendRtpPortRange();
+ int startPort;
+ int endPort;
+ if (sendRtpPortRange != null) {
+ String[] portArray = sendRtpPortRange.split(",");
+ if (portArray.length != 2 || !NumberUtils.isParsable(portArray[0]) || !NumberUtils.isParsable(portArray[1])) {
+ logger.warn("{}鍙戦�佺鍙ｉ厤缃牸寮忛敊璇紝鑷姩浣跨敤50000-60000浣滀负绔彛鑼冨洿", mediaServer.getId());
+ startPort = 50000;
+ endPort = 60000;
+ }else {
+ if ( Integer.parseInt(portArray[1]) - Integer.parseInt(portArray[0]) < 1) {
+ logger.warn("{}鍙戦�佺鍙ｉ厤缃敊璇�,缁撴潫绔彛鑷冲皯姣斿紑濮嬬鍙ｅぇ涓�锛岃嚜鍔ㄤ娇鐢�50000-60000浣滀负绔彛鑼冨洿", mediaServer.getId());
+ startPort = 50000;
+ endPort = 60000;
+ }else {
+ startPort = Integer.parseInt(portArray[0]);
+ endPort = Integer.parseInt(portArray[1]);
+ }
+ }
+ }else {
+ logger.warn("{}鏈缃彂閫佺鍙ｉ粯璁ゅ�硷紝鑷姩浣跨敤50000-60000浣滀负绔彛鑼冨洿", mediaServer.getId());
+ startPort = 50000;
+ endPort = 60000;
+ }
+ if (redisTemplate == null || redisTemplate.getConnectionFactory() == null) {
+ logger.warn("{}鑾峰彇redis杩炴帴淇℃伅澶辫触", mediaServer.getId());
+ return -1;
+ }
+// RedisAtomicInteger redisAtomicInteger = new RedisAtomicInteger(sendIndexKey , redisTemplate.getConnectionFactory());
+// return redisAtomicInteger.getAndUpdate((current)->{
+// return getPort(current, startPort, endPort, checkPort-> !sendRtpItemMap.containsKey(checkPort));
+// });
+ return getSendPort(startPort, endPort, sendIndexKey, sendRtpItemMap);
+ }
+
+ private synchronized int getSendPort(int startPort, int endPort, String sendIndexKey, Map<Integer, SendRtpItem> sendRtpItemMap){
+ RedisAtomicInteger redisAtomicInteger = new RedisAtomicInteger(sendIndexKey , redisTemplate.getConnectionFactory());
+ if (redisAtomicInteger.get() < startPort) {
+ redisAtomicInteger.set(startPort);
+ return startPort;
+ }else {
+ int port = redisAtomicInteger.getAndIncrement();
+ if (port > endPort) {
+ redisAtomicInteger.set(startPort);
+ if (sendRtpItemMap.containsKey(startPort)) {
+ return getSendPort(startPort, endPort, sendIndexKey, sendRtpItemMap);
+ }else {
+ return startPort;
+ }
+ }
+ if (sendRtpItemMap.containsKey(port)) {
+ return getSendPort(startPort, endPort, sendIndexKey, sendRtpItemMap);
+ }else {
+ return port;
+ }
+ }
+
+ }
+
+ interface CheckPortCallback{
+ boolean check(int port);
+ }
+
+ private int getPort(int current, int start, int end, CheckPortCallback checkPortCallback) {
+ if (current <= 0) {
+ if (start%2 == 0) {
+ current = start;
+ }else {
+ current = start + 1;
+ }
+ }else {
+ current += 2;
+ if (current > end) {
+ if (start%2 == 0) {
+ current = start;
+ }else {
+ current = start + 1;
+ }
+ }
+ }
+ if (!checkPortCallback.check(current)) {
+ return getPort(current + 2, start, end, checkPortCallback);
+ }
+ return current;
}
}
--
Gitblit v1.8.0