-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
-
移动设备实时位置兼容ISO8601格式
-
fix:修复拉流代理配置展示问题:音频、录制、无人观看
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
-
删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql，保证升级脚本能正常执行。
-
修复 启用代理失败： ->缺少必要参数:"src_url","dst_url","timeout_ms"
