From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
utils/src/main/java/org/yeshi/utils/JsonUtil.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/JsonUtil.java b/utils/src/main/java/org/yeshi/utils/JsonUtil.java
index ff23e1f..d05d734 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;
@@ -66,7 +63,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 +202,8 @@
desc = (nowDay - oldDay) + "澶╁墠";
}
out.value(desc);
- }
+ } else
+ out.value("");
}
@Override
--
Gitblit v1.8.0