Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev

zhaowenyu

2025-11-27 f28472ed7c143b6b0ae1eb7f6dc2e1ac73616d53

Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev

 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

 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());

 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;