wvp-GB28181-pro/src/main/java/com/genersoft/iot/vmp/gb28181
648540858 f223aad705 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/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.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/RegisterRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/dialog/devicePlayer.vue
2022-11-18 18:39:44 +08:00
..
auth 异常情况打印信息优化 2022-09-23 23:15:44 +08:00
bean Merge branch 'wvp-28181-2.0' 2022-11-18 18:39:44 +08:00
conf 更新readme 2022-10-18 22:40:43 +08:00
event Merge branch 'wvp-28181-2.0' 2022-11-18 18:39:44 +08:00
session Merge branch 'wvp-28181-2.0' 2022-11-18 18:39:44 +08:00
task 升级Fastjson到Fastjson2 2022-11-05 20:49:56 +08:00
transmit Merge branch 'wvp-28181-2.0' 2022-11-18 18:39:44 +08:00
utils Merge branch 'wvp-28181-2.0' 2022-11-18 18:39:44 +08:00
SipLayer.java 优化多网卡下的localIp获取 2022-11-17 17:01:54 +08:00