diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java
index 7238ecd41..ea6fcf156 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java
@@ -136,6 +136,13 @@ public class DateConverter extends AbstractConverter {
return DateUtil.date(mills);
}
- return SqlDateUtil.wrap(targetClass, mills);
+ final String dateClassName = targetClass.getName();
+ if(dateClassName.startsWith("java.sql.")){
+ // 为了解决在JDK9+模块化项目中用户没有引入java.sql模块导致的问题,此处增加判断
+ // 如果targetClass是java.sql的类,说明引入了此模块
+ return SqlDateUtil.wrap(targetClass, mills);
+ }
+
+ throw new ConvertException("Unsupported target Date type: {}", targetClass.getName());
}
}
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/SqlDateUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/SqlDateUtil.java
index 62633a4c3..48ca30c23 100755
--- a/hutool-core/src/main/java/org/dromara/hutool/core/date/SqlDateUtil.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/SqlDateUtil.java
@@ -16,7 +16,6 @@ import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.text.StrUtil;
import java.sql.Timestamp;
-import java.util.Date;
/**
* {@code java.sql.*}日期时间相关封装
@@ -80,12 +79,6 @@ public class SqlDateUtil {
@SuppressWarnings("unchecked")
public static T wrap(final Class> targetClass, final long mills) {
// 返回指定类型
- if (java.util.Date.class == targetClass) {
- return (T) new Date(mills);
- }
- if (DateTime.class == targetClass) {
- return (T) DateUtil.date(mills);
- }
if (java.sql.Date.class == targetClass) {
return (T) new java.sql.Date(mills);
}
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/cache/SimpleCacheTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/cache/SimpleCacheTest.java
index ed87c70c7..5776b0590 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/cache/SimpleCacheTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/cache/SimpleCacheTest.java
@@ -12,7 +12,6 @@
package org.dromara.hutool.core.cache;
-import org.dromara.hutool.core.cache.SimpleCache;
import org.dromara.hutool.core.thread.ConcurrencyTester;
import org.dromara.hutool.core.thread.ThreadUtil;
import org.junit.jupiter.api.Assertions;
diff --git a/pom.xml b/pom.xml
index c5ebaff2a..6b5faec7c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
8
5.10.3
1.18.34
- 1.9.23
+ 1.9.24
@@ -167,7 +167,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.11.0
+ 3.13.0
${compile.version}
${compile.version}
@@ -178,12 +178,12 @@
org.apache.maven.plugins
maven-surefire-plugin
- 3.1.2
+ 3.3.1
org.apache.maven.plugins
maven-jar-plugin
- 3.3.0
+ 3.4.2
true
@@ -192,10 +192,11 @@
${os.name}
- ${user.name}
+ Looly
${java.version}
${maven.build.timestamp}
${Automatic-Module-Name}
+ true
@@ -204,7 +205,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.6.3
+ 3.7.0
package