From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 7246b0a..b65c23d 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
@@ -24,9 +24,9 @@
private static ObjectMapper objectMapper = SpringUtils.getBean(ObjectMapper.class);
public static String toJsonString(Object object) {
- if (StringUtils.isNull(object)) {
- return null;
- }
+ if (StringUtils.isNull(object)) {
+ return null;
+ }
try {
return objectMapper.writeValueAsString(object);
} catch (JsonProcessingException e) {
@@ -57,9 +57,9 @@
}
public static <T> T parseObject(String text, TypeReference<T> typeReference) {
- if (StringUtils.isBlank(text)) {
- return null;
- }
+ if (StringUtils.isBlank(text)) {
+ return null;
+ }
try {
return objectMapper.readValue(text, typeReference);
} catch (IOException e) {
@@ -67,16 +67,17 @@
}
}
- public static <T> Map<String, T> parseMap(String text) {
- if (StringUtils.isBlank(text)) {
- return null;
- }
- try {
- return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {});
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
+ public static <T> Map<String, T> parseMap(String text) {
+ if (StringUtils.isBlank(text)) {
+ return null;
+ }
+ try {
+ return objectMapper.readValue(text, new TypeReference<Map<String, T>>() {
+ });
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
public static <T> List<T> parseArray(String text, Class<T> clazz) {
if (StringUtils.isEmpty(text)) {
--
Gitblit v1.9.3