diff --git a/mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java b/mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java index 26a46d5..8db4a83 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java +++ b/mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java @@ -1,17 +1,16 @@ package com.mcwl.common.core.domain; -import java.io.Serializable; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Builder; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * Entity基类 @@ -42,7 +41,7 @@ public class BaseEntity implements Serializable private String updateBy; /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @TableField(fill = FieldFill.UPDATE) private Date updateTime; diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/vo/PromotionVo.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/vo/PromotionVo.java index 7aa368c..56a03a5 100644 --- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/vo/PromotionVo.java +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/vo/PromotionVo.java @@ -1,14 +1,9 @@ package com.mcwl.memberCenter.domain.vo; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.mcwl.common.core.domain.BaseEntity; -import com.mcwl.memberCenter.enums.PromotionEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.util.Date; @@ -48,14 +43,14 @@ public class PromotionVo { * 活动开始时间 */ @ApiModelProperty(value = "活动开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; /** * 活动结束时间 */ @ApiModelProperty(value = "活动结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java index 64da08b..e68400a 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java @@ -33,6 +33,6 @@ public class ConsumeVo { // 消费时间 @ApiModelProperty(value = "消费时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date consumeDate; } diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/domain/OrderTrade.java b/mcwl-pay/src/main/java/com/mcwl/pay/domain/OrderTrade.java index dc1c64d..9bef18a 100644 --- a/mcwl-pay/src/main/java/com/mcwl/pay/domain/OrderTrade.java +++ b/mcwl-pay/src/main/java/com/mcwl/pay/domain/OrderTrade.java @@ -64,7 +64,7 @@ public class OrderTrade extends BaseEntity { /** * 下单时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date orderTime; /** diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletConsumeRecordVo.java b/mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletConsumeRecordVo.java index e8f637d..3f54526 100644 --- a/mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletConsumeRecordVo.java +++ b/mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletConsumeRecordVo.java @@ -33,7 +33,7 @@ public class WalletConsumeRecordVo { * 消费时间 */ @ApiModelProperty(value = "消费时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date orderTime; } diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletRechargeRecordVo.java b/mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletRechargeRecordVo.java index fbeb103..5017996 100644 --- a/mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletRechargeRecordVo.java +++ b/mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletRechargeRecordVo.java @@ -32,7 +32,7 @@ public class WalletRechargeRecordVo { * 下单时间 */ @ApiModelProperty(value = "下单时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date orderTime; diff --git a/mcwl-quartz/src/main/java/com/mcwl/quartz/domain/SysJob.java b/mcwl-quartz/src/main/java/com/mcwl/quartz/domain/SysJob.java index 9a55fa1..c31008b 100644 --- a/mcwl-quartz/src/main/java/com/mcwl/quartz/domain/SysJob.java +++ b/mcwl-quartz/src/main/java/com/mcwl/quartz/domain/SysJob.java @@ -15,7 +15,7 @@ import com.mcwl.quartz.util.CronUtils; /** * 定时任务调度表 sys_job - * + * * @author mcwl */ public class SysJob extends BaseEntity @@ -110,7 +110,7 @@ public class SysJob extends BaseEntity this.cronExpression = cronExpression; } - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") public Date getNextValidTime() { if (StringUtils.isNotEmpty(cronExpression)) diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/ModelImagePageRes.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/ModelImagePageRes.java index 4c05fac..ab2408a 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/ModelImagePageRes.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/ModelImagePageRes.java @@ -6,9 +6,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -35,14 +33,14 @@ public class ModelImagePageRes extends PageDomain { * 开始时间 */ @ApiModelProperty(value = "开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; /** * 结束时间 */ @ApiModelProperty(value = "结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AdviceVo.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AdviceVo.java index 70a802f..32fcc7f 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AdviceVo.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AdviceVo.java @@ -39,7 +39,7 @@ public class AdviceVo { /** * 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AttentionAdviceVo.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AttentionAdviceVo.java index 6423c0b..7432ef0 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AttentionAdviceVo.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AttentionAdviceVo.java @@ -38,7 +38,7 @@ public class AttentionAdviceVo { /** * 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/CommentAdviceVo.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/CommentAdviceVo.java index 4ef91c0..d5344db 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/CommentAdviceVo.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/CommentAdviceVo.java @@ -57,7 +57,7 @@ public class CommentAdviceVo { /** * 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/mcwl-system/src/main/java/com/mcwl/system/domain/SysLogininfor.java b/mcwl-system/src/main/java/com/mcwl/system/domain/SysLogininfor.java index 9ea2b4c..f37b347 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/domain/SysLogininfor.java +++ b/mcwl-system/src/main/java/com/mcwl/system/domain/SysLogininfor.java @@ -48,7 +48,7 @@ public class SysLogininfor extends BaseEntity private String msg; /** 访问时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date loginTime; diff --git a/mcwl-system/src/main/java/com/mcwl/system/domain/SysOperLog.java b/mcwl-system/src/main/java/com/mcwl/system/domain/SysOperLog.java index e1da71a..d0f1969 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/domain/SysOperLog.java +++ b/mcwl-system/src/main/java/com/mcwl/system/domain/SysOperLog.java @@ -1,14 +1,15 @@ package com.mcwl.system.domain; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.mcwl.common.annotation.Excel; import com.mcwl.common.annotation.Excel.ColumnType; import com.mcwl.common.core.domain.BaseEntity; +import java.util.Date; + /** * 操作日志记录表 oper_log - * + * * @author mcwl */ public class SysOperLog extends BaseEntity @@ -79,7 +80,7 @@ public class SysOperLog extends BaseEntity private String errorMsg; /** 操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date operTime;