From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 13 Jan 2023 23:22:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=80=82=E9=85=8D=20=E6=96=B0?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/captcha/UnsignedMathGenerator.java | 3 +++ .../java/com/ruoyi/common/core/domain/BaseEntity.java | 2 ++ .../java/com/ruoyi/common/core/domain/PageQuery.java | 2 ++ .../src/main/java/com/ruoyi/common/core/domain/R.java | 3 +++ .../java/com/ruoyi/common/core/domain/TreeEntity.java | 2 ++ .../com/ruoyi/common/core/domain/dto/UserOnlineDTO.java | 2 ++ .../com/ruoyi/common/core/domain/entity/SysDept.java | 9 ++++++--- .../ruoyi/common/core/domain/event/LogininforEvent.java | 3 +++ .../com/ruoyi/common/core/domain/event/OperLogEvent.java | 2 ++ .../com/ruoyi/common/core/domain/model/LoginUser.java | 2 ++ .../com/ruoyi/common/core/domain/model/XcxLoginUser.java | 3 +++ .../java/com/ruoyi/common/core/page/TableDataInfo.java | 3 +++ .../com/ruoyi/common/exception/DemoModeException.java | 4 ++++ .../java/com/ruoyi/common/exception/GlobalException.java | 5 +++-- .../com/ruoyi/common/exception/ServiceException.java | 6 ++++-- .../java/com/ruoyi/common/exception/UtilException.java | 4 ++++ .../com/ruoyi/common/exception/base/BaseException.java | 4 ++++ .../com/ruoyi/common/exception/file/FileException.java | 4 ++++ .../file/FileNameLengthLimitExceededException.java | 4 ++++ .../exception/file/FileSizeLimitExceededException.java | 4 ++++ .../ruoyi/common/exception/user/CaptchaException.java | 4 ++++ .../common/exception/user/CaptchaExpireException.java | 4 ++++ .../com/ruoyi/common/exception/user/UserException.java | 4 ++++ .../exception/user/UserPasswordNotMatchException.java | 4 ++++ .../user/UserPasswordRetryLimitExceedException.java | 3 +++ .../src/main/java/com/ruoyi/demo/domain/TestDemo.java | 4 +++- .../src/main/java/com/ruoyi/demo/domain/TestTree.java | 4 +++- .../main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java | 5 ++++- .../main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java | 5 ++++- .../java/com/xxl/job/admin/core/cron/CronExpression.java | 2 ++ .../src/main/resources/vm/java/domain.java.vm | 4 +++- ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 6 +++++- .../main/java/com/ruoyi/oss/exception/OssException.java | 3 +++ .../main/java/com/ruoyi/sms/exception/SmsException.java | 3 +++ .../main/java/com/ruoyi/system/domain/SysLogininfor.java | 3 +++ .../main/java/com/ruoyi/system/domain/SysOperLog.java | 2 ++ .../java/com/ruoyi/system/domain/vo/SysOssConfigVo.java | 6 +++++- .../main/java/com/ruoyi/system/domain/vo/SysOssVo.java | 5 ++++- .../java/com/ruoyi/system/domain/vo/SysUserExportVo.java | 3 +++ .../java/com/ruoyi/system/domain/vo/SysUserImportVo.java | 3 +++ 40 files changed, 133 insertions(+), 15 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java b/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java index 5dd00ec08..022fefca6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java @@ -6,6 +6,8 @@ import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.RandomUtil; import com.ruoyi.common.utils.StringUtils; +import java.io.Serial; + /** * 无符号计算生成器 * @@ -13,6 +15,7 @@ import com.ruoyi.common.utils.StringUtils; */ public class UnsignedMathGenerator implements CodeGenerator { + @Serial private static final long serialVersionUID = -5514819971774091076L; private static final String OPERATORS = "+-*"; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index bd316079a..191780000 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.HashMap; @@ -20,6 +21,7 @@ import java.util.Map; @Data public class BaseEntity implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java index 60abde623..06f53a127 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java @@ -9,6 +9,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.sql.SqlUtil; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -22,6 +23,7 @@ import java.util.List; @Data public class PageQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java index 381a6f602..a31c32380 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java @@ -4,6 +4,7 @@ import com.ruoyi.common.constant.HttpStatus; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; /** @@ -14,6 +15,8 @@ import java.io.Serializable; @Data @NoArgsConstructor public class R implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java index c7bb9b4ff..81053d6b2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -17,6 +18,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class TreeEntity extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java index cdd3905a3..c8f568fd6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java @@ -3,6 +3,7 @@ package com.ruoyi.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; /** @@ -15,6 +16,7 @@ import java.io.Serializable; @NoArgsConstructor public class UserOnlineDTO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index 0e7c83ccd..9f565d889 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -4,13 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.TreeEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; /** * 部门表 sys_dept @@ -22,6 +23,8 @@ import jakarta.validation.constraints.Size; @EqualsAndHashCode(callSuper = true) @TableName("sys_dept") public class SysDept extends TreeEntity { + + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java index b58c56caf..c02e05781 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java @@ -3,6 +3,8 @@ package com.ruoyi.common.core.domain.event; import lombok.Data; import jakarta.servlet.http.HttpServletRequest; + +import java.io.Serial; import java.io.Serializable; /** @@ -14,6 +16,7 @@ import java.io.Serializable; @Data public class LogininforEvent implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java index 3a2997810..7ef44a177 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java @@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain.event; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.Date; @Data public class OperLogEvent implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java index c93b9efe1..a680751ed 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -5,6 +5,7 @@ import com.ruoyi.common.helper.LoginHelper; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.List; import java.util.Set; @@ -19,6 +20,7 @@ import java.util.Set; @NoArgsConstructor public class LoginUser implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java index 83313a0fd..5ac449bba 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.io.Serial; + /** * 小程序登录用户身份权限 * @@ -14,6 +16,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class XcxLoginUser extends LoginUser { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java index 5f3f2d1ad..8bfe0490b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -17,6 +18,8 @@ import java.util.List; @Data @NoArgsConstructor public class TableDataInfo implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java index 9178131d7..0b12e09ad 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java @@ -1,11 +1,15 @@ package com.ruoyi.common.exception; +import java.io.Serial; + /** * 演示模式异常 * * @author ruoyi */ public class DemoModeException extends RuntimeException { + + @Serial private static final long serialVersionUID = 1L; public DemoModeException() { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java index 080785c9f..bea24ccaa 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java @@ -1,5 +1,7 @@ package com.ruoyi.common.exception; +import java.io.Serial; + /** * 全局异常 * @@ -7,6 +9,7 @@ package com.ruoyi.common.exception; */ public class GlobalException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; /** @@ -16,8 +19,6 @@ public class GlobalException extends RuntimeException { /** * 错误明细,内部调试错误 - *

- * 和 {@link CommonResult#getDetailMessage()} 一致的设计 */ private String detailMessage; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java index 53f41b3b9..57063bf25 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java @@ -1,11 +1,15 @@ package com.ruoyi.common.exception; +import java.io.Serial; + /** * 业务异常 * * @author ruoyi */ public final class ServiceException extends RuntimeException { + + @Serial private static final long serialVersionUID = 1L; /** @@ -20,8 +24,6 @@ public final class ServiceException extends RuntimeException { /** * 错误明细,内部调试错误 - *

- * 和 {@link CommonResult#getDetailMessage()} 一致的设计 */ private String detailMessage; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java index 01cc8782b..3452fc1e8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java @@ -1,11 +1,15 @@ package com.ruoyi.common.exception; +import java.io.Serial; + /** * 工具类异常 * * @author ruoyi */ public class UtilException extends RuntimeException { + + @Serial private static final long serialVersionUID = 8247610319171014183L; public UtilException(Throwable e) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java index dc0b84bf6..e7a92881a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java @@ -6,6 +6,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.io.Serial; + /** * 基础异常 * @@ -15,6 +17,8 @@ import lombok.NoArgsConstructor; @EqualsAndHashCode(callSuper = true) @NoArgsConstructor public class BaseException extends RuntimeException { + + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java index 794f4e1a7..e5542bb4f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java @@ -2,12 +2,16 @@ package com.ruoyi.common.exception.file; import com.ruoyi.common.exception.base.BaseException; +import java.io.Serial; + /** * 文件信息异常类 * * @author ruoyi */ public class FileException extends BaseException { + + @Serial private static final long serialVersionUID = 1L; public FileException(String code, Object[] args) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java index 64a5020d0..44bcea557 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,11 +1,15 @@ package com.ruoyi.common.exception.file; +import java.io.Serial; + /** * 文件名称超长限制异常类 * * @author ruoyi */ public class FileNameLengthLimitExceededException extends FileException { + + @Serial private static final long serialVersionUID = 1L; public FileNameLengthLimitExceededException(int defaultFileNameLength) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java index 93e9e1c60..9127428ef 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java @@ -1,11 +1,15 @@ package com.ruoyi.common.exception.file; +import java.io.Serial; + /** * 文件名大小限制异常类 * * @author ruoyi */ public class FileSizeLimitExceededException extends FileException { + + @Serial private static final long serialVersionUID = 1L; public FileSizeLimitExceededException(long defaultMaxSize) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java index 2345c2045..a2765e5a1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java @@ -1,11 +1,15 @@ package com.ruoyi.common.exception.user; +import java.io.Serial; + /** * 验证码错误异常类 * * @author ruoyi */ public class CaptchaException extends UserException { + + @Serial private static final long serialVersionUID = 1L; public CaptchaException() { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java index bb4c0376f..b3beef84d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java @@ -1,11 +1,15 @@ package com.ruoyi.common.exception.user; +import java.io.Serial; + /** * 验证码失效异常类 * * @author ruoyi */ public class CaptchaExpireException extends UserException { + + @Serial private static final long serialVersionUID = 1L; public CaptchaExpireException() { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java index 99a888056..632bf2482 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java @@ -2,12 +2,16 @@ package com.ruoyi.common.exception.user; import com.ruoyi.common.exception.base.BaseException; +import java.io.Serial; + /** * 用户信息异常类 * * @author ruoyi */ public class UserException extends BaseException { + + @Serial private static final long serialVersionUID = 1L; public UserException(String code, Object... args) { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java index 863ba7658..b30408e82 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java @@ -1,11 +1,15 @@ package com.ruoyi.common.exception.user; +import java.io.Serial; + /** * 用户密码不正确或不符合规范异常类 * * @author ruoyi */ public class UserPasswordNotMatchException extends UserException { + + @Serial private static final long serialVersionUID = 1L; public UserPasswordNotMatchException() { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java index 3d2b640e0..70c88977d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -1,5 +1,7 @@ package com.ruoyi.common.exception.user; +import java.io.Serial; + /** * 用户错误最大次数异常类 * @@ -7,6 +9,7 @@ package com.ruoyi.common.exception.user; */ public class UserPasswordRetryLimitExceedException extends UserException { + @Serial private static final long serialVersionUID = 1L; public UserPasswordRetryLimitExceedException(int retryLimitCount, int lockTime) { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java index dc19ce2c7..2484e3976 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java @@ -5,6 +5,8 @@ import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; + /** * 测试单表对象 test_demo * @@ -16,9 +18,9 @@ import lombok.EqualsAndHashCode; @TableName("test_demo") public class TestDemo extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; - /** * 主键 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java index b480aa0c1..4a5ea941e 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java @@ -8,6 +8,8 @@ import com.ruoyi.common.core.domain.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; + /** * 测试树表对象 test_tree * @@ -19,9 +21,9 @@ import lombok.EqualsAndHashCode; @TableName("test_tree") public class TestTree extends TreeEntity { + @Serial private static final long serialVersionUID = 1L; - /** * 主键 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java index c4a46edf3..41faec369 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; @@ -15,8 +17,9 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -public class TestDemoVo { +public class TestDemoVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java index 6836c06bb..abaecea04 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; @@ -15,8 +17,9 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -public class TestTreeVo { +public class TestTreeVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java index 2ce373eeb..1530119a9 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java +++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java @@ -17,6 +17,7 @@ package com.xxl.job.admin.core.cron; +import java.io.Serial; import java.io.Serializable; import java.text.ParseException; import java.util.Calendar; @@ -199,6 +200,7 @@ import java.util.TreeSet; */ public final class CronExpression implements Serializable, Cloneable { + @Serial private static final long serialVersionUID = 12423409423L; protected static final int SECOND = 0; diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm index 28ca34c0f..1fdc9139e 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -3,6 +3,7 @@ package ${packageName}.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.math.BigDecimal; @@ -32,7 +33,8 @@ import com.ruoyi.common.core.domain.TreeEntity; @TableName("${tableName}") public class ${ClassName} extends ${Entity} { - private static final long serialVersionUID=1L; + @Serial + private static final long serialVersionUID = 1L; #foreach ($column in $columns) #if(!$table.isSuperColumn($column.javaField)) diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm index 983c29c0d..9c51e5956 100644 --- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm @@ -8,6 +8,9 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; import java.util.Date; @@ -20,8 +23,9 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -public class ${ClassName}Vo { +public class ${ClassName}Vo implements Serializable { + @Serial private static final long serialVersionUID = 1L; #foreach ($column in $columns) diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java index 540b1cc0b..c170297ab 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java +++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java @@ -1,5 +1,7 @@ package com.ruoyi.oss.exception; +import java.io.Serial; + /** * OSS异常类 * @@ -7,6 +9,7 @@ package com.ruoyi.oss.exception; */ public class OssException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; public OssException(String msg) { diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/exception/SmsException.java b/ruoyi-sms/src/main/java/com/ruoyi/sms/exception/SmsException.java index 28632a375..006babcce 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/exception/SmsException.java +++ b/ruoyi-sms/src/main/java/com/ruoyi/sms/exception/SmsException.java @@ -1,5 +1,7 @@ package com.ruoyi.sms.exception; +import java.io.Serial; + /** * Sms异常类 * @@ -7,6 +9,7 @@ package com.ruoyi.sms.exception; */ public class SmsException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; public SmsException(String msg) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index f95b332e7..896890a49 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -9,6 +9,7 @@ import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.HashMap; @@ -24,6 +25,8 @@ import java.util.Map; @TableName("sys_logininfor") @ExcelIgnoreUnannotated public class SysLogininfor implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index 84af07b91..9f9ca5164 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -9,6 +9,7 @@ import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.HashMap; @@ -25,6 +26,7 @@ import java.util.Map; @ExcelIgnoreUnannotated public class SysOperLog implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java index 616e4e82d..d2302457e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java @@ -3,6 +3,9 @@ package com.ruoyi.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; + /** * 对象存储配置视图对象 sys_oss_config @@ -13,8 +16,9 @@ import lombok.Data; */ @Data @ExcelIgnoreUnannotated -public class SysOssConfigVo { +public class SysOssConfigVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java index 53f5f8de8..26c11e0cf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java @@ -2,6 +2,8 @@ package com.ruoyi.system.domain.vo; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; /** @@ -10,8 +12,9 @@ import java.util.Date; * @author Lion Li */ @Data -public class SysOssVo { +public class SysOssVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java index a50283d28..5556cd422 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java @@ -6,6 +6,7 @@ import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -18,6 +19,8 @@ import java.util.Date; @Data @NoArgsConstructor public class SysUserExportVo implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java index d461332f2..50158da75 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java @@ -6,6 +6,7 @@ import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; /** @@ -18,6 +19,8 @@ import java.io.Serializable; @NoArgsConstructor // @Accessors(chain = true) // 导入不允许使用 会找不到set方法 public class SysUserImportVo implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /**