Skip to content

Commit dedd7eb

Browse files
committed
修复fastjson 解析类型装换错误
1 parent 4fbbb25 commit dedd7eb

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ public <T> List<T> getArray(String key, Class<T> tClass) {
6161
JSONArray jsonArray = jsonObject.getJSONArray(key);
6262
List<T> jsonMappers = new ArrayList<>(jsonArray.size());
6363
for (Object jsonObject : jsonArray) {
64-
jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
64+
if (jsonObject instanceof JSONObject) {
65+
jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
66+
} else {
67+
jsonMappers.add((T) jsonObject);
68+
}
6569
}
6670
return jsonMappers;
6771
}

admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ public <T> List<T> getArray(String key, Class<T> tClass) {
5858
JSONArray jsonArray = jsonObject.getJSONArray(key);
5959
List<T> jsonMappers = new ArrayList<>(jsonArray.size());
6060
for (Object jsonObject : jsonArray) {
61-
jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
61+
if (jsonObject instanceof JSONObject) {
62+
jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
63+
} else {
64+
jsonMappers.add((T) jsonObject);
65+
}
6266
}
6367
return jsonMappers;
6468
}

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</scm>
3333

3434
<properties>
35-
<revision>0.7.0</revision>
35+
<revision>0.7.1</revision>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737
</properties>
3838

0 commit comments

Comments
 (0)