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 { 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 @@ true UTF-8 UTF-8 - 11 + 1.8 3.5.2 8.1.2.79 3.0.3