refactor(core): 升级Spring Boot至4.0.0并替换Jackson为Tools Jackson

- 将Spring Boot版本从3.5.7升级到4.0.0 - 替换com.fasterxml.jackson依赖为tools.jackson - 更新MyBatis Plus starter为spring-boot4-starter版本 - 修改JsonUtils工具类以适配新的Jackson包路径 - 更新全局异常处理器中的异常类型引用 - 调整相关模块的依赖配置和导入语句 - 升级MyBatis Plus版本至3.5.15 - 更新阿里云Spring Cloud版本至2025.0.0.0

refactor(core): 升级Spring Boot至4.0.0并替换Jackson为Tools Jackson
- 将Spring Boot版本从3.5.7升级到4.0.0 - 替换com.fasterxml.jackson依赖为tools.jackson - 更新MyBatis Plus starter为spring-boot4-starter版本 - 修改JsonUtils工具类以适配新的Jackson包路径 - 更新全局异常处理器中的异常类型引用 - 调整相关模块的依赖配置和导入语句 - 升级MyBatis Plus版本至3.5.15 - 更新阿里云Spring Cloud版本至2025.0.0.0
zhangmeiyang
1 parent 31863474
Showing 12 changed files with 90 additions and 80 deletions
pom.xml
tax-adopt/src/main/java/com/diligrp/tax/adopt/service/impl/AdoptMessageServiceImpl.java
tax-central/src/main/java/com/diligrp/tax/central/config/GlobalExceptionHandler.java
tax-central/src/main/java/com/diligrp/tax/central/type/DocumentFieldType.java
tax-central/src/main/java/com/diligrp/tax/central/utils/JsonPathUtils.java
tax-central/src/main/java/com/diligrp/tax/central/utils/JsonUtils.java
tax-central/src/main/java/com/diligrp/tax/central/utils/MappingUtils.java
tax-map/src/main/java/com/diligrp/tax/mapping/process/kingdee/MappingProcessor.java
tax-proxy/src/main/java/com/diligrp/tax/proxy/demarcate/kingdee/CustomerSender.java
tax-proxy/src/main/java/com/diligrp/tax/proxy/helper/KingDeeHelper.java
tax-storage/pom.xml
tax-storage/src/main/java/com/diligrp/tax/storage/service/MappingErrorService.java
@@ -27,11 +27,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Spring相关版本 -->
         <spring-cloud.version>2025.0.0</spring-cloud.version>
-        <spring-boot.version>3.5.7</spring-boot.version>
-        <alibaba.cloud.version>2023.0.3.4</alibaba.cloud.version>
+        <spring-boot.version>4.0.0</spring-boot.version>
+        <alibaba.cloud.version>2025.0.0.0</alibaba.cloud.version>
         <!-- 数据库相关 -->
         <mysql-connector.version>9.4.0</mysql-connector.version>
-        <mybatis-plus.version>3.5.14</mybatis-plus.version>
+        <mybatis-plus.version>3.5.15</mybatis-plus.version>
         <!-- 工具类库 -->
         <lombok.version>1.18.42</lombok.version>
         <poi.version>5.5.0</poi.version>
@@ -41,7 +41,7 @@
         <dependencies>
             <dependency>
                 <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+                <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
             <dependency>
@@ -14,7 +14,7 @@ import com.diligrp.tax.central.service.ITenantService;
 import com.diligrp.tax.central.type.TaxSystemType;
 import com.diligrp.tax.central.utils.AdoptUtils;
 import com.diligrp.tax.central.utils.JsonUtils;
-import com.fasterxml.jackson.core.type.TypeReference;
+
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
@@ -24,6 +24,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
+import tools.jackson.core.type.TypeReference;
 import java.io.IOException;
 import java.util.List;
@@ -3,7 +3,6 @@ package com.diligrp.tax.central.config;
 import com.diligrp.tax.central.exception.TaxAgentServiceException;
 import com.diligrp.tax.central.message.Message;
 import com.diligrp.tax.central.type.TaxSystemType;
-import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +15,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import tools.jackson.core.JacksonException;
 import java.util.List;
 import java.util.Set;
