From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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..676de01 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,8 +1,6 @@
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;
@@ -33,7 +31,7 @@
}
public static String toJsonString(Object object) {
- if (Validator.isEmpty(object)) {
+ if (StringUtils.isNull(object)) {
return null;
}
try {
@@ -44,7 +42,7 @@
}
public static <T> T parseObject(String text, Class<T> clazz) {
- if (StrUtil.isEmpty(text)) {
+ if (StringUtils.isEmpty(text)) {
return null;
}
try {
@@ -66,7 +64,7 @@
}
public static <T> T parseObject(String text, TypeReference<T> typeReference) {
- if (StrUtil.isBlank(text)) {
+ if (StringUtils.isBlank(text)) {
return null;
}
try {
@@ -77,7 +75,7 @@
}
public static <T> Map<String, T> parseMap(String text) {
- if (StrUtil.isBlank(text)) {
+ if (StringUtils.isBlank(text)) {
return null;
}
try {
@@ -88,7 +86,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