Jackson 序列化修改

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/AccessToken.java

@@ -1,4 +1,4 @@
-package com.bonus.config;
+package com.bonus.core.config;
 
 import cn.hutool.core.util.ArrayUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/AuthenticationPredicate.java

@@ -1,4 +1,4 @@
-package com.bonus.config;
+package com.bonus.core.config;
 
 public interface AuthenticationPredicate {
    boolean authenticated(AccessToken accessToken);

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/SecureProperties.java

@@ -1,4 +1,4 @@
-package com.bonus.config;
+package com.bonus.core.config;
 
 import cn.hutool.core.codec.Base64Decoder;
 import com.google.common.collect.Sets;

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/WebContext.java

@@ -1,4 +1,4 @@
-package com.bonus.config;
+package com.bonus.core.config;
 
 import com.google.common.collect.Maps;
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/json/InstantsSerializer.java

@@ -1,4 +1,4 @@
-package com.bonus.config.json;
+package com.bonus.core.config.json;
 
 import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializer;
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/config/json/JacksonConfiguration.java

@@ -1,9 +1,8 @@
-package com.bonus.config.json;
+package com.bonus.core.config.json;
 
-import com.bonus.config.WebContext;
+import com.bonus.core.config.WebContext;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -14,11 +13,9 @@ 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.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
@@ -29,10 +26,11 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.TimeZone;
 
-@AutoConfiguration(
-   before = {JacksonAutoConfiguration.class}
-)
-@ConditionalOnClass({ObjectMapper.class})
+//@AutoConfiguration(
+//   before = {JacksonAutoConfiguration.class}
+//)
+@Configuration
+//@ConditionalOnClass({ObjectMapper.class})
 public class JacksonConfiguration {
    public static final StdSerializer<Long> LONG_STD_SERIALIZER;
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/controller/OrderController.java

@@ -1,7 +1,6 @@
 package com.bonus.core.order.common.controller;
 
 import com.bonus.common.core.web.controller.BaseController;
-import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.core.order.common.vo.OrderEnumVO;
 import com.bonus.core.pay.common.constants.PayTypeEnum;
 import io.swagger.annotations.Api;
@@ -22,8 +21,8 @@ import java.util.Map;
 public class OrderController extends BaseController {
    @PostMapping({"/pay-type-list"})
    @ApiOperation("支付类型")
-   public TableDataInfo getPayTypeEnumList() {
+   public List<OrderEnumVO> getPayTypeEnumList() {
       List<Map<String, Object>> allEnumsList = PayTypeEnum.getAllEnumsList();
-      return getDataTable(OrderEnumVO.listOf(allEnumsList));
+      return OrderEnumVO.listOf(allEnumsList);
    }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/controller/OrderInfoMobileController.java

@@ -2,7 +2,6 @@ package com.bonus.core.order.mobile.controller;
 
 import com.bonus.common.core.domain.R;
 import com.bonus.common.core.web.controller.BaseController;
-import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.core.common.page.PageVO;
 import com.bonus.core.common.utils.JavaxValidateUtils;
 import com.bonus.core.order.common.dto.RequestHeaderDTO;
@@ -16,7 +15,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -40,10 +38,10 @@ public class OrderInfoMobileController extends BaseController {
       value = "订单列表查询",
       notes = "cmt-订单列表查询"
    )
-   public TableDataInfo orderList(@RequestHeader Map<String, String> headers, @RequestBody OrderListMobileDTO request) {
+   public PageVO<OrderListMobileVO> orderList(@RequestHeader Map<String, String> headers, @RequestBody OrderListMobileDTO request) {
       RequestHeaderDTO headerDTO = RequestHeaderDTO.of(headers);
       PageVO<OrderListMobileVO> orderPage = this.orderInfoMobileBusiness.orderList(request, headerDTO);
-      return getDataTable(orderPage.getRecords());
+      return orderPage;
    }
 //
 //   @PostMapping({"/group"})