From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 23 九月 2021 19:13:58 +0800
Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
index ae6cc11..7246b0a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java
@@ -1,11 +1,12 @@
package com.ruoyi.common.utils;
-import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import java.io.IOException;
import java.util.ArrayList;
@@ -17,23 +18,13 @@
*
* @author 鑺嬮亾婧愮爜
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class JsonUtils {
- private static ObjectMapper objectMapper = new ObjectMapper();
-
- /**
- * 鍒濆鍖� objectMapper 灞炴��
- * <p>
- * 閫氳繃杩欐牱鐨勬柟寮忥紝浣跨敤 Spring 鍒涘缓鐨� ObjectMapper Bean
- *
- * @param objectMapper ObjectMapper 瀵硅薄
- */
- public static void init(ObjectMapper objectMapper) {
- JsonUtils.objectMapper = objectMapper;
- }
+ private static ObjectMapper objectMapper = SpringUtils.getBean(ObjectMapper.class);
public static String toJsonString(Object object) {
- if (Validator.isEmpty(object)) {
+ if (StringUtils.isNull(object)) {
return null;
}
try {
@@ -44,7 +35,7 @@
}
public static <T> T parseObject(String text, Class<T> clazz) {
- if (StrUtil.isEmpty(text)) {
+ if (StringUtils.isEmpty(text)) {
return null;
}
try {
@@ -66,7 +57,7 @@
}
public static <T> T parseObject(String text, TypeReference<T> typeReference) {
- if (StrUtil.isBlank(text)) {
+ if (StringUtils.isBlank(text)) {
return null;
}
try {
@@ -77,7 +68,7 @@
}
public static <T> Map<String, T> parseMap(String text) {
- if (StrUtil.isBlank(text)) {
+ if (StringUtils.isBlank(text)) {
return null;
}
try {
@@ -88,7 +79,7 @@
}
public static <T> List<T> parseArray(String text, Class<T> clazz) {
- if (StrUtil.isEmpty(text)) {
+ if (StringUtils.isEmpty(text)) {
return new ArrayList<>();
}
try {
--
Gitblit v1.9.3