@@ -42,7 +42,7 @@ public class GlobalExceptionHandler {
      * @param ex InvalidFormatException
      * @return 响应消息对象
      */
-    @ExceptionHandler({HttpMessageNotReadableException.class, InvalidFormatException.class})
+    @ExceptionHandler({HttpMessageNotReadableException.class, JacksonException.class})
     public Message<?> invalidFormatExceptionHandler(Exception ex) {
         return Message.failure(TaxSystemType.ABNORMAL_PARAMETERS.code, ex.getMessage());
     }
@@ -3,7 +3,7 @@ package com.diligrp.tax.central.type;
 import com.diligrp.tax.central.model.PipelineBusinessKeywordDO;
 import com.diligrp.tax.central.utils.JsonPathUtils;
 import com.diligrp.tax.central.utils.JsonUtils;
-import com.fasterxml.jackson.core.type.TypeReference;
+import tools.jackson.core.type.TypeReference;
 import java.util.*;
@@ -2,8 +2,8 @@ package com.diligrp.tax.central.utils;
 import com.diligrp.tax.central.exception.TaxAgentServiceException;
 import com.diligrp.tax.central.type.TaxSystemType;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.jayway.jsonpath.JsonPath;
+import tools.jackson.core.type.TypeReference;
 import java.util.HashMap;
 import java.util.Map;
 package com.diligrp.tax.central.utils;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.SerializationFeature;
+import tools.jackson.databind.cfg.DateTimeFeature;
+import tools.jackson.databind.cfg.EnumFeature;
+import tools.jackson.databind.ext.javatime.deser.LocalDateDeserializer;
+import tools.jackson.databind.ext.javatime.deser.LocalDateTimeDeserializer;
+import tools.jackson.databind.ext.javatime.deser.LocalTimeDeserializer;
+import tools.jackson.databind.ext.javatime.ser.LocalDateSerializer;
+import tools.jackson.databind.ext.javatime.ser.LocalDateTimeSerializer;
+import tools.jackson.databind.ext.javatime.ser.LocalTimeSerializer;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.module.SimpleModule;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -24,100 +24,109 @@ import java.time.format.DateTimeFormatter;
 import java.util.TimeZone;
 public class JsonUtils {
-
     private static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
     private static final String DATE_FORMAT = "yyyy-MM-dd";
     private static final String TIME_FORMAT = "HH:mm:ss";
-    private static final ObjectMapper objectMapper = initObjectMapper();
-
-    private static ObjectMapper initObjectMapper() {
-        Jackson2ObjectMapperBuilder jackson2ObjectMapperBuilder = new Jackson2ObjectMapperBuilder();
-        initObjectMapperBuilder(jackson2ObjectMapperBuilder);
-        ObjectMapper objectMapper = jackson2ObjectMapperBuilder.createXmlMapper(false).build();
-        objectMapper.setSerializerFactory(objectMapper.getSerializerFactory());
-        return objectMapper;
-    }
-    public static void initObjectMapperBuilder(Jackson2ObjectMapperBuilder builder) {
-        //序列化java.util.Date类型
-        builder.dateFormat(new SimpleDateFormat(DATE_TIME_FORMAT));
-        builder.timeZone(TimeZone.getTimeZone(ZoneOffset.of("+8")));
-        builder.serializationInclusion(JsonInclude.Include.NON_NULL);
-        builder.featuresToDisable(
-                DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, // Json串的属性无JavaBean字段对应时，避免抛出异常
-                DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, // JavaBean中primitive类型的字段无Json属性时，避免抛出异常
-                DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS, // Json串数字类型属性，赋值JavaBean中Enum字段时，避免抛出异常
-                SerializationFeature.WRITE_DATES_AS_TIMESTAMPS,
-                SerializationFeature.FAIL_ON_EMPTY_BEANS
-        );
-        builder.featuresToEnable(
-                DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT,
-                DeserializationFeature.USE_JAVA_ARRAY_FOR_JSON_ARRAY
-        );
+    private static final JsonMapper MAPPER = initJacksonMapper();
+    private static JsonMapper initJacksonMapper() {
         var dateTimeFormatter = DateTimeFormatter.ofPattern(DATE_TIME_FORMAT);
         var dateFormatter = DateTimeFormatter.ofPattern(DATE_FORMAT);
         var timeFormatter = DateTimeFormatter.ofPattern(TIME_FORMAT);
-        // 添加自定义序列化
-        builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(dateTimeFormatter));
-        builder.serializerByType(LocalDate.class, new LocalDateSerializer(dateFormatter));
-        builder.serializerByType(LocalTime.class, new LocalTimeSerializer(timeFormatter));
-        // 添加自定义反序列化
-        builder.deserializerByType(LocalDateTime.class, new LocalDateTimeDeserializer(dateTimeFormatter));
-        builder.deserializerByType(LocalDate.class, new LocalDateDeserializer(dateFormatter));
-        builder.deserializerByType(LocalTime.class, new LocalTimeDeserializer(timeFormatter));
+        LocalDateTimeSerializer localDateTimeSerializer = new LocalDateTimeSerializer(dateTimeFormatter);
+        LocalDateSerializer localDateSerializer = new LocalDateSerializer(dateFormatter);
+        LocalTimeSerializer localTimeSerializer = new LocalTimeSerializer(timeFormatter);
+
+        LocalDateTimeDeserializer localDateTimeDeserializer = new LocalDateTimeDeserializer(dateTimeFormatter);
+        LocalDateDeserializer localDateDeserializer = new LocalDateDeserializer(dateFormatter);
+        LocalTimeDeserializer localTimeDeserializer = new LocalTimeDeserializer(timeFormatter);
+
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(LocalDateTime.class, localDateTimeSerializer);
+        module.addSerializer(LocalDate.class, localDateSerializer);
+        module.addSerializer(LocalTime.class, localTimeSerializer);
+        module.addDeserializer(LocalDateTime.class, localDateTimeDeserializer);
+        module.addDeserializer(LocalDate.class, localDateDeserializer);
+        module.addDeserializer(LocalTime.class, localTimeDeserializer);
+        return JsonMapper.builder()
+                .changeDefaultPropertyInclusion(incl -> incl.withValueInclusion(JsonInclude.Include.NON_NULL))
+                .changeDefaultPropertyInclusion(incl -> incl.withContentInclusion(JsonInclude.Include.NON_NULL))
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES)
+                .disable(EnumFeature.FAIL_ON_NUMBERS_FOR_ENUMS)
+                .disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+                .enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)
+                .enable(DeserializationFeature.USE_JAVA_ARRAY_FOR_JSON_ARRAY)
+                .defaultDateFormat(new SimpleDateFormat(DATE_TIME_FORMAT))
+                .defaultTimeZone(TimeZone.getTimeZone(ZoneOffset.of("+8")))
+                .addModule(module)
+                .build();
+
     }
     public static <T> T fromJsonString(String json, Class<T> type) {
         try {
-            return objectMapper.readValue(json, type);
-        } catch (JsonProcessingException ex) {
+            return MAPPER.readValue(json, type);
+        } catch (JacksonException ex) {
             throw new IllegalArgumentException("Deserialize json exception", ex);
         }
     }
