修复录像下载路径错误的问题

648540858
1 parent 04f5846d
Showing 3 changed files with 9 additions and 11 deletions
pom.xml
src/main/java/top/panll/assist/service/VideoFileService.java
src/main/resources/application-local.yml
@@ -9,12 +9,12 @@
     </parent>
     <groupId>top.panll.assist</groupId>
     <artifactId>wvp-pro-assist</artifactId>
-    <version>1.0.0</version>
+    <version>2.6.8</version>
     <name>wvp-pro-assist</name>
     <description></description>
     <properties>
         <java.version>1.8</java.version>
-        <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
+        <maven.build.timestamp.format>MMddHHmm</maven.build.timestamp.format>
 <!--        <pagehelper.version>5.2.0</pagehelper.version>-->
     </properties>
@@ -379,7 +379,7 @@ public class VideoFileService {
                 logger.info("[录像合并] 失败，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
                 return taskId;
             }
-            mergeOrCutTaskInfo.setRecordFile(relativize.toString());
+            mergeOrCutTaskInfo.setRecordFile("/download/" + relativize.toString());
             if (remoteHost != null) {
                 mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=download/" + relativize);
                 mergeOrCutTaskInfo.setPlayFile(remoteHost + "/download/" + relativize);
@@ -397,8 +397,8 @@ public class VideoFileService {
                     Path relativize = Paths.get(userSettings.getRecord()).relativize(Paths.get(result));
                     mergeOrCutTaskInfo.setRecordFile(relativize.toString());
                     if (remoteHost != null) {
-                        mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=" + relativize);
-                        mergeOrCutTaskInfo.setPlayFile(remoteHost + "/" + relativize);
+                        mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=download/" + relativize);
+                        mergeOrCutTaskInfo.setPlayFile(remoteHost + "/download/" + relativize);
                     }
                     logger.info("[录像合并] 合并完成，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
                 }else {
@@ -35,21 +35,19 @@ server:
 userSettings:
     # [必选 ] 服务ID
     id: 334533
-    # [必选 ] zlm配置的录像路径
-    record: /home/lin/server/test001/default/www/record/
+    # [必选 ] 录像路径
+    record: /home/lin/record/
     # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理
-    recordDay: 7
+    recordDay: 10
     # [可选 ] 录像下载合成临时文件保存时长， 不配置默认取值recordDay（单位： 天）每天晚12点自动对过期文件执行清理
     # recordTempDay: 7
     # [必选 ] ffmpeg路径
     ffmpeg: /home/lin/IdeaProjects/wvp-pro-assist/lib/ffmpeg
-    # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息
+    # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息，
     ffprobe: /home/lin/IdeaProjects/wvp-pro-assist/lib/ffprobe
     # [可选 ] 限制 ffmpeg 合并文件使用的线程数，间接限制cpu使用率， 默认2 限制到50%
     threads: 2
-swagger-ui:
-
 # [可选] 日志配置, 一般不需要改
 logging:
     file: