From fe98e57fc4350ddc2220b5f6f2201d0d73573c01 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期一, 19 四月 2021 11:13:39 +0800
Subject: [PATCH] 增加对https的支持
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 7 +++++--
src/main/resources/application-dev.yml | 10 ++++++++++
2 files changed, 15 insertions(+), 2 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 6e0bc60..2ef4cf6 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
@@ -61,6 +61,9 @@
@Value("${media.autoConfig}")
private boolean autoConfig;
+ @Value("${server.ssl.enabled}")
+ private boolean sslEnabled;
+
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@@ -116,8 +119,8 @@
if (StringUtils.isEmpty(mediaHookIp)) {
mediaHookIp = sipIP;
}
-
- String hookPrex = String.format("http://%s:%s/index/hook", mediaHookIp, serverPort);
+ String protocol = sslEnabled ? "https" : "http";
+ String hookPrex = String.format("%s://%s:%s/index/hook", protocol, 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");
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fad47f9..e1397d7 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -31,6 +31,16 @@
# [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
server:
port: 18080
+ # [鍙�塢 HTTPS閰嶇疆锛� 榛樿涓嶅紑鍚�
+ ssl:
+ # [鍙�塢 鏄惁寮�鍚疕TTPS璁块棶
+ enabled: false
+ # [鍙�塢 璇佷功鏂囦欢璺緞锛屾斁缃湪resource/鐩綍涓嬪嵆鍙紝淇敼xxx涓烘枃浠跺悕
+ key-store: classpath:xxx.jks
+ # [鍙�塢 璇佷功瀵嗙爜
+ key-password: password
+ # [鍙�塢 璇佷功绫诲瀷锛� 榛樿涓簀ks锛屾牴鎹疄闄呬慨鏀�
+ key-store-type: JKS
# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
sip:
--
Gitblit v1.8.0