From 868942e202aeb967b8ce47b38cc2433a636a128d Mon Sep 17 00:00:00 2001
From: phanes <5411232+phanes@user.noreply.gitee.com>
Date: 星期日, 16 一月 2022 17:46:24 +0800
Subject: [PATCH] update 格式化代码结构 统一编码格式

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java |   61 ++++++++++++++----------------
 1 files changed, 29 insertions(+), 32 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 246df9b..1c01912 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,10 +1,12 @@
 package com.ruoyi.common.utils;
 
-import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ArrayUtil;
 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;
@@ -16,27 +18,21 @@
  *
  * @author 鑺嬮亾婧愮爜
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class JsonUtils {
 
-    private static ObjectMapper objectMapper = new ObjectMapper();
+    private static final ObjectMapper OBJECT_MAPPER = SpringUtils.getBean(ObjectMapper.class);
 
-    /**
-     * 鍒濆鍖� objectMapper 灞炴��
-     * <p>
-     * 閫氳繃杩欐牱鐨勬柟寮忥紝浣跨敤 Spring 鍒涘缓鐨� ObjectMapper Bean
-     *
-     * @param objectMapper ObjectMapper 瀵硅薄
-     */
-    public static void init(ObjectMapper objectMapper) {
-        JsonUtils.objectMapper = objectMapper;
+    public static ObjectMapper getObjectMapper() {
+        return OBJECT_MAPPER;
     }
 
     public static String toJsonString(Object object) {
-		if (StringUtils.isNull(object)) {
-			return null;
-		}
+        if (StringUtils.isNull(object)) {
+            return null;
+        }
         try {
-            return objectMapper.writeValueAsString(object);
+            return OBJECT_MAPPER.writeValueAsString(object);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
@@ -47,7 +43,7 @@
             return null;
         }
         try {
-            return objectMapper.readValue(text, clazz);
+            return OBJECT_MAPPER.readValue(text, clazz);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -58,40 +54,41 @@
             return null;
         }
         try {
-            return objectMapper.readValue(bytes, clazz);
+            return OBJECT_MAPPER.readValue(bytes, clazz);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }
 
     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);
+            return OBJECT_MAPPER.readValue(text, typeReference);
         } 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> Map<String, T> parseMap(String text) {
+        if (StringUtils.isBlank(text)) {
+            return null;
+        }
+        try {
+            return OBJECT_MAPPER.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)) {
             return new ArrayList<>();
         }
         try {
-            return objectMapper.readValue(text, objectMapper.getTypeFactory().constructCollectionType(List.class, clazz));
+            return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, clazz));
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

--
Gitblit v1.9.3