zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2024-07-15 18:43:31 +08:00
parent 738f67549a
commit 052c45537b
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/DateConverter.java
View File

@@ -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());
}
}

7
hutool-core/src/main/java/org/dromara/hutool/core/date/SqlDateUtil.java
View File

@@ -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.*}日期时间相关封装<br>
@@ -80,12 +79,6 @@ public class SqlDateUtil {
@SuppressWarnings("unchecked")
public static <T extends java.util.Date> 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);
}

1
hutool-core/src/test/java/org/dromara/hutool/core/cache/SimpleCacheTest.java vendored
View File

@@ -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;