From 672ec0a719f4edb07cb37d0f1b8b486eeb1cfbbe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 19 十一月 2020 16:18:43 +0800
Subject: [PATCH] 支付宝调整

---
 utils/src/main/java/org/yeshi/utils/JsonUtil.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/utils/src/main/java/org/yeshi/utils/JsonUtil.java b/utils/src/main/java/org/yeshi/utils/JsonUtil.java
index 2d229c5..21ca5b9 100644
--- a/utils/src/main/java/org/yeshi/utils/JsonUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/JsonUtil.java
@@ -12,9 +12,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
@@ -38,7 +35,6 @@
 		object.put("code", 0);
 		object.put("data", result);
 		return object.toString();
-
 	}
 
 	public static String loadFalseResult(String error) {
@@ -66,7 +62,10 @@
 	}
 
 	public static String loadJSONP(String callback, String data) {
-		return callback + "(" + data + ")";
+		if (StringUtil.isNullOrEmpty(callback))
+			return data;
+		else
+			return callback + "(" + data + ")";
 	}
 
 	public static String loadFalseResult(int code, String error) {
@@ -202,7 +201,8 @@
 						desc = (nowDay - oldDay) + "澶╁墠";
 					}
 					out.value(desc);
-				}
+				} else
+					out.value("");
 			}
 
 			@Override
@@ -271,7 +271,11 @@
 		List<T> list = new ArrayList<>();
 		JSONArray array = JSONArray.fromObject(jsonData);
 		for (int i = 0; i < array.size(); i++) {
-			list.add(baseGson.fromJson(array.optJSONObject(i).toString(), beanType));
+			try {
+				list.add(baseGson.fromJson(array.optJSONObject(i).toString(), beanType));
+			} catch (Exception e) {
+				list.add(baseGson.fromJson(array.optString(i), beanType));
+			}
 		}
 		return list;
 	}

--
Gitblit v1.8.0