Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-12 e5a9dd24efe3e852445daf1aa8bffd9598985b3a

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

@@ -117,7 +117,7 @@
                + ":*";
        List<Object> scanResult = RedisUtil.scan(redisTemplate, key);
        if (scanResult.size() != 1) {
            return null;
            logger.warn("[获取InviteInfo] 发现 key: {}存在多条", key);
        }

        return (InviteInfo) redisTemplate.opsForValue().get(scanResult.get(0));
@@ -257,7 +257,7 @@
                ":" + inviteInfo.getDeviceId() +
                ":" + inviteInfo.getChannelId() +
                ":" + inviteInfo.getStream() +
                ":" + inviteInfo.getSsrcInfo().getSsrc();
                ":" + ssrc;
        if (inviteInfoInDb.getSsrcInfo() != null) {
            inviteInfoInDb.getSsrcInfo().setSsrc(ssrc);
        }