648540858 6bfd48776d Merge branch 'wvp-28181-2.0' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java		2022-10-17 12:45:56 +08:00
..
java/com/genersoft/iot/vmp	Merge branch 'wvp-28181-2.0'	2022-10-17 12:45:56 +08:00
resources	添加队列处理redis消息和sip消息，支持使用推流状态作为通道在线状态	2022-09-22 11:22:08 +08:00