[test] AES单元测试

DateUtil 标准化日期时间的转换函数

README.md

@@ -1,13 +1,13 @@
-yexuejc-base 基于jdk8常用工具包
+yexuejc-base 基于jdk11常用工具包
 ----------------------
 源码地址:<br>
 github:https://github.com/yexuejc/yexuejc-base
 gitee:https://gitee.com/jzsw-it/yexuejc-base
 
 ### 说明
-1. 支持环境：java8（1.5.0开始支持java11，请使用`x.x.x-jre11`版本）
+1. 支持环境：java11（1.5.0开始支持java11，请使用`1.5.x-jre11`版本）
 2. 该工具包基于springboot提取，按理说适用于所有java工程
-3. 从`1.5.0`开始，版本分为`1.5.0-jre8`和`1.5.0-jre11`，分别对于jre8和jre11使用
+7. 从`1.5.0`开始，版本分为`1.5.0-jre8`和`1.5.0-jre11`，分别对于jre8和jre11使用（后续逐渐放弃jre8）
 
 ### 使用
 
@@ -17,10 +17,11 @@ pom.xml
     <dependency>
         <groupId>top.yexuejc</groupId>
         <artifactId>yexuejc-base</artifactId>
-        <version>1.5.2-jre8</version>
+        <version>1.5.2-jre11</version>
     </dependency>
 </dependencies>
 ```
+
 ### 工具文档
 [Wiki](WIKI.md)
 

UPDATE.md

@@ -1,35 +1,41 @@
 yexuejc-base 更新记录
 ------------------
-#### version ：1.5.3-jre8
+
+#### version ：1.5.3-jre11
 **time： ** <br/>
-**branch：** jre8    <br/>
+**branch：** jre11    <br/>
 **update：**     <br/>
 1. [FileUtil.java](src/main/java/com/yexuejc/base/util/FileUtil.java)增加读取大文件自定义方法和单纯读取方法
-2. 增加AES加解密: [com.yexuejc.base.encrypt.AES](src/main/java/com/yexuejc/base/encrypt/AES.java)
+2. JsonUtil 增加objToMap；优化obj2Json
+3. DateUtil 标准化日期时间的转换函数
+4. [AES.java](src/main/java/com/yexuejc/base/encrypt/AES.java) 兼容ECB(虽然不再建议利用)
 ---
 
-#### version ：1.5.2-jre8
+#### version ：1.5.2-jre11
 **time：2024-4-7 14:34:33** <br/>
-**branch：** jre8    <br/>
+**branch：** jre11    <br/>
 **update：**     <br/>
 1. 升级相关依赖
 2. 依赖工具读取文件[FileInput.java](src/main/java/com/yexuejc/base/file/FileInput.java)从[FileUtil.java](src/main/java/com/yexuejc/base/util/FileUtil.java)中提取出来
 3. 优化[FileUtil.java](src/main/java/com/yexuejc/base/util/FileUtil.java)
 4. 优化[JwtUtil.java](src/main/java/com/yexuejc/base/util/JwtUtil.java)
-
 ---
 
-#### version ：1.5.1-jre8
+
+#### version ：1.5.1-jre11
 **time：2023-6-8 16:02:56** <br/>
 **branch：** jre11    <br/>
 **update：**     <br/>
 1. FileUtil 增加读取csv文件（分页读取）
-   提供读取IO流方法合集
+            提供读取IO流方法合集
 2. 增加AES加解密
 3. 增加文件压缩ZipUtil
 4. DateUtil，DateTimeUtil 时间操作工具优化
 5. JsonUtil [feat] 增加json化时对LocalDateTime,LocalDate,Timestamp时间的优化,增加特殊场景序列化反序列化
 
+
+
+---
 #### version ：1.5.0-jre8
 **time：2022-5-9 13:37:31** <br/>
 **branch：** master    <br/>

pom.xml

@@ -6,11 +6,11 @@
 
     <groupId>top.yexuejc</groupId>
     <artifactId>yexuejc-base</artifactId>
-    <version>1.5.2-jre8</version>
+    <version>1.5.2-jre11</version>
 
     <name>yexuejc-base</name>
     <url>https://github.com/yexuejc/yexuejc-base</url>
-    <description>Common toolkits based on JDK8 packaging</description>
+    <description>Common toolkits based on JDK11+ packaging</description>
 
     <licenses>
         <license>
@@ -44,7 +44,7 @@
         <repos.jitpack.url>https://jitpack.io</repos.jitpack.url>
         <jjwt.version>0.12.5</jjwt.version>
         <maven.compiler.verbose>true</maven.compiler.verbose>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <validation-api.version>3.0.2</validation-api.version>
 
         <commons-io.version>2.11.0</commons-io.version>
@@ -155,8 +155,8 @@
                 <version>3.13.0</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <!-- 打包源码 -->

src/main/java/com/yexuejc/base/converter/LocalDateTimeSerializer.java

@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 public class LocalDateTimeSerializer extends JsonSerializer<LocalDateTime> {
     @Override
     public void serialize(LocalDateTime localDateTime, JsonGenerator jsonGenerator,
-            SerializerProvider serializerProvider) throws IOException {
+                          SerializerProvider serializerProvider) throws IOException {
         jsonGenerator.writeString(localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
     }
 }

src/main/java/com/yexuejc/base/encrypt/AES.java

@@ -1,11 +1,11 @@
 package com.yexuejc.base.encrypt;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 /**
  * AES加解密
@@ -94,7 +94,7 @@ public class AES {
             System.arraycopy(dataBytes, 0, plaintext, 0, dataBytes.length);
             SecretKeySpec keyspec = new SecretKeySpec(key.getBytes(charset), AES_ALGORITHM);
             IvParameterSpec ivspec = null;
-            if (!algorithm.name.contains("ECB")) {
+            if(!algorithm.name.contains("ECB")){
                 ivspec = new IvParameterSpec(iv.getBytes(charset));
             }
             cipher.init(Cipher.ENCRYPT_MODE, keyspec, ivspec);
@@ -119,7 +119,7 @@ public class AES {
             Cipher cipher = Cipher.getInstance(algorithm.name);
             SecretKeySpec keyspec = new SecretKeySpec(key.getBytes(charset), AES_ALGORITHM);
             IvParameterSpec ivspec = null;
-            if (!algorithm.name.contains("ECB")) {
+            if(!algorithm.name.contains("ECB")){
                 ivspec = new IvParameterSpec(iv.getBytes(charset));
             }
             cipher.init(Cipher.DECRYPT_MODE, keyspec, ivspec);

src/main/java/com/yexuejc/base/file/FileInput.java

@@ -0,0 +1,254 @@
+package com.yexuejc.base.file;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.nio.charset.Charset;
+import java.util.Scanner;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.IOUtils;
+
+/**
+ * 提供读取IO流方法合集
+ * <p>读取速度快慢顺序：</p>
+ * 1. {@link #read4Buffer(InputStream, Charset)} <br>
+ * 2. {@link #read4IOUtilsCopy(InputStream, Charset)} <br>
+ * 3. {@link #read4ByteStreams(InputStream, Charset)} <br>
+ * 4. {@link #read4Byte(InputStream, Charset)} <br>
+ * 5. {@link #read4StringBuilder(InputStream, Charset)} <br>
+ * 6. {@link #read4BufferedReaderParallel(InputStream, Charset, String)}<br>
+ * 7. {@link #read4BufferedReader(InputStream, Charset, String)}<br>
+ * 8. {@link #read4ScannerA(InputStream)}<br>
+ * 9. {@link #read4BufferIO(InputStream, Charset)}<br>
+ * 10. {@link #read4IOUtils(InputStream, Charset)}<br>
+ * 11. {@link #read4ScannerZ(InputStream)}<br>
+ * 12. {@link #read4CharStreams(InputStream, Charset)}<br>
+ */
+public class FileInput {
+    /**
+     * 读取IO流内容：byte方式
+     *
+     * @param inputStream
+     * @param charset     编码：默认 {@link Charset#defaultCharset()}
+     * @return
+     * @throws IOException
+     */
+    public static String read4Byte(InputStream inputStream, Charset charset) throws IOException {
+        byte[] bytes = new byte[inputStream.available()];
+        inputStream.read(bytes);
+        return new String(bytes, charset == null ? Charset.defaultCharset() : charset);
+    }
+
+    /**
+     * 读取IO流内容：BufferedReader方式
+     *
+     * @param inputStream
+     * @param charset       编码：默认跟随系统 {@link Charset#defaultCharset()}
+     * @param lineSeparator 换行方式：默认跟随系统 {@link System#lineSeparator()}
+     * @return
+     */
+    public static String read4BufferedReader(InputStream inputStream, Charset charset, String lineSeparator) {
+        return new BufferedReader(
+                new InputStreamReader(inputStream, charset == null ? Charset.defaultCharset() : charset)
+        ).lines().collect(Collectors.joining(lineSeparator == null ? System.lineSeparator() : lineSeparator));
+    }
+
+    /**
+     * 读取IO流内容：BufferedReader 并行方式
+     *
+     * @param inputStream
+     * @param charset       编码：默认跟随系统 {@link Charset#defaultCharset()}
+     * @param lineSeparator 换行方式：默认跟随系统 {@link System#lineSeparator()}
+     * @return
+     */
+    public static String read4BufferedReaderParallel(InputStream inputStream, Charset charset, String lineSeparator) {
+        return new BufferedReader(
+                new InputStreamReader(inputStream, charset == null ? Charset.defaultCharset() : charset)
+        ).lines().parallel()
+                .collect(Collectors.joining(lineSeparator == null ? System.lineSeparator() : lineSeparator));
+    }
+
+    /**
+     * 读取IO流内容：Scanner A方式
+     *
+     * @param inputStream
+     * @return
+     */
+    public static String read4ScannerA(InputStream inputStream) {
+        Scanner s = new Scanner(inputStream).useDelimiter("\\A");
+        String str = s.hasNext() ? s.next() : "";
+        return str;
+    }
+
+    /**
+     * 读取IO流内容：Scanner Z方式
+     *
+     * @param inputStream
+     * @return
+     */
+    public static String read4ScannerZ(InputStream inputStream) {
+        return new Scanner(inputStream).useDelimiter("\\Z").next();
+    }
+
+    /**
+     * 读取IO流内容：StringBuilder方式
+     *
+     * @param inputStream
+     * @param charset     编码：默认跟随系统 {@link Charset#defaultCharset()}
+     * @return
+     */
+    public static String read4StringBuilder(InputStream inputStream, Charset charset) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        String line;
+        BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, charset == null ? Charset.defaultCharset() : charset));
+        while ((line = br.readLine()) != null) {
+            sb.append(line);
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 读取IO流内容：ByteArrayOutputStream方式
+     *
+     * @param inputStream
+     * @param charset     编码：默认跟随系统 {@link Charset#defaultCharset()}
+     * @return
+     */
+    public static String read4Buffer(InputStream inputStream, Charset charset) throws IOException {
+        ByteArrayOutputStream result = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int length;
+        while ((length = inputStream.read(buffer)) != -1) {
+            result.write(buffer, 0, length);
+        }
+        return result.toString(charset == null ? Charset.defaultCharset().name() : charset.name());
+    }
+
+    /**
+     * 读取IO流内容：BufferedInputStream+ByteArrayOutputStream方式
+     *
+     * @param inputStream
+     * @param charset     编码：默认跟随系统 {@link Charset#defaultCharset()}
+     * @return
+     */
+    public static String read4BufferIO(InputStream inputStream, Charset charset) throws IOException {
+        BufferedInputStream bis = new BufferedInputStream(inputStream);
+        ByteArrayOutputStream buf = new ByteArrayOutputStream();
+        int result = bis.read();
+        while (result != -1) {
+            buf.write((byte) result);
+            result = bis.read();
+        }
+        return buf.toString(charset == null ? Charset.defaultCharset().name() : charset.name());
+    }
+
+    /**
+     * 读取IO流内容： 依赖于commons-io:commons-io {@link IOUtils#copy(Reader, OutputStream, Charset)}
+     *
+     * @param inputStream
+     * @param charset     编码：默认跟随系统 {@link Charset#defaultCharset()}
+     * @return
+     * @throws IOException
+     */
+    public static String read4IOUtilsCopy(InputStream inputStream, Charset charset) throws IOException {
+        StringWriter writer = new StringWriter();
+        IOUtils.copy(inputStream, writer, charset == null ? Charset.defaultCharset() : charset);
+        return writer.toString();
+    }
+
+    /**
+     * 读取IO流内容： 依赖于commons-io:commons-io {@link IOUtils#toString(InputStream, Charset)}
+     *
+     * @param inputStream
+     * @param charset     编码：默认跟随系统 {@link Charset#defaultCharset()}
+     * @return
+     * @throws IOException
+     */
+    public static String read4IOUtils(InputStream inputStream, Charset charset) throws IOException {
+        return IOUtils.toString(inputStream, charset == null ? Charset.defaultCharset() : charset);
+    }
+
+    /**
+     * 读取IO流内容： 依赖于com.google.guava:guava {@link com.google.common.io.CharStreams#toString(Readable)}
+     *
+     * @param inputStream
+     * @param charset     编码：默认跟随系统 {@link Charset#defaultCharset()}
+     * @return
+     * @throws IOException
+     */
+    public static String read4CharStreams(InputStream inputStream, Charset charset) throws IOException, ClassNotFoundException {
+        try {
+            Class<?> charStreamsClass = Class.forName("com.google.common.io.CharStreams");
+            Method toStringMethod = charStreamsClass.getMethod("toString", InputStreamReader.class);
+            return (String) toStringMethod.invoke(null, new InputStreamReader(inputStream, charset == null ? Charset.defaultCharset() : charset));
+        } catch (ClassNotFoundException e) {
+            throw new ClassNotFoundException("缺少依赖，请引入Guava");
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException("com.google.common.io.CharStreams.toString调用失败，请检查Guava版本", e);
+        }
+//        return com.google.common.io.CharStreams.toString(new InputStreamReader(inputStream, charset == null ? Charset.defaultCharset() : charset));
+    }
+
+    /**
+     * 读取IO流内容： 依赖于com.google.guava:guava {@link com.google.common.io.ByteStreams#toByteArray(InputStream)}
+     *
+     * @param inputStream
+     * @param charset     编码：默认跟随系统 {@link Charset#defaultCharset()}
+     * @return
+     * @throws IOException
+     */
+    public static String read4ByteStreams(InputStream inputStream, Charset charset) throws IOException, ClassNotFoundException {
+        try {
+            Class<?> charStreamsClass = Class.forName("com.google.common.io.ByteStreams");
+            Method toStringMethod = charStreamsClass.getMethod("toByteArray", InputStreamReader.class);
+            return (String) toStringMethod.invoke(null, new InputStreamReader(inputStream, charset == null ? Charset.defaultCharset() : charset));
+        } catch (ClassNotFoundException e) {
+            throw new ClassNotFoundException("缺少依赖，请引入Guava");
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException("com.google.common.io.ByteStreams.toByteArray调用失败，请检查Guava版本", e);
+        }
+//        return new String(com.google.common.io.ByteStreams.toByteArray(inputStream), charset == null ? Charset.defaultCharset() : charset);
+    }
+}
+
+
+    /*public static void main(String[] args) {
+        long size = FileUtil.size(new File("E:\\OS\\deepin-15.6-amd64\\DeepinCloudPrintServerInstaller_1.0.0.1.exe"));
+        System.out.println(size);
+        System.out.println(1024 * 1024 * 5);
+        if (size > 1024 * 1024 * 5) {
+            System.out.println("文件最大5M");
+            return;
+        }
+
+        long s1 = fileSize(new File("E:\\OS\\cn_windows_10_consumer_editions_version_1803_updated_march_2018_x64_dvd_12063766.iso"));
+        System.out.println(s1);
+        long s2 = fileSize4Stream(new File("E:\\OS\\cn_windows_10_consumer_editions_version_1803_updated_march_2018_x64_dvd_12063766.iso"));
+        System.out.println(s2);
+
+        String s1 = base64(new File("C:\\Users\\Administrator\\Desktop\\a.html"));
+        System.out.println(s1);
+
+        String s = sha1(new File("C:\\Users\\Administrator\\Desktop\\a.html"));
+        String s2 = sha1ByBigFile(new File("C:\\Users\\Administrator\\Desktop\\a.html"));
+        System.out.println(s);
+        System.out.println(s2);
+
+
+        String md5 = md5(new File("C:\\Users\\Administrator\\Desktop\\a.html"));
+        String md52 = md5ByBigFile(new File("C:\\Users\\Administrator\\Desktop\\a.html"));
+        System.out.println(md5);
+        System.out.println(md52);
+
+
+        String crc32 = crc32(new File("C:\\Users\\Administrator\\Desktop\\a.html"));
+        System.out.println(crc32);
+    }*/

src/main/java/com/yexuejc/base/pojo/CreateZipFileBean.java

@@ -0,0 +1,90 @@
+package com.yexuejc.base.pojo;
+
+import java.util.List;
+
+/**
+ * 压缩文件的参数设定
+ *
+ * @author maxf
+ * @class-name CreateZipFileBean
+ * @description 压缩文件参考 {@link com.yexuejc.base.util.ZipUtil}
+ * @date 2022/11/11 10:30
+ */
+public class CreateZipFileBean {
+    /**
+     * 压缩的源文件列表，为空表示压缩整个目录
+     */
+    private List<String> sourceFileName;
+    /**
+     * 当压缩文件夹时，需要排除的文件。压缩文件时（该参数无效）
+     */
+    private List<String> excludeFileName;
+    /**
+     * 压缩源文件的目录
+     */
+    private String sourcePath;
+    /**
+     * 生成压缩文件路径（全路径+压缩文件名）
+     */
+    private String zipFile;
+    /**
+     * 加密密码
+     */
+    private String encryptPwd;
+
+    private String writeCharsetName = "UTF-8";
+
+    public List<String> getSourceFileName() {
+        return sourceFileName;
+    }
+
+    public String getEncryptPwd() {
+        return encryptPwd;
+    }
+
+    public CreateZipFileBean setEncryptPwd(String encryptPwd) {
+        this.encryptPwd = encryptPwd;
+        return this;
+    }
+
+    public CreateZipFileBean setSourceFileName(List<String> sourceFileName) {
+        this.sourceFileName = sourceFileName;
+        return this;
+    }
+
+    public String getSourcePath() {
+        return sourcePath;
+    }
+
+    public CreateZipFileBean setSourcePath(String sourcePath) {
+        this.sourcePath = sourcePath;
+        return this;
+    }
+
+    public String getZipFile() {
+        return zipFile;
+    }
+
+    public CreateZipFileBean setZipFile(String zipFile) {
+        this.zipFile = zipFile;
+        return this;
+    }
+
+    public String getWriteCharsetName() {
+        return writeCharsetName;
+    }
+
+    public CreateZipFileBean setWriteCharsetName(String writeCharsetName) {
+        this.writeCharsetName = writeCharsetName;
+        return this;
+    }
+
+    public List<String> getExcludeFileName() {
+        return excludeFileName;
+    }
+
+    public CreateZipFileBean setExcludeFileName(List<String> excludeFileName) {
+        this.excludeFileName = excludeFileName;
+        return this;
+    }
+}

src/main/java/com/yexuejc/base/util/DateUtil.java

@@ -80,57 +80,122 @@ public class DateUtil {
     /**
      * 日期字符串转date
      *
-     * @param dateStr
-     * @return Date
+     * @param dateStr 格式：yyyy-MM-dd
+     * @return Date 日期
      * @throws ParseException
+     * @deprecated 替代参考 {@link #parseDate(String, String)}
+     * @see 1.5.2
      */
+    @Deprecated
     public static Date str2date(String dateStr) throws ParseException {
         Date date = DATE_FORMAT.parse(dateStr);
         return date;
     }
 
+
     /**
      * date转字符串
      *
-     * @param date
-     * @return Date
-     * @throws ParseException
+     * @param date 日期
+     * @return String 格式 yyyy-MM-dd
+     * @deprecated 替代参考 {@link #formatDate(Date, String)} 或 {@link #formatDate(Date, String, Locale)}
+     * @see 1.5.2
      */
-    public static String date2str(Date date) throws ParseException {
+    @Deprecated
+    public static String date2str(Date date) {
         if (date != null) {
             return DATE_FORMAT.format(date);
         } else {
-            return "null";
+            return "";
         }
     }
 
+
     /**
      * 日期字符串转dateTime
      *
-     * @param dateStr
-     * @return
+     * @param dateStr 格式：yyyy-MM-dd HH:mm:ss.SSS
+     * @return Date 时间
      * @throws ParseException
+     * @deprecated 替代参考 {@link #parseDate(String, String)}
+     * @see 1.5.2
      */
+    @Deprecated
     public static Date str2dateTime(String dateStr) throws ParseException {
-        Date date = DATE_TIME_FORMAT.parse(dateStr);
-        return date;
+        return DATE_TIME_FORMAT.parse(dateStr);
     }
 
     /**
      * dateTime转字符串
      *
-     * @param date
-     * @return Date
-     * @throws ParseException
+     * @param date 时间
+     * @return String 格式：yyyy-MM-dd HH:mm:ss.SSS
+     * @deprecated 替代参考 {@link #formatDate(Date, String)} 或 {@link #formatDate(Date, String, Locale)}
+     * @see 1.5.2
      */
-    public static String dateTime2str(Date date) throws ParseException {
+    @Deprecated
+    public static String dateTime2str(Date date) {
         if (date != null) {
             return DATE_TIME_FORMAT.format(date);
         } else {
-            return "null";
+            return "";
         }
     }
 
+    /**
+     * 格式化当前日期为指定格式的字符串。
+     *
+     * @param dateFormat 日期格式字符串，用于指定日期的输出格式，例如"yyyy-MM-dd HH:mm:ss"。
+     * @return 格式化后的当前日期字符串。
+     */
+    public static String formatDateNow(String dateFormat) {
+        return formatDate(new Date(), dateFormat); // 使用系统当前时间生成日期对象，并按指定格式进行格式化。
+    }
+
+    /**
+     * 解析字符串形式的日期到Date对象。
+     *
+     * @param dateStr 待解析的日期字符串。
+     * @param dateFormat 日期字符串的格式。
+     * @return 返回解析后的Date对象，如果解析失败则返回null。
+     * @throws ParseException
+     */
+    public static Date parseDate(String dateStr, String dateFormat) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        // 尝试根据给定的日期格式解析日期字符串
+        return sdf.parse(dateStr);
+    }
+
+    /**
+     * 根据指定的日期格式和地域格式化日期对象为字符串。
+     * 如果未指定地域，则默认使用中文地域格式。
+     *
+     * @param date 需要格式化的日期对象。
+     * @param dateFormat 日期格式字符串，例如"yyyy-MM-dd"。
+     * @return 格式化后的日期字符串。
+     */
+    public static String formatDate(Date date, String dateFormat) {
+        return formatDate(date, dateFormat, null);
+    }
+
+    /**
+     * 根据指定的日期格式、地域格式化日期对象为字符串。
+     *
+     * @param date 需要格式化的日期对象。
+     * @param dateFormat 日期格式字符串，例如"yyyy-MM-dd"。
+     * @param locale 地域设置，如果为null则默认使用中文地域。
+     * @return 格式化后的日期字符串。
+     */
+    public static String formatDate(Date date, String dateFormat, Locale locale) {
+        SimpleDateFormat sdf;
+        // 根据是否提供了地域参数来创建SimpleDateFormat实例
+        if (StrUtil.isEmpty(locale)) {
+            sdf = new SimpleDateFormat(dateFormat, Locale.CHINA);
+        } else {
+            sdf = new SimpleDateFormat(dateFormat, locale);
+        }
+        return sdf.format(date);
+    }
 
     /**
      * 获取本周的日期

src/main/java/com/yexuejc/base/util/FileUtil.java

@@ -417,6 +417,7 @@ public class FileUtil {
                 throw new RuntimeException(e);
             }
         });
+
     }
 
     /**

src/main/java/com/yexuejc/base/util/JsonUtil.java

@@ -134,7 +134,7 @@ public class JsonUtil {
         jsonMapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true);
 
         //值为空时，序列化所有值为“”
-        jsonMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
+        jsonMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<>() {
             @Override
             public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
                 jsonGenerator.writeString("");
@@ -249,6 +249,29 @@ public class JsonUtil {
         return pojo;
     }
 
+    /**
+     * Json字符串转换为Java对象
+     *
+     * @param in             输入流
+     * @param parametrized     容器类
+     * @param parameterClasses 实际类
+     * @return
+     */
+    public static <T> T json2Obj(InputStream in, Class<T> parametrized, Class<?>... parameterClasses) {
+        T pojo = null;
+        JavaType javaType = jsonMapper.getTypeFactory().constructParametricType(parametrized, parameterClasses);
+        try {
+            pojo = jsonMapper.readValue(in, javaType);
+        } catch (JsonParseException e) {
+            log.warning("json to Object JsonParseException.\n" + StrUtil.printStackTrace(e));
+        } catch (JsonMappingException e) {
+            log.warning("json to Object JsonMappingException.\n" + StrUtil.printStackTrace(e));
+        } catch (IOException e) {
+            log.warning("json to Object IOException.\n" + StrUtil.printStackTrace(e));
+        }
+        return pojo;
+    }
+
     /**
      * Json字符串转换为Java-Map对象
      *
@@ -291,29 +314,6 @@ public class JsonUtil {
         return null;
     }
 
-    /**
-     * Json字符串转换为Java对象
-     *
-     * @param json             字符串
-     * @param parametrized     容器类
-     * @param parameterClasses 实际类
-     * @return
-     */
-    public static <T> T json2Obj(InputStream json, Class<T> parametrized, Class<?>... parameterClasses) {
-        T pojo = null;
-        JavaType javaType = jsonMapper.getTypeFactory().constructParametrizedType(parametrized, parametrized,
-                parameterClasses);
-        try {
-            pojo = jsonMapper.readValue(json, javaType);
-        } catch (JsonParseException e) {
-            log.warning("json to Object JsonParseException.\n" + StrUtil.printStackTrace(e));
-        } catch (JsonMappingException e) {
-            log.warning("json to Object JsonMappingException.\n" + StrUtil.printStackTrace(e));
-        } catch (IOException e) {
-            log.warning("json to Object IOException.\n" + StrUtil.printStackTrace(e));
-        }
-        return pojo;
-    }
 
     /**
      * 将任何对象转换为json
@@ -322,15 +322,31 @@ public class JsonUtil {
      * @return 返回json
      */
     public static String obj2Json(Object pojo) {
-        String json = null;
+        if (StrUtil.isEmpty(pojo)) {
+            return "";
+        }
+        String json = "";
         try {
-            json = jsonMapper.writeValueAsString(pojo);
+            return jsonMapper.writeValueAsString(pojo);
         } catch (JsonProcessingException e) {
             log.warning("json to Object JsonProcessingException.\n" + StrUtil.printStackTrace(e));
         }
         return json;
     }
 
+    /**
+     * 从bean到Map的转换
+     * <p>
+     * 例：Map map = JsonUtil.obj2Map(data);
+     * </p>
+     *
+     * @param pojo bean
+     * @return Map
+     */
+    public static Map<?, ?> objToMap(Object pojo) {
+        return json2Obj(obj2Json(pojo), Map.class);
+    }
+
     /**
      * 格式化输出
      *
@@ -338,7 +354,7 @@ public class JsonUtil {
      * @return 格式化后的字符串
      */
     public static String formatPrinter(Object obj) {
-        String json = null;
+        String json = "";
         try {
             json = jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(obj);
         } catch (JsonProcessingException e) {

src/main/java/com/yexuejc/base/util/JwtUtil.java

@@ -115,7 +115,7 @@ public class JwtUtil {
      */
     public <T> T parse(String token, Class<T> cls) {
         return JsonUtil.json2Obj(parseStr(token), cls);
-        }
+    }
     /**
      * 解密token为字符串
      *
@@ -124,7 +124,7 @@ public class JwtUtil {
      */
     public String parseStr(String token) {
         return Jwts.parser().verifyWith(getSecretKey()).build().parseSignedClaims(token).getPayload().getSubject();
-        }
+    }
 
     private SecretKey getSecretKey() {
         byte[] bytes = Decoders.BASE64.decode(JWT_SIGNATURE_KEY);

src/main/java/com/yexuejc/base/util/StrUtil.java

@@ -42,7 +42,7 @@ public final class StrUtil {
         if (obj == null) {
             return true;
         } else if (obj instanceof Optional) {
-            return !((Optional<?>) obj).isPresent();
+            return ((Optional<?>) obj).isEmpty();
         } else if (obj instanceof CharSequence) {
             return ((CharSequence) obj).length() == 0;
         } else if (obj.getClass().isArray()) {

src/main/java/com/yexuejc/base/util/ZipUtil.java

@@ -0,0 +1,65 @@
+package com.yexuejc.base.util;
+
+import com.yexuejc.base.pojo.CreateZipFileBean;
+import net.lingala.zip4j.ZipFile;
+import net.lingala.zip4j.exception.ZipException;
+import net.lingala.zip4j.model.ExcludeFileFilter;
+import net.lingala.zip4j.model.ZipParameters;
+import net.lingala.zip4j.model.enums.CompressionMethod;
+import net.lingala.zip4j.model.enums.EncryptionMethod;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 压缩相关
+ * <p>依赖于zip4j：<a href='https://github.com/srikanth-lingala/zip4j'>https://github.com/srikanth-lingala/zip4j</a></p>
+ *
+ * @author maxf
+ * @class-name ZipUtil
+ * @description 文件压缩
+ * @date 2022/11/11 11:09
+ */
+public class ZipUtil {
+
+    /**
+     * 创建压缩文件
+     *
+     * @param zipFileBean
+     */
+    public static void createZipFile(CreateZipFileBean zipFileBean) throws ZipException {
+        ZipParameters zipParameters = new ZipParameters();
+        zipParameters.setCompressionMethod(CompressionMethod.STORE);
+
+        //加密
+        zipParameters.setEncryptFiles(true);
+        zipParameters.setEncryptionMethod(EncryptionMethod.ZIP_STANDARD);
+        ZipFile zipFile = new ZipFile(zipFileBean.getZipFile());
+        if (StrUtil.isNotEmpty(zipFileBean.getEncryptPwd())) {
+            zipFile = new ZipFile(zipFileBean.getZipFile(), zipFileBean.getEncryptPwd().toCharArray());
+        }
+        if (StrUtil.isNotEmpty(zipFileBean.getSourceFileName())) {
+            //压缩文件
+            List<File> filesToAdd = new ArrayList<>(16);
+            Map<String, String> fileNamesMap = new HashMap<>(16);
+            zipFileBean.getSourceFileName().forEach(it -> {
+                String file = zipFileBean.getSourcePath() + File.separator + it;
+                filesToAdd.add(new File(file));
+                fileNamesMap.put(file, it);
+            });
+            zipFile.renameFiles(fileNamesMap);
+            zipFile.addFiles(filesToAdd, zipParameters);
+        } else {
+            //压缩目录
+            ExcludeFileFilter excludeFileFilter = zipFileBean.getExcludeFileName()::contains;
+            zipParameters.setExcludeFileFilter(excludeFileFilter);
+            zipFile.addFolder(new File(zipFileBean.getSourcePath()), zipParameters);
+        }
+    }
+}
+
+//checkemun key -> codeMst检索(缓存)
+//返回exception(message用区分分割文言和exp)

src/test/java/com/yexuejc/base/util/DateUtilTest.java

@@ -0,0 +1,70 @@
+package com.yexuejc.base.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.Locale;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DateUtilTest {
+
+    @Test
+    public void testParseDate() throws ParseException {
+        String dateStr = "2022-03-20";
+        String dateFormat = "yyyy-MM-dd";
+        Date date = DateUtil.parseDate(dateStr, dateFormat);
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        assertEquals(sdf.format(date), dateStr);
+    }
+
+    @Test
+    public void testParseLocalDate() throws ParseException {
+        String dateStr = "2022-03-20";
+        String dateFormat = "yyyy-MM-dd";
+        LocalDate date = DateTimeUtil.parseLocalDate(DateUtil.parseDate(dateStr, dateFormat));
+        assertEquals(date.toString(), dateStr);
+    }
+
+    @Test
+    public void testFormatDateNow() {
+        String dateFormat = "yyyy-MM-dd";
+        String nowDateStr = DateUtil.formatDateNow(dateFormat);
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        String nowDate = sdf.format(new Date());
+        assertEquals(nowDate, nowDateStr);
+    }
+
+    @Test
+    public void testFormatDate() {
+        Date date = new Date();
+        String dateFormat = "yyyy-MM-dd";
+        String formattedDate = DateUtil.formatDate(date, dateFormat);
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        assertEquals(sdf.format(date), formattedDate);
+    }
+
+    @Test
+    public void testFormatDateWithLocale() {
+        Date date = new Date();
+        String dateFormat = "yyyy-MM-dd";
+        Locale locale = Locale.JAPAN;
+        String formattedDate = DateUtil.formatDate(date, dateFormat, locale);
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat, locale);
+        assertEquals(sdf.format(date), formattedDate);
+    }
+
+    @Test
+    public void testGetDateByPlusDay() {
+        int days = 2;
+        String dateFormat = "yyyy-MM-dd";
+        String plusDateStr = DateUtil.formatDate(DateUtil.datePlus(new Date(), days), dateFormat);
+        LocalDate nowDate = LocalDate.now();
+        LocalDate plusDate = nowDate.plusDays(days);
+        assertEquals(plusDate.toString(), plusDateStr);
+    }
+
+}

src/test/java/com/yexuejc/base/util/SysUtilTest.java

@@ -1,7 +1,5 @@
 package com.yexuejc.base.util;
 
-import java.util.Arrays;
-
 /**
  *
  * @author: yexuejc