648540858 b7f2a6b25b Merge branch '2.6.8' into wvp-28181-2.0 ... # 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		2023-06-07 20:21:10 +08:00
..
CatalogDataCatch.java	优化目录更新，更新失败时只更新收到的内容不重置所有通道和自动拉流	2023-01-15 15:27:47 +08:00
RecordDataCatch.java	修复WVP作为下级平台接受recordinfo指令上报上级平台的问题	2023-02-07 09:28:55 +08:00
SSRCFactory.java	优化日志	2023-06-02 16:40:19 +08:00
VideoStreamSessionManager.java	修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题	2023-05-06 17:40:57 +08:00