diff --git a/eladmin/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java b/eladmin/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java index 5112730..977788c 100644 --- a/eladmin/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java +++ b/eladmin/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java @@ -15,9 +15,7 @@ */ package me.zhengjie.exception.handler; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import java.time.LocalDateTime; /** * @author Zheng Jie @@ -27,12 +25,11 @@ import java.time.LocalDateTime; class ApiError { private Integer status = 400; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime timestamp; + private Long timestamp; private String message; private ApiError() { - timestamp = LocalDateTime.now(); + timestamp = System.currentTimeMillis(); } public static ApiError error(String message){ diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java index cc41611..26af317 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java @@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -52,7 +51,6 @@ public class Dept extends BaseEntity implements Serializable { private Set roles; @TableField(exist = false) - @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; @ApiModelProperty(value = "排序") diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java index 82fc0cc..e1efa5a 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java @@ -15,7 +15,6 @@ */ package me.zhengjie.modules.system.domain.vo; -import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import java.io.Serializable; import java.util.List; @@ -26,7 +25,6 @@ import java.util.List; * @date 2018-12-20 */ @Data -@JsonInclude(JsonInclude.Include.NON_EMPTY) public class MenuVo implements Serializable { private String name; diff --git a/eladmin/eladmin-system/src/main/resources/config/application.yml b/eladmin/eladmin-system/src/main/resources/config/application.yml index a47e06b..f433442 100644 --- a/eladmin/eladmin-system/src/main/resources/config/application.yml +++ b/eladmin/eladmin-system/src/main/resources/config/application.yml @@ -15,8 +15,6 @@ spring: check-template-location: false profiles: active: dev - jackson: - time-zone: GMT+8 data: redis: repositories: