Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 30806108 8c1e6a85
Showing 2 changed files with 18 additions and 8 deletions
fw-valhalla-common/src/main/java/cn/fw/valhalla/common/utils/DateUtil.java
fw-valhalla-common/src/main/java/cn/fw/valhalla/common/utils/QRCodeKit.java
@@ -307,7 +307,7 @@ public final class DateUtil {
      * 获取时间字符串
      *
      * @param date 需要转换格式的日期
-     * @return 返回短时间字符串格式 yyyy-MM-dd HH:mm:ss
+     * @return 返回短时间字符串格式 yyyy-MM
      */
     public static String getMonthString(Date date) {
         if (date == null) {
@@ -318,6 +318,21 @@ public final class DateUtil {
     }
  
     /**
+     * 获取时间字符串
+     *
+     * @param date    需要转换格式的日期
+     * @param pattern 时间字符串格式
+     * @return 返回时间字符串
+     */
+    public static String getFormatString(Date date, String pattern) {
+        if (date == null) {
+            return "";
+        }
+        SimpleDateFormat format = new SimpleDateFormat(pattern);
+        return format.format(date);
+    }
+
+    /**
      * 获取下月月初时间
      */
     public static Date getNextMonthStartTime() {
@@ -557,6 +572,7 @@ public final class DateUtil {
         }
         System.out.println(getEndInTime(getMonthEndDay()));
         System.out.println(expired);
-        System.out.println(startDate(DateUtil.getMonthFirstDay(date)));;
+        System.out.println(startDate(DateUtil.getMonthFirstDay(date)));
+        ;
     }
 }
 package cn.fw.valhalla.common.utils;
  
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Base64OutputStream;
@@ -27,11 +26,6 @@ public class QRCodeKit {
     private static final String WECHAT_GETWXACODE_URL = "https://api.weixin.qq.com/wxa/getwxacode?access_token={0}";
  
  
-
-
-
-
-
     /**
      * Return base64 for image
      *