改回原有配置
This commit is contained in:
parent
e02950a1dc
commit
33bbe5c09c
|
@ -11,6 +11,8 @@ import net.maku.framework.common.utils.DateUtils;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* 日期转换
|
||||||
|
*
|
||||||
* @author eden
|
* @author eden
|
||||||
*/
|
*/
|
||||||
public class DateConverter implements Converter<Date> {
|
public class DateConverter implements Converter<Date> {
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
spring:
|
spring:
|
||||||
redis:
|
redis:
|
||||||
database: 10
|
database: 1
|
||||||
host: localhost
|
host: localhost
|
||||||
port: 16379
|
port: 6379
|
||||||
password: 123456
|
#password:
|
||||||
#timeout: 6000ms # 连接超时时长(毫秒)
|
#timeout: 6000ms # 连接超时时长(毫秒)
|
||||||
datasource:
|
datasource:
|
||||||
# MySQL8
|
# MySQL8
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
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
|
url: jdbc:mysql://localhost:3306/maku_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
||||||
username: root
|
username: maku
|
||||||
password: 123456
|
password: 123456
|
||||||
# 达梦
|
# 达梦
|
||||||
# driver-class-name: dm.jdbc.driver.DmDriver
|
# driver-class-name: dm.jdbc.driver.DmDriver
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -30,7 +30,7 @@
|
||||||
<skipTests>true</skipTests>
|
<skipTests>true</skipTests>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<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>
|
<mybatisplus.version>3.5.2</mybatisplus.version>
|
||||||
<dameng.version>8.1.2.79</dameng.version>
|
<dameng.version>8.1.2.79</dameng.version>
|
||||||
<knife4j.version>3.0.3</knife4j.version>
|
<knife4j.version>3.0.3</knife4j.version>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user