zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-08-18 20:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix DateConvert

Browse Source
This commit is contained in:
Looly
2019-12-18 17:34:32 +08:00
parent 7ffdc2c473
commit 0db031e88b
11 changed files with 82 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-json/src/main/java/cn/hutool/json/JSONConverter.java
View File

@@ -1,8 +1,5 @@
package cn.hutool.json;
import java.lang.reflect.Type;
import java.util.List;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.convert.ConvertException;
import cn.hutool.core.convert.Converter;
@@ -14,6 +11,9 @@ import cn.hutool.core.util.TypeUtil;
import cn.hutool.json.serialize.GlobalSerializeMapping;
import cn.hutool.json.serialize.JSONDeserializer;
import java.lang.reflect.Type;
import java.util.List;
/**
* JSON转换器
*
@@ -76,7 +76,7 @@ public class JSONConverter implements Converter<JSON> {
return (T) deserializer.deserialize((JSON)value);
}
}
Object targetValue;
try {
targetValue = Convert.convert(targetType, value);

31
hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
View File

@@ -1,21 +1,5 @@
package cn.hutool.json;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.lang.reflect.Type;
import java.nio.charset.Charset;
import java.time.LocalDateTime;
import java.time.temporal.TemporalAccessor;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.file.FileReader;
import cn.hutool.core.lang.TypeReference;
@@ -31,6 +15,21 @@ import cn.hutool.json.serialize.JSONDeserializer;
import cn.hutool.json.serialize.JSONObjectSerializer;
import cn.hutool.json.serialize.JSONSerializer;
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.lang.reflect.Type;
import java.nio.charset.Charset;
import java.time.temporal.TemporalAccessor;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
/**
* JSON工具类
*