guzijian / wvp-assist · Commits

Commit 8679ad210daff07d1073d04e8ad129d3f17b6a5a

Authored by 648540858
1 parent 04f5846d

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

Inline Side-by-side
Showing 3 changed files with 9 additions and 11 deletions
... ... @@ -9,12 +9,12 @@
9 9 </parent>
10 10 <groupId>top.panll.assist</groupId>
11 11 <artifactId>wvp-pro-assist</artifactId>
12   - <version>1.0.0</version>
  12 + <version>2.6.8</version>
13 13 <name>wvp-pro-assist</name>
14 14 <description></description>
15 15 <properties>
16 16 <java.version>1.8</java.version>
17   - <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
  17 + <maven.build.timestamp.format>MMddHHmm</maven.build.timestamp.format>
18 18 <!-- <pagehelper.version>5.2.0</pagehelper.version>-->
19 19 </properties>
20 20  
... ...
src/main/java/top/panll/assist/service/VideoFileService.java
  View file @8679ad2
... ... @@ -379,7 +379,7 @@ public class VideoFileService {
379 379 logger.info("[录像合并] 失败，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
380 380 return taskId;
381 381 }
382   - mergeOrCutTaskInfo.setRecordFile(relativize.toString());
  382 + mergeOrCutTaskInfo.setRecordFile("/download/" + relativize.toString());
383 383 if (remoteHost != null) {
384 384 mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=download/" + relativize);
385 385 mergeOrCutTaskInfo.setPlayFile(remoteHost + "/download/" + relativize);
... ... @@ -397,8 +397,8 @@ public class VideoFileService {
397 397 Path relativize = Paths.get(userSettings.getRecord()).relativize(Paths.get(result));
398 398 mergeOrCutTaskInfo.setRecordFile(relativize.toString());
399 399 if (remoteHost != null) {
400   - mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=" + relativize);
401   - mergeOrCutTaskInfo.setPlayFile(remoteHost + "/" + relativize);
  400 + mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=download/" + relativize);
  401 + mergeOrCutTaskInfo.setPlayFile(remoteHost + "/download/" + relativize);
402 402 }
403 403 logger.info("[录像合并] 合并完成，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
404 404 }else {
... ...
src/main/resources/application-local.yml 100644 → 100755
  View file @8679ad2
... ... @@ -35,21 +35,19 @@ server:
35 35 userSettings:
36 36 # [必选 ] 服务ID
37 37 id: 334533
38   - # [必选 ] zlm配置的录像路径
39   - record: /home/lin/server/test001/default/www/record/
  38 + # [必选 ] 录像路径
  39 + record: /home/lin/record/
40 40 # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理
41   - recordDay: 7
  41 + recordDay: 10
42 42 # [可选 ] 录像下载合成临时文件保存时长， 不配置默认取值recordDay（单位： 天）每天晚12点自动对过期文件执行清理
43 43 # recordTempDay: 7
44 44 # [必选 ] ffmpeg路径
45 45 ffmpeg: /home/lin/IdeaProjects/wvp-pro-assist/lib/ffmpeg
46   - # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息
  46 + # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息，
47 47 ffprobe: /home/lin/IdeaProjects/wvp-pro-assist/lib/ffprobe
48 48 # [可选 ] 限制 ffmpeg 合并文件使用的线程数，间接限制cpu使用率， 默认2 限制到50%
49 49 threads: 2
50 50  
51   -swagger-ui:
52   -
53 51 # [可选] 日志配置, 一般不需要改
54 52 logging:
55 53 file:
... ...