Merge branch '2.7.0'

648540858

2024-04-08 a890b62fa1bbacd1a6156cbccf59def8b7cfe262

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

@@ -90,6 +90,7 @@
   @Override
   public void process(RequestEvent evt) {
      CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
      dynamicTask.stop(callIdHeader.getCallId());
      String fromUserId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
      String toUserId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
      logger.info("[收到ACK]： 来自->{}", fromUserId);
@@ -115,7 +116,7 @@

      if (parentPlatform != null) {
         Map<String, Object> param = getSendRtpParam(sendRtpItem);
         if (mediaInfo == null) {
         if (!userSetting.getServerId().equals(sendRtpItem.getServerId())) {
            RequestPushStreamMsg requestPushStreamMsg = RequestPushStreamMsg.getInstance(
                  sendRtpItem.getMediaServerId(), sendRtpItem.getApp(), sendRtpItem.getStream(),
                  sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isTcp(),