-    public static <T> T fromJsonString(String json, TypeReference<T> jsonTypeReference) {
+    public static <T> T fromJsonString(String json, tools.jackson.core.type.TypeReference<T> jsonTypeReference) {
         try {
-            return objectMapper.readValue(json, jsonTypeReference);
-        } catch (JsonProcessingException ex) {
+            return MAPPER.readValue(json, jsonTypeReference);
+        } catch (JacksonException ex) {
             throw new IllegalArgumentException("Deserialize json array exception", ex);
         }
     }
-    public static <T> T fromJsonString(String json, JavaType javaType) {
+    public static <T> T fromJsonString(String json, tools.jackson.databind.JavaType javaType) {
         try {
-            return objectMapper.readValue(json, javaType);
-        } catch (JsonProcessingException ex) {
+            return MAPPER.readValue(json, javaType);
+        } catch (JacksonException ex) {
             throw new IllegalArgumentException("Deserialize json array exception", ex);
         }
     }
     public static <T> String toJsonString(T object) {
         try {
-            return objectMapper.writeValueAsString(object);
-        } catch (JsonProcessingException ex) {
+            return MAPPER.writeValueAsString(object);
+        } catch (JacksonException ex) {
             throw new IllegalArgumentException("Serialize json exception", ex);
         }
     }
     public static <T> T convertValue(Object fromValue, Class<T> toValueType) {
-        return objectMapper.convertValue(fromValue, toValueType);
+        try {
+            return MAPPER.convertValue(fromValue, toValueType);
+        } catch (JacksonException ex) {
+            throw new IllegalArgumentException("Convert value exception", ex);
+        }
     }
-    public static <T> T convertValue(Object fromValue, TypeReference<T> toValueTypeRef) {
-        return objectMapper.convertValue(fromValue, toValueTypeRef);
+    public static <T> T convertValue(Object fromValue, tools.jackson.core.type.TypeReference<T> toValueTypeRef) {
+        try {
+            return MAPPER.convertValue(fromValue, toValueTypeRef);
+        } catch (JacksonException ex) {
+            throw new IllegalArgumentException("Convert value exception", ex);
+        }
     }
-    public static <T> T convertValue(Object fromValue, JavaType toValueType) {
-        return objectMapper.convertValue(fromValue, toValueType);
+    public static <T> T convertValue(Object fromValue, tools.jackson.databind.JavaType toValueType) {
+        try {
+            return MAPPER.convertValue(fromValue, toValueType);
+        } catch (JacksonException ex) {
+            throw new IllegalArgumentException("Convert value exception", ex);
+        }
     }
     public static <T> T deepCopy(T t, Class<T> cls) {
         return JsonUtils.fromJsonString(JsonUtils.toJsonString(t), cls);
     }
-
 }
@@ -11,8 +11,8 @@ import com.diligrp.tax.central.exception.TaxAgentServiceException;
 import com.diligrp.tax.central.model.PipelineDocFieldTypeDO;
 import com.diligrp.tax.central.model.PipelineDocFieldTypeRemoteParamDO;
 import com.diligrp.tax.central.type.TaxSystemType;
-import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.extern.slf4j.Slf4j;
+import tools.jackson.core.type.TypeReference;
 import java.lang.reflect.Field;
 import java.util.*;
@@ -6,11 +6,10 @@ import com.diligrp.tax.central.process.AbstractProcessor;
 import com.diligrp.tax.central.utils.JsonUtils;
 import com.diligrp.tax.mapping.context.MappingContext;
 import com.diligrp.tax.mapping.demarcate.Transformer;
-import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-
+import tools.jackson.core.type.TypeReference;
 import java.util.Map;
 /**
@@ -11,12 +11,13 @@ import com.diligrp.tax.central.type.TaxSystemType;
 import com.diligrp.tax.central.utils.JsonUtils;
 import com.diligrp.tax.proxy.demarcate.Sender;
 import com.diligrp.tax.proxy.helper.KingDeeHelper;
-import com.fasterxml.jackson.core.type.TypeReference;
+
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.RepoRet;
 import com.kingdee.bos.webapi.entity.SuccessEntity;
 import com.kingdee.bos.webapi.sdk.K3CloudApi;
 import org.springframework.stereotype.Component;
+import tools.jackson.core.type.TypeReference;
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,6 @@ import com.diligrp.tax.central.type.TaxSystemType;
 import com.diligrp.tax.central.utils.JsonUtils;
 import com.diligrp.tax.proxy.message.KingDeeQuery;
 import com.diligrp.tax.proxy.message.KingDeeSubmit;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.gson.Gson;
 import com.kingdee.bos.webapi.entity.IdentifyInfo;
 import com.kingdee.bos.webapi.entity.OperateParam;
@@ -14,6 +13,7 @@ import com.kingdee.bos.webapi.entity.RepoError;
 import com.kingdee.bos.webapi.entity.RepoRet;
 import com.kingdee.bos.webapi.sdk.K3CloudApi;
 import lombok.extern.slf4j.Slf4j;
+import tools.jackson.core.type.TypeReference;
 import java.util.Collections;
 import java.util.List;
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot4-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
         </dependency>
     </dependencies>
 </project>
@@ -13,11 +13,11 @@ import com.diligrp.tax.storage.domain.MappingError;
 import com.diligrp.tax.storage.model.co.MappingErrorCO;
 import com.diligrp.tax.storage.model.vo.MappingErrorVO;
 import com.diligrp.tax.storage.repo.MappingErrorRepository;
-import com.fasterxml.jackson.core.type.TypeReference;
 import jakarta.annotation.Resource;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tools.jackson.core.type.TypeReference;
 import static com.diligrp.tax.central.queue.TaxAutoPush.NORMAL_EXCHANGE;
 import static com.diligrp.tax.central.queue.TaxAutoPush.NORMAL_ROUTING;