feat: Add JsonUtils and modify related methods (opentiny#243)

Author: lu-yg

app/src/main/java/com/tinyengine/it/config/filter/FilterConfig.java

@@ -15,8 +15,6 @@
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
@@ -56,16 +54,4 @@ public FilterRegistrationBean<RequestIdFilter> requestIdFilter() {
         registrationBean.setFilter(new RequestIdFilter());
         return registrationBean;
     }
-
-    /**
-     * Object mapper object mapper.
-     *
-     * @return the object mapper
-     */
-    @Bean
-    public ObjectMapper objectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.registerModule(new JavaTimeModule());
-        return mapper;
-    }
 }

app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java

@@ -1,13 +1,12 @@
 /**
  * Copyright (c) 2023 - present TinyEngine Authors.
  * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
- *
+ * <p>
  * Use of this source code is governed by an MIT-style license.
- *
+ * <p>
  * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
  * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
  * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
- *
  */
 
 package com.tinyengine.it.config.filter;
@@ -16,31 +15,35 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.reactive.CorsWebFilter;
-import org.springframework.web.reactive.config.WebFluxConfigurer;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.Arrays;
 import java.util.List;
 
 @Configuration
-public class WebConfig implements WebFluxConfigurer {
+public class WebConfig implements WebMvcConfigurer {
     @Value("${cors.allowed-origins}")
     private String allowedOrigins;
 
     @Bean
-    public CorsWebFilter corsFilter() {
+    public CorsFilter corsFilter() {
+        // 跨域配置地址
         List<String> crosDomainList = Arrays.asList(allowedOrigins.split(","));
 
         CorsConfiguration corsConfiguration = new CorsConfiguration();
+        // 1、允许来源
         corsConfiguration.setAllowedOriginPatterns(crosDomainList);
+        // 2、允许任何请求头
         corsConfiguration.addAllowedHeader(CorsConfiguration.ALL);
+        // 3、允许任何方法
         corsConfiguration.addAllowedMethod(CorsConfiguration.ALL);
+        // 4、允许凭证
         corsConfiguration.setAllowCredentials(true);
 
-        org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource source =
-                new org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource();
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", corsConfiguration);
-
-        return new CorsWebFilter(source);
+        return new CorsFilter(source);
     }
-}
+}

base/src/main/java/com/tinyengine/it/common/handler/ListTypeHandler.java

@@ -14,8 +14,8 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
+import com.tinyengine.it.common.utils.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.ibatis.type.BaseTypeHandler;
@@ -38,14 +38,12 @@
  */
 @Slf4j
 public class ListTypeHandler extends BaseTypeHandler<List<?>> {
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
     @Override
     public void setNonNullParameter(PreparedStatement ps, int i, List<?> parameter, JdbcType jdbcType)
             throws SQLException {
         // 将 List<?> 转换为字符串，并设置到 PreparedStatement 中的相应参数
         try {
-            String json = objectMapper.writeValueAsString(parameter);
+            String json = JsonUtils.MAPPER.writeValueAsString(parameter);
             ps.setString(i, json);
         } catch (IOException e) {
             throw new SQLException("Error converting List<?> to JSON", e);
@@ -90,10 +88,10 @@ private List<?> convetJsonList(String jsonString) throws JsonProcessingException
             return Collections.emptyList();
         } else if (jsonString.startsWith("[{") && jsonString.endsWith("}]")) {
             // 尝试将 JSON 字符串转换为 List<Map<String, Object>>
-            return objectMapper.readValue(jsonString, new TypeReference<List<Map<String, Object>>>() {});
+            return JsonUtils.MAPPER.readValue(jsonString, new TypeReference<List<Map<String, Object>>>() {});
         } else {
             // 尝试将 JSON 字符串转换为 List<String>
-            return objectMapper.readValue(jsonString, new TypeReference<List<String>>() {});
+            return JsonUtils.MAPPER.readValue(jsonString, new TypeReference<List<String>>() {});
         }
     }
 }

base/src/main/java/com/tinyengine/it/common/handler/MapTypeHandler.java

@@ -15,8 +15,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
+import com.tinyengine.it.common.utils.JsonUtils;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.ibatis.type.BaseTypeHandler;
@@ -37,13 +37,11 @@
  */
 @Slf4j
 public class MapTypeHandler extends BaseTypeHandler<Map<String, Object>> {
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
     @Override
     public void setNonNullParameter(PreparedStatement ps, int i, Map<String, Object> parameter, JdbcType jdbcType)
             throws SQLException {
         try {
-            String json = objectMapper.writeValueAsString(parameter);
+            String json = JsonUtils.MAPPER.writeValueAsString(parameter);
             ps.setString(i, json);
         } catch (JsonProcessingException e) {
             throw new SQLException("Error converting Map to JSON", e);
@@ -71,9 +69,9 @@ private Map<String, Object> parseJson(String json) throws SQLException {
             return new HashMap<>();
         }
         try {
-            JsonNode jsonNode = objectMapper.readTree(json);
+            JsonNode jsonNode = JsonUtils.MAPPER.readTree(json);
             if (jsonNode.isObject()) {
-                return objectMapper.readValue(json, new TypeReference<Map<String, Object>>() {});
+                return JsonUtils.MAPPER.readValue(json, new TypeReference<Map<String, Object>>() {});
             } else {
                 // 非对象类型也返回空的 Map
                 return new HashMap<>();