fix: 工具类注入逻辑优化、log 优化

Author: cadecode

uni-boot-common/src/main/java/top/cadecode/uniboot/common/util/JacksonUtil.java

@@ -7,8 +7,9 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
@@ -21,16 +22,21 @@
  * @author Cade Li
  * @date 2022/5/23
  */
-@RequiredArgsConstructor
+@Slf4j
 @Component
 public class JacksonUtil implements InitializingBean {
 
+    public static ObjectMapper OBJECT_MAPPER;
+
+    private ObjectMapper objectMapper;
+
     /**
      * 注入 Spring 管理的 ObjectMapper
      */
-    private final ObjectMapper objectMapper;
-
-    public static ObjectMapper OBJECT_MAPPER;
+    @Autowired(required = false)
+    public void setObjectMapper(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
 
     /**
      * 转换对象到 json 串
@@ -62,7 +68,7 @@ public static String toJson(Object bean, boolean isPretty) {
             }
             return OBJECT_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(bean);
         } catch (JsonProcessingException e) {
-            throw new RuntimeException("转换 Bean 到 Json 出错", e);
+            throw new RuntimeException("cast bean to json fail", e);
         }
     }
 
@@ -84,7 +90,7 @@ public static <T> T toBean(String json, Class<T> clazz) {
         try {
             return OBJECT_MAPPER.readValue(json, clazz);
         } catch (Exception e) {
-            throw new RuntimeException("转换 Json 到 Bean 出错", e);
+            throw new RuntimeException("cast json to bean fail", e);
         }
     }
 
@@ -106,14 +112,15 @@ public static <T> T toBean(String json, TypeReference<T> typeReference) {
         try {
             return OBJECT_MAPPER.readValue(json, typeReference);
         } catch (IOException e) {
-            throw new RuntimeException("转换 Json 到 Bean 出错", e);
+            throw new RuntimeException("cast json to bean fail", e);
         }
     }
 
     @Override
     public void afterPropertiesSet() {
         OBJECT_MAPPER = this.objectMapper;
         if (Objects.isNull(OBJECT_MAPPER)) {
+            log.warn("Bean objectMapper not found, use default config by JacksonUtil");
             OBJECT_MAPPER = new ObjectMapper();
             // 定义日期格式
             String STANDARD_FORMAT = "yyyy-MM-dd HH:mm:ss";

uni-boot-common/src/main/java/top/cadecode/uniboot/common/util/RedisUtil.java

@@ -1,8 +1,8 @@
 package top.cadecode.uniboot.common.util;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
@@ -15,16 +15,20 @@
  * @author Cade Li
  * @date 2022/5/29
  */
-@RequiredArgsConstructor
 @Component
 public class RedisUtil implements InitializingBean {
 
+    public static StringRedisTemplate TEMPLATE;
+
+    private StringRedisTemplate stringRedisTemplate;
+
     /**
      * 自动注入 stringRedisTemplate
      */
-    private final StringRedisTemplate stringRedisTemplate;
-
-    public static StringRedisTemplate TEMPLATE;
+    @Autowired(required = false)
+    public void setStringRedisTemplate(StringRedisTemplate stringRedisTemplate) {
+        this.stringRedisTemplate = stringRedisTemplate;
+    }
 
     /**
      * 获取 value
@@ -45,21 +49,45 @@ public static <T> T get(String key, TypeReference<T> typeReference) {
     /**
      * 添加 key
      */
+    public static void set(String key, Object o) {
+        String json = JacksonUtil.toJson(o);
+        TEMPLATE.opsForValue().set(key, json);
+    }
+
+    /**
+     * 添加 key，如果不存在
+     */
+    public static Boolean setIfAbsent(String key, Object o) {
+        String json = JacksonUtil.toJson(o);
+        return TEMPLATE.opsForValue().setIfAbsent(key, json);
+    }
+
+    /**
+     * 添加 key，如果不存在
+     */
+    public static Boolean setIfPresent(String key, Object o) {
+        String json = JacksonUtil.toJson(o);
+        return TEMPLATE.opsForValue().setIfPresent(key, json);
+    }
+
+    /**
+     * 添加 key 并设置有效期
+     */
     public static void set(String key, Object o, long timeout, TimeUnit timeUnit) {
         String json = JacksonUtil.toJson(o);
         TEMPLATE.opsForValue().set(key, json, timeout, timeUnit);
     }
 
     /**
-     * 添加 key，如果不存在
+     * 添加 key 并设置有效期，如果不存在
      */
     public static Boolean setIfAbsent(String key, Object o, long timeout, TimeUnit timeUnit) {
         String json = JacksonUtil.toJson(o);
         return TEMPLATE.opsForValue().setIfAbsent(key, json, timeout, timeUnit);
     }
 
     /**
-     * 添加 key，如果不存在
+     * 添加 key 并设置有效期，如果不存在
      */
     public static Boolean setIfPresent(String key, Object o, long timeout, TimeUnit timeUnit) {
         String json = JacksonUtil.toJson(o);
@@ -91,7 +119,7 @@ public static Boolean expire(String key, long timeout, TimeUnit timeUnit) {
     public void afterPropertiesSet() {
         TEMPLATE = stringRedisTemplate;
         if (Objects.isNull(TEMPLATE)) {
-            throw new IllegalArgumentException("无法注入依赖：stringRedisTemplate");
+            throw new IllegalArgumentException("Bean stringRedisTemplate not found");
         }
     }
 }