diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java
index 2dd1f5e44..0e49f24c2 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.core.annotation;
 
 import org.dromara.hutool.core.array.ArrayUtil;
 import org.dromara.hutool.core.classloader.ClassLoaderUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.func.LambdaInfo;
 import org.dromara.hutool.core.func.LambdaUtil;
 import org.dromara.hutool.core.func.SerFunction;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java
index b6a6d9073..cc93affa9 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java
@@ -18,7 +18,7 @@ import org.dromara.hutool.core.collection.set.SetUtil;
 import org.dromara.hutool.core.collection.set.UniqueKeySet;
 import org.dromara.hutool.core.comparator.CompareUtil;
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.map.MapUtil;
 import org.dromara.hutool.core.text.StrJoiner;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java
index ec0db384a..256134e0a 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.bean;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java
index 8a05b0755..045c0590f 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/DynaBean.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.bean;
 
-import org.dromara.hutool.core.exceptions.CloneException;
+import org.dromara.hutool.core.exception.CloneException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.reflect.ClassUtil;
 import org.dromara.hutool.core.reflect.ConstructorUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java
index 3ce121340..1f3b86824 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.classloader;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.reflect.ClassDescUtil;
 
 import java.io.File;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java
index c5de29308..1849b0a5a 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.classloader;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.file.FileUtil;
 import org.dromara.hutool.core.net.url.URLUtil;
 import org.dromara.hutool.core.reflect.MethodUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java
index 7fa472490..e5a9b58a7 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/HexUtil.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.codec;
 
 import org.dromara.hutool.core.codec.binary.Base16Codec;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.core.util.ByteUtil;
 import org.dromara.hutool.core.util.CharUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java
index 05a814b4b..c6e341fb0 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/PunyCode.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.codec;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.core.text.split.SplitUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java
index 34119935d..c5e20e47a 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base16Codec.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.core.codec.binary;
 
 import org.dromara.hutool.core.codec.Decoder;
 import org.dromara.hutool.core.codec.Encoder;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java
index 2a911d32f..7640742f8 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java
@@ -12,8 +12,8 @@
 
 package org.dromara.hutool.core.codec.binary;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
-import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.exception.HutoolException;
+import org.dromara.hutool.core.exception.ValidateException;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java
index 22b6bcd1f..c756946ca 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/KetamaHash.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.codec.hash;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java
index f73313fa9..010a28c80 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java
@@ -24,7 +24,7 @@ import org.dromara.hutool.core.comparator.PinyinComparator;
 import org.dromara.hutool.core.comparator.PropertyComparator;
 import org.dromara.hutool.core.convert.CompositeConverter;
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.func.SerBiConsumer;
 import org.dromara.hutool.core.func.SerConsumer3;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java
index 797380fbc..048e98ed4 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/comparator/ComparatorException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.comparator;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java
index d77a648c9..144d4cb95 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipSecurityUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.compress;
 
-import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.exception.ValidateException;
 
 import java.util.zip.ZipEntry;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java
index 664ddfbb7..9a512a72d 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.compress;
 
 import org.dromara.hutool.core.collection.iter.EnumerationIter;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.io.file.FileNameUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java
index b252b11ab..a6d63c06b 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/ConvertException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.convert;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java
index 32519ec31..47b11bb34 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.date;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/CloneException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exception/CloneException.java
similarity index 97%
rename from hutool-core/src/main/java/org/dromara/hutool/core/exceptions/CloneException.java
rename to hutool-core/src/main/java/org/dromara/hutool/core/exception/CloneException.java
index 4ab139c18..677e63200 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/CloneException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/exception/CloneException.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.core.exceptions;
+package org.dromara.hutool.core.exception;
 
 /**
  * 克隆异常
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/DependencyException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exception/DependencyException.java
similarity index 97%
rename from hutool-core/src/main/java/org/dromara/hutool/core/exceptions/DependencyException.java
rename to hutool-core/src/main/java/org/dromara/hutool/core/exception/DependencyException.java
index 44b3d2b9d..b37882282 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/DependencyException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/exception/DependencyException.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.core.exceptions;
+package org.dromara.hutool.core.exception;
 
 /**
  * 依赖异常
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java
similarity index 99%
rename from hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java
rename to hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java
index 31212f634..db691fd95 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/exception/ExceptionUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.core.exceptions;
+package org.dromara.hutool.core.exception;
 
 import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
 import org.dromara.hutool.core.map.MapUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/HutoolException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exception/HutoolException.java
similarity index 98%
rename from hutool-core/src/main/java/org/dromara/hutool/core/exceptions/HutoolException.java
rename to hutool-core/src/main/java/org/dromara/hutool/core/exception/HutoolException.java
index 3f62024f1..4898bfddb 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/HutoolException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/exception/HutoolException.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.core.exceptions;
+package org.dromara.hutool.core.exception;
 
 import org.dromara.hutool.core.text.StrUtil;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/NotInitedException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exception/NotInitedException.java
similarity index 97%
rename from hutool-core/src/main/java/org/dromara/hutool/core/exceptions/NotInitedException.java
rename to hutool-core/src/main/java/org/dromara/hutool/core/exception/NotInitedException.java
index a6c3fe823..1a11507df 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/NotInitedException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/exception/NotInitedException.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.core.exceptions;
+package org.dromara.hutool.core.exception;
 
 /**
  * 未初始化异常
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/StatefulException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exception/StatefulException.java
similarity index 98%
rename from hutool-core/src/main/java/org/dromara/hutool/core/exceptions/StatefulException.java
rename to hutool-core/src/main/java/org/dromara/hutool/core/exception/StatefulException.java
index 182de8542..07f365131 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/StatefulException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/exception/StatefulException.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.core.exceptions;
+package org.dromara.hutool.core.exception;
 
 /**
  * 带有状态码的异常
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ValidateException.java b/hutool-core/src/main/java/org/dromara/hutool/core/exception/ValidateException.java
similarity index 98%
rename from hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ValidateException.java
rename to hutool-core/src/main/java/org/dromara/hutool/core/exception/ValidateException.java
index 895729ead..8336085f9 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ValidateException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/exception/ValidateException.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.core.exceptions;
+package org.dromara.hutool.core.exception;
 
 /**
  * 验证异常
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/exception/package-info.java
similarity index 93%
rename from hutool-core/src/main/java/org/dromara/hutool/core/exceptions/package-info.java
rename to hutool-core/src/main/java/org/dromara/hutool/core/exception/package-info.java
index 40b866e82..c6860b563 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/package-info.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/exception/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package org.dromara.hutool.core.exceptions;
+package org.dromara.hutool.core.exception;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaFactory.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaFactory.java
index 356d7a8cc..7e3588e6f 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaFactory.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaFactory.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.lang.mutable.MutableEntry;
 import org.dromara.hutool.core.map.WeakConcurrentMap;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaUtil.java
index f94600fb8..521586022 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/LambdaUtil.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.core.func;
 
 import org.dromara.hutool.core.bean.BeanUtil;
 import org.dromara.hutool.core.classloader.ClassLoaderUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.lang.Opt;
 import org.dromara.hutool.core.map.WeakConcurrentMap;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiConsumer.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiConsumer.java
index ca8ff6a36..21f73a7fa 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiConsumer.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiConsumer.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.Objects;
@@ -47,7 +47,7 @@ public interface SerBiConsumer<T, U> extends BiConsumer<T, U>, Serializable {
 	 *
 	 * @param t the first input argument
 	 * @param u the second input argument
-	 * @throws Exception wrapped checked exceptions for easy using
+	 * @throws Exception wrapped checked exception for easy using
 	 */
 	void accepting(T t, U u) throws Exception;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiFunction.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiFunction.java
