syy/SYYTe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

使用LocalDateTime替换Date

This commit is contained in:
阿沐 2024-04-01 09:49:48 +08:00
parent d96f27dbd0
commit 7213035701
35 changed files with 321 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maku-boot-module/maku-module-message/src/main/java/net/maku/message/entity/SmsLogEntity.java
View File

@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 短信日志 * 短信日志
@ -16,7 +16,7 @@ import java.util.Date;
* <a href="https://maku.net">MAKU</a> * <a href="https://maku.net">MAKU</a>
*/ */
@Data @Data
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper = false)
@TableName("sms_log") @TableName("sms_log")
public class SmsLogEntity { public class SmsLogEntity {
/** /**
@ -59,6 +59,6 @@ public class SmsLogEntity {
* 创建时间 * 创建时间
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date createTime; private LocalDateTime createTime;
} }

12
maku-boot-module/maku-module-message/src/main/java/net/maku/message/vo/SmsLogVO.java
View File

@ -6,13 +6,13 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 短信日志 * 短信日志
* *
* @author 阿沐 babamu@126.com * @author 阿沐 babamu@126.com
*/ */
@Data @Data
@Schema(description = "短信日志") @Schema(description = "短信日志")
public class SmsLogVO implements Serializable { public class SmsLogVO implements Serializable {
@ -41,6 +41,6 @@ public class SmsLogVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

4
maku-boot-module/maku-module-message/src/main/java/net/maku/message/vo/SmsPlatformVO.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 短信平台 * 短信平台
@ -51,6 +51,6 @@ public class SmsPlatformVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

6
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobEntity.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 定时任务 * 定时任务
@ -78,7 +78,7 @@ public class ScheduleJobEntity implements Serializable {
* 创建时间 * 创建时间
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date createTime; private LocalDateTime createTime;
/** /**
* 更新者 * 更新者
@ -90,7 +90,7 @@ public class ScheduleJobEntity implements Serializable {
* 更新时间 * 更新时间
*/ */
@TableField(fill = FieldFill.INSERT_UPDATE) @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime; private LocalDateTime updateTime;
/** /**
* 版本号 * 版本号

4
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/entity/ScheduleJobLogEntity.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 定时任务日志 * 定时任务日志
@ -72,6 +72,6 @@ public class ScheduleJobLogEntity {
* 创建时间 * 创建时间
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date createTime; private LocalDateTime createTime;
} }

3
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/utils/AbstractScheduleJob.java
View File

@ -13,6 +13,7 @@ import org.quartz.JobExecutionContext;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
@Slf4j @Slf4j
@ -66,7 +67,7 @@ public abstract class AbstractScheduleJob implements Job {
log.setMethod(scheduleJob.getMethod()); log.setMethod(scheduleJob.getMethod());
log.setParams(scheduleJob.getParams()); log.setParams(scheduleJob.getParams());
log.setTimes(times); log.setTimes(times);
log.setCreateTime(new Date()); log.setCreateTime(LocalDateTime.now());
if (e != null) { if (e != null) {
log.setStatus(ScheduleStatusEnum.PAUSE.getValue()); log.setStatus(ScheduleStatusEnum.PAUSE.getValue());

12
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobLogVO.java
View File

@ -6,13 +6,13 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 定时任务日志 * 定时任务日志
* *
* @author 阿沐 babamu@126.com * @author 阿沐 babamu@126.com
*/ */
@Data @Data
@Schema(description = "定时任务日志") @Schema(description = "定时任务日志")
public class ScheduleJobLogVO implements Serializable { public class ScheduleJobLogVO implements Serializable {
@ -50,6 +50,6 @@ public class ScheduleJobLogVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

12
maku-boot-module/maku-module-quartz/src/main/java/net/maku/quartz/vo/ScheduleJobVO.java
View File

@ -6,13 +6,13 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 定时任务 * 定时任务
* *
* @author 阿沐 babamu@126.com * @author 阿沐 babamu@126.com
*/ */
@Data @Data
@Schema(description = "定时任务") @Schema(description = "定时任务")
public class ScheduleJobVO implements Serializable { public class ScheduleJobVO implements Serializable {
@ -50,6 +50,6 @@ public class ScheduleJobVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

6
maku-boot-system/src/main/java/net/maku/system/dao/SysUserTokenDao.java
View File

@ -5,7 +5,7 @@ import net.maku.system.entity.SysUserTokenEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
@ -23,7 +23,7 @@ public interface SysUserTokenDao extends BaseDao<SysUserTokenEntity> {
* @param time 当前时间 * @param time 当前时间
* @return 返回 access_token 列表 * @return 返回 access_token 列表
*/ */
List<String> getOnlineAccessTokenListByRoleId(@Param("roleId") Long roleId, @Param("time") Date time); List<String> getOnlineAccessTokenListByRoleId(@Param("roleId") Long roleId, @Param("time") LocalDateTime time);
/** /**
* 根据用户ID，查询在线用户 access_token 列表 * 根据用户ID，查询在线用户 access_token 列表
@ -32,6 +32,6 @@ public interface SysUserTokenDao extends BaseDao<SysUserTokenEntity> {
* @param time 当前时间 * @param time 当前时间
* @return 返回 access_token 列表 * @return 返回 access_token 列表
*/ */
List<String> getOnlineAccessTokenListByUserId(@Param("userId") Long userId, @Param("time") Date time); List<String> getOnlineAccessTokenListByUserId(@Param("userId") Long userId, @Param("time") LocalDateTime time);
} }

4
maku-boot-system/src/main/java/net/maku/system/entity/SysLogLoginEntity.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 登录日志 * 登录日志
@ -57,7 +57,7 @@ public class SysLogLoginEntity {
* 创建时间 * 创建时间
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date createTime; private LocalDateTime createTime;
/** /**
* 租户ID * 租户ID

4
maku-boot-system/src/main/java/net/maku/system/entity/SysLogOperateEntity.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 操作日志 * 操作日志
@ -98,7 +98,7 @@ public class SysLogOperateEntity {
* 创建时间 * 创建时间
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date createTime; private LocalDateTime createTime;
/** /**
* 租户ID * 租户ID

4
maku-boot-system/src/main/java/net/maku/system/entity/SysThirdLoginConfigEntity.java
View File

@ -3,7 +3,7 @@ package net.maku.system.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 第三方登录配置 * 第三方登录配置
@ -68,6 +68,6 @@ public class SysThirdLoginConfigEntity {
* 创建时间 * 创建时间
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date createTime; private LocalDateTime createTime;
} }

4
maku-boot-system/src/main/java/net/maku/system/entity/SysThirdLoginEntity.java
View File

@ -3,7 +3,7 @@ package net.maku.system.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 第三方登录 * 第三方登录
@ -64,6 +64,6 @@ public class SysThirdLoginEntity {
* 创建时间 * 创建时间
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date createTime; private LocalDateTime createTime;
} }

8
maku-boot-system/src/main/java/net/maku/system/entity/SysUserTokenEntity.java
View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 用户Token * 用户Token
@ -35,7 +35,7 @@ public class SysUserTokenEntity {
/** /**
* accessToken 过期时间 * accessToken 过期时间
*/ */
private Date accessTokenExpire; private LocalDateTime accessTokenExpire;
/** /**
* refreshToken * refreshToken
@ -45,7 +45,7 @@ public class SysUserTokenEntity {
/** /**
* refreshToken 过期时间 * refreshToken 过期时间
*/ */
private Date refreshTokenExpire; private LocalDateTime refreshTokenExpire;
/** /**
* 租户ID * 租户ID
@ -56,6 +56,6 @@ public class SysUserTokenEntity {
* 创建时间 * 创建时间
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date createTime; private LocalDateTime createTime;
} }

16
maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserTokenServiceImpl.java
View File

@ -23,6 +23,7 @@ import net.maku.system.vo.SysUserTokenVO;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -52,8 +53,8 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, Sy
// 过期时间 // 过期时间
Date now = new Date(); Date now = new Date();
entity.setAccessTokenExpire(DateUtil.offsetSecond(now, securityProperties.getAccessTokenExpire())); entity.setAccessTokenExpire(DateUtil.toLocalDateTime(DateUtil.offsetSecond(now, securityProperties.getAccessTokenExpire())));
entity.setRefreshTokenExpire(DateUtil.offsetSecond(now, securityProperties.getRefreshTokenExpire())); entity.setRefreshTokenExpire(DateUtil.toLocalDateTime(DateUtil.offsetSecond(now, securityProperties.getRefreshTokenExpire())));
// 是否存在Token // 是否存在Token
SysUserTokenEntity tokenEntity = baseMapper.selectOne(new LambdaQueryWrapper<SysUserTokenEntity>().eq(SysUserTokenEntity::getUserId, userId)); SysUserTokenEntity tokenEntity = baseMapper.selectOne(new LambdaQueryWrapper<SysUserTokenEntity>().eq(SysUserTokenEntity::getUserId, userId));
@ -85,7 +86,7 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, Sy
// 生成新 accessToken // 生成新 accessToken
String accessToken = TokenUtils.generator(); String accessToken = TokenUtils.generator();
entity.setAccessToken(accessToken); entity.setAccessToken(accessToken);
entity.setAccessTokenExpire(DateUtil.offsetSecond(new Date(), securityProperties.getAccessTokenExpire())); entity.setAccessTokenExpire(DateUtil.toLocalDateTime(DateUtil.offsetSecond(new Date(), securityProperties.getAccessTokenExpire())));
// 更新 // 更新
baseMapper.updateById(entity); baseMapper.updateById(entity);
@ -104,8 +105,9 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, Sy
@Override @Override
public void expireToken(Long userId) { public void expireToken(Long userId) {
SysUserTokenEntity entity = new SysUserTokenEntity(); SysUserTokenEntity entity = new SysUserTokenEntity();
entity.setAccessTokenExpire(new Date()); LocalDateTime now = LocalDateTime.now();
entity.setRefreshTokenExpire(new Date()); entity.setAccessTokenExpire(now);
entity.setRefreshTokenExpire(now);
baseMapper.update(entity, new LambdaQueryWrapper<SysUserTokenEntity>().eq(SysUserTokenEntity::getUserId, userId)); baseMapper.update(entity, new LambdaQueryWrapper<SysUserTokenEntity>().eq(SysUserTokenEntity::getUserId, userId));
} }
@ -114,7 +116,7 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, Sy
@Override @Override
public void updateCacheAuthByRoleId(Long roleId) { public void updateCacheAuthByRoleId(Long roleId) {
// 根据角色ID，查询用户 access_token 列表 // 根据角色ID，查询用户 access_token 列表
List<String> accessTokenList = baseMapper.getOnlineAccessTokenListByRoleId(roleId, new Date()); List<String> accessTokenList = baseMapper.getOnlineAccessTokenListByRoleId(roleId, LocalDateTime.now());
accessTokenList.forEach(this::updateCacheAuth); accessTokenList.forEach(this::updateCacheAuth);
} }
@ -123,7 +125,7 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, Sy
@Override @Override
public void updateCacheAuthByUserId(Long userId) { public void updateCacheAuthByUserId(Long userId) {
// 根据用户ID，查询用户 access_token 列表 // 根据用户ID，查询用户 access_token 列表
List<String> accessTokenList = baseMapper.getOnlineAccessTokenListByUserId(userId, new Date()); List<String> accessTokenList = baseMapper.getOnlineAccessTokenListByUserId(userId, LocalDateTime.now());
accessTokenList.forEach(this::updateCacheAuth); accessTokenList.forEach(this::updateCacheAuth);
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/AccessTokenVO.java
View File

@ -8,7 +8,7 @@ import net.maku.framework.common.utils.DateUtils;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* AccessToken * AccessToken
@ -28,6 +28,6 @@ public class AccessTokenVO implements Serializable {
@Schema(description = "access_token 过期时间") @Schema(description = "access_token 过期时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date accessTokenExpire; private LocalDateTime accessTokenExpire;
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/SysAttachmentVO.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 附件管理 * 附件管理
@ -36,6 +36,6 @@ public class SysAttachmentVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

6
maku-boot-system/src/main/java/net/maku/system/vo/SysDictDataVO.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 字典数据 * 字典数据
@ -48,9 +48,9 @@ public class SysDictDataVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
@Schema(description = "更新时间") @Schema(description = "更新时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date updateTime; private LocalDateTime updateTime;
} }

6
maku-boot-system/src/main/java/net/maku/system/vo/SysDictTypeVO.java
View File

@ -8,7 +8,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 字典类型 * 字典类型
@ -41,11 +41,11 @@ public class SysDictTypeVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
@Schema(description = "更新时间") @Schema(description = "更新时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date updateTime; private LocalDateTime updateTime;
@Schema(description = "来源 0：字典数据 1：动态SQL") @Schema(description = "来源 0：字典数据 1：动态SQL")
private Integer dictSource; private Integer dictSource;

4
maku-boot-system/src/main/java/net/maku/system/vo/SysLogLoginVO.java
View File

@ -12,7 +12,7 @@ import net.maku.framework.common.excel.DateConverter;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 登录日志 * 登录日志
@ -64,6 +64,6 @@ public class SysLogLoginVO implements Serializable, TransPojo {
@ExcelProperty(value = "创建时间", converter = DateConverter.class) @ExcelProperty(value = "创建时间", converter = DateConverter.class)
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/SysLogOperateVO.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 操作日志 * 操作日志
@ -66,6 +66,6 @@ public class SysLogOperateVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/SysMenuVO.java
View File

@ -10,7 +10,7 @@ import net.maku.framework.common.utils.DateUtils;
import net.maku.framework.common.utils.TreeNode; import net.maku.framework.common.utils.TreeNode;
import org.hibernate.validator.constraints.Range; import org.hibernate.validator.constraints.Range;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 菜单管理 * 菜单管理
@ -50,7 +50,7 @@ public class SysMenuVO extends TreeNode<SysMenuVO> {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
@Schema(description = "上级菜单名称") @Schema(description = "上级菜单名称")
private String parentName; private String parentName;

4
maku-boot-system/src/main/java/net/maku/system/vo/SysOrgVO.java
View File

@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import net.maku.framework.common.utils.TreeNode; import net.maku.framework.common.utils.TreeNode;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 机构列表 * 机构列表
@ -35,7 +35,7 @@ public class SysOrgVO extends TreeNode<SysOrgVO> {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
@Schema(description = "上级名称") @Schema(description = "上级名称")
private String parentName; private String parentName;

6
maku-boot-system/src/main/java/net/maku/system/vo/SysParamsVO.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 参数管理 * 参数管理
@ -48,14 +48,14 @@ public class SysParamsVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
@Schema(description = "更新者") @Schema(description = "更新者")
private Long updater; private Long updater;
@Schema(description = "更新时间") @Schema(description = "更新时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date updateTime; private LocalDateTime updateTime;
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/SysPostVO.java
View File

@ -9,7 +9,7 @@ import net.maku.framework.common.utils.DateUtils;
import org.hibernate.validator.constraints.Range; import org.hibernate.validator.constraints.Range;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 岗位管理 * 岗位管理
@ -43,6 +43,6 @@ public class SysPostVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/SysRoleVO.java
View File

@ -7,7 +7,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
@ -46,6 +46,6 @@ public class SysRoleVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/SysThirdLoginConfigVO.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 第三方登录配置 * 第三方登录配置
@ -39,7 +39,7 @@ public class SysThirdLoginConfigVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/SysThirdLoginVO.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 第三方登录 * 第三方登录
@ -39,5 +39,5 @@ public class SysThirdLoginVO implements Serializable {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/SysUserExcelVO.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
import net.maku.framework.common.excel.DateConverter; import net.maku.framework.common.excel.DateConverter;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* excel用户表 * excel用户表
@ -64,6 +64,6 @@ public class SysUserExcelVO implements Serializable, TransPojo {
private String superAdminLabel; private String superAdminLabel;
@ExcelProperty(value = "创建时间", converter = DateConverter.class) @ExcelProperty(value = "创建时间", converter = DateConverter.class)
private Date createTime; private LocalDateTime createTime;
} }

6
maku-boot-system/src/main/java/net/maku/system/vo/SysUserTokenVO.java
View File

@ -8,7 +8,7 @@ import lombok.Data;
import net.maku.framework.common.utils.DateUtils; import net.maku.framework.common.utils.DateUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* 用户Token * 用户Token
@ -32,9 +32,9 @@ public class SysUserTokenVO implements Serializable {
@Schema(description = "access_token 过期时间") @Schema(description = "access_token 过期时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date accessTokenExpire; private LocalDateTime accessTokenExpire;
@Schema(description = "refresh_token 过期时间") @Schema(description = "refresh_token 过期时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date refreshTokenExpire; private LocalDateTime refreshTokenExpire;
} }

4
maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java
View File

@ -15,7 +15,7 @@ import net.maku.system.entity.SysOrgEntity;
import org.hibernate.validator.constraints.Range; import org.hibernate.validator.constraints.Range;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
@ -85,5 +85,5 @@ public class SysUserVO implements Serializable, TransPojo {
@Schema(description = "创建时间") @Schema(description = "创建时间")
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime; private LocalDateTime createTime;
} }

6
maku-framework/src/main/java/net/maku/framework/mybatis/entity/BaseEntity.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fhs.core.trans.vo.TransPojo; import com.fhs.core.trans.vo.TransPojo;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* Entity基类 * Entity基类
@ -30,7 +30,7 @@ public abstract class BaseEntity implements TransPojo {
* 创建时间 * 创建时间
*/ */
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date createTime; private LocalDateTime createTime;
/** /**
* 更新者 * 更新者
@ -42,7 +42,7 @@ public abstract class BaseEntity implements TransPojo {
* 更新时间 * 更新时间
*/ */
@TableField(fill = FieldFill.INSERT_UPDATE) @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime; private LocalDateTime updateTime;
/** /**
* 版本号 * 版本号

10
maku-framework/src/main/java/net/maku/framework/mybatis/handler/FieldMetaObjectHandler.java
View File

@ -5,7 +5,7 @@ import net.maku.framework.security.user.SecurityUser;
import net.maku.framework.security.user.UserDetail; import net.maku.framework.security.user.UserDetail;
import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.MetaObject;
import java.util.Date; import java.time.LocalDateTime;
/** /**
* mybatis-plus 自动填充字段 * mybatis-plus 自动填充字段
@ -25,7 +25,7 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
@Override @Override
public void insertFill(MetaObject metaObject) { public void insertFill(MetaObject metaObject) {
UserDetail user = SecurityUser.getUser(); UserDetail user = SecurityUser.getUser();
Date date = new Date(); LocalDateTime now = LocalDateTime.now();
// 用户字段填充 // 用户字段填充
if (user != null) { if (user != null) {
@ -38,9 +38,9 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
} }
// 创建时间 // 创建时间
setFieldValByName(CREATE_TIME, date, metaObject); setFieldValByName(CREATE_TIME, now, metaObject);
// 更新时间 // 更新时间
setFieldValByName(UPDATE_TIME, date, metaObject); setFieldValByName(UPDATE_TIME, now, metaObject);
// 版本号 // 版本号
setFieldValByName(VERSION, 0, metaObject); setFieldValByName(VERSION, 0, metaObject);
// 删除标识 // 删除标识
@ -52,6 +52,6 @@ public class FieldMetaObjectHandler implements MetaObjectHandler {
// 更新者 // 更新者
setFieldValByName(UPDATER, SecurityUser.getUserId(), metaObject); setFieldValByName(UPDATER, SecurityUser.getUserId(), metaObject);
// 更新时间 // 更新时间
setFieldValByName(UPDATE_TIME, new Date(), metaObject); setFieldValByName(UPDATE_TIME, LocalDateTime.now(), metaObject);
} }
} }

4
maku-framework/src/main/java/net/maku/framework/security/user/UserDetail.java
View File

@ -6,8 +6,8 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import java.time.LocalDateTime;
import java.util.Collection; import java.util.Collection;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -34,7 +34,7 @@ public class UserDetail implements UserDetails {
private Integer status; private Integer status;
private Integer superAdmin; private Integer superAdmin;
private Long tenantId; private Long tenantId;
private Date createTime; private LocalDateTime createTime;
/** /**
* 数据权限范围 * 数据权限范围

8
maku-server/src/test/java/net/maku/EasyExcelTest.java
View File

@ -8,8 +8,8 @@ import net.maku.framework.common.utils.ExcelUtils;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -26,7 +26,7 @@ public class EasyExcelTest {
excelClass.setNumber(1); excelClass.setNumber(1);
excelClass.setDecimals(1.2); excelClass.setDecimals(1.2);
excelClass.setString("test"); excelClass.setString("test");
excelClass.setDate(new Date()); excelClass.setDate(LocalDateTime.now());
List<ExcelClass> data = Arrays.asList(excelClass, excelClass, excelClass); List<ExcelClass> data = Arrays.asList(excelClass, excelClass, excelClass);
if (file.exists()) { if (file.exists()) {
ExcelUtils.excelExport(ExcelClass.class, file, data); ExcelUtils.excelExport(ExcelClass.class, file, data);
@ -43,7 +43,7 @@ public class EasyExcelTest {
excelClass.setNumber(1); excelClass.setNumber(1);
excelClass.setDecimals(1.2); excelClass.setDecimals(1.2);
excelClass.setString("test"); excelClass.setString("test");
excelClass.setDate(new Date()); excelClass.setDate(LocalDateTime.now());
List<ExcelClass> data = Arrays.asList(excelClass, excelClass, excelClass, excelClass, excelClass, excelClass, excelClass); List<ExcelClass> data = Arrays.asList(excelClass, excelClass, excelClass, excelClass, excelClass, excelClass, excelClass);
if (file.exists()) { if (file.exists()) {
ExcelUtils.excelExport(ExcelClass.class, file, data); ExcelUtils.excelExport(ExcelClass.class, file, data);
@ -65,7 +65,7 @@ public class EasyExcelTest {
private Double decimals; private Double decimals;
@ExcelProperty(value = "日期", converter = DateConverter.class) @ExcelProperty(value = "日期", converter = DateConverter.class)
private Date date; private LocalDateTime date;
} }
} }