Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

whyclxw

7 天以前 a7e0682010b832c504f9ff7129dae36316f2f946

 src/main/java/com/whyc/util/ThreadLocalUtil.java

@@ -8,6 +8,7 @@

    public static String TIME_YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
    public static String TIME_YYYY_MM_DD = "yyyy-MM-dd";
    public static String TIME_YYYY_MM = "yyyy-MM";
    public static String TIME_YYYY_MM_DD_HH_MM_SS_UNION = "yyyyMMddHHmmss";
    public static String TIME_YYYY_MM_DD_HH_MM_SS_UNION2 = "yyyy-MM-dd_HH_mm_ss";

@@ -52,6 +53,12 @@
        return timeStr;
    }

    /**
     *
     * @param timeFormat
     * @param date
     * @return
     */
    public static String format(String timeFormat,Date date) {
        ThreadLocal<SimpleDateFormat> formatThreadLocal = ThreadLocal.withInitial(() -> new SimpleDateFormat(timeFormat));
        SimpleDateFormat format = formatThreadLocal.get();