Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -702,7 +702,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         String endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endTm);
 
         String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
-        String s = HttpUtils.sendGet(webUrl + "/api/record/flv/list", param);
+        // /api/record/flv/list
+        String s = HttpUtils.sendGet(webUrl + "/recordpro/api/list", param);
         // 视频拼接
         if (!StringUtils.isBlank(s) || "null".equals(s)) {
             List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);

hazard-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ base:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /opt/streams
+  profile: /opt/streams/record/flv
   #  profile: C:\base\uploadPath
   # 获取ip地址开关
   addressEnabled: true
@@ -17,7 +17,7 @@ base:
   captchaType: math
   # 摄像头配置
   ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
-  filePath: /opt/streams/
+  filePath: /opt/streams/record/flv/
   webUrl: http://124.70.58.209:18812
   bakUrl: http://124.70.58.209:18891
   wsUrl: ws://124.70.58.209:9080