648540858 aa6bce35c7 Merge branch 'wvp-28181-2.0' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java		2022-09-05 09:44:24 +08:00
..
dto	Merge branch 'wvp-28181-2.0'	2022-08-22 16:53:16 +08:00
event	去除zlm使用redis过期作为心跳超时的方式	2022-08-29 11:50:36 +08:00
AssistRESTfulUtils.java	去除对redis key过期事件的使用；重构国标级联的注册保活	2022-08-31 11:29:13 +08:00
ZLMHttpHookListener.java	优化级联平台注册的周期时间	2022-09-02 15:49:40 +08:00
ZlmHttpHookSubscribe.java	hook订阅曾增加过期清除功能，防止内存溢出	2022-08-31 13:09:45 +08:00
ZLMMediaListManager.java	hook订阅曾增加过期清除功能，防止内存溢出	2022-08-31 13:09:45 +08:00
ZLMRESTfulUtils.java	Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial	2022-06-27 10:16:21 +08:00
ZLMRTPServerFactory.java	Merge branch 'wvp-28181-2.0'	2022-09-01 14:50:28 +08:00
ZLMRunner.java	hook订阅曾增加过期清除功能，防止内存溢出	2022-08-31 13:09:45 +08:00
ZLMServerConfig.java	使用zlm原生的rtp随机端口配置	2022-03-15 15:37:22 +08:00