优化录像路径配置，不再使用zlm默认http服务器

648540858
1 parent 7360de7f
Showing 32 changed files with 504 additions and 88 deletions
.gitignore
LICENSE
README.md
pom.xml
src/main/java/top/panll/assist/WvpProAssistApplication.java
src/main/java/top/panll/assist/config/FastJsonRedisSerializer.java
src/main/java/top/panll/assist/config/GlobalExceptionHandler.java
src/main/java/top/panll/assist/config/GlobalResponseAdvice.java
src/main/java/top/panll/assist/config/RedisConfig.java
src/main/java/top/panll/assist/config/SpringDocConfig.java
src/main/java/top/panll/assist/config/StartConfig.java
src/main/java/top/panll/assist/config/ThreadPoolTaskConfig.java
src/main/java/top/panll/assist/controller/DownController.java
src/main/java/top/panll/assist/controller/DownloadController.java
src/main/java/top/panll/assist/controller/RecordController.java
src/main/java/top/panll/assist/controller/bean/ErrorCode.java
src/main/java/top/panll/assist/controller/bean/WVPResult.java
src/main/java/top/panll/assist/dto/MergeOrCutTaskInfo.java
src/main/java/top/panll/assist/dto/SignInfo.java
src/main/java/top/panll/assist/dto/SpaceInfo.java
@@ -69,10 +69,28 @@
         </dependency>
  
         <dependency>
+            <groupId>org.mp4parser</groupId>
+            <artifactId>muxer</artifactId>
+            <version>1.9.56</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mp4parser</groupId>
+            <artifactId>streaming</artifactId>
+            <version>1.9.56</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mp4parser</groupId>
+            <artifactId>isoparser</artifactId>
+            <version>1.9.27</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
  
     <build>
@@ -41,29 +41,39 @@ public class StartConfig implements CommandLineRunner {
         if (!record.endsWith(File.separator)) {
             userSettings.setRecord(userSettings.getRecord() + File.separator);
         }
+
         File recordFile = new File(record);
-        if (!recordFile.exists() || !recordFile.isDirectory()) {
-            logger.error("[userSettings.record]配置错误，请检查路径是否存在");
-            System.exit(1);
-        }
-        if (!recordFile.canRead()) {
-            logger.error("[userSettings.record]路径无法读取");
-            System.exit(1);
-        }
-        if (!recordFile.canWrite()) {
-            logger.error("[userSettings.record]路径无法写入");
-            System.exit(1);
+        if (!recordFile.exists()){
+            logger.warn("[userSettings.record]路径不存在，开始创建");
+            boolean mkResult = recordFile.mkdirs();
+            if (!mkResult) {
+                logger.info("[userSettings.record]目录创建失败");
+                System.exit(1);
+            }
+        }else {
+            if ( !recordFile.isDirectory()) {
+                logger.warn("[userSettings.record]路径是文件，请修改为目录");
+                System.exit(1);
+            }
+            if (!recordFile.canRead()) {
+                logger.error("[userSettings.record]路径无法读取");
+                System.exit(1);
+            }
+            if (!recordFile.canWrite()) {
+                logger.error("[userSettings.record]路径无法写入");
+                System.exit(1);
+            }
         }
-        // 在zlm目录写入assist下载页面
-        writeAssistDownPage(recordFile);
+
         try {
  
-//            FFmpegExecUtils.getInstance().ffmpeg = ffmpeg;
-//            FFmpegExecUtils.getInstance().ffprobe = ffprobe;
             // 对目录进行预整理
             File[] appFiles = recordFile.listFiles();
             if (appFiles != null && appFiles.length > 0) {
                 for (File appFile : appFiles) {
+                    if (appFile.getName().equals("recordTemp")) {
+                        continue;
+                    }
                     File[] streamFiles = appFile.listFiles();
                     if (streamFiles != null && streamFiles.length > 0) {
                         for (File streamFile : streamFiles) {
@@ -91,48 +101,48 @@ public class StartConfig implements CommandLineRunner {
         }
     }
  
-    private void writeAssistDownPage(File recordFile) {
-        try {
-            File file = new File(recordFile.getParentFile().getAbsolutePath(), "download.html");
-            if (file.exists()) {
-                file.delete();
-            }
-            file.createNewFile();
-            FileOutputStream fs = new FileOutputStream(file);
-            StringBuffer stringBuffer = new StringBuffer();
-            String content = "<!DOCTYPE html>\n" +
-                    "<html lang=\"en\">\n" +
-                    "<head>\n" +
-                    "    <meta charset=\"UTF-8\">\n" +
-                    "    <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n" +
-                    "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n" +
-                    "    <title>下载</title>\n" +
-                    "</head>\n" +
-                    "<body>\n" +
-                    "    <a id=\"download\" download />\n" +
-                    "    <script>\n" +
-                    "        (function(){\n" +
-                    "            let searchParams = new URLSearchParams(location.search);\n" +
-                    "            var download = document.getElementById(\"download\");\n" +
-                    "            download.setAttribute(\"href\", searchParams.get(\"url\"))\n" +
-                    "            download.click()\n" +
-                    "            setTimeout(()=>{\n" +
-                    "                window.location.href=\"about:blank\";\n" +
-                    "\t\t\t          window.close();\n" +
-                    "            },200)\n" +
-                    "        })();\n" +
-                    "       \n" +
-                    "    </script>\n" +
-                    "</body>\n" +
-                    "</html>";
-            fs.write(content.getBytes(StandardCharsets.UTF_8));
-            logger.info("已写入html配置页面： " + file.getAbsolutePath());
-        } catch (FileNotFoundException e) {
-            logger.error("写入html页面错误", e);
-        } catch (IOException e) {
-            logger.error("写入html页面错误", e);
-        }
-
-
-    }
+//    private void writeAssistDownPage(File recordFile) {
+//        try {
+//            File file = new File(recordFile.getParentFile().getAbsolutePath(), "download.html");
+//            if (file.exists()) {
+//                file.delete();
+//            }
+//            file.createNewFile();
+//            FileOutputStream fs = new FileOutputStream(file);
+//            StringBuffer stringBuffer = new StringBuffer();
+//            String content = "<!DOCTYPE html>\n" +
+//                    "<html lang=\"en\">\n" +
+//                    "<head>\n" +
+//                    "    <meta charset=\"UTF-8\">\n" +
+//                    "    <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n" +
+//                    "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n" +
+//                    "    <title>下载</title>\n" +
+//                    "</head>\n" +
+//                    "<body>\n" +
+//                    "    <a id=\"download\" download />\n" +
+//                    "    <script>\n" +
+//                    "        (function(){\n" +
+//                    "            let searchParams = new URLSearchParams(location.search);\n" +
+//                    "            var download = document.getElementById(\"download\");\n" +
+//                    "            download.setAttribute(\"href\", searchParams.get(\"url\"))\n" +
+//                    "            download.click()\n" +
+//                    "            setTimeout(()=>{\n" +
+//                    "                window.location.href=\"about:blank\";\n" +
+//                    "\t\t\t          window.close();\n" +
+//                    "            },200)\n" +
+//                    "        })();\n" +
+//                    "       \n" +
+//                    "    </script>\n" +
+//                    "</body>\n" +
+//                    "</html>";
+//            fs.write(content.getBytes(StandardCharsets.UTF_8));
+//            logger.info("已写入html配置页面： " + file.getAbsolutePath());
+//        } catch (FileNotFoundException e) {
+//            logger.error("写入html页面错误", e);
+//        } catch (IOException e) {
+//            logger.error("写入html页面错误", e);
+//        }
+//
+//
+//    }
 }
+package top.panll.assist.controller;
+
+
+import org.apache.catalina.connector.ClientAbortException;
+import org.mp4parser.BasicContainer;
+import org.mp4parser.Container;
+import org.mp4parser.muxer.Movie;
+import org.mp4parser.muxer.Track;
+import org.mp4parser.muxer.builder.DefaultMp4Builder;
+import org.mp4parser.muxer.builder.Mp4Builder;
+import org.mp4parser.muxer.container.mp4.MovieCreator;
+import org.mp4parser.muxer.tracks.AppendTrack;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import top.panll.assist.dto.UserSettings;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.nio.channels.Channels;
+import java.nio.channels.WritableByteChannel;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/down")
+public class DownController {
+
+    private final static Logger logger = LoggerFactory.getLogger(DownController.class);
+
+    @Autowired
+    private UserSettings userSettings;
+
+    /**
+     * 获取app+stream列表
+     *
+     * @return
+     */
+    @GetMapping(value = "/**")
+    @ResponseBody
+    public void download(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+        List<String> videoList = new ArrayList<>();
+        videoList.add("/home/lin/server/test/zlm/Debug/www/record/rtp/34020000002000000003_34020000001310000001/2023-03-20/16-09-07.mp4");
+        videoList.add("/home/lin/server/test/zlm/Debug/www/record/rtp/34020000002000000003_34020000001310000001/2023-03-20/17-12-10.mp4");
+        videoList.add("/home/lin/server/test/zlm/Debug/www/record/rtp/34020000002000000003_34020000001310000001/2023-03-20/17-38-36.mp4");
+        List<Movie> sourceMovies = new ArrayList<>();
+        for (String video : videoList) {
+            sourceMovies.add(MovieCreator.build(video));
+        }
+
+        List<Track> videoTracks = new LinkedList<>();
+        List<Track> audioTracks = new LinkedList<>();
+        for (Movie movie : sourceMovies) {
+            for (Track track : movie.getTracks()) {
+                if ("soun".equals(track.getHandler())) {
+                    audioTracks.add(track);
+                }
+
+                if ("vide".equals(track.getHandler())) {
+                    videoTracks.add(track);
+                }
+            }
+        }
+        Movie mergeMovie = new Movie();
+        if (audioTracks.size() > 0) {
+            mergeMovie.addTrack(new AppendTrack(audioTracks.toArray(new Track[audioTracks.size()])));
+        }
+
+        if (videoTracks.size() > 0) {
+            mergeMovie.addTrack(new AppendTrack(videoTracks.toArray(new Track[videoTracks.size()])));
+        }
+
+        BasicContainer out = (BasicContainer)new DefaultMp4Builder().build(mergeMovie);
+
+        // 文件名
+        String fileName = "测试.mp4";
+        // 文件类型
+        String contentType = request.getServletContext().getMimeType(fileName);
+
+        // 解决下载文件时文件名乱码问题
+        byte[] fileNameBytes = fileName.getBytes(StandardCharsets.UTF_8);
+        fileName = new String(fileNameBytes, 0, fileNameBytes.length, StandardCharsets.ISO_8859_1);
+
+        response.setHeader("Content-Type", contentType);
+        response.setHeader("Content-Length", String.valueOf(out));
+        //inline表示浏览器直接使用，attachment表示下载，fileName表示下载的文件名
+        response.setHeader("Content-Disposition", "inline;filename=" + fileName);
+        response.setContentType(contentType);
+
+        WritableByteChannel writableByteChannel = Channels.newChannel(response.getOutputStream());
+        out.writeContainer(writableByteChannel);
+        writableByteChannel.close();
+
+    }
+}
+package top.panll.assist.controller;
+
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.catalina.connector.ClientAbortException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import top.panll.assist.dto.UserSettings;
+import top.panll.assist.utils.PageInfo;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/download")
+public class DownloadController {
+
+    private final static Logger logger = LoggerFactory.getLogger(DownloadController.class);
+
+    @Autowired
+    private UserSettings userSettings;
+
+    /**
+     * 获取app+stream列表
+     *
+     * @return
+     */
+    @GetMapping(value = "/**")
+    @ResponseBody
+    public void download(HttpServletRequest request, HttpServletResponse response) {
+
+        String resourcePath = request.getServletPath();
+        System.out.println(resourcePath);
+        resourcePath = resourcePath.substring("/download".length() + 1, resourcePath.length());
+        String record = userSettings.getRecord();
+//        if (record.endsWith("/")) {
+//            record = record.substring(0, record.length() - 1);
+//            System.out.println(record);
+//        }
+        System.out.println(record + resourcePath);
+        File file = new File(record + resourcePath);
+        if (!file.exists()) {
+            response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+            return;
+        }
+
+        /**
+         * 参考实现来自： CSDN 进修的CODER SpringBoot Java实现Http方式分片下载断点续传+实现H5大视频渐进式播放
+         * https://blog.csdn.net/lovequanquqn/article/details/104562945
+         */
+        String range = request.getHeader("Range");
+        logger.info("current request rang:" + range);
+        //开始下载位置
+        long startByte = 0;
+        //结束下载位置
+        long endByte = file.length() - 1;
+        logger.info("文件开始位置：{}，文件结束位置：{}，文件总长度：{}", startByte, endByte, file.length());
+
+        //有range的话
+        if (range != null && range.contains("bytes=") && range.contains("-")) {
+            range = range.substring(range.lastIndexOf("=") + 1).trim();
+            String[] ranges = range.split("-");
+            try {
+                //判断range的类型
+                if (ranges.length == 1) {
+                    // 类型一：bytes=-2343,
+                    if (range.startsWith("-")) {
+                        endByte = Long.parseLong(ranges[0]);
+                    }
+                    //类型二：bytes=2343-
+                    else if (range.endsWith("-")) {
+                        startByte = Long.parseLong(ranges[0]);
+                    }
+                }
+                //类型三：bytes=22-2343
+                else if (ranges.length == 2) {
+                    startByte = Long.parseLong(ranges[0]);
+                    endByte = Long.parseLong(ranges[1]);
+                }
+
+            } catch (NumberFormatException e) {
+                startByte = 0;
+                endByte = file.length() - 1;
+                logger.error("Range Occur Error,Message:{}", e.getLocalizedMessage());
+            }
+
+
+        }
+
+        // 要下载的长度
+        long contentLength = endByte - startByte + 1;
+        // 文件名
+        String fileName = file.getName();
+        // 文件类型
+        String contentType = request.getServletContext().getMimeType(fileName);
+
+        // 解决下载文件时文件名乱码问题
+        byte[] fileNameBytes = fileName.getBytes(StandardCharsets.UTF_8);
+        fileName = new String(fileNameBytes, 0, fileNameBytes.length, StandardCharsets.ISO_8859_1);
+
+        response.setHeader("Content-Type", contentType);
+        response.setHeader("Content-Length", String.valueOf(contentLength));
+        //inline表示浏览器直接使用，attachment表示下载，fileName表示下载的文件名
+        response.setHeader("Content-Disposition", "inline;filename=" + fileName);
+        response.setContentType(contentType);
+        if (range != null) {
+            //各种响应头设置
+            //支持断点续传，获取部分字节内容：
+            response.setHeader("Accept-Ranges", "bytes");
+            //http状态码要为206：表示获取部分内容
+            response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
+            // Content-Range，格式为：[要下载的开始位置]-[结束位置]/[文件总大小]
+            response.setHeader("Content-Range", "bytes " + startByte + "-" + endByte + "/" + file.length());
+        } else {
+            response.setStatus(HttpServletResponse.SC_OK);
+        }
+
+
+        BufferedOutputStream outputStream = null;
+        RandomAccessFile randomAccessFile = null;
+        //已传送数据大小
+        long transmitted = 0;
+        try {
+            randomAccessFile = new RandomAccessFile(file, "r");
+
+            outputStream = new BufferedOutputStream(response.getOutputStream());
+            byte[] buff = new byte[4096];
+            int len = 0;
+            randomAccessFile.seek(startByte);
+            //warning：判断是否到了最后不足4096（buff的length）个byte这个逻辑（(transmitted + len) <= contentLength）要放前面
+            //不然会会先读取randomAccessFile，造成后面读取位置出错;
+            while ((transmitted + len) <= contentLength && (len = randomAccessFile.read(buff)) != -1) {
+                outputStream.write(buff, 0, len);
+                transmitted += len;
+            }
+            //处理不足buff.length部分
+            if (transmitted < contentLength) {
+                len = randomAccessFile.read(buff, 0, (int) (contentLength - transmitted));
+                outputStream.write(buff, 0, len);
+                transmitted += len;
+            }
+
+            outputStream.flush();
+            response.flushBuffer();
+            randomAccessFile.close();
+            logger.info("下载完毕：" + startByte + "-" + endByte + "：" + transmitted);
+        } catch (ClientAbortException e) {
+            logger.warn("用户停止下载：" + startByte + "-" + endByte + "：" + transmitted);
+            //捕获此异常表示拥护停止下载
+        } catch (IOException e) {
+            e.printStackTrace();
+            logger.error("用户下载IO异常，Message：{}", e.getLocalizedMessage());
+        } finally {
+            try {
+                if (randomAccessFile != null) {
+                    randomAccessFile.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }///end try
+    }
+}
@@ -24,10 +24,8 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 @Tag(name = "录像管理", description = "录像管理")
 @CrossOrigin
 @RestController
@@ -49,6 +47,16 @@ public class RecordController {
  
  
     /**
+     * 获取Assist服务配置信息
+     */
+    @Operation(summary ="获取Assist服务配置信息")
+    @GetMapping(value = "/info")
+    @ResponseBody
+    public UserSettings getInfo(){
+        return userSettings;
+    }
+
+    /**
      * 获取app+stream列表
      * @return
      */
@@ -58,7 +66,7 @@ public class RecordController {
     @GetMapping(value = "/list")
     @ResponseBody
     public PageInfo<Map<String, String>> getList(@RequestParam int page,
-                                                  @RequestParam int count){
+                                                 @RequestParam int count){
         List<Map<String, String>> appList = videoFileService.getList();
  
         PageInfo<Map<String, String>> stringPageInfo = new PageInfo<>(appList);
@@ -84,6 +92,7 @@ public class RecordController {
                 resultData.add(file.getName());
             }
         }
+        Collections.sort(resultData);
  
         PageInfo<String> stringPageInfo = new PageInfo<>(resultData);
         stringPageInfo.startPage(page, count);
@@ -342,9 +351,10 @@ public class RecordController {
         ret.put("code", 0);
         ret.put("msg", "success");
         String file_path = json.getString("file_path");
+
         String app = json.getString("app");
         String stream = json.getString("stream");
-        logger.debug("ZLM 录制完成，参数：" + file_path);
+        logger.debug("ZLM 录制完成，文件路径：" + file_path);
  
         if (file_path == null) {
             return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
@@ -356,7 +366,6 @@ public class RecordController {
             videoFileService.handFile(new File(file_path), app, stream);
         }
  
-
         return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
     }
  
@@ -39,6 +39,9 @@ public class FileManagerTimer {
 //    @Scheduled(fixedDelay = 2000)   //测试 20秒执行一次
     @Scheduled(cron = "0 0 0 * * ?")   //每天的0点执行
     public void execute(){
+        if (userSettings.getRecord() == null) {
+            return;
+        }
         int recordDay = userSettings.getRecordDay();
         Date lastDate=new Date();
         Calendar lastCalendar = Calendar.getInstance();
@@ -115,7 +118,7 @@ public class FileManagerTimer {
         lastTempCalendar.add(Calendar.DAY_OF_MONTH, 0 - recordTempDay);
         lastTempDate = lastTempCalendar.getTime();
         logger.info("[录像巡查]移除合并任务临时文件 {} 之前的文件", formatter.format(lastTempDate));
-        File recordTempFile = new File(recordFileDir.getParentFile().getAbsolutePath() + File.separator +  "recordTemp");
+        File recordTempFile = new File(userSettings.getRecord() +  "recordTemp");
         if (recordTempFile.exists() && recordTempFile.isDirectory() && recordTempFile.canWrite()) {
             File[] tempFiles = recordTempFile.listFiles();
             for (File tempFile : tempFiles) {
@@ -48,7 +48,7 @@ public class VideoFileService {
         if (recordFile.isDirectory()) {
             File[] files = recordFile.listFiles((File dir, String name) -> {
                 File currentFile = new File(dir.getAbsolutePath() + File.separator + name);
-                return  currentFile.isDirectory();
+                return  currentFile.isDirectory() && !name.equals("recordTemp");
             });
             List<File> result = Arrays.asList(files);
             if (sort != null && sort) {
@@ -144,22 +144,17 @@ public class VideoFileService {
  
                 String key = AssistConstants.STREAM_CALL_INFO + userSettings.getId() + "_" + app + "_" + stream;
                 String callId = (String) redisUtil.get(key);
-                if (callId != null) {
-
-                    File newPath = new File(file.getParentFile().getParent() + "_" + callId + File.separator + file.getParentFile().getName());
-                    if (!newPath.exists()) {
-                        newPath.mkdirs();
-                    }
-                    String newName = newPath.getAbsolutePath() + File.separator+  simpleDateFormat.format(startTime) + "-" + simpleDateFormat.format(endTime) + "-" + durationLong + ".mp4";
-                    file.renameTo(new File(newName));
-                }else {
-                    String newName = file.getAbsolutePath().replace(file.getName(),
-                            simpleDateFormat.format(startTime) + "-" + simpleDateFormat.format(endTime) + "-" + durationLong + ".mp4");
  
-                    file.renameTo(new File(newName));
+                String streamNew = (callId == null? stream : stream + "_" + callId);
+                File newPath = new File(userSettings.getRecord() + File.separator +  app + File.separator + streamNew + File.separator + DateUtils.getDateStr(new Date(startTime)));
+                if (!newPath.exists()) {
+                    newPath.mkdirs();
                 }
  
-                logger.debug("[处理文件] {}", file.getName());
+                String newName = newPath.getAbsolutePath() + File.separator+  simpleDateFormat.format(startTime) + "-" + simpleDateFormat.format(endTime) + "-" + durationLong + ".mp4";
+                file.renameTo(new File(newName));
+                System.out.println(file.getAbsolutePath());
+                logger.info("[处理文件] {}", file.getName());
             } catch (IOException e) {
                 logger.warn("文件可能以损坏[{}]", file.getAbsolutePath());
             } catch (ParseException e) {
@@ -339,13 +334,13 @@ public class VideoFileService {
     public String mergeOrCut(String app, String stream, Date startTime, Date endTime, String remoteHost) {
         List<File> filesInTime = this.getFilesInTime(app, stream, startTime, endTime);
         if (filesInTime== null || filesInTime.size() == 0){
-            logger.info("此时间段未未找到视频文件");
+            logger.info("此时间段未未找到视频文件， {}/{} {}->{}", app, stream, DateUtils.getDateTimeStr(startTime), DateUtils.getDateTimeStr(endTime));
             return null;
         }
         String taskId = DigestUtils.md5DigestAsHex(String.valueOf(System.currentTimeMillis()).getBytes());
         logger.info("[录像合并] 开始合并，APP:{}, STREAM: {}, 任务ID：{}", app, stream, taskId);
         String destDir = "recordTemp" + File.separator + taskId + File.separator + app;
-        File recordFile = new File(new File(userSettings.getRecord()).getParentFile().getAbsolutePath()  + File.separator + destDir );
+        File recordFile = new File(userSettings.getRecord() + destDir );
         if (!recordFile.exists()) {
             recordFile.mkdirs();
         }
@@ -374,7 +369,7 @@ public class VideoFileService {
             mergeOrCutTaskInfo.setPercentage("1");
             // 处理文件路径
             String recordFileResultPath = recordFile.getAbsolutePath() + File.separator + stream + ".mp4";
-            Path relativize = Paths.get(userSettings.getRecord()).getParent().relativize(Paths.get(recordFileResultPath));
+            Path relativize = Paths.get(userSettings.getRecord()).relativize(Paths.get(recordFileResultPath));
             try {
                 Files.copy(filesInTime.get(0).toPath(), Paths.get(recordFileResultPath));
             } catch (IOException e) {
@@ -384,8 +379,8 @@ public class VideoFileService {
             }
             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);
             }
             String key = String.format("%S_%S_%S_%S_%S", AssistConstants.MERGEORCUT , userSettings.getId(), mergeOrCutTaskInfo.getApp(), mergeOrCutTaskInfo.getStream(), mergeOrCutTaskInfo.getId());
             redisUtil.set(key, mergeOrCutTaskInfo);
@@ -397,7 +392,7 @@ public class VideoFileService {
                     mergeOrCutTaskInfo.setPercentage("1");
  
                     // 处理文件路径
-                    Path relativize = Paths.get(userSettings.getRecord()).getParent().relativize(Paths.get(result));
+                    Path relativize = Paths.get(userSettings.getRecord()).relativize(Paths.get(result));
                     mergeOrCutTaskInfo.setRecordFile(relativize.toString());
                     if (remoteHost != null) {
                         mergeOrCutTaskInfo.setDownloadFile(remoteHost + "/download.html?url=" + relativize);
 package top.panll.assist.utils;
  
+import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.Locale;
  
 public class DateUtils {
  
+    public static final String PATTERNForDateTime = "yyyy-MM-dd HH:mm:ss";
+
+    public static final String PATTERNForDate = "yyyy-MM-dd";
+
+    public static final String zoneStr = "Asia/Shanghai";
+
+
+
     // 获得某天最大时间 2020-02-19 23:59:59
     public static Date getEndOfDay(Date date) {
         LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(date.getTime()), ZoneId.systemDefault());;
@@ -22,4 +33,14 @@ public class DateUtils {
         return Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
     }
  
+    public static String getDateStr(Date date) {
+        SimpleDateFormat formatter =  new SimpleDateFormat(PATTERNForDate);
+        return formatter.format(date);
+    }
+
+    public static String getDateTimeStr(Date date) {
+        SimpleDateFormat formatter =  new SimpleDateFormat(PATTERNForDateTime);
+        return formatter.format(date);
+    }
+
 }
+spring:
+    # REDIS数据库配置
+    redis:
+        # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
+        host: 127.0.0.1
+        # [必须修改] 端口号
+        port: 6379
+        # [可选] 数据库 DB
+        database: 8
+        # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
+        password:
+        # [可选] 超时时间
+        timeout: 10000
+
+# [必选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
+server:
+    port: 18081
+    # [可选] HTTPS配置， 默认不开启
+    ssl:
+        # [可选] 是否开启HTTPS访问
+        enabled: false
+        # [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名
+        key-store: classpath:xxx.jks
+        # [可选] 证书密码
+        key-password: password
+        # [可选] 证书类型， 默认为jks，根据实际修改
+        key-store-type: JKS
+
+# [根据业务需求配置]
+user-settings:
+    # [可选 ] zlm配置的录像路径，不配置则使用当前目录下的record目录 即： ./record
+    record: /media/lin/Server/ZLMediaKit/dev/ZLMediaKit/release/linux/Debug/www/record
+    # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理, 不配置则不删除
+    recordDay: 7
+    # [可选 ] 录像下载合成临时文件保存时长， 不配置默认取值recordDay（单位： 天）每天晚12点自动对过期文件执行清理
+    # recordTempDay: 7
+    # [必选 ] ffmpeg路径
+    ffmpeg: /usr/bin/ffmpeg
+    # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息
+    ffprobe: /usr/bin/ffprobe
+    # [可选 ] 限制 ffmpeg 合并文件使用的线程数，间接限制cpu使用率， 默认2 限制到50%
+    threads: 2
+
+swagger-ui:
+
+# [可选] 日志配置, 一般不需要改
+logging:
+    file:
+        name: logs/wvp.log
+        max-history: 30
+        max-size: 10MB
+        total-size-cap: 300MB
+    level:
+        root: WARN
+        top:
+            panll:
+                assist: info
 \ No newline at end of file
@@ -28,7 +28,7 @@ server:
  
 # [根据业务需求配置]
 userSettings:
-    # [必选 ] zlm配置的录像路径
+    # [可选 ] zlm配置的录像路径，
     record: /media/lin/Server/ZLMediaKit/dev/ZLMediaKit/release/linux/Debug/www/record
     # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理
     recordDay: 7
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>下载</title>
+</head>
+<body>
+<a id="download" download></a>
+<script>
+    (function () {
+        let searchParams = new URLSearchParams(location.search);
+        var download = document.getElementById("download");
+        download.setAttribute("href", searchParams.get("url"))
+        download.click()
+        setTimeout(() => {
+            window.location.href = "about:blank";
+            window.close();
+        }, 200)
+    })();
+
+</script>
+</body>
+</html>
 \ No newline at end of file