648540858 668dc8f0dd Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # 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/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java # src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java # src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java		2023-07-13 14:47:24 +08:00
..
java/com/genersoft/iot/vmp	Merge branch '2.6.8' into wvp-28181-2.0	2023-07-13 14:47:24 +08:00
resources	新增接口超时时间配置，修复点播超时的情况下报错org.springframework.web.context.request.async.AsyncRequestTimeoutException	2023-06-25 16:16:40 +08:00