修复fastjson 解析类型装换错误

admin4j · Aug 9, 2023 · dedd7eb · dedd7eb
1 parent 4fbbb25
commit dedd7eb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java b/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java
@@ -61,7 +61,11 @@ public <T> List<T> getArray(String key, Class<T> tClass) {
         JSONArray jsonArray = jsonObject.getJSONArray(key);
         List<T> jsonMappers = new ArrayList<>(jsonArray.size());
         for (Object jsonObject : jsonArray) {
-            jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
+            if (jsonObject instanceof JSONObject) {
+                jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
+            } else {
+                jsonMappers.add((T) jsonObject);
+            }
         }
         return jsonMappers;
     }

diff --git a/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java b/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java
@@ -58,7 +58,11 @@ public <T> List<T> getArray(String key, Class<T> tClass) {
         JSONArray jsonArray = jsonObject.getJSONArray(key);
         List<T> jsonMappers = new ArrayList<>(jsonArray.size());
         for (Object jsonObject : jsonArray) {
-            jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
+            if (jsonObject instanceof JSONObject) {
+                jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass));
+            } else {
+                jsonMappers.add((T) jsonObject);
+            }
         }
         return jsonMappers;
     }

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
     </scm>
 
     <properties>
-        <revision>0.7.0</revision>
+        <revision>0.7.1</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>