Merge branch 'v6-dev' of gitee.com:dromara/hutool into v6-dev

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;
 
 /**

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.exception.HutoolException;
-import org.dromara.hutool.core.exceptions.ValidateException;
+import org.dromara.hutool.core.exception.ValidateException;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

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;

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;

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;
 
 /**

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;
 

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;

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;
 
 /**

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;
 
 /**

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;
 
 /**
  * 克隆异常

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;
 
 /**
  * 依赖异常

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;

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;
 

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;
 
 /**
  * 未初始化异常

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;
 
 /**
  * 带有状态码的异常

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;
 
 /**
  * 验证异常

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;

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;

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;

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;
 

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;
 

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.
 	 *

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;
 

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;
 

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;
 

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;
 

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.
 	 *

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;

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;
 

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;
 

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;
 
 /**

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;

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;

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;

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;

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;
 

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;
 

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;
 
 /**

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;

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方式获取调用者。此方式效率最低，不推荐使用

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;
 
 /**

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;
 
 /**

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;
 

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;

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;

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;
 

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;

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;