From f28472ed7c143b6b0ae1eb7f6dc2e1ac73616d53 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 27 Nov 2025 14:21:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev
---
ard-vtdu/src/main/java/com/ard/vtdu/config/MediamtxConfig.java | 1 +
ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java | 2 +-
ard-admin/src/main/resources/application-prod.yml | 1 +
3 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index be98aff..fb474ac 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -57,6 +57,7 @@
apiHost: 192.168.1.3
playHost: 192.168.1.3
https: true
+ pushHost: 111.40.46.199
rtmpPort: 1935
rtspPort: 8554
webrtcPort: 8889
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
index 7133276..e2fb700 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
@@ -101,7 +101,7 @@
@Override
public ResponseResult liveStart(LiveTypeDTO liveParam) {
String rtmpPublishUrl =
- "rtmp://" + mediamtxConfig.getApiHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + liveParam.getVideoId();
+ "rtmp://" + mediamtxConfig.getPushHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + liveParam.getVideoId();
liveParam.setUrl(rtmpPublishUrl);
// Check if this lens is available live.
ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
diff --git a/ard-vtdu/src/main/java/com/ard/vtdu/config/MediamtxConfig.java b/ard-vtdu/src/main/java/com/ard/vtdu/config/MediamtxConfig.java
index fd39058..dcfc73c 100644
--- a/ard-vtdu/src/main/java/com/ard/vtdu/config/MediamtxConfig.java
+++ b/ard-vtdu/src/main/java/com/ard/vtdu/config/MediamtxConfig.java
@@ -17,6 +17,7 @@
private String apiHost;
private String playHost;
private boolean isHttps;
+ private String pushHost;
private Integer rtmpPort;
private Integer rtspPort;
private Integer webrtcPort;
--
Gitblit v1.9.3