From e1ed3078060c24973a1796253882f189cad4c949 Mon Sep 17 00:00:00 2001
From: MAC <1162714483@qq.com>
Date: Tue, 5 Apr 2022 12:38:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=BA=93):=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=B9h2=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               | 10 ++--------
 src/main/resources/config/application-dev.properties  |  9 ---------
 src/main/resources/config/application-prod.properties |  7 -------
 src/main/resources/config/application.properties      |  9 ++++++++-
 4 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 src/main/resources/config/application-dev.properties
 delete mode 100644 src/main/resources/config/application-prod.properties

diff --git a/pom.xml b/pom.xml
index 9d189c1..3a8be54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.qiwenshare</groupId>
         <artifactId>qiwenshare</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7</version>
     </parent>
 
     <artifactId>qiwen-file</artifactId>
-    <version>1.1.6-SNAPSHOT</version>
+    <version>1.1.7-SNAPSHOT</version>
     <name>qiwen-file</name>
     <description>pan.qiwenshare.com</description>
     <packaging>jar</packaging>
@@ -91,12 +91,6 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
 
         <dependency>
             <groupId>com.qiwenshare</groupId>
diff --git a/src/main/resources/config/application-dev.properties b/src/main/resources/config/application-dev.properties
deleted file mode 100644
index 48e44e1..0000000
--- a/src/main/resources/config/application-dev.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#jdbc连接-h2数据库
-spring.datasource.driverClassName=org.h2.Driver
-spring.datasource.url = jdbc:h2:file:C:/ProgramData/QiwenNetDisk/file;MODE=MYSQL;DATABASE_TO_LOWER=TRUE
-spring.datasource.username=sa
-spring.datasource.password=
-spring.h2.console.enabled=true
-
-
diff --git a/src/main/resources/config/application-prod.properties b/src/main/resources/config/application-prod.properties
deleted file mode 100644
index ec1b460..0000000
--- a/src/main/resources/config/application-prod.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#jdbc连接-mysql数据库
-spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://localhost:3306/file?createDatabaseIfNotExist=true&serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
-spring.datasource.username=root
-spring.datasource.password=ma123456
-
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
index c92e52b..4e326b0 100644
--- a/src/main/resources/config/application.properties
+++ b/src/main/resources/config/application.properties
@@ -15,10 +15,16 @@ logging.level.root=info
 
 #jpa配置 create/update
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
 spring.jpa.show-sql=true
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 
+#jdbc连接-mysql数据库
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+spring.datasource.url = jdbc:mysql://localhost:3306/file?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true
+spring.datasource.username=root
+spring.datasource.password=ma123456
+
 #静态资源指定
 spring.mvc.static-path-pattern=/**
 spring.web.resources.static-locations=classpath:/static
@@ -53,6 +59,7 @@ ufop.aliyun.oss.access-key-id=
 ufop.aliyun.oss.access-key-secret=
 ufop.aliyun.oss.bucket-name=
 
+
 #FastDFS配置
 #读取时间
 fdfs.so-timeout=15000