648540858 d7a1b94f90 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/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/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java		2022-09-24 21:04:58 +08:00
..
java/com/genersoft/iot/vmp	Merge branch 'wvp-28181-2.0'	2022-09-24 21:04:58 +08:00
resources	添加队列处理redis消息和sip消息，支持使用推流状态作为通道在线状态	2022-09-22 11:22:08 +08:00