From 7d059e6d746c60d99dfa78558e68f395cc83c050 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 14 Nov 2016 18:17:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E8=AF=8A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/common/utils/JsonUtil.java  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
index 16bcb2c..e75fe52 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
@@ -18,16 +18,6 @@ import java.util.*;
 
 public class JsonUtil {
 
-    static JsonConfig config = new JsonConfig();
-
-    static {
-        config.registerJsonValueProcessor(Date.class,
-                new DateJsonValueProcessor("yyyy-MM-dd hh:mm:ss"));
-        config.registerJsonValueProcessor(Timestamp.class,
-                new DateJsonValueProcessor("yyyy-MM-dd hh:mm:ss"));
-    }
-
-
     public static <T> T jkstr2Obj(String content,
                                   Class<T> cls) {
         ObjectMapper objectMapper = new ObjectMapper();
@@ -63,7 +53,7 @@ public class JsonUtil {
 
     public static JSONObject getObj(String content) {
         if (StringUtils.isNotBlank(content))
-            return JSONObject.fromObject(content, config);
+            return JSONObject.fromObject(content);
         return null;
     }
 
@@ -77,7 +67,7 @@ public class JsonUtil {
 
     public static String obj2JsonString(Object obj) {
         try {
-            return JSONObject.fromObject(obj, config).toString();
+            return JSONObject.fromObject(obj).toString();
         } catch (Exception e) {
             ExceptionUtils.catchException(e, "obj2 json string error ." + e.getMessage());
         }
@@ -85,13 +75,13 @@ public class JsonUtil {
     }
 
     public static String array2JsonString(Object obj) {
-        return JSONArray.fromObject(obj, config).toString();
+        return JSONArray.fromObject(obj).toString();
     }
 
     @SuppressWarnings("unchecked")
     public static <T> List<T> toList(String content,
                                      Class<T> cls) {
-        return (List<T>) JSONArray.toCollection(JSONArray.fromObject(content, config), cls);
+        return (List<T>) JSONArray.toCollection(JSONArray.fromObject(content), cls);
     }
 
     public static void main(String[] args) {
-- 
1.8.3.1