-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java # web_src/src/components/dialog/devicePlayer.vue # web_src/src/components/live.vue
-
前端首页控制台设备在线数显示bug修复
-
修复分屏监控与视频播放页在 HTTPS 环境下无法播放的问题
-
升级Fastjson到Fastjson2
-
Update play_error.md
-
修复描述文字错误
-
【同步设备通道】第一次收到同步通道数据应该将通道数据放入 不然会造成通道数量不一致 同步时也会漏掉第一个通道
-
【zlm心跳hook】重复查询redis了
-
变量也不需要多次定义 数据库有的话应该恢复zlm 缓存没有的话需要重新加载缓存
-
变量也不需要多次定义 数据库有的话应该恢复zlm
-
# Conflicts: # sql/mysql.sql