From 33bbe5c09c1dae0565b43873a72118a10fd8f272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Fri, 4 Nov 2022 12:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=9B=9E=E5=8E=9F=E6=9C=89=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/maku/framework/common/excel/DateConverter.java    |  2 ++
 maku-server/src/main/resources/application-dev.yml             | 10 +++++-----
 pom.xml                                                        |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/maku-framework/src/main/java/net/maku/framework/common/excel/DateConverter.java b/maku-framework/src/main/java/net/maku/framework/common/excel/DateConverter.java
index 40ab16b..91e6780 100644
--- a/maku-framework/src/main/java/net/maku/framework/common/excel/DateConverter.java
+++ b/maku-framework/src/main/java/net/maku/framework/common/excel/DateConverter.java
@@ -11,6 +11,8 @@ import net.maku.framework.common.utils.DateUtils;
 import java.util.Date;
 
 /**
+ * 日期转换
+ *
  * @author eden
  */
 public class DateConverter implements Converter<Date> {
diff --git a/maku-server/src/main/resources/application-dev.yml b/maku-server/src/main/resources/application-dev.yml
index 2280142..36432cc 100644
--- a/maku-server/src/main/resources/application-dev.yml
+++ b/maku-server/src/main/resources/application-dev.yml
@@ -1,15 +1,15 @@
 spring:
   redis:
-    database: 10
+    database: 1
     host: localhost
-    port: 16379
-    password: 123456
+    port: 6379
+    #password:
     #timeout: 6000ms  # 连接超时时长（毫秒）
   datasource:
     # MySQL8
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:13306/maku_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-    username: root
+    url: jdbc:mysql://localhost:3306/maku_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+    username: maku
     password: 123456
     # 达梦
     #    driver-class-name: dm.jdbc.driver.DmDriver
diff --git a/pom.xml b/pom.xml
index 9facb08..1cc0f7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
         <skipTests>true</skipTests>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>11</java.version>
+        <java.version>1.8</java.version>
         <mybatisplus.version>3.5.2</mybatisplus.version>
         <dameng.version>8.1.2.79</dameng.version>
         <knife4j.version>3.0.3</knife4j.version>