From cd40466377499d3b3e85558695fd59564131df26 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 2 Sep 2022 15:05:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{天泽数据大平台-4.pdb => 天泽数据大平台.pdb}    | 0
 .../{天泽数据大平台-4.pdm => 天泽数据大平台.pdm}    | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename data_base_design/{天泽数据大平台-4.pdb => 天泽数据大平台.pdb} (100%)
 rename data_base_design/{天泽数据大平台-4.pdm => 天泽数据大平台.pdm} (100%)

diff --git a/data_base_design/天泽数据大平台-4.pdb b/data_base_design/天泽数据大平台.pdb
similarity index 100%
rename from data_base_design/天泽数据大平台-4.pdb
rename to data_base_design/天泽数据大平台.pdb
diff --git a/data_base_design/天泽数据大平台-4.pdm b/data_base_design/天泽数据大平台.pdm
similarity index 100%
rename from data_base_design/天泽数据大平台-4.pdm
rename to data_base_design/天泽数据大平台.pdm

From f8724f97447475740cb424098d12d98a3bf3cd44 Mon Sep 17 00:00:00 2001
From: jiangdalu <993797447@qq.com>
Date: Sat, 3 Sep 2022 00:07:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0mac=E6=9C=AC=E5=9C=B0=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E5=BF=BD=E7=95=A5=E6=96=87=E4=BB=B6=E3=80=81=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9A=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                     | 2 ++
 web/src/main/java/cn/jlw/util/ConvertM3U8.java | 3 +++
 web/src/main/resources/application.properties  | 1 +
 3 files changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 944fbb92..82559987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,5 @@ rebel.xml
 
 
 /backup/
+/web/src/main/resources/application-dev.properties
+/lib/rt.jar
diff --git a/web/src/main/java/cn/jlw/util/ConvertM3U8.java b/web/src/main/java/cn/jlw/util/ConvertM3U8.java
index ec315c7a..7720bdca 100644
--- a/web/src/main/java/cn/jlw/util/ConvertM3U8.java
+++ b/web/src/main/java/cn/jlw/util/ConvertM3U8.java
@@ -34,6 +34,9 @@ public class ConvertM3U8 {
 
         try {
             File files = new File(p+"\\filesystem\\temp\\");
+            if (!files.exists()) {
+                files.mkdirs();
+            }
             File file[] = files.listFiles();
             for(int i=0;i<file.length;i++){
                 if(file[i].isDirectory()){
diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties
index 294c97f5..fe7b5df8 100644
--- a/web/src/main/resources/application.properties
+++ b/web/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+spring.profiles.active=dev
 spring.datasource.baseDataSource.url=jdbc:mysql://localhost:3306/tzcj?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true
 spring.datasource.baseDataSource.username=root
 spring.datasource.baseDataSource.password=root