From b0cc14051c84af562cee794cef0f0a9551e23b9c Mon Sep 17 00:00:00 2001
From: chenlw <brokge@qq.com>
Date: 星期四, 16 十二月 2021 12:49:12 +0800
Subject: [PATCH] 1.修复录像合并文件下载链接问题；2.时间滑道，endTime超出24小时问题。3.录像文件格式命名 startTime~endTime~duration.mp4

---
 .gitignore |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c96aaf..51ebf9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
-
+src/main/resources/application-*.yml
 # Package Files #
 #*.jar
 *.war
@@ -18,7 +18,7 @@
 *.zip
 *.tar.gz
 *.rar
-
+*.iml
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /.idea/*
@@ -26,3 +26,4 @@
 /.idea/
 /target/
 
+/src/main/resources/static/

--
Gitblit v1.8.0