From 9f2f515a4e035af0bf798e9fcad0bd0662e96077 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Thu, 18 Mar 2021 12:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ink/wgink/util/date/DateUtil.java    | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/basic-util/src/main/java/ink/wgink/util/date/DateUtil.java b/basic-util/src/main/java/ink/wgink/util/date/DateUtil.java
index 1de6bc91..6061ac4d 100644
--- a/basic-util/src/main/java/ink/wgink/util/date/DateUtil.java
+++ b/basic-util/src/main/java/ink/wgink/util/date/DateUtil.java
@@ -236,9 +236,10 @@ public class DateUtil {
      */
     public static String getAfterDayDate(String days) {
         int daysInt = Integer.parseInt(days);
-
-        Calendar canlendar = Calendar.getInstance(); // java.util包
-        canlendar.add(Calendar.DATE, daysInt); // 日期减 如果不够减会将月变动
+        // java.util包
+        Calendar canlendar = Calendar.getInstance();
+        // 日期减 如果不够减会将月变动
+        canlendar.add(Calendar.DATE, daysInt);
         Date date = canlendar.getTime();
 
         SimpleDateFormat sdfd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -255,8 +256,10 @@ public class DateUtil {
      */
     public static String getAfterDayWeek(String days) {
         int daysInt = Integer.parseInt(days);
-        Calendar canlendar = Calendar.getInstance(); // java.util包
-        canlendar.add(Calendar.DATE, daysInt); // 日期减 如果不够减会将月变动
+        // java.util包
+        Calendar canlendar = Calendar.getInstance();
+        // 日期减 如果不够减会将月变动
+        canlendar.add(Calendar.DATE, daysInt);
         Date date = canlendar.getTime();
         SimpleDateFormat sdf = new SimpleDateFormat("E");
         String dateStr = sdf.format(date);
@@ -335,7 +338,6 @@ public class DateUtil {
     /**
      * 获取本月开始日期
      *
-     * @param pattern
      * @return
      */
     public static Date monthStartDate() {
@@ -370,7 +372,14 @@ public class DateUtil {
      */
     public static String formatDate(long parseLong, String format) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
-        return simpleDateFormat.format(new Date(parseLong));
+        String date;
+        try {
+            date = simpleDateFormat.format(new Date(parseLong));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        return date;
     }
 
     /**