[update] 1.5.2-jre8 发布

README.md

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

UPDATE.md

@@ -1,40 +1,27 @@
 yexuejc-base 更新记录
 ------------------
-
-#### version ：1.5.3-jre11
-**time： ** <br/>
-**branch：** jre11    <br/>
-**update：**     <br/>
-1. [FileUtil.java](src/main/java/com/yexuejc/base/util/FileUtil.java)增加读取大文件自定义方法和单纯读取方法
-2. JsonUtil 增加objToMap；优化obj2Json
-3. DateUtil 标准化日期时间的转换函数
----
-
-#### version ：1.5.2-jre11
+#### version ：1.5.2-jre8
 **time：2024-4-7 14:34:33** <br/>
-**branch：** jre11    <br/>
+**branch：** jre8    <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-jre11
+#### version ：1.5.1-jre8
 **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-jre11</version>
+    <version>1.5.2-jre8</version>
 
     <name>yexuejc-base</name>
     <url>https://github.com/yexuejc/yexuejc-base</url>
-    <description>Common toolkits based on JDK11+ packaging</description>
+    <description>Common toolkits based on JDK8 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>11</java.version>
+        <java.version>1.8</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>11</source>
-                    <target>11</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
             <!-- 打包源码 -->

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

@@ -1,38 +0,0 @@
-package com.yexuejc.base.converter;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
-
-/**
- * 反序列化中内容为空时，返回Integer为空
- * <p>使用方式：@JsonDeserialize(using = IntegerNullValueDeserializer.class)</p>
- * @author: yexuejc
- * @date: 2024/4/15 18:08
- */
-public class IntegerNullValueDeserializer extends StdScalarDeserializer<Integer> {
-    public IntegerNullValueDeserializer() {
-        super(Integer.class);
-    }
-
-    @Override
-    public Integer deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        String value = p.getValueAsString();
-        if (isInteger(value)) {
-            return super._parseInteger(p, ctxt, Integer.class);
-        } else {
-            return null;
-        }
-    }
-
-    private static boolean isInteger(String s) {
-        try {
-            Integer.parseInt(s);
-            return true;
-        } catch (NumberFormatException e) {
-            return false;
-        }
-    }
-}

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,173 +0,0 @@
-package com.yexuejc.base.encrypt;
-
-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加解密
- *
- * @author maxf
- * @class-name AES
- * @description
- * @date 2022/11/11 15:36
- */
-public class AES {
-    public static AES builder() {
-        return Instace.aes;
-    }
-
-    private static class Instace {
-        private static AES aes = new AES();
-    }
-
-    public static final String AES_ALGORITHM = "AES";
-
-    /**
-     * 加密模式
-     */
-    public static enum ALGORITHM {
-        //算法/模式/填充                 16字节加密后数据长度       不满16字节加密后长度
-        //AES/CBC/NoPadding                   16                          不支持
-        AES_CBC_NoPadding("AES/CBC/NoPadding"),
-        //AES/CBC/PKCS5Padding                32                          16
-        AES_CBC_PKCS5Padding("AES/CBC/PKCS5Padding"),
-        //AES/CBC/ISO10126Padding             32                          16
-        AES_CBC_ISO10126Padding("AES/CBC/ISO10126Padding"),
-        //AES/CFB/NoPadding                   16                          原始数据长度
-        AES_CFB_NoPadding("AES/CFB/NoPadding"),
-        //AES/CFB/PKCS5Padding                32                          16
-        AES_CFB_PKCS5Padding("AES/CFB/PKCS5Padding"),
-        //AES/CFB/ISO10126Padding             32                          16
-        AES_CFB_ISO10126Padding("AES/CFB/ISO10126Padding"),
-        //AES/ECB/NoPadding                   16                          不支持
-        AES_ECB_NoPadding("AES/ECB/NoPadding"),
-        //AES/ECB/PKCS5Padding                32                          16
-        AES_ECB_PKCS5Padding("AES/ECB/PKCS5Padding"),
-        //AES/ECB/ISO10126Padding             32                          16
-        AES_ECB_ISO10126Padding("AES/ECB/ISO10126Padding"),
-        //AES/OFB/NoPadding                   16                          原始数据长度
-        AES_OFB_NoPadding("AES/OFB/NoPadding"),
-        //AES/OFB/PKCS5Padding                32                          16
-        AES_OFB_PKCS5Padding("AES/OFB/PKCS5Padding"),
-        //AES/OFB/ISO10126Padding             32                          16
-        AES_OFB_ISO10126Padding("AES/OFB/ISO10126Padding"),
-        //AES/PCBC/NoPadding                  16                          不支持
-        AES_PCBC_NoPadding("AES/PCBC/NoPadding"),
-        //AES/PCBC/PKCS5Padding               32                          16
-        AES_PCBC_PKCS5Padding("AES/PCBC/PKCS5Padding"),
-        //AES/PCBC/ISO10126Padding            32                          16
-        AES_PCBC_ISO10126Padding("AES/PCBC/ISO10126Padding");
-        public String name;
-
-        ALGORITHM(String name) {
-            this.name = name;
-        }
-    }
-
-    private ALGORITHM algorithm = ALGORITHM.AES_CBC_NoPadding;
-    private String key = "hj7x89H$yuBI0456";
-    private String iv = "NIfb&95GUY86Gfgh";
-    private Charset charset = StandardCharsets.UTF_8;
-
-    /**
-     * 加密
-     *
-     * @param data 明文
-     * @return 密文
-     * @Description AES算法加密明文
-     */
-    public String encrypt(String data) throws Exception {
-        try {
-
-            Cipher cipher = Cipher.getInstance(algorithm.name);
-            int blockSize = cipher.getBlockSize();
-            byte[] dataBytes = data.getBytes(charset);
-            int plaintextLength = dataBytes.length;
-            if (plaintextLength % blockSize != 0) {
-                plaintextLength = plaintextLength + (blockSize - (plaintextLength % blockSize));
-            }
-            byte[] plaintext = new byte[plaintextLength];
-            System.arraycopy(dataBytes, 0, plaintext, 0, dataBytes.length);
-            SecretKeySpec keyspec = new SecretKeySpec(key.getBytes(charset), AES_ALGORITHM);
-            IvParameterSpec ivspec = new IvParameterSpec(iv.getBytes(charset));
-            cipher.init(Cipher.ENCRYPT_MODE, keyspec, ivspec);
-            byte[] encrypted = cipher.doFinal(plaintext);
-            return Base64.getEncoder().encodeToString(encrypted);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * 解密
-     *
-     * @param data 密文
-     * @return 明文
-     * @Description AES算法解密密文
-     */
-    public String decrypt(String data) throws Exception {
-        try {
-            byte[] encrypted = Base64.getDecoder().decode(data);
-            Cipher cipher = Cipher.getInstance(algorithm.name);
-            SecretKeySpec keyspec = new SecretKeySpec(key.getBytes(charset), AES_ALGORITHM);
-            IvParameterSpec ivspec = new IvParameterSpec(iv.getBytes(charset));
-            cipher.init(Cipher.DECRYPT_MODE, keyspec, ivspec);
-            byte[] original = cipher.doFinal(encrypted);
-            return new String(original, charset).trim();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-//
-//    public static void main(String[] args) throws Exception {
-//        String str = "  奥萨蒂  asd8阿斯顿8asd  ";
-//        AES.builder().setAlgorithm(ALGORITHM.AES_CBC_ISO10126Padding);
-//        AES.builder().setKey("DEsx89H$yuBI0456");
-//        String encrypt = AES.builder().encrypt(str);
-//        System.out.println(encrypt);
-//        String decrypt = AES.builder().decrypt(encrypt);
-//        System.out.println(">>>" + decrypt + "<<<");
-//    }
-
-    public ALGORITHM getAlgorithm() {
-        return algorithm;
-    }
-
-    public AES setAlgorithm(ALGORITHM algorithm) {
-        this.algorithm = algorithm;
-        return this;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public AES setKey(String key) {
-        this.key = key;
-        return this;
-    }
-
-    public String getIv() {
-        return iv;
-    }
-
-    public AES setIv(String iv) {
-        this.iv = iv;
-        return this;
-    }
-
-    public Charset getCharset() {
-        return charset;
-    }
-
-    public AES setCharset(Charset charset) {
-        this.charset = charset;
-        return this;
-    }
-}

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

@@ -1,254 +0,0 @@
-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

@@ -1,90 +0,0 @@
-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,122 +80,57 @@ public class DateUtil {
     /**
      * 日期字符串转date
      *
-     * @param dateStr 格式：yyyy-MM-dd
-     * @return Date 日期
+     * @param dateStr
+     * @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 String 格式 yyyy-MM-dd
-     * @deprecated 替代参考 {@link #formatDate(Date, String)} 或 {@link #formatDate(Date, String, Locale)}
-     * @see 1.5.2
+     * @param date
+     * @return Date
+     * @throws ParseException
      */
-    @Deprecated
-    public static String date2str(Date date) {
+    public static String date2str(Date date) throws ParseException {
         if (date != null) {
             return DATE_FORMAT.format(date);
         } else {
-            return "";
+            return "null";
         }
     }
 
-
     /**
      * 日期字符串转dateTime
      *
-     * @param dateStr 格式：yyyy-MM-dd HH:mm:ss.SSS
-     * @return Date 时间
+     * @param dateStr
+     * @return
      * @throws ParseException
-     * @deprecated 替代参考 {@link #parseDate(String, String)}
-     * @see 1.5.2
      */
-    @Deprecated
     public static Date str2dateTime(String dateStr) throws ParseException {
-        return DATE_TIME_FORMAT.parse(dateStr);
+        Date date = DATE_TIME_FORMAT.parse(dateStr);
+        return date;
     }
 
     /**
      * dateTime转字符串
      *
-     * @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
+     * @param date
+     * @return Date
+     * @throws ParseException
      */
-    @Deprecated
-    public static String dateTime2str(Date date) {
+    public static String dateTime2str(Date date) throws ParseException {
         if (date != null) {
             return DATE_TIME_FORMAT.format(date);
         } else {
-            return "";
+            return "null";
         }
     }
 
-    /**
-     * 格式化当前日期为指定格式的字符串。
-     *
-     * @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

@@ -18,7 +18,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.List;
-import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.CRC32;
@@ -39,14 +38,11 @@ import io.jsonwebtoken.lang.Assert;
  * @time 2017年11月3日 下午3:12:49
  */
 public class FileUtil {
-    private static final Logger logger = Logger.getLogger(FileUtil.class.getName());
+    static Logger logger = Logger.getLogger(FileUtil.class.getName());
 
     private FileUtil() {
     }
 
-
-    private static final String NEW_LINE = "\n";
-    private static final String CONSTANT_DOT = ".";
     private static final String TYPE_TAR_GZ = ".tar.gz";
     private static final String TYPE_CSV = ".csv";
     private static final String TAR_GZ = "tar.gz";
@@ -65,7 +61,7 @@ public class FileUtil {
             if (fileName.lastIndexOf(TYPE_TAR_GZ) > 0) {
                 return TAR_GZ;
             }
-            return fileName.substring(fileName.lastIndexOf(CONSTANT_DOT) + 1);
+            return fileName.substring(fileName.lastIndexOf(".") + 1);
         } catch (Exception e) {
             logger.severe("file doesn't exist or is not a file");
         }
@@ -336,19 +332,22 @@ public class FileUtil {
     }
 
     /**
-     * 分段读取大文件（不限格式）
+     * 分段读取大文件
      *
-     * @param filePath         文件路径
+     * @param csvFilePath         文件路径
      * @param readFileBean 分段每次读取的bean 初始值需要设置每次读取的行数
      * @param <T>          读取结果类型bean
-     * @return 文件分页读取内容（自定义处理后）及读取信息
+     * @return
      */
-    public static <T> ReadFileBean<T> readBigFile(String filePath, ReadFileBean<T> readFileBean, Function<List<String>, List<T>> readAfter) throws IOException {
-        if (!isFileExist(filePath)) {
-            throw new FileNotFoundException(String.format("[%s]文件不存在。", filePath));
+    public static <T> ReadFileBean<T> readBigFile(String csvFilePath, ReadFileBean<T> readFileBean, Class<T> readCls) throws IOException {
+        if (!isFileExist(csvFilePath)) {
+            throw new FileNotFoundException(String.format("解析用的csv： [%s] 文件不存在。", csvFilePath));
+        }
+        if (!csvFilePath.endsWith(TYPE_CSV)) {
+            throw new IOException(String.format("解析用的csv： [%s] 文件不是CSV文件格式。", csvFilePath));
         }
         List<String> datas = new ArrayList<>();
-        try (RandomAccessFile randomAccessFile = new RandomAccessFile(new File(filePath), "r")) {
+        try (RandomAccessFile randomAccessFile = new RandomAccessFile(new File(csvFilePath), "r")) {
             if (readFileBean.getPointer() < 0) {
                 readFileBean.setPointer(0);
             }
@@ -366,60 +365,29 @@ public class FileUtil {
             //无数据
             return readFileBean.setDatas(new ArrayList<>());
         }
-        List<T> dataList = readAfter.apply(datas);
+
+        //csv文件处理
+        com.yexuejc.base.pojo.CsvToBean csvToBean = getCsvToBean(readCls);
+        readFileBean.setHeader(csvToBean.getHeader());
+        if (csvToBean.hasHeader()) {
+            //文件存在header,设置header优先,没设置使用文件的
+            if (StrUtil.isNotEmpty(csvToBean.getHeader())) {
+                //替换header
+                datas.remove(0);
+                datas.add(0, csvToBean.getHeader());
+            } else {
+                readFileBean.setHeader(datas.get(0));
+            }
+        } else {
+            //文件不存在header，使用设置的
+            datas.add(0, csvToBean.getHeader());
+        }
+
+        List<T> dataList = readCsv(String.join("\n", datas), readCls, csvToBean.getDelimiter());
         readFileBean.setDatas(dataList);
         return readFileBean;
     }
 
-    /**
-     * 分段读取大文件(不解析)
-     *
-     * @param csvFilePath         文件路径
-     * @param readFileBean 分段每次读取的bean 初始值需要设置每次读取的行数
-     * @return 文件分页读取内容（每行为一个String对象）及读取信息
-     */
-    public static ReadFileBean<String> readBigFile(String csvFilePath, ReadFileBean<String> readFileBean) throws IOException {
-        return readBigFile(csvFilePath, readFileBean, (datas) -> datas);
-    }
-
-    /**
-     * 分段读取大文件(CSV格式)
-     *
-     * @param csvFilePath         文件路径
-     * @param readFileBean 分段每次读取的bean 初始值需要设置每次读取的行数
-     * @param <T>          读取结果类型bean
-     * @return 文件分页读取内容（转bean后）及读取信息
-     */
-    public static <T> ReadFileBean<T> readBigFile(String csvFilePath, ReadFileBean<T> readFileBean, Class<T> readCls) throws IOException {
-        if (!csvFilePath.endsWith(TYPE_CSV)) {
-            throw new IOException(String.format("[%s]文件不是CSV文件格式。", csvFilePath));
-        }
-        return readBigFile(csvFilePath, readFileBean, (datas) -> {
-            //csv文件处理
-            com.yexuejc.base.pojo.CsvToBean csvToBean = getCsvToBean(readCls);
-            readFileBean.setHeader(csvToBean.getHeader());
-            if (csvToBean.hasHeader()) {
-                //文件存在header,设置header优先,没设置使用文件的
-                if (StrUtil.isNotEmpty(csvToBean.getHeader())) {
-                    //替换header
-                    datas.remove(0);
-                    datas.add(0, csvToBean.getHeader());
-                } else {
-                    readFileBean.setHeader(datas.get(0));
-                }
-            } else {
-                //文件不存在header，使用设置的
-                datas.add(0, csvToBean.getHeader());
-            }
-            try {
-                return readCsv(String.join(NEW_LINE, datas), readCls, csvToBean.getDelimiter());
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        });
-
-    }
-
     /**
      * 获取csv的header,使用注解{@link CsvToBean}
      *

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<>() {
+        jsonMapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
             @Override
             public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
                 jsonGenerator.writeString("");
@@ -249,29 +249,6 @@ 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对象
      *
@@ -314,6 +291,29 @@ 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,31 +322,15 @@ public class JsonUtil {
      * @return 返回json
      */
     public static String obj2Json(Object pojo) {
-        if (StrUtil.isEmpty(pojo)) {
-            return "";
-        }
-        String json = "";
+        String json = null;
         try {
-            return jsonMapper.writeValueAsString(pojo);
+            json = 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);
-    }
-
     /**
      * 格式化输出
      *
@@ -354,7 +338,7 @@ public class JsonUtil {
      * @return 格式化后的字符串
      */
     public static String formatPrinter(Object obj) {
-        String json = "";
+        String json = null;
         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).isEmpty();
+            return !((Optional<?>) obj).isPresent();
         } else if (obj instanceof CharSequence) {
             return ((CharSequence) obj).length() == 0;
         } else if (obj.getClass().isArray()) {

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

@@ -1,65 +0,0 @@
-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

@@ -1,70 +0,0 @@
-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/FileUtilTest.java

@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import com.yexuejc.base.pojo.ReadFileBean;
 import com.yexuejc.base.util.bean.AppnodeCertCsvBean;
@@ -55,63 +54,19 @@ public class FileUtilTest {
     }
 
     private static void readCsvFile() throws IOException {
-        String path = "F:\\coding\\yexuejc-base\\src\\test\\java\\com\\yexuejc\\base\\util\\test.csv";
+        String path = "F:\\coding\\yexuejc-base2\\src\\test\\java\\com\\yexuejc\\base\\util\\test.csv";
 
-//        List<AppnodeCertCsvBean> list = FileUtil.readCsv(path, AppnodeCertCsvBean.class, true, "enable,domain,protocol,deployHost,deployPath,uname,pwd,appnodeId", ',');
-//        System.out.println("***********************************************");
-//        System.out.println(JsonUtil.formatPrinter(list));
-//        System.out.println("条数：" + list.size());
+        List<AppnodeCertCsvBean> list = FileUtil.readCsv(path, AppnodeCertCsvBean.class, true, "enable,domain,protocol,deployHost,deployPath,uname,pwd,appnodeId", ',');
+        System.out.println("***********************************************");
+        System.out.println(JsonUtil.formatPrinter(list));
+        System.out.println("条数：" + list.size());
 
-        //直接把每行读取成字符串
-        ReadFileBean<String> readFileBean2 = new ReadFileBean<>(2);
-        ReadFileBean<String> bean2 = FileUtil.readBigFile(path, readFileBean2);
-        System.out.println("直接把每行读取成字符串============================================");
-        System.out.println(JsonUtil.formatPrinter(bean2));
-        System.out.println("直接把每行读取成字符串============================================");
-
-        //自定义每行数据的处理
-        ReadFileBean<AppnodeCertCsvBean> readFileBean1 = new ReadFileBean<>(2);
-        ReadFileBean<AppnodeCertCsvBean> bean1 = FileUtil.readBigFile(path, readFileBean1, datas -> {
-            if (readFileBean1.getStartRowNum() == 1) {
-                datas.remove(0);//跳过第一行
-            }
-            return datas.stream().map(str -> {
-                //自定义处理每一条数据
-                String[] split = str.split(",");
-                AppnodeCertCsvBean app = new AppnodeCertCsvBean();
-                app.setEnable(getValue(split, 0));
-                app.setDomain(getValue(split, 1));
-                app.setProtocol(getValue(split, 2));
-                app.setDeployHost(getValue(split, 3));
-                app.setDeployPath(getValue(split, 4));
-                app.setUname(getValue(split, 5));
-                app.setPwd(getValue(split, 6));
-                if (StrUtil.isNotEmpty(getValue(split, 7))) {
-                    app.setAppnodeId(Integer.valueOf(getValue(split, 7)));
-                }
-                return app;
-            }).collect(Collectors.toList());
-        });
-        System.out.println("自定义每行数据的处理============================================");
-        System.out.println(JsonUtil.formatPrinter(bean1));
-        System.out.println("自定义每行数据的处理============================================");
-
-        //直接使用提供的csv文件读取
         ReadFileBean<AppnodeCertCsvBean> readFileBean = new ReadFileBean<>(2);
         do {
             ReadFileBean<AppnodeCertCsvBean> bean = FileUtil.readBigFile(path, readFileBean, AppnodeCertCsvBean.class);
-            System.out.println("直接使用提供的csv文件读取============================================");
+            System.out.println("============================================");
             System.out.println(JsonUtil.formatPrinter(bean));
-            System.out.println("直接使用提供的csv文件读取============================================");
         } while (readFileBean.hasNext());
 
     }
-
-    private static String getValue(String[] value, int index) {
-        try {
-            return value[index];
-        } catch (Exception e) {
-            return "";
-        }
-    }
 }

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

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

src/test/java/com/yexuejc/base/util/bean/AppnodeCertCsvBean.java

@@ -2,16 +2,13 @@ package com.yexuejc.base.util.bean;
 
 import java.io.Serializable;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.yexuejc.base.annotation.CsvToBean;
-import com.yexuejc.base.converter.IntegerNullValueDeserializer;
 
 /**
  *
  * @author: yexuejc
  * @date: 2024/2/27 10:40
  */
-@CsvToBean(header = "enable,domain,protocol,deployHost,deployPath,uname,pwd,appnodeId")
 public class AppnodeCertCsvBean implements Serializable {
     /**是否生效：Y/N*/
     private String enable;
@@ -39,7 +36,6 @@ public class AppnodeCertCsvBean implements Serializable {
     /**
      * appnode协议时：且远程部署时，对应的远程appnode的ApiNodeId
      */
-    @JsonDeserialize(using = IntegerNullValueDeserializer.class)
     private Integer appnodeId;
 
     public String getEnable() {