XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
This commit is contained in:
648540858
2022-05-16 11:47:17 +08:00
parent 9fa739ac02 9a80e10f6e
commit 39efda779f
37 changed files with 389 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
View File

@@ -89,7 +89,7 @@ public class ZLMRunner implements CommandLineRunner {
});
// 获取zlm信息
logger.info("[zlm接入]等待默认zlm中...");
logger.info("[zlm] 等待默认zlm中...");
// 获取所有的zlm， 并开启主动连接
List<MediaServerItem> all = mediaServerService.getAllFromDatabase();

5
src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java
View File

@@ -39,8 +39,7 @@ public class ZLMStatusEventListener {
@Async
@EventListener
public void onApplicationEvent(ZLMOnlineEvent event) {
logger.info("【ZLM上线】ID：" + event.getMediaServerId());
logger.info("[ZLM] 上线 ID：" + event.getMediaServerId());
streamPushService.zlmServerOnline(event.getMediaServerId());
streamProxyService.zlmServerOnline(event.getMediaServerId());
@@ -50,7 +49,7 @@ public class ZLMStatusEventListener {
@EventListener
public void onApplicationEvent(ZLMOfflineEvent event) {
logger.info("ZLM离线事件触发，ID：" + event.getMediaServerId());
logger.info("[ZLM] 离线，ID：" + event.getMediaServerId());
// 处理ZLM离线
mediaServerService.zlmServerOffline(event.getMediaServerId());
streamProxyService.zlmServerOffline(event.getMediaServerId());