index 7e4e9d6ff..43f383a3e 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiFunction.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiFunction.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.Objects;
@@ -36,7 +36,7 @@ public interface SerBiFunction<T, U, R> extends BiFunction<T, U, R>, Serializabl
 	 * @param t the first function argument
 	 * @param u the second function argument
 	 * @return the function result
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 */
 	R applying(T t, U u) throws Exception;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiPredicate.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiPredicate.java
index c915a37d9..60649d442 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiPredicate.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBiPredicate.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.Objects;
@@ -37,7 +37,7 @@ public interface SerBiPredicate<T, U> extends BiPredicate<T, U>, Serializable {
 	 * @param u the second input argument
 	 * @return {@code true} if the input arguments match the predicate,
 	 * otherwise {@code false}
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 */
 	boolean testing(T t, U u) throws Exception;
 
@@ -65,7 +65,7 @@ public interface SerBiPredicate<T, U> extends BiPredicate<T, U>, Serializable {
 	 * predicate, if this predicate is {@code false}, then the {@code other}
 	 * predicate is not evaluated.
 	 *
-	 * <p>Any exceptions thrown during evaluation of either predicate are relayed
+	 * <p>Any exception thrown during evaluation of either predicate are relayed
 	 * to the caller; if evaluation of this predicate throws an exception, the
 	 * {@code other} predicate will not be evaluated.
 	 *
@@ -98,7 +98,7 @@ public interface SerBiPredicate<T, U> extends BiPredicate<T, U>, Serializable {
 	 * predicate, if this predicate is {@code true}, then the {@code other}
 	 * predicate is not evaluated.
 	 *
-	 * <p>Any exceptions thrown during evaluation of either predicate are relayed
+	 * <p>Any exception thrown during evaluation of either predicate are relayed
 	 * to the caller; if evaluation of this predicate throws an exception, the
 	 * {@code other} predicate will not be evaluated.
 	 *
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBinaryOperator.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBinaryOperator.java
index 454b5da45..ad542642e 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBinaryOperator.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerBinaryOperator.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.Comparator;
@@ -35,7 +35,7 @@ public interface SerBinaryOperator<T> extends BinaryOperator<T>, Serializable {
 	 * @param t the first function argument
 	 * @param u the second function argument
 	 * @return the function result
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 */
 	T applying(T t, T u) throws Exception;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer.java
index 1508151e8..3018d34b4 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.Objects;
@@ -33,7 +33,7 @@ public interface SerConsumer<T> extends Consumer<T>, Serializable {
 	 * Performs this operation on the given argument.
 	 *
 	 * @param t the input argument
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 */
 	void accepting(T t) throws Exception;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer3.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer3.java
index ecda8c463..2643e0e59 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer3.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerConsumer3.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.Objects;
@@ -35,7 +35,7 @@ public interface SerConsumer3<P1, P2, P3> extends Serializable {
 	 * @param p1 参数一
 	 * @param p2 参数二
 	 * @param p3 参数三
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 */
 	void accepting(P1 p1, P2 p2, P3 p3) throws Exception;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerFunction.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerFunction.java
index aa02413bd..9a779a4f7 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerFunction.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerFunction.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.function.Function;
@@ -33,7 +33,7 @@ public interface SerFunction<T, R> extends Function<T, R>, Serializable {
 	 *
 	 * @param t the function argument
 	 * @return the function result
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 */
 	R applying(T t) throws Exception;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerPredicate.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerPredicate.java
index 96e536f95..7dbbe2021 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerPredicate.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerPredicate.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.Objects;
@@ -35,7 +35,7 @@ public interface SerPredicate<T> extends Predicate<T>, Serializable {
 	 * @param t the input argument
 	 * @return {@code true} if the input argument matches the predicate,
 	 * otherwise {@code false}
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 */
 	boolean testing(T t) throws Exception;
 
@@ -101,7 +101,7 @@ public interface SerPredicate<T> extends Predicate<T>, Serializable {
 	 * predicate, if this predicate is {@code false}, then the {@code other}
 	 * predicate is not evaluated.
 	 *
-	 * <p>Any exceptions thrown during evaluation of either predicate are relayed
+	 * <p>Any exception thrown during evaluation of either predicate are relayed
 	 * to the caller; if evaluation of this predicate throws an exception, the
 	 * {@code other} predicate will not be evaluated.
 	 *
@@ -134,7 +134,7 @@ public interface SerPredicate<T> extends Predicate<T>, Serializable {
 	 * predicate, if this predicate is {@code true}, then the {@code other}
 	 * predicate is not evaluated.
 	 *
-	 * <p>Any exceptions thrown during evaluation of either predicate are relayed
+	 * <p>Any exception thrown during evaluation of either predicate are relayed
 	 * to the caller; if evaluation of this predicate throws an exception, the
 	 * {@code other} predicate will not be evaluated.
 	 *
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerRunnable.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerRunnable.java
index 38c2d4538..6d25ac96c 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerRunnable.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerRunnable.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.func;
 
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.stream.Stream;
@@ -36,7 +36,7 @@ public interface SerRunnable extends Runnable, Serializable {
 	 * The general contract of the method {@code run} is that it may
 	 * take any action whatsoever.
 	 *
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 * @see Thread#run()
 	 */
 	void running() throws Exception;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerSupplier.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerSupplier.java
index 1fca78bc9..ec210a525 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerSupplier.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerSupplier.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.function.Supplier;
@@ -32,7 +32,7 @@ public interface SerSupplier<R> extends Supplier<R>, Serializable {
 	 * Gets a result.
 	 *
 	 * @return a result
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 */
 	R getting() throws Exception;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerUnaryOperator.java b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerUnaryOperator.java
index 15b3f73f2..3d581cdc4 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/func/SerUnaryOperator.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/func/SerUnaryOperator.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.func;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Serializable;
 import java.util.function.Function;
@@ -33,7 +33,7 @@ public interface SerUnaryOperator<T> extends UnaryOperator<T>, Serializable {
 	 *
 	 * @param t the function argument
 	 * @return the function result
-	 * @throws Exception wrapped checked exceptions
+	 * @throws Exception wrapped checked exception
 	 */
 	T applying(T t) throws Exception;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java
index dcdd175ca..b8f8b80b5 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/IORuntimeException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.io;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java
index 39cbed434..c2303184f 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.core.io;
 
 import org.dromara.hutool.core.codec.HexUtil;
 import org.dromara.hutool.core.collection.iter.LineIter;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.copy.FileChannelCopier;
 import org.dromara.hutool.core.io.copy.ReaderWriterCopier;
 import org.dromara.hutool.core.io.copy.StreamCopier;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java
index 385fd72db..3f7e77cd2 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.io;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.stream.FastByteArrayOutputStream;
 
 import java.io.ByteArrayInputStream;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java
index 19818fcdd..8869871a6 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.io.file;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.func.SerConsumer;
 import org.dromara.hutool.core.func.SerFunction;
 import org.dromara.hutool.core.io.IORuntimeException;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java
index dc727a12d..cf1d3ddb2 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.io.file;
 
 import org.dromara.hutool.core.date.DateUnit;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.lang.Console;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java
index 0d877348c..fb36727e6 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/resource/NoResourceException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.io.resource;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.text.StrUtil;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java
index aa30a92c4..262b935d2 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/StreamReader.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.io.stream;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java
index aecfc0b69..ba8f94304 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.io.watch;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java
index 81cfdf1aa..7127754ab 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.lang;
 
 import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.exception.ValidateException;
 import org.dromara.hutool.core.regex.PatternPool;
 import org.dromara.hutool.core.regex.RegexPool;
 import org.dromara.hutool.core.util.CharsetUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java
index a59c90c53..5e38f23ba 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/StackTraceCaller.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.core.lang.caller;
 
 import java.io.Serializable;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 /**
  * 通过StackTrace方式获取调用者。此方式效率最低，不推荐使用
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java
index ab7dfaee8..a83cea0f9 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/IdUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.lang.id;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.lang.Singleton;
 import org.dromara.hutool.core.net.Ipv4Util;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java
index 105e6fcf3..e29a6cec6 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/Pid.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.lang.id;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.text.StrUtil;
 
 import java.lang.management.ManagementFactory;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Triple.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Triple.java
index 309a23632..ecf4bb9cc 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Triple.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Triple.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.lang.tuple;
 
-import org.dromara.hutool.core.exceptions.CloneException;
+import org.dromara.hutool.core.exception.CloneException;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Tuple.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Tuple.java
index a1922b216..47a8465a4 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Tuple.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/tuple/Tuple.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.core.lang.tuple;
 
 import org.dromara.hutool.core.collection.ListUtil;
 import org.dromara.hutool.core.collection.iter.ArrayIter;
-import org.dromara.hutool.core.exceptions.CloneException;
+import org.dromara.hutool.core.exception.CloneException;
 import org.dromara.hutool.core.array.ArrayUtil;
 
 import java.io.Serializable;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java
index e698d1c77..8824ed7d4 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/Dict.java
@@ -17,7 +17,7 @@ import org.dromara.hutool.core.bean.BeanUtil;
 import org.dromara.hutool.core.bean.copier.CopyOptions;
 import org.dromara.hutool.core.collection.set.SetUtil;
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.exceptions.CloneException;
+import org.dromara.hutool.core.exception.CloneException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.func.LambdaInfo;
 import org.dromara.hutool.core.func.LambdaUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv6Util.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv6Util.java
index 6fabf42e4..b3fc8c514 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv6Util.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv6Util.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.net;
 
 import org.dromara.hutool.core.collection.CollUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Singleton;
 
 import java.math.BigInteger;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/MacAddressUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/MacAddressUtil.java
index 9c73df6e8..a8ebca94a 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/net/MacAddressUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/MacAddressUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.net;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java
index 0570a9169..7e4182322 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.core.net;
 
 import org.dromara.hutool.core.collection.CollUtil;
 import org.dromara.hutool.core.collection.iter.EnumerationIter;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.text.StrUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLUtil.java
index f424f7584..cc2f567b2 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/ssl/SSLUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.net.ssl;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.text.StrUtil;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java
index 9cc566741..a4640c43a 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLEncoder.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.net.url;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.util.CharUtil;
 import org.dromara.hutool.core.util.CharsetUtil;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLUtil.java
index b8a7f2f3b..4d37125e5 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/URLUtil.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.net.url;
 
 import org.dromara.hutool.core.classloader.ClassLoaderUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.io.file.FileNameUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java
index 0dfa1bad9..2055912ee 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassDescUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.reflect;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.map.TripleTable;
 import org.dromara.hutool.core.text.StrTrimer;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java
index 1e099c451..3f8942d92 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java
@@ -15,7 +15,7 @@ package org.dromara.hutool.core.reflect;
 import org.dromara.hutool.core.bean.NullWrapperBean;
 import org.dromara.hutool.core.classloader.ClassLoaderUtil;
 import org.dromara.hutool.core.convert.BasicType;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.file.FileUtil;
 import org.dromara.hutool.core.io.resource.ResourceUtil;
 import org.dromara.hutool.core.net.url.URLDecoder;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java
index 5e4db3ce2..1cef0123f 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ConstructorUtil.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.reflect;
 
 import org.dromara.hutool.core.classloader.ClassLoaderUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.map.WeakConcurrentMap;
 import org.dromara.hutool.core.reflect.lookup.LookupUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java
index be08a2bab..4ff234a62 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.core.reflect;
 
 import org.dromara.hutool.core.annotation.Alias;
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.map.MapUtil;
 import org.dromara.hutool.core.map.WeakConcurrentMap;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodHandleUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodHandleUtil.java
index 5e09d30d5..12d650d8f 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodHandleUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodHandleUtil.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.core.reflect;
 
 import org.dromara.hutool.core.bean.NullWrapperBean;
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.reflect.lookup.LookupUtil;
 
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java
index 26de9915e..1bf48fd1f 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java
@@ -17,7 +17,7 @@ import org.dromara.hutool.core.bean.NullWrapperBean;
 import org.dromara.hutool.core.classloader.ClassLoaderUtil;
 import org.dromara.hutool.core.collection.set.SetUtil;
 import org.dromara.hutool.core.collection.set.UniqueKeySet;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.lang.Singleton;
 import org.dromara.hutool.core.map.WeakConcurrentMap;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java
index 2e5be1fd8..f752bbf64 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.reflect;
 
 import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupUtil.java
index 8bdc399bd..9c76d74f5 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/LookupUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.reflect.lookup;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.caller.CallerUtil;
 import org.dromara.hutool.core.reflect.ConstructorUtil;
 import org.dromara.hutool.core.reflect.ModifierUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/MethodLookupFactory.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/MethodLookupFactory.java
index a15f0d002..65ec9a425 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/MethodLookupFactory.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/lookup/MethodLookupFactory.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.reflect.lookup;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/spi/SPIException.java b/hutool-core/src/main/java/org/dromara/hutool/core/spi/SPIException.java
index 8bc3c865d..9188bd46e 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/spi/SPIException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/spi/SPIException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.spi;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java
index 1da742e65..3672d18e9 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/PlaceholderParser.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.text.placeholder;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.text.StrValidator;
 import org.dromara.hutool.core.util.CharUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrTemplate.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrTemplate.java
index 8e291c80f..a297faf92 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrTemplate.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/StrTemplate.java
@@ -3,7 +3,7 @@ package org.dromara.hutool.core.text.placeholder;
 import org.dromara.hutool.core.array.ArrayUtil;
 import org.dromara.hutool.core.collection.CollUtil;
 import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.text.CharPool;
 import org.dromara.hutool.core.text.StrUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/NamedPlaceholderStrTemplate.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/NamedPlaceholderStrTemplate.java
index 0e3404e0e..dc904bccd 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/NamedPlaceholderStrTemplate.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/placeholder/template/NamedPlaceholderStrTemplate.java
@@ -6,7 +6,7 @@ import org.dromara.hutool.core.bean.BeanUtil;
 import org.dromara.hutool.core.collection.CollUtil;
 import org.dromara.hutool.core.collection.ListUtil;
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.func.LambdaUtil;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.math.NumberUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java
index 25d181356..92d696be0 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/GlobalThreadPool.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.thread;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java
index 808c1ca84..b1025873e 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/SyncFinisher.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.thread;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.io.Closeable;
 import java.util.LinkedHashSet;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java
index 68e8a710b..f0f676cda 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.thread;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java
index 2306ae55c..8d95dbedc 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/JNDIUtil.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.util;
 
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.map.MapUtil;
 
 import javax.naming.InitialContext;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java
index ed12b2107..1c9bb0b87 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java
@@ -16,7 +16,7 @@ import org.dromara.hutool.core.array.ArrayUtil;
 import org.dromara.hutool.core.collection.CollUtil;
 import org.dromara.hutool.core.collection.iter.IterUtil;
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.SerializeUtil;
 import org.dromara.hutool.core.map.MapUtil;
 import org.dromara.hutool.core.math.NumberUtil;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java
index 7cf76bf3d..9d2f6fa89 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/RandomUtil.java
@@ -18,7 +18,7 @@ import org.dromara.hutool.core.collection.ListUtil;
 import org.dromara.hutool.core.date.DateField;
 import org.dromara.hutool.core.date.DateTime;
 import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.lang.WeightRandom;
 import org.dromara.hutool.core.lang.WeightRandom.WeightObj;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java
index 83d19d866..ef7b389a4 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/RuntimeUtil.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.core.util;
 
 import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.lang.id.Pid;
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java
index 59bc18106..f46cdcf91 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java
@@ -15,7 +15,7 @@ package org.dromara.hutool.core.util;
 import org.dromara.hutool.core.bean.BeanUtil;
 import org.dromara.hutool.core.collection.CollUtil;
 import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.file.FileUtil;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/exceptions/ExceptionUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/exception/ExceptionUtilTest.java
similarity index 96%
rename from hutool-core/src/test/java/org/dromara/hutool/core/exceptions/ExceptionUtilTest.java
rename to hutool-core/src/test/java/org/dromara/hutool/core/exception/ExceptionUtilTest.java
index 05e3cc977..d359edeb2 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/exceptions/ExceptionUtilTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/exception/ExceptionUtilTest.java
@@ -1,4 +1,4 @@
-package org.dromara.hutool.core.exceptions;
+package org.dromara.hutool.core.exception;
 
 import org.dromara.hutool.core.convert.Convert;
 import org.dromara.hutool.core.io.IORuntimeException;
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java
index b754a667a..5e6a654c2 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SingletonTest.java
@@ -1,6 +1,6 @@
 package org.dromara.hutool.core.lang;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.thread.ThreadUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java
index 99d0fcc74..97833cc74 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java
@@ -1,7 +1,7 @@
 package org.dromara.hutool.core.lang;
 
 import org.dromara.hutool.core.collection.ConcurrentHashSet;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.id.IdUtil;
 import org.dromara.hutool.core.lang.id.Snowflake;
 import org.dromara.hutool.core.text.StrUtil;
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java
index 039faa9f9..8d375e475 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/ValidatorTest.java
@@ -1,7 +1,7 @@
 package org.dromara.hutool.core.lang;
 
 import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.exception.ValidateException;
 import org.dromara.hutool.core.lang.id.IdUtil;
 import org.dromara.hutool.core.regex.PatternPool;
 import org.dromara.hutool.core.text.StrUtil;
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/spi/ListServiceLoaderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/spi/ListServiceLoaderTest.java
index dae5ef049..0bb34cb64 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/spi/ListServiceLoaderTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/spi/ListServiceLoaderTest.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.spi;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/spi/MapServiceLoaderTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/spi/MapServiceLoaderTest.java
index 615a6b484..c3eeab673 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/spi/MapServiceLoaderTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/spi/MapServiceLoaderTest.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.core.spi;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrTemplateTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrTemplateTest.java
index 57244b321..9cfd62366 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/text/StrTemplateTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/text/StrTemplateTest.java
@@ -5,7 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.dromara.hutool.core.collection.ListUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.map.MapUtil;
 import org.dromara.hutool.core.text.placeholder.StrTemplate;
 import org.dromara.hutool.core.text.placeholder.template.NamedPlaceholderStrTemplate;
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java
index ae225de28..a5abe20aa 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/CloneTest.java
@@ -1,6 +1,6 @@
 package org.dromara.hutool.core.util;
 
-import org.dromara.hutool.core.exceptions.CloneException;
+import org.dromara.hutool.core.exception.CloneException;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java
index c59321ff5..17fd4cde5 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/DefaultCloneTest.java
@@ -1,7 +1,7 @@
 package org.dromara.hutool.core.util;
 
 
-import org.dromara.hutool.core.exceptions.CloneException;
+import org.dromara.hutool.core.exception.CloneException;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java
index 76d0319dd..5f43b5414 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/util/IdUtilTest.java
@@ -3,7 +3,7 @@ package org.dromara.hutool.core.util;
 import org.dromara.hutool.core.collection.ConcurrentHashSet;
 import org.dromara.hutool.core.date.DateUtil;
 import org.dromara.hutool.core.date.StopWatch;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.lang.Console;
 import org.dromara.hutool.core.lang.id.IdUtil;
 import org.dromara.hutool.core.lang.id.Snowflake;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java
index ea779c86f..ec79769c4 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronUtil.java
@@ -13,7 +13,7 @@
 
 package org.dromara.hutool.cron;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.resource.NoResourceException;
 import org.dromara.hutool.cron.pattern.CronPattern;
 import org.dromara.hutool.cron.task.Task;
diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java
index 860ad2687..6be136165 100644
--- a/hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java
+++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/task/InvokeTask.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.cron.task;
 
 import org.dromara.hutool.core.classloader.ClassLoaderUtil;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.reflect.ConstructorUtil;
 import org.dromara.hutool.core.reflect.MethodUtil;
 import org.dromara.hutool.core.text.StrUtil;
diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java
index 6737b0630..39e4aa31c 100644
--- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java
+++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/CryptoException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.crypto;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/DbRuntimeException.java b/hutool-db/src/main/java/org/dromara/hutool/db/DbRuntimeException.java
index a52123b82..ccdd1a0db 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/DbRuntimeException.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/DbRuntimeException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.db;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java
index 1807c6c3d..5e0d63c48 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/DSWrapper.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.db.ds;
 
-import org.dromara.hutool.core.exceptions.CloneException;
+import org.dromara.hutool.core.exception.CloneException;
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.func.Wrapper;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
index a0f3e68b5..201389fc6 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/c3p0/C3p0DSFactory.java
@@ -18,7 +18,7 @@ import org.dromara.hutool.db.DbRuntimeException;
 import org.dromara.hutool.db.ds.AbstractDSFactory;
 import org.dromara.hutool.db.ds.DSKeys;
 import org.dromara.hutool.setting.Setting;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 
 import javax.sql.DataSource;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
index 9cb247686..8d6c44264 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
@@ -16,7 +16,7 @@ import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.db.ds.AbstractDSFactory;
 import org.dromara.hutool.db.ds.DSKeys;
 import org.dromara.hutool.setting.Setting;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 import com.alibaba.druid.pool.DruidDataSource;
 
 import javax.sql.DataSource;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
index 4d17c8122..45a1fcefe 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/hikari/HikariDSFactory.java
@@ -16,7 +16,7 @@ import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.db.ds.AbstractDSFactory;
 import org.dromara.hutool.db.ds.DSKeys;
 import org.dromara.hutool.setting.Setting;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
index 3706d68bf..6285478d0 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/pooled/PooledConnection.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.db.ds.pooled;
 
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.map.MapUtil;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java
index f737dd8f2..51192eff0 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/AbstractDataSource.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.db.ds.simple;
 
-import org.dromara.hutool.core.exceptions.CloneException;
+import org.dromara.hutool.core.exception.CloneException;
 
 import javax.sql.DataSource;
 import java.io.Closeable;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
index 5a4bff82a..9515d2fbf 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/simple/SimpleDataSource.java
@@ -18,7 +18,7 @@ import org.dromara.hutool.db.DbRuntimeException;
 import org.dromara.hutool.db.dialect.DriverUtil;
 import org.dromara.hutool.db.ds.DSKeys;
 import org.dromara.hutool.setting.Setting;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
index f1a5f9574..b1527d9e5 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/tomcat/TomcatDSFactory.java
@@ -16,7 +16,7 @@ import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.db.ds.AbstractDSFactory;
 import org.dromara.hutool.db.ds.DSKeys;
 import org.dromara.hutool.setting.Setting;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 import org.apache.tomcat.jdbc.pool.DataSource;
 import org.apache.tomcat.jdbc.pool.PoolProperties;
 
diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java
index 08a446f87..efd6f8986 100644
--- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java
+++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.db.sql;
 
 import org.dromara.hutool.core.convert.Convert;
-import org.dromara.hutool.core.exceptions.CloneException;
+import org.dromara.hutool.core.exception.CloneException;
 import org.dromara.hutool.core.math.NumberUtil;
 import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.core.text.split.SplitUtil;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java
index 7506c9520..1a748be22 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/CompressException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.compress;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java
index e0e81a80a..64ea9adc1 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/FtpException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.ftp;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java
index 05dd3e538..f95ce867b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.mail;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java
index f4f2d1154..3d4bfd032 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.management;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java
index 0bc98135b..0f155eb88 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/PinyinException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.pinyin;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java
index a07bf1831..ab2d327fe 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/qrcode/QrCodeException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.qrcode;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java
index 59db3625b..d3efc3755 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/spring/SpringUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.spring;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.reflect.TypeReference;
 import org.dromara.hutool.core.array.ArrayUtil;
 import org.springframework.beans.BeansException;
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschRuntimeException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschRuntimeException.java
index 09b9fac24..8bf8bc492 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschRuntimeException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschRuntimeException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.ssh;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java
index 7d18ba799..71dbff557 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/TemplateException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.template;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java
index 558851f6f..d6f5d2e5b 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/TokenizerException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.tokenizer;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
index 17919fbff..3db4f5a1d 100644
--- a/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
+++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.extra.xml;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.file.FileUtil;
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.text.StrUtil;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java
index 89116b323..10570b2c1 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java
@@ -17,7 +17,7 @@ import org.dromara.hutool.core.bean.copier.CopyOptions;
 import org.dromara.hutool.core.bean.copier.ValueProvider;
 import org.dromara.hutool.core.collection.ListUtil;
 import org.dromara.hutool.core.collection.iter.ArrayIter;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.file.FileUtil;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java
index f59c2d019..55ced26d1 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java
@@ -17,7 +17,7 @@ import org.dromara.hutool.core.bean.copier.CopyOptions;
 import org.dromara.hutool.core.bean.copier.ValueProvider;
 import org.dromara.hutool.core.collection.ListUtil;
 import org.dromara.hutool.core.collection.iter.ArrayIter;
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.file.FileUtil;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.io.IoUtil;
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java
index 29245d8d0..f2b363838 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java
@@ -20,7 +20,7 @@ import java.nio.charset.Charset;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.util.CharsetUtil;
 import org.dromara.hutool.core.util.XmlUtil;
 
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java
index e619df773..034c60ff4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.json;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java
index 1aaa71d6c..e0d3baf9c 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java
@@ -15,7 +15,7 @@ package org.dromara.hutool.json.jwt;
 import org.dromara.hutool.core.codec.binary.Base64;
 import org.dromara.hutool.core.collection.CollUtil;
 import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.exception.ValidateException;
 import org.dromara.hutool.core.lang.Assert;
 import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.core.text.split.SplitUtil;
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java
index 6fb5cb279..564381605 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.json.jwt;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java
index cf8947549..3ad5e245a 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java
@@ -13,7 +13,7 @@
 package org.dromara.hutool.json.jwt;
 
 import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.exception.ValidateException;
 import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.json.jwt.signers.JWTSigner;
 import org.dromara.hutool.json.jwt.signers.NoneJWTSigner;
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java
index 1376760ba..156dccc0e 100644
--- a/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/jwt/JWTValidatorTest.java
@@ -1,7 +1,7 @@
 package org.dromara.hutool.json.jwt;
 
 import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.exception.ValidateException;
 import org.dromara.hutool.json.jwt.signers.JWTSignerUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java
index 1dcde7b09..59e06f282 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/AbstractLog.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.log;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.log.level.Level;
 
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java
index b434d0f5e..bd25766ef 100644
--- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java
+++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.log.engine.logtube;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.log.AbstractLog;
 import org.dromara.hutool.log.level.Level;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java
index 0313ce25c..a4613c952 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/PoiChecker.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.poi;
 
-import org.dromara.hutool.core.exceptions.DependencyException;
+import org.dromara.hutool.core.exception.DependencyException;
 import org.dromara.hutool.core.classloader.ClassLoaderUtil;
 
 /**
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java
index d3552cb62..f534716a1 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.poi.excel;
 
-import org.dromara.hutool.core.exceptions.DependencyException;
+import org.dromara.hutool.core.exception.DependencyException;
 import org.dromara.hutool.core.io.file.FileUtil;
 import org.dromara.hutool.core.io.IoUtil;
 import org.dromara.hutool.core.util.ObjUtil;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java
index cc9edea5b..82fd55bee 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java
@@ -14,7 +14,7 @@ package org.dromara.hutool.poi.excel.sax;
 
 import org.dromara.hutool.core.date.DateTime;
 import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.core.exceptions.DependencyException;
+import org.dromara.hutool.core.exception.DependencyException;
 import org.dromara.hutool.core.io.IORuntimeException;
 import org.dromara.hutool.core.util.CharUtil;
 import org.dromara.hutool.core.text.StrUtil;
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/POIException.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/POIException.java
index d8ef40e06..886d510e8 100644
--- a/hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/POIException.java
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/exceptions/POIException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.poi.exceptions;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
index 60204723d..a6973f92d 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java
@@ -28,7 +28,7 @@ import org.dromara.hutool.core.text.StrUtil;
 import org.dromara.hutool.core.util.CharUtil;
 import org.dromara.hutool.core.util.CharsetUtil;
 import org.dromara.hutool.log.StaticLog;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 
 import java.io.File;
 import java.net.URL;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
index f9ba20306..a5548b086 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/SettingException.java
@@ -12,37 +12,74 @@
 
 package org.dromara.hutool.setting;
 
-import org.dromara.hutool.core.text.StrUtil;
+import org.dromara.hutool.core.exception.HutoolException;
 
 /**
  * 设置异常
  *
- * @author xiaoleilu
+ * @author looly
  */
-public class SettingException extends RuntimeException {
+public class SettingException extends HutoolException {
 	private static final long serialVersionUID = 7941096116780378387L;
 
+	/**
+	 * 构造
+	 *
+	 * @param e 异常
+	 */
 	public SettingException(final Throwable e) {
 		super(e);
 	}
 
+	/**
+	 * 构造
+	 *
+	 * @param message 消息
+	 */
 	public SettingException(final String message) {
 		super(message);
 	}
 
+	/**
+	 * 构造
+	 *
+	 * @param messageTemplate 消息模板
+	 * @param params          参数
+	 */
 	public SettingException(final String messageTemplate, final Object... params) {
-		super(StrUtil.format(messageTemplate, params));
+		super(messageTemplate, params);
 	}
 
-	public SettingException(final String message, final Throwable throwable) {
-		super(message, throwable);
+	/**
+	 * 构造
+	 *
+	 * @param message 消息
+	 * @param cause   被包装的子异常
+	 */
+	public SettingException(final String message, final Throwable cause) {
+		super(message, cause);
 	}
 
-	public SettingException(final String message, final Throwable throwable, final boolean enableSuppression, final boolean writableStackTrace) {
-		super(message, throwable, enableSuppression, writableStackTrace);
+	/**
+	 * 构造
+	 *
+	 * @param message            消息
+	 * @param cause              被包装的子异常
+	 * @param enableSuppression  是否启用抑制
+	 * @param writableStackTrace 堆栈跟踪是否应该是可写的
+	 */
+	public SettingException(final String message, final Throwable cause, final boolean enableSuppression, final boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
 	}
 
-	public SettingException(final Throwable throwable, final String messageTemplate, final Object... params) {
-		super(StrUtil.format(messageTemplate, params), throwable);
+	/**
+	 * 构造
+	 *
+	 * @param cause           被包装的子异常
+	 * @param messageTemplate 消息模板
+	 * @param params          参数
+	 */
+	public SettingException(final Throwable cause, final String messageTemplate, final Object... params) {
+		super(cause, messageTemplate, params);
 	}
 }
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/Props.java
similarity index 99%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/props/Props.java
index 23c7673ac..ded42cc4f 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/Props.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.setting.dialect;
+package org.dromara.hutool.setting.props;
 
 import org.dromara.hutool.core.bean.BeanUtil;
 import org.dromara.hutool.core.io.file.FileUtil;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsUtil.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/PropsUtil.java
similarity index 98%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsUtil.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/props/PropsUtil.java
index 39def155a..6b2a84825 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/PropsUtil.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/PropsUtil.java
@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  */
 
-package org.dromara.hutool.setting.dialect;
+package org.dromara.hutool.setting.props;
 
 import org.dromara.hutool.core.io.file.FileNameUtil;
 import org.dromara.hutool.core.io.resource.NoResourceException;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/package-info.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/package-info.java
similarity index 93%
rename from hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/package-info.java
rename to hutool-setting/src/main/java/org/dromara/hutool/setting/props/package-info.java
index 348356173..843461fe8 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/package-info.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/props/package-info.java
@@ -16,4 +16,4 @@
  * @author looly
  *
  */
-package org.dromara.hutool.setting.dialect;
+package org.dromara.hutool.setting.props;
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java
index 4ad0f5610..2ac28d477 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/Toml.java
@@ -42,7 +42,7 @@ public class Toml {
 	 * @param data TOML数据
 	 * @param writer {@link Writer}
 	 */
-	public static void write(Map<String, Object> data, Writer writer){
+	public static void write(final Map<String, Object> data, final Writer writer){
 		new TomlWriter(writer).write(data);
 	}
 
diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
index 63fc79748..66a05246f 100644
--- a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
+++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlReader.java
@@ -42,109 +42,20 @@ public class TomlReader {
 	private int line = 1;// current line
 
 	/**
-	 * Creates a new TomlReader.
+	 * 构造
+	 * <pre>
+	 *     严格模式：[A-Za-z0-9_-]
+	 *     宽松模式：所有字符但是不包括. [ ] # =
+	 * </pre>
 	 *
-	 * @param data                the TOML data to read
-	 * @param strictAsciiBareKeys {@code true} to allow only strict bare keys, {@code false} to allow lenient ones.
+	 * @param data                TOML数据
+	 * @param strictAsciiBareKeys {@code true} 只允许严格的key格式, {@code false} 支持宽松格式.
 	 */
 	public TomlReader(final String data, final boolean strictAsciiBareKeys) {
 		this.data = data;
 		this.strictAsciiBareKeys = strictAsciiBareKeys;
 	}
 
-	private boolean hasNext() {
-		return pos < data.length();
-	}
-
-	private char next() {
-		return data.charAt(pos++);
-	}
-
-	private char nextUseful(final boolean skipComments) {
-		char c = ' ';
-		while (hasNext() && (c == ' ' || c == '\t' || c == '\r' || c == '\n' || (c == '#' && skipComments))) {
-			c = next();
-			if (skipComments && c == '#') {
-				final int nextLinebreak = data.indexOf('\n', pos);
-				if (nextLinebreak == -1) {
-					pos = data.length();
-				} else {
-					pos = nextLinebreak + 1;
-					line++;
-				}
-			} else if (c == '\n') {
-				line++;
-			}
-		}
-		return c;
-	}
-
-	private char nextUsefulOrLinebreak() {
-		char c = ' ';
-		while (c == ' ' || c == '\t' || c == '\r') {
-			if (!hasNext())// fixes error when no '\n' at the end of the file
-				return '\n';
-			c = next();
-		}
-		if (c == '\n')
-			line++;
-		return c;
-	}
-
-	private Object nextValue(final char firstChar) {
-		switch (firstChar) {
-			case '+':
-			case '-':
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-				return nextNumberOrDate(firstChar);
-			case '"':
-				if (pos + 1 < data.length()) {
-					final char c2 = data.charAt(pos);
-					final char c3 = data.charAt(pos + 1);
-					if (c2 == '"' && c3 == '"') {
-						pos += 2;
-						return nextBasicMultilineString();
-					}
-				}
-				return nextBasicString();
-			case '\'':
-				if (pos + 1 < data.length()) {
-					final char c2 = data.charAt(pos);
-					final char c3 = data.charAt(pos + 1);
-					if (c2 == '\'' && c3 == '\'') {
-						pos += 2;
-						return nextLiteralMultilineString();
-					}
-				}
-				return nextLiteralString();
-			case '[':
-				return nextArray();
-			case '{':
-				return nextInlineTable();
-			case 't':// Must be "true"
-				if (pos + 3 > data.length() || next() != 'r' || next() != 'u' || next() != 'e') {
-					throw new SettingException("Invalid value at line " + line);
-				}
-				return true;
-			case 'f':// Must be "false"
-				if (pos + 4 > data.length() || next() != 'a' || next() != 'l' || next() != 's' || next() != 'e') {
-					throw new SettingException("Invalid value at line " + line);
-				}
-				return false;
-			default:
-				throw new SettingException("Invalid character '" + toString(firstChar) + "' at line " + line);
-		}
-	}
-
 	/**
 	 * 读取TOML
 	 *
@@ -268,6 +179,99 @@ public class TomlReader {
 		return map;
 	}
 
+	private boolean hasNext() {
+		return pos < data.length();
+	}
+
+	private char next() {
+		return data.charAt(pos++);
+	}
+
+	private char nextUseful(final boolean skipComments) {
+		char c = ' ';
+		while (hasNext() && (c == ' ' || c == '\t' || c == '\r' || c == '\n' || (c == '#' && skipComments))) {
+			c = next();
+			if (skipComments && c == '#') {
+				final int nextLinebreak = data.indexOf('\n', pos);
+				if (nextLinebreak == -1) {
+					pos = data.length();
+				} else {
+					pos = nextLinebreak + 1;
+					line++;
+				}
+			} else if (c == '\n') {
+				line++;
+			}
+		}
+		return c;
+	}
+
+	private char nextUsefulOrLinebreak() {
+		char c = ' ';
+		while (c == ' ' || c == '\t' || c == '\r') {
+			if (!hasNext())// fixes error when no '\n' at the end of the file
+				return '\n';
+			c = next();
+		}
+		if (c == '\n')
+			line++;
+		return c;
+	}
+
+	private Object nextValue(final char firstChar) {
+		switch (firstChar) {
+			case '+':
+			case '-':
+			case '0':
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9':
+				return nextNumberOrDate(firstChar);
+			case '"':
+				if (pos + 1 < data.length()) {
+					final char c2 = data.charAt(pos);
+					final char c3 = data.charAt(pos + 1);
+					if (c2 == '"' && c3 == '"') {
+						pos += 2;
+						return nextBasicMultilineString();
+					}
+				}
+				return nextBasicString();
+			case '\'':
+				if (pos + 1 < data.length()) {
+					final char c2 = data.charAt(pos);
+					final char c3 = data.charAt(pos + 1);
+					if (c2 == '\'' && c3 == '\'') {
+						pos += 2;
+						return nextLiteralMultilineString();
+					}
+				}
+				return nextLiteralString();
+			case '[':
+				return nextArray();
+			case '{':
+				return nextInlineTable();
+			case 't':// Must be "true"
+				if (pos + 3 > data.length() || next() != 'r' || next() != 'u' || next() != 'e') {
+					throw new SettingException("Invalid value at line " + line);
+				}
+				return true;
+			case 'f':// Must be "false"
+				if (pos + 4 > data.length() || next() != 'a' || next() != 'l' || next() != 's' || next() != 'e') {
+					throw new SettingException("Invalid value at line " + line);
+				}
+				return false;
+			default:
+				throw new SettingException("Invalid character '" + toString(firstChar) + "' at line " + line);
+		}
+	}
+
 	private List<Object> nextArray() {
 		final ArrayList<Object> list = new ArrayList<>();
 		while (true) {
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java
index eb9f27f08..3bbffd161 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/Issue3008Test.java
@@ -1,8 +1,8 @@
 package org.dromara.hutool.setting;
 
 import org.dromara.hutool.core.array.ArrayUtil;
-import org.dromara.hutool.setting.dialect.Props;
-import org.dromara.hutool.setting.dialect.PropsUtil;
+import org.dromara.hutool.setting.props.Props;
+import org.dromara.hutool.setting.props.PropsUtil;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java
index 64cc73597..2ae0b31d2 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsTest.java
@@ -1,7 +1,7 @@
 package org.dromara.hutool.setting;
 
 import org.dromara.hutool.core.date.DateUtil;
-import org.dromara.hutool.setting.dialect.Props;
+import org.dromara.hutool.setting.props.Props;
 import lombok.Data;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
index 088cc4c22..aee292c8e 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/PropsUtilTest.java
@@ -1,6 +1,6 @@
 package org.dromara.hutool.setting;
 
-import org.dromara.hutool.setting.dialect.PropsUtil;
+import org.dromara.hutool.setting.props.PropsUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java b/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java
index 29ba12dff..cab15551f 100644
--- a/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java
+++ b/hutool-setting/src/test/java/org/dromara/hutool/setting/toml/TomlTest.java
@@ -13,6 +13,7 @@
 package org.dromara.hutool.setting.toml;
 
 import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.lang.Console;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java
index ec71546dd..395f638f6 100644
--- a/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java
+++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/SocketRuntimeException.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.socket;
 
-import org.dromara.hutool.core.exceptions.ExceptionUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
 import org.dromara.hutool.core.text.StrUtil;
 
 /**
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java
index 1432579b2..ea422dfd0 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/RobotUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.swing;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.swing.clipboard.ClipboardUtil;
 import org.dromara.hutool.swing.img.ImgUtil;
 
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java
index 9dff62e66..37f745395 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.swing.clipboard;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 
 import java.awt.Image;
 import java.awt.Toolkit;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/FontUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/FontUtil.java
index c990c4686..965ced669 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/FontUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/FontUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.swing.img;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.IORuntimeException;
 
 import java.awt.Dimension;
diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java
index 3182eb966..3bc266d3a 100644
--- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java
+++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgMetaUtil.java
@@ -12,7 +12,7 @@
 
 package org.dromara.hutool.swing.img;
 
-import org.dromara.hutool.core.exceptions.HutoolException;
+import org.dromara.hutool.core.exception.HutoolException;
 import org.dromara.hutool.core.io.IORuntimeException;
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;