wangli/axzo-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除 joda-time 依赖

Browse Source
This commit is contained in:
zhaoyong 2021-10-20 17:01:43 +08:00
parent ca52fed6cd
commit 20500028e0
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common-common/pom.xml
View File

@ -6,7 +6,7 @@
<groupId>cn.axzo.framework</groupId>
<artifactId>common-common</artifactId>
<version>1.0.11</version>
<version>1.0.12</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -22,7 +22,6 @@
<mybatis-plus.version>3.3.2</mybatis-plus.version>
<lombok.version>1.18.18</lombok.version>
<fastjson.version>1.2.47</fastjson.version>
<joda-time.version>2.10.6</joda-time.version>
<hutool-all.version>5.5.7</hutool-all.version>
<jackson-databind.version>2.10.2</jackson-databind.version>
<apm-toolkit-trace.version>6.5.0</apm-toolkit-trace.version>
@ -105,12 +104,6 @@
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>

18
common-common/src/main/java/cn/azxo/framework/common/utils/DateUtils.java
View File

@ -1,9 +1,9 @@
package cn.azxo.framework.common.utils;
import org.joda.time.DateTime;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
/**
@ -23,9 +23,9 @@ public abstract class DateUtils {
* @return
*/
public static Date plusHour(int hour) {
DateTime dateTime = DateTime.now();
DateTime afterPlus = dateTime.plusHours(hour);
return afterPlus.toDate();
LocalDateTime ldt = LocalDateTime.now();
LocalDateTime afterPlus = ldt.plusHours(hour);
return Date.from(afterPlus.atZone(ZoneId.systemDefault()).toInstant());
}
/**
@ -35,9 +35,11 @@ public abstract class DateUtils {
* @return
*/
public static Date plusHour(Date date, int hour) {
DateTime dateTime = new DateTime(date);
DateTime afterPlus = dateTime.plusHours(hour);
return afterPlus.toDate();
LocalDateTime ldt = date.toInstant()
.atZone( ZoneId.systemDefault() )
.toLocalDateTime();
LocalDateTime afterPlus = ldt.plusHours(hour);
return Date.from(afterPlus.atZone(ZoneId.systemDefault()).toInstant());
}
public static Date parseY14S(String pattern){