diff --git a/src/main/java/io/jboot/support/jwt/JwtManager.java b/src/main/java/io/jboot/support/jwt/JwtManager.java index 3195bebc052e80f0e3800f749478694da25513d0..9eed78d658756d0ff162d5af8047fcfb0084b4df 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 988e089954e860986012c6dc307600e290c3451f..fb1ad960aba3a30fc2f94a8a36ce884abb716c01 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 getRawObject(Class tClass) { - return StrUtil.isBlank(getRawData()) ? null : JSON.parseObject(getRawData(), tClass); + return StrUtil.isBlank(getRawData()) ? null : JsonKit.parse(getRawData(), tClass); }