Pre Merge pull request !42 from 樊冲/fix-bug-fanchong

fix: 修复 issue 2159 级联点播自定义 SSRC 鉴权 key 未刷新问题

src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java

@@ -859,6 +859,9 @@ public class PlayServiceImpl implements IPlayService {
             }
         }else {
             log.info("[Invite 200OK] 收到invite 200, 发现下级自定义了ssrc: {}", ssrcInResponse);
+            String oldStreamId = String.format("%08x", Long.parseLong(ssrcInfo.getSsrc())).toUpperCase();
+            String newStreamId = String.format("%08x", Long.parseLong(ssrcInResponse)).toUpperCase();
+            receiveRtpServerService.refreshAuthenticateInfo(oldStreamId, newStreamId);
             // ssrc 不一致
             if (mediaServerItem.isRtpEnable()) {
                 // 多端口

src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java

@@ -50,7 +50,7 @@ public class SSRCFactory {
     public void init() {
         String sipDomain = sipConfig.getDomain();
         domainPart = sipDomain.length() >= 8 ? sipDomain.substring(3, 8) : sipDomain;
-        scheduler.scheduleAtFixedRate(this::rebuild, 10, 30, TimeUnit.SECONDS);
+        scheduler.scheduleAtFixedRate(this::rebuild, 5, 5, TimeUnit.SECONDS);
     }
 
     public String getPlaySsrc(String mediaServerId) {
@@ -127,12 +127,11 @@ public class SSRCFactory {
                 usedMap.put(server.getId(), bits);
                 if (count > 8000) {
                     log.info("[SSRC重建] 媒体节点 {} 的SSRC使用率已超过80%，请注意扩展服务提升性能", server.getId());
-                } else {
+                }
                 if (log.isDebugEnabled()) {
                     log.debug("[SSRC重建] 节点 {} 已占用 {} 个SSRC", server.getId(), count);
                 }
             }
         }
     }
-    }
 }

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java

@@ -212,7 +212,7 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
                         if (sendRtpItem.isTcpActive()) {
                             MediaServer mediaServer = mediaServerService.getOne(sendRtpItem.getMediaServerId());
                             try {
-                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5);
+                                mediaServerService.startSendRtpPassive(mediaServer, sendRtpItem, 5*1000);
                                 DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(sendRtpItem.getChannelId());
                                 if (deviceChannel != null) {
                                     redisCatchStorage.sendPlatformStartPlayMsg(sendRtpItem, deviceChannel, platform);

src/main/java/com/genersoft/iot/vmp/service/IReceiveRtpServerService.java

@@ -39,4 +39,6 @@ public interface IReceiveRtpServerService {
     void addAuthenticateInfo(String streamId, String streamReplace, Boolean enableAudio, Boolean enableMp4, Integer mp4MaxSecond);
 
     ResultForOnPublish getAuthenticateInfo(String streamId);
+
+    void refreshAuthenticateInfo(String oldStreamId, String newStreamId);
 }

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

@@ -406,4 +406,22 @@ public class RtpServerServiceImpl implements IReceiveRtpServerService {
          }
          return null;
      }
+
+     @Override
+     public void refreshAuthenticateInfo(String oldStreamId, String newStreamId) {
+         if (oldStreamId == null || newStreamId == null || oldStreamId.equals(newStreamId)) {
+             return;
+         }
+         String oldKey = String.format("%s:%s", VideoManagerConstants.RTP_AUTHENTICATE, oldStreamId);
+         Object obj = redisTemplate.opsForValue().get(oldKey);
+         if (obj instanceof ResultForOnPublish) {
+             String newKey = String.format("%s:%s", VideoManagerConstants.RTP_AUTHENTICATE, newStreamId);
+             redisTemplate.opsForValue().set(newKey, obj);
+             redisTemplate.expire(newKey, 60, TimeUnit.SECONDS);
+             redisTemplate.delete(oldKey);
+             log.info("[刷新RTP鉴权信息] {} -> {}", oldStreamId, newStreamId);
+         } else {
+             log.warn("[刷新RTP鉴权信息] 未找到旧key: {}", oldKey);
+         }
+     }
 }