-
修复云端录像播放和下载路径错误的问题
-
修改3个小bug
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
-
This reverts commit 16e8aa32.
-
# Conflicts: # web_src/src/components/control.vue
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
-
1
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
-
fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复
-
Merge pull request !6 from lanss/N/A
-
Merge pull request !11 from ydpd/wvp-28181-2.0
-
Merge pull request !9 from 随波/N/A
-
Merge pull request !8 from 随波/N/A
-
Merge pull request !7 from ckb_test/N/A
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
-
告警信息上报过程中，AlarmType存储失败的解决
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java # web_src/src/components/control.vue