648540858 db6dd3f755 Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.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/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java # src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java		2023-07-19 11:33:58 +08:00
..
auth	修复 设备注册时报错 #799	2023-03-31 09:10:16 +08:00
bean	Merge branch 'wvp-28181-2.0' into main-dev	2023-07-19 11:33:58 +08:00
conf	优化日志	2023-07-17 16:54:00 +08:00
event	合并主线	2023-05-25 17:28:57 +08:00
session	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
task	合并主线	2023-05-25 17:28:57 +08:00
transmit	Merge branch 'wvp-28181-2.0' into main-dev	2023-07-19 11:33:58 +08:00
utils	Merge branch 'wvp-28181-2.0' into main-dev	2023-07-19 11:33:58 +08:00
SipLayer.java	优化海康发送的Message消息设置的消息体长度为0，导致无法解析的问题 #920	2023-07-07 14:51:41 +08:00