From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 13 一月 2023 23:22:30 +0800 Subject: [PATCH] update 适配 新序列化注解 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java | 2 ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java | 4 + ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java | 5 + ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 2 ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java | 3 + ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java | 4 + ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java | 4 + ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java | 4 + ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java | 2 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java | 3 + ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java | 3 + ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java | 5 + ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java | 4 + ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java | 6 + ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 9 ++- ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java | 2 ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java | 4 + ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java | 3 + ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 4 + ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java | 3 + ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java | 4 + ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java | 3 + ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java | 4 + ruoyi-sms/src/main/java/com/ruoyi/sms/exception/SmsException.java | 3 + ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java | 6 + ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java | 4 + ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java | 4 + ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java | 3 + ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java | 3 + ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java | 2 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java | 3 + ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java | 5 + ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 2 ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java | 3 + ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java | 4 + ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java | 4 + ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 2 ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 6 + ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java | 2 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java | 5 + 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 5dd00ec..022fefc 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.RandomUtil; import com.ruoyi.common.utils.StringUtils; +import java.io.Serial; + /** * 鏃犵鍙疯绠楃敓鎴愬櫒 * @@ -13,6 +15,7 @@ */ 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 bd31607..1917800 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.JsonInclude; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.HashMap; @@ -20,6 +21,7 @@ @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 60abde6..06f53a1 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.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 @@ @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 381a6f6..a31c323 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 lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; /** @@ -14,6 +15,8 @@ @Data @NoArgsConstructor public class R<T> 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 c7bb9b4..81053d6 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 lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; import java.util.ArrayList; import java.util.List; @@ -17,6 +18,7 @@ @EqualsAndHashCode(callSuper = true) public class TreeEntity<T> 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 cdd3905..c8f568f 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 @@ import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; /** @@ -15,6 +16,7 @@ @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 0e7c83c..9f565d8 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.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 @@ @EqualsAndHashCode(callSuper = true) @TableName("sys_dept") public class SysDept extends TreeEntity<SysDept> { + + @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 b58c56c..c02e057 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 @@ import lombok.Data; import jakarta.servlet.http.HttpServletRequest; + +import java.io.Serial; import java.io.Serializable; /** @@ -14,6 +16,7 @@ @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 3a29978..7ef44a1 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 @@ import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -14,6 +15,7 @@ @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 c93b9ef..a680751 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 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 @@ @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 83313a0..5ac449b 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.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.io.Serial; + /** * 灏忕▼搴忕櫥褰曠敤鎴疯韩浠芥潈闄� * @@ -14,6 +16,7 @@ @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 5f3f2d1..8bfe049 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 lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -17,6 +18,8 @@ @Data @NoArgsConstructor public class TableDataInfo<T> 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 9178131..0b12e09 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 080785c..bea24cc 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 @@ */ public class GlobalException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; /** @@ -16,8 +19,6 @@ /** * 閿欒鏄庣粏锛屽唴閮ㄨ皟璇曢敊璇� - * <p> - * 鍜� {@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 53f41b3..57063bf 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 @@ /** * 閿欒鏄庣粏锛屽唴閮ㄨ皟璇曢敊璇� - * <p> - * 鍜� {@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 01cc878..3452fc1 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 dc0b84b..e7a9288 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.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.io.Serial; + /** * 鍩虹寮傚父 * @@ -15,6 +17,8 @@ @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 794f4e1..e5542bb 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 @@ 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 64a5020..44bcea5 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 93e9e1c..9127428 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 2345c20..a2765e5 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 bb4c037..b3beef8 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 99a8880..632bf24 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 @@ 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 863ba76..b30408e 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 3d2b640..70c8897 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 @@ */ 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 dc19ce2..2484e39 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 lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; + /** * 娴嬭瘯鍗曡〃瀵硅薄 test_demo * @@ -16,8 +18,8 @@ @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 b480aa0..4a5ea94 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 lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; + /** * 娴嬭瘯鏍戣〃瀵硅薄 test_tree * @@ -19,8 +21,8 @@ @TableName("test_tree") public class TestTree extends TreeEntity<TestTree> { + @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 c4a46ed..41faec3 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.ExcelProperty; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; @@ -15,8 +17,9 @@ */ @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 6836c06..abaecea 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.ExcelProperty; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; @@ -15,8 +17,9 @@ */ @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 2ce373e..1530119 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 @@ */ 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 28ca34c..1fdc913 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 @@ 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 @@ @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 983c29c..9c51e59 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.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 @@ */ @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 540b1cc..c170297 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 @@ */ 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 28632a3..006babc 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 @@ */ 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 f95b332..896890a 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.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 @@ @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 84af07b..9f9ca51 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.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 @@ @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 616e4e8..d230245 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 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; + /** * 瀵硅薄瀛樺偍閰嶇疆瑙嗗浘瀵硅薄 sys_oss_config @@ -13,8 +16,9 @@ */ @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 53f5f8d..26c11e0 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 @@ import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; /** @@ -10,8 +12,9 @@ * @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 a50283d..5556cd4 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 lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -18,6 +19,8 @@ @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 d461332..50158da 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 lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; /** @@ -18,6 +19,8 @@ @NoArgsConstructor // @Accessors(chain = true) // 瀵煎叆涓嶅厑璁镐娇鐢� 浼氭壘涓嶅埌set鏂规硶 public class SysUserImportVo implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /** -- Gitblit v1.9.3