From c3271d7407e43c176d03c777a89367357c2262e2 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期四, 08 七月 2021 09:26:12 +0800
Subject: [PATCH] 优化鉴权例外， 添加.gitignore
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 221 ++++++++++++++++++++++++++++--------------------------
1 files changed, 115 insertions(+), 106 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 8dc8e50..f9171c3 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,9 +3,10 @@
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.conf.MediaConfig;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import okhttp3.*;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,9 +15,9 @@
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Component
@Order(value=1)
@@ -24,129 +25,137 @@
private final static Logger logger = LoggerFactory.getLogger(ZLMRunner.class);
+ @Autowired
+ private IVideoManagerStorager storager;
+
@Autowired
- private IVideoManagerStorager storager;
-
- @Value("${media.ip}")
- private String mediaIp;
-
- @Value("${media.port}")
- private int mediaPort;
-
- @Value("${media.secret}")
- private String mediaSecret;
-
- @Value("${sip.ip}")
- private String sipIP;
+ private MediaConfig mediaConfig;
@Value("${server.port}")
private String serverPort;
+ @Value("${server.ssl.enabled:false}")
+ private boolean sslEnabled;
+
+ private boolean startGetMedia = false;
+
+ @Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
+ private ZLMMediaListManager zlmMediaListManager;
+
+ @Autowired
+ private ZLMHttpHookSubscribe hookSubscribe;
+
+ @Autowired
+ private ZLMServerManger zlmServerManger;
+
+ @Autowired
+ private IStreamProxyService streamProxyService;
+
@Override
public void run(String... strings) throws Exception {
+ // 璁㈤槄 zlm鍚姩浜嬩欢
+ hookSubscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_server_started,null,(response)->{
+ ZLMServerConfig ZLMServerConfig = JSONObject.toJavaObject(response, ZLMServerConfig.class);
+ zLmRunning(ZLMServerConfig);
+ });
+
// 鑾峰彇zlm淇℃伅
logger.info("绛夊緟zlm鎺ュ叆...");
- MediaServerConfig mediaServerConfig = getMediaServerConfig();
- if (mediaServerConfig != null) {
- logger.info("zlm鎺ュ叆鎴愬姛...");
- storager.updateMediaInfo(mediaServerConfig);
- logger.info("璁剧疆zlm...");
- saveZLMConfig();
+ startGetMedia = true;
+ ZLMServerConfig ZLMServerConfig = getMediaServerConfig();
+ if (ZLMServerConfig != null) {
+ zLmRunning(ZLMServerConfig);
}
}
+ public ZLMServerConfig getMediaServerConfig() {
+ if (!startGetMedia) return null;
+ JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig();
+ ZLMServerConfig ZLMServerConfig = null;
+ if (responseJSON != null) {
+ JSONArray data = responseJSON.getJSONArray("data");
+ if (data != null && data.size() > 0) {
+ ZLMServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), ZLMServerConfig.class);
-
- public MediaServerConfig getMediaServerConfig() {
- MediaServerConfig mediaServerConfig = null;
- OkHttpClient client = new OkHttpClient();
- String url = String.format("http://%s:%s/index/api/getServerConfig?secret=%s", mediaIp, mediaPort, mediaSecret);
- //鍒涘缓涓�涓猂equest
- Request request = new Request.Builder()
- .get()
- .url(url)
- .build();
- //閫氳繃client鍙戣捣璇锋眰
- final Call call = client.newCall(request);
- //鎵ц鍚屾璇锋眰锛岃幏鍙朢esponse瀵硅薄
- Response response = null;
- try {
- response = call.execute();
- if (response.isSuccessful()) {
- String responseStr = response.body().string();
- if (responseStr != null) {
- JSONObject responseJSON = JSON.parseObject(responseStr);
- JSONArray data = responseJSON.getJSONArray("data");
- if (data != null && data.size() > 0) {
- mediaServerConfig = JSON.parseObject(JSON.toJSONString(data.get(0)), MediaServerConfig.class);
- mediaServerConfig.setLocalIP(mediaIp);
- }
- }
- }else {
- logger.error("getMediaServerConfig澶辫触, 1s鍚庨噸璇�");
- Thread.sleep(1000);
- getMediaServerConfig();
}
- } catch (IOException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
+ } else {
+ logger.error("getMediaServerConfig澶辫触, 1s鍚庨噸璇�");
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ ZLMServerConfig = getMediaServerConfig();
}
-
- return mediaServerConfig;
+ return ZLMServerConfig;
}
private void saveZLMConfig() {
- String hookIP = sipIP;
- if (mediaIp.equals(sipIP)) {
- hookIP = "127.0.0.1";
+ logger.info("璁剧疆zlm...");
+ String protocol = sslEnabled ? "https" : "http";
+ String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaConfig.getHookIp(), serverPort);
+ String recordHookPrex = null;
+ if (mediaConfig.getRecordAssistPort() != 0) {
+ recordHookPrex = String.format("http://127.0.0.1:%s/api/record", mediaConfig.getRecordAssistPort());
}
- OkHttpClient client = new OkHttpClient();
- String url = String.format("http://%s:%s/index/api/setServerConfig", mediaIp, mediaPort);
- String hookPrex = String.format("http://%s:%s/index/hook", hookIP, serverPort);
+ Map<String, Object> param = new HashMap<>();
+ param.put("api.secret",mediaConfig.getSecret()); // -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",String.format("%s/on_play", hookPrex));
+ param.put("hook.on_http_access","");
+ param.put("hook.on_publish", String.format("%s/on_publish", hookPrex));
+ param.put("hook.on_record_mp4",recordHookPrex != null? String.format("%s/on_record_mp4", recordHookPrex): "");
+ 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",mediaConfig.getStreamNoneReaderDelayMS());
- RequestBody body = new FormBody.Builder()
- .add("secret",mediaSecret)
- .add("hook.enable","1")
- .add("hook.on_flow_report","")
- .add("hook.on_http_access","")
- .add("hook.on_publish",String.format("%s/on_publish", hookPrex))
- .add("hook.on_record_mp4","")
- .add("hook.on_record_ts","")
- .add("hook.on_rtsp_auth","")
- .add("hook.on_rtsp_realm","")
- .add("hook.on_server_started",String.format("%s/on_server_started", hookPrex))
- .add("hook.on_shell_login",String.format("%s/on_shell_login", hookPrex))
- .add("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex))
- .add("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex))
- .add("hook.timeoutSec","20")
- .build();
+ JSONObject responseJSON = zlmresTfulUtils.setServerConfig(param);
- Request request = new Request.Builder()
- .post(body)
- .url(url)
- .build();
- client.newCall(request).enqueue(new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
- logger.error("saveZLMConfig ",e);
+ if (responseJSON != null && responseJSON.getInteger("code") == 0) {
+ logger.info("璁剧疆zlm鎴愬姛");
+ }else {
+ logger.info("璁剧疆zlm澶辫触: " + responseJSON.getString("msg"));
+ }
+ }
+
+ /**
+ * zlm 杩炴帴鎴愬姛鎴栬�厇lm閲嶅惎鍚�
+ */
+ private void zLmRunning(ZLMServerConfig zlmServerConfig){
+ logger.info( "[ id: " + zlmServerConfig.getGeneralMediaServerId() + "] zlm鎺ュ叆鎴愬姛...");
+ // 鍏抽棴寰幆鑾峰彇zlm閰嶇疆
+ startGetMedia = false;
+ if (mediaConfig.isAutoConfig()) saveZLMConfig();
+ zlmServerManger.updateServerCatch(zlmServerConfig);
+
+ // 娓呯┖鎵�鏈塻ession
+// zlmMediaListManager.clearAllSessions();
+
+ // 鏇存柊娴佸垪琛�
+ zlmMediaListManager.updateMediaList();
+ // 鎭㈠娴佷唬鐞�
+ List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnable(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());
}
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- if (response.isSuccessful()) {
- String responseStr = response.body().string();
- if (responseStr != null) {
- JSONObject responseJSON = JSON.parseObject(responseStr);
- if (responseJSON.getInteger("code") == 0) {
- logger.info("璁剧疆zlm鎴愬姛");
- }else {
- logger.info("璁剧疆zlm澶辫触: " + responseJSON.getString("msg"));
- }
- }
- }
-
- }
- });
+ }
}
}
--
Gitblit v1.8.0