From 9390b992faf767f4206fa9ddb869dfd6d3b4ff98 Mon Sep 17 00:00:00 2001
From: yangyao <junzizhiyao@163.com>
Date: Thu, 16 Apr 2020 13:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8JsonKit=E6=9D=A5=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2JSON=E7=9A=84=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=BC=80=E5=8F=91=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E4=B8=AD=E4=BD=BF=E7=94=A8=E5=85=B6=E5=AE=83json=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/io/jboot/support/jwt/JwtManager.java         | 7 +++----
 src/main/java/io/jboot/web/controller/JbootController.java | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/jboot/support/jwt/JwtManager.java b/src/main/java/io/jboot/support/jwt/JwtManager.java
index 3195bebc..9eed78d6 100644
--- a/src/main/java/io/jboot/support/jwt/JwtManager.java
+++ b/src/main/java/io/jboot/support/jwt/JwtManager.java
@@ -15,7 +15,7 @@
  */
 package io.jboot.support.jwt;
 
-import com.alibaba.fastjson.JSON;
+import com.jfinal.kit.JsonKit;
 import io.jboot.Jboot;
 import io.jboot.exception.JbootException;
 import io.jboot.utils.StrUtil;
@@ -80,8 +80,7 @@ public class JwtManager {
             if (StrUtil.isBlank(jsonString)) {
                 return null;
             }
-
-            return JSON.parseObject(jsonString, HashMap.class);
+            return JsonKit.parse(jsonString, HashMap.class);
 
         } catch (SignatureException | MalformedJwtException e) {
             // don't trust the JWT!
@@ -108,7 +107,7 @@ public class JwtManager {
         Date now = new Date(nowMillis);
 
         map.put(JwtInterceptor.ISUUED_AT, nowMillis);
-        String subject = JSON.toJSONString(map);
+        String subject = JsonKit.toJson(map);
 
         JwtBuilder builder = Jwts.builder()
                 .setIssuedAt(now)
diff --git a/src/main/java/io/jboot/web/controller/JbootController.java b/src/main/java/io/jboot/web/controller/JbootController.java
index 988e0899..fb1ad960 100644
--- a/src/main/java/io/jboot/web/controller/JbootController.java
+++ b/src/main/java/io/jboot/web/controller/JbootController.java
@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.core.Controller;
 import com.jfinal.core.NotAction;
+import com.jfinal.kit.JsonKit;
 import io.jboot.support.jwt.JwtManager;
 import io.jboot.utils.RequestUtil;
 import io.jboot.utils.StrUtil;
@@ -194,7 +195,7 @@ public class JbootController extends Controller {
      */
     @NotAction
     public <T> T getRawObject(Class<T> tClass) {
-        return StrUtil.isBlank(getRawData()) ? null : JSON.parseObject(getRawData(), tClass);
+        return StrUtil.isBlank(getRawData()) ? null : JsonKit.parse(getRawData(), tClass);
     }
 
 
-- 
Gitee