From eca1e05aeed3c51cce36bbce80c71bc3cbcea87d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 12 十一月 2021 14:40:39 +0800
Subject: [PATCH] 维护目录订阅消息与接口
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 237 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 118 insertions(+), 119 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index 15fa957..f20f74d 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -3,24 +3,18 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-//import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService;
+import com.genersoft.iot.vmp.conf.MediaConfig;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Component
@Order(value=1)
@@ -28,44 +22,10 @@
private final static Logger logger = LoggerFactory.getLogger(ZLMRunner.class);
- @Autowired
- private IVideoManagerStorager storager;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Value("${media.ip}")
- private String mediaIp;
-
- @Value("${media.wanIp}")
- private String mediaWanIp;
-
- @Value("${media.hookIp}")
- private String mediaHookIp;
-
- @Value("${media.port}")
- private int mediaPort;
-
- @Value("${media.secret}")
- private String mediaSecret;
-
- @Value("${media.streamNoneReaderDelayMS}")
- private String streamNoneReaderDelayMS;
-
- @Value("${sip.ip}")
- private String sipIP;
-
- @Value("${server.port}")
- private String serverPort;
-
- @Value("${media.autoConfig}")
- private boolean autoConfig;
+ private Map<String, Boolean> startGetMedia;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
-
- @Autowired
- private ZLMMediaListManager zlmMediaListManager;
@Autowired
private ZLMHttpHookSubscribe hookSubscribe;
@@ -73,102 +33,141 @@
@Autowired
private IStreamProxyService streamProxyService;
+ @Autowired
+ private IMediaServerService mediaServerService;
+
+ @Autowired
+ private MediaConfig mediaConfig;
+
@Override
public void run(String... strings) throws Exception {
- JSONObject subscribeKey = new JSONObject();
- // 璁㈤槄 zlm鍚姩浜嬩欢
- hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,subscribeKey,(response)->{
- MediaServerConfig mediaServerConfig = JSONObject.toJavaObject(response, MediaServerConfig.class);
- zLmRunning(mediaServerConfig);
+ // 娓呮redis缂撳瓨鐨勫湪绾縵lm淇℃伅
+ mediaServerService.clearMediaServerForOnline();
+
+ // 灏嗛厤缃枃浠剁殑meida閰嶇疆鍐欏叆鏁版嵁搴�
+// MediaServerItem presetMediaServer = mediaServerService.getOneByHostAndPort(
+// mediaConfig.getIp(), mediaConfig.getHttpPort());
+// if (presetMediaServer != null) {
+// MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
+// mediaSerItem.setId(presetMediaServer.getId());
+// mediaServerService.update(mediaSerItem);
+// }else {
+// if (mediaConfig.getId() != null) {
+// MediaServerItem mediaSerItem = mediaConfig.getMediaSerItem();
+// mediaServerService.add(mediaSerItem);
+// }
+// }
+
+ // 璁㈤槄 zlm鍚姩浜嬩欢, 鏂扮殑zlm涔熶細浠庤繖閲岃繘鍏ョ郴缁�
+ hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,null,
+ (MediaServerItem mediaServerItem, JSONObject response)->{
+ ZLMServerConfig zlmServerConfig = JSONObject.toJavaObject(response, ZLMServerConfig.class);
+ if (zlmServerConfig !=null ) {
+ startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
+ mediaServerService.handLeZLMServerConfig(zlmServerConfig);
+// zLmRunning(zlmServerConfig);
+ }
});
// 鑾峰彇zlm淇℃伅
- logger.info("绛夊緟zlm鎺ュ叆...");
- MediaServerConfig mediaServerConfig = getMediaServerConfig();
+ logger.info("绛夊緟榛樿zlm鎺ュ叆...");
- if (mediaServerConfig != null) {
- zLmRunning(mediaServerConfig);
+ // 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺�
+ List<MediaServerItem> all = mediaServerService.getAllFromDatabase();
+ if (all.size() == 0) {
+ all.add(mediaConfig.getMediaSerItem());
}
+ for (MediaServerItem mediaServerItem : all) {
+ if (startGetMedia == null) startGetMedia = new HashMap<>();
+ startGetMedia.put(mediaServerItem.getId(), true);
+ new Thread(() -> {
+
+ ZLMServerConfig zlmServerConfig = getMediaServerConfig(mediaServerItem);
+ if (zlmServerConfig != null) {
+ zlmServerConfig.setIp(mediaServerItem.getIp());
+ zlmServerConfig.setHttpPort(mediaServerItem.getHttpPort());
+ startGetMedia.remove(mediaServerItem.getId());
+ mediaServerService.handLeZLMServerConfig(zlmServerConfig);
+ }
+
+ }).start();
+ }
+ Timer timer = new Timer();
+ // 2鍒嗛挓鍚庢湭杩炴帴鍒板垯涓嶅啀鍘讳富鍔ㄨ繛鎺�, TODO 骞跺閲嶅惎鍓嶄娇鐢ㄦ鍦▃lm鐨勯�氶亾鍙戦�乥ye
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if (startGetMedia != null) {
+ Set<String> allZlmId = startGetMedia.keySet();
+ for (String id : allZlmId) {
+ logger.error("[ {} ]]涓诲姩杩炴帴澶辫触锛屼笉鍐嶄富鍔ㄨ繛鎺�", id);
+ }
+ startGetMedia = null;
+ }
+ // TODO 娓呯悊鏁版嵁搴撲腑涓巖edis涓嶅尮閰嶇殑zlm
+ }
+ }, 60 * 1000 * 2);
}
- public MediaServerConfig getMediaServerConfig() {
- JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig();
- MediaServerConfig mediaServerConfig = null;
+ public ZLMServerConfig getMediaServerConfig(MediaServerItem mediaServerItem) {
+ if (startGetMedia == null) { return null;}
+ if (!mediaServerItem.isDefaultServer() && mediaServerService.getOne(mediaServerItem.getId()) == null) {
+ return null;
+ }
+ if ( startGetMedia.get(mediaServerItem.getId()) == null || !startGetMedia.get(mediaServerItem.getId())) {
+ return null;
+ }
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ ZLMServerConfig ZLMServerConfig = null;
if (responseJSON != null) {
JSONArray data = responseJSON.getJSONArray("data");
if (data != null && data.size() > 0) {
- mediaServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), MediaServerConfig.class);
-
+ ZLMServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
+ ZLMServerConfig.setIp(mediaServerItem.getIp());
}
} else {
- logger.error("getMediaServerConfig澶辫触, 1s鍚庨噸璇�");
+ logger.error("[ {} ]-[ {}:{} ]涓诲姩杩炴帴澶辫触澶辫触, 2s鍚庨噸璇�",
+ mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
try {
- Thread.sleep(1000);
+ Thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
- mediaServerConfig = getMediaServerConfig();
+ ZLMServerConfig = getMediaServerConfig(mediaServerItem);
}
- return mediaServerConfig;
- }
+ return ZLMServerConfig;
- private void saveZLMConfig() {
- logger.info("璁剧疆zlm...");
- if (StringUtils.isEmpty(mediaHookIp)) {
- mediaHookIp = sipIP;
- }
-
- String hookPrex = String.format("http://%s:%s/index/hook", mediaHookIp, serverPort);
- Map<String, Object> param = new HashMap<>();
- param.put("api.secret",mediaSecret); // -profile:v Baseline
- param.put("ffmpeg.cmd","%s -fflags nobuffer -rtsp_transport tcp -i %s -c:a aac -strict -2 -ar 44100 -ab 48k -c:v libx264 -f flv %s");
- param.put("hook.enable","1");
- param.put("hook.on_flow_report","");
- param.put("hook.on_play","");
- param.put("hook.on_http_access","");
- param.put("hook.on_publish",String.format("%s/on_publish", hookPrex));
- param.put("hook.on_record_mp4","");
- param.put("hook.on_record_ts","");
- param.put("hook.on_rtsp_auth","");
- param.put("hook.on_rtsp_realm","");
- param.put("hook.on_server_started",String.format("%s/on_server_started", hookPrex));
- param.put("hook.on_shell_login",String.format("%s/on_shell_login", hookPrex));
- param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrex));
- param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex));
- param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
- param.put("hook.timeoutSec","20");
- param.put("general.streamNoneReaderDelayMS",streamNoneReaderDelayMS);
-
- JSONObject responseJSON = zlmresTfulUtils.setServerConfig(param);
-
- if (responseJSON != null && responseJSON.getInteger("code") == 0) {
- logger.info("璁剧疆zlm鎴愬姛");
- }else {
- logger.info("璁剧疆zlm澶辫触: " + responseJSON.getString("msg"));
- }
}
/**
* zlm 杩炴帴鎴愬姛鎴栬�厇lm閲嶅惎鍚�
*/
- private void zLmRunning(MediaServerConfig mediaServerConfig){
- logger.info("zlm鎺ュ叆鎴愬姛...");
- if (autoConfig) saveZLMConfig();
- MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
- if (System.currentTimeMillis() - mediaInfo.getUpdateTime() < 50){
- logger.info("zlm鍒氬垰鏇存柊锛屽拷鐣ヨ繖娆℃洿鏂�");
- return;
- }
- mediaServerConfig.setLocalIP(mediaIp);
- mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);
- redisCatchStorage.updateMediaInfo(mediaServerConfig);
- // 鏇存柊娴佸垪琛�
- zlmMediaListManager.updateMediaList();
- // 鎭㈠娴佷唬鐞�
- List<StreamProxyDto> streamProxyListForEnable = storager.getStreamProxyListForEnable(true);
- for (StreamProxyDto streamProxyDto : streamProxyListForEnable) {
- logger.info("鎭㈠娴佷唬鐞嗭紝" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
- streamProxyService.addStreamProxyToZlm(streamProxyDto);
- }
- }
+// private void zLmRunning(ZLMServerConfig zlmServerConfig){
+// logger.info( "[ id: " + zlmServerConfig.getGeneralMediaServerId() + "] zlm鎺ュ叆鎴愬姛...");
+// // 鍏抽棴寰幆鑾峰彇zlm閰嶇疆
+// startGetMedia = false;
+// MediaServerItem mediaServerItem = new MediaServerItem(zlmServerConfig, sipIp);
+// storager.updateMediaServer(mediaServerItem);
+//
+// if (mediaServerItem.isAutoConfig()) setZLMConfig(mediaServerItem);
+// zlmServerManger.updateServerCatchFromHook(zlmServerConfig);
+//
+// // 娓呯┖鎵�鏈塻ession
+//// zlmMediaListManager.clearAllSessions();
+//
+// // 鏇存柊娴佸垪琛�
+// zlmMediaListManager.updateMediaList(mediaServerItem);
+// // 鎭㈠娴佷唬鐞�, 鍙煡鎵捐繖涓繖涓祦濯掍綋
+// List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnableInMediaServer(
+// mediaServerItem.getId(), true);
+// for (StreamProxyItem streamProxyDto : streamProxyListForEnable) {
+// logger.info("鎭㈠娴佷唬鐞嗭紝" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+// JSONObject jsonObject = streamProxyService.addStreamProxyToZlm(streamProxyDto);
+// if (jsonObject == null) {
+// // 璁剧疆涓烘湭鍚敤
+// logger.info("鎭㈠娴佷唬鐞嗗け璐ワ紝璇锋鏌ユ祦鍦板潃鍚庨噸鏂板惎鐢�" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+// streamProxyService.stop(streamProxyDto.getApp(), streamProxyDto.getStream());
+// }
+// }
+// }
}
--
Gitblit v1.8.0