diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml index 4d62bb89..1b2b9617 100644 --- a/continew-admin-common/pom.xml +++ b/continew-admin-common/pom.xml @@ -80,7 +80,7 @@ limitations under the License. cn.dev33 - sa-token-spring-boot-starter + sa-token-spring-boot3-starter @@ -146,7 +146,7 @@ limitations under the License. com.github.xiaoymin - knife4j-openapi3-spring-boot-starter + knife4j-openapi3-jakarta-spring-boot-starter diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java index d1f33d63..5bf81a64 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java @@ -20,7 +20,7 @@ import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDO.java index 051a2642..99aa9f43 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.base; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -34,6 +35,7 @@ import com.baomidou.mybatisplus.annotation.TableId; @Data public class BaseDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailResp.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailResp.java index e9166129..145eb9c7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailResp.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.base; +import java.io.Serial; import java.time.LocalDateTime; import lombok.Data; @@ -34,6 +35,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @Data public class BaseDetailResp extends BaseResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java index 0607661b..203546e8 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseReq.java @@ -16,8 +16,11 @@ package top.charles7c.cnadmin.common.base; +import java.io.Serial; import java.io.Serializable; +import jakarta.validation.groups.Default; + import lombok.Data; /** @@ -29,5 +32,6 @@ import lombok.Data; @Data public class BaseReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseResp.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseResp.java index 8d307d11..c586bf58 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseResp.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.base; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -36,6 +37,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; @Data public class BaseResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java index f5a476a2..64fcb3a7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseService.java @@ -18,7 +18,7 @@ package top.charles7c.cnadmin.common.base; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import cn.hutool.core.lang.tree.Tree; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java index 5730748e..83a62dc4 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java @@ -20,7 +20,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -156,7 +156,7 @@ public abstract class BaseServiceImpl, T extends BaseDO, /** * 设置排序 - * + * * @param queryWrapper * 查询 Wrapper * @param sortQuery @@ -231,8 +231,7 @@ public abstract class BaseServiceImpl, T extends BaseDO, * 待填充列表信息 */ protected void fill(Object baseObj) { - if (baseObj instanceof BaseResp) { - BaseResp baseResp = (BaseResp)baseObj; + if (baseObj instanceof BaseResp baseResp) { Long createUser = baseResp.getCreateUser(); if (null == createUser) { return; @@ -249,8 +248,7 @@ public abstract class BaseServiceImpl, T extends BaseDO, * 待填充详情信息 */ public void fillDetail(Object detailObj) { - if (detailObj instanceof BaseDetailResp) { - BaseDetailResp detail = (BaseDetailResp)detailObj; + if (detailObj instanceof BaseDetailResp detail) { this.fill(detail); Long updateUser = detail.getUpdateUser(); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index 5a005d46..e7a982a7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -60,9 +60,8 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { Long createUser = LoginHelper.getUserId(); LocalDateTime createTime = LocalDateTime.now(); - if (metaObject.getOriginalObject() instanceof BaseDO) { + if (metaObject.getOriginalObject()instanceof BaseDO baseDO) { // 继承了 BaseDO 的类，填充创建信息 - BaseDO baseDO = (BaseDO)metaObject.getOriginalObject(); baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser)); baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime)); } else { @@ -90,9 +89,8 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { Long updateUser = LoginHelper.getUserId(); LocalDateTime updateTime = LocalDateTime.now(); - if (metaObject.getOriginalObject() instanceof BaseDO) { + if (metaObject.getOriginalObject()instanceof BaseDO baseDO) { // 继承了 BaseDO 的类，填充修改信息 - BaseDO baseDO = (BaseDO)metaObject.getOriginalObject(); baseDO.setUpdateUser(updateUser); baseDO.setUpdateTime(updateTime); } else { diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java index cfb3f6d1..5c0e19e2 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/CrudRequestMappingHandlerMapping.java @@ -16,20 +16,19 @@ package top.charles7c.cnadmin.common.handler; -import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api; - -import java.lang.reflect.Method; - +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; import org.springframework.lang.NonNull; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; - -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.StrUtil; - +import org.springframework.web.util.pattern.PathPatternParser; import top.charles7c.cnadmin.common.annotation.CrudRequestMapping; import top.charles7c.cnadmin.common.util.ExceptionUtils; +import java.lang.reflect.Method; + +import static top.charles7c.cnadmin.common.annotation.CrudRequestMapping.Api; + /** * CRUD 请求映射器处理器映射器 * @@ -55,7 +54,14 @@ public class CrudRequestMappingHandlerMapping extends RequestMappingHandlerMappi // 拼接路径前缀（合并了 @RequestMapping 的部分能力） String pathPrefix = crudRequestMapping.value(); if (StrUtil.isNotBlank(pathPrefix)) { - requestMappingInfo = RequestMappingInfo.paths(pathPrefix).build().combine(requestMappingInfo); + /* + * 问题：RequestMappingInfo.paths(pathPrefix) 返回的 RequestMappingInfo 对象里 pathPatternsCondition = null + * 导致 combine() 方法抛出断言异常！ 修复：创建 options 对象，并设置 PatternParser + */ + RequestMappingInfo.BuilderConfiguration options = new RequestMappingInfo.BuilderConfiguration(); + options.setPatternParser(PathPatternParser.defaultInstance); + requestMappingInfo = + RequestMappingInfo.paths(pathPrefix).options(options).build().combine(requestMappingInfo); } // 过滤 API diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java index a5c816a1..d7a86ae1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java @@ -18,9 +18,9 @@ package top.charles7c.cnadmin.common.handler; import java.util.Objects; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; @@ -132,18 +132,11 @@ public class GlobalExceptionHandler { @ExceptionHandler(NotLoginException.class) public R handleNotLoginException(NotLoginException e, HttpServletRequest request) { log.error("请求地址 [{}]，认证失败，无法访问系统资源。", request.getRequestURI(), e); - String errorMsg; - switch (e.getType()) { - case NotLoginException.KICK_OUT: - errorMsg = "您已被踢下线。"; - break; - case NotLoginException.BE_REPLACED_MESSAGE: - errorMsg = "您已被顶下线。"; - break; - default: - errorMsg = "您的登录状态已过期，请重新登录。"; - break; - } + String errorMsg = switch (e.getType()) { + case NotLoginException.KICK_OUT -> "您已被踢下线。"; + case NotLoginException.BE_REPLACED_MESSAGE -> "您已被顶下线。"; + default -> "您的登录状态已过期，请重新登录。"; + }; LogContextHolder.setErrorMsg(errorMsg); return R.fail(HttpStatus.UNAUTHORIZED.value(), errorMsg); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java index e2a4a214..da810c15 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.dto; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -30,6 +31,7 @@ import lombok.Data; @Data public class LogContext implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java index be1d1f36..00cfdfb3 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.dto; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; import java.util.Set; @@ -35,6 +36,7 @@ import top.charles7c.cnadmin.common.constant.SysConsts; @Data public class LoginUser implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java index 298ba332..89843ea3 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.dto; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -31,6 +32,7 @@ import top.charles7c.cnadmin.common.enums.DataScopeEnum; @Data public class RoleDTO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java index 1e91e48e..1b1a6048 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/PageQuery.java @@ -16,7 +16,9 @@ package top.charles7c.cnadmin.common.model.query; -import javax.validation.constraints.Min; +import java.io.Serial; + +import jakarta.validation.constraints.Min; import lombok.Data; import lombok.NoArgsConstructor; @@ -24,7 +26,7 @@ import lombok.NoArgsConstructor; import io.swagger.v3.oas.annotations.media.Schema; import org.hibernate.validator.constraints.Range; -import org.springdoc.api.annotations.ParameterObject; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.domain.Sort; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -46,6 +48,7 @@ import cn.hutool.core.util.StrUtil; @Schema(description = "分页查询条件") public class PageQuery extends SortQuery { + @Serial private static final long serialVersionUID = 1L; /** 默认页码：1 */ private static final int DEFAULT_PAGE = 1; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/req/UpdateStatusReq.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/req/UpdateStatusReq.java index 30c6e814..8d307554 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/req/UpdateStatusReq.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/req/UpdateStatusReq.java @@ -16,9 +16,10 @@ package top.charles7c.cnadmin.common.model.req; +import java.io.Serial; import java.io.Serializable; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -36,6 +37,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "修改状态信息") public class UpdateStatusReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/CaptchaResp.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/CaptchaResp.java index 63884467..98f7c66a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/CaptchaResp.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/CaptchaResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Builder; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "验证码信息") public class CaptchaResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/LabelValueResp.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/LabelValueResp.java index ef264c79..0113eae1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/LabelValueResp.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/LabelValueResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -37,6 +38,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; @Schema(description = "键值对信息") public class LabelValueResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/PageDataResp.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/PageDataResp.java index 16107a9a..e38e9798 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/PageDataResp.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/PageDataResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.resp; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -41,6 +42,7 @@ import cn.hutool.core.collection.CollUtil; @Schema(description = "分页信息") public class PageDataResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/R.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/R.java index a2d50a66..bd7b751f 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/R.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/R.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.common.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.AccessLevel; @@ -39,6 +40,7 @@ import cn.hutool.core.date.DateUtil; @Schema(description = "响应信息") public class R implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** 是否成功 */ diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java index 7793fe38..831751f4 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExcelUtils.java @@ -19,7 +19,7 @@ package top.charles7c.cnadmin.common.util; import java.util.Date; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java index 84484560..22f6d54e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java @@ -46,9 +46,8 @@ public class ExceptionUtils { * 异常 */ public static void printException(Runnable runnable, Throwable throwable) { - if (null == throwable && runnable instanceof Future) { + if (null == throwable && runnable instanceof Future future) { try { - Future future = (Future)runnable; if (future.isDone()) { future.get(); } diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java index 00a4e525..a6389084 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/MailUtils.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import lombok.AccessLevel; import lombok.Data; @@ -200,14 +200,14 @@ public class MailUtils { // 设置收信人 // 抄送人 if (CollUtil.isNotEmpty(ccs)) { - messageHelper.setCc(ccs.toArray(new String[0])); + messageHelper.setCc(ccs.toArray(String[]::new)); } // 密送人 if (CollUtil.isNotEmpty(bccs)) { - messageHelper.setBcc(bccs.toArray(new String[0])); + messageHelper.setBcc(bccs.toArray(String[]::new)); } // 收件人 - messageHelper.setTo(tos.toArray(new String[0])); + messageHelper.setTo(tos.toArray(String[]::new)); // 设置附件 if (ArrayUtil.isNotEmpty(files)) { diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java index 4f636eca..2b129dbc 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java @@ -18,8 +18,8 @@ package top.charles7c.cnadmin.common.util; import java.util.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java index e8f51889..18c1af7d 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java @@ -18,7 +18,7 @@ package top.charles7c.cnadmin.common.util.helper; import java.time.LocalDateTime; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -26,7 +26,7 @@ import lombok.NoArgsConstructor; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.extra.servlet.ServletUtil; +import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.spring.SpringUtil; import top.charles7c.cnadmin.common.constant.CacheConsts; @@ -58,7 +58,7 @@ public class LoginHelper { public static String login(LoginUser loginUser) { // 记录登录信息 HttpServletRequest request = ServletUtils.getRequest(); - loginUser.setClientIp(ServletUtil.getClientIP(request)); + loginUser.setClientIp(JakartaServletUtil.getClientIP(request)); loginUser.setLocation(IpUtils.getCityInfo(loginUser.getClientIp())); loginUser.setBrowser(ServletUtils.getBrowser(request)); LogContext logContext = LogContextHolder.get(); diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java index df4efed1..3175c817 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java @@ -20,6 +20,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; +import cn.hutool.core.collection.CollUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -86,7 +87,7 @@ public class QueryHelper { * 查询数据类型 */ private static void buildQuery(Q query, Field field, QueryWrapper queryWrapper) { - boolean accessible = field.isAccessible(); + boolean accessible = field.canAccess(null); try { field.setAccessible(true); // 没有 @Query，直接返回 @@ -149,54 +150,31 @@ public class QueryHelper { String columnName = StrUtil.toUnderlineCase(StrUtil.blankToDefault(property, fieldName)); QueryTypeEnum queryType = queryAnnotation.type(); switch (queryType) { - case EQUAL: - queryWrapper.eq(columnName, fieldValue); - break; - case NOT_EQUAL: - queryWrapper.ne(columnName, fieldValue); - break; - case GREATER_THAN: - queryWrapper.gt(columnName, fieldValue); - break; - case LESS_THAN: - queryWrapper.lt(columnName, fieldValue); - break; - case GREATER_THAN_OR_EQUAL: - queryWrapper.ge(columnName, fieldValue); - break; - case LESS_THAN_OR_EQUAL: - queryWrapper.le(columnName, fieldValue); - break; - case BETWEEN: + case EQUAL -> queryWrapper.eq(columnName, fieldValue); + case NOT_EQUAL -> queryWrapper.ne(columnName, fieldValue); + case GREATER_THAN -> queryWrapper.gt(columnName, fieldValue); + case LESS_THAN -> queryWrapper.lt(columnName, fieldValue); + case GREATER_THAN_OR_EQUAL -> queryWrapper.ge(columnName, fieldValue); + case LESS_THAN_OR_EQUAL -> queryWrapper.le(columnName, fieldValue); + case BETWEEN -> { List between = new ArrayList<>((List)fieldValue); ValidationUtils.throwIf(between.size() != 2, "[{}] 必须是一个范围", fieldName); queryWrapper.between(columnName, between.get(0), between.get(1)); - break; - case LEFT_LIKE: - queryWrapper.likeLeft(columnName, fieldValue); - break; - case INNER_LIKE: - queryWrapper.like(columnName, fieldValue); - break; - case RIGHT_LIKE: - queryWrapper.likeRight(columnName, fieldValue); - break; - case IN: + } + case LEFT_LIKE -> queryWrapper.likeLeft(columnName, fieldValue); + case INNER_LIKE -> queryWrapper.like(columnName, fieldValue); + case RIGHT_LIKE -> queryWrapper.likeRight(columnName, fieldValue); + case IN -> { ValidationUtils.throwIfEmpty(fieldValue, "[{}] 不能为空", fieldName); queryWrapper.in(columnName, (List)fieldValue); - break; - case NOT_IN: + } + case NOT_IN -> { ValidationUtils.throwIfEmpty(fieldValue, "[{}] 不能为空", fieldName); queryWrapper.notIn(columnName, (List)fieldValue); - break; - case IS_NULL: - queryWrapper.isNull(columnName); - break; - case IS_NOT_NULL: - queryWrapper.isNotNull(columnName); - break; - default: - throw new IllegalArgumentException(String.format("暂不支持 [%s] 查询类型", queryType)); + } + case IS_NULL -> queryWrapper.isNull(columnName); + case IS_NOT_NULL -> queryWrapper.isNotNull(columnName); + default -> throw new IllegalArgumentException(String.format("暂不支持 [%s] 查询类型", queryType)); } } } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java index 7517ddc1..89554997 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java @@ -19,10 +19,10 @@ package top.charles7c.cnadmin.monitor.filter; import java.io.IOException; import java.util.Objects; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.core.Ordered; import org.springframework.lang.NonNull; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java index 5dfef9df..f65a70ac 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -43,7 +43,7 @@ import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.servlet.ServletUtil; +import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.http.HttpStatus; import cn.hutool.json.JSONArray; @@ -217,7 +217,7 @@ public class LogInterceptor implements HandlerInterceptor { : request.getRequestURL().append(StringConsts.QUESTION_MARK).append(request.getQueryString()).toString()); String method = request.getMethod(); logDO.setRequestMethod(method); - logDO.setRequestHeaders(this.desensitize(ServletUtil.getHeaderMap(request))); + logDO.setRequestHeaders(this.desensitize(JakartaServletUtil.getHeaderMap(request))); String requestBody = this.getRequestBody(request); logDO.setCreateUser(ObjectUtil.defaultIfNull(logDO.getCreateUser(), LoginHelper.getUserId())); String requestURI = request.getRequestURI(); @@ -241,13 +241,13 @@ public class LogInterceptor implements HandlerInterceptor { } requestBody = JSONUtil.toJsonStr(requestBodyJsonObjList); } else { - requestBody = this.desensitize(ServletUtil.getParamMap(request)); + requestBody = this.desensitize(JakartaServletUtil.getParamMap(request)); } logDO.setRequestBody(requestBody); } - logDO.setClientIp(ServletUtil.getClientIP(request)); + logDO.setClientIp(JakartaServletUtil.getClientIP(request)); logDO.setLocation(IpUtils.getCityInfo(logDO.getClientIp())); - logDO.setBrowser(ServletUtils.getBrowser(request)); + logDO.setBrowser(JakartaServletUtil.getBrowser(request)); } /** @@ -262,7 +262,7 @@ public class LogInterceptor implements HandlerInterceptor { int status = response.getStatus(); logDO.setStatusCode(status); logDO.setStatus(status >= HttpStatus.HTTP_BAD_REQUEST ? LogStatusEnum.FAILURE : logDO.getStatus()); - logDO.setResponseHeaders(this.desensitize(ServletUtil.getHeadersMap(response))); + logDO.setResponseHeaders(this.desensitize(JakartaServletUtil.getHeadersMap(response))); // 响应体（不记录非 JSON 响应数据） String responseBody = this.getResponseBody(response); if (StrUtil.isNotBlank(responseBody) && JSONUtil.isTypeJSON(responseBody)) { @@ -350,7 +350,7 @@ public class LogInterceptor implements HandlerInterceptor { return false; } // 2、检查是否需要记录内网 IP 操作 - boolean isInnerIp = IpUtils.isInnerIp(ServletUtil.getClientIP(request)); + boolean isInnerIp = IpUtils.isInnerIp(JakartaServletUtil.getClientIP(request)); if (isInnerIp && Boolean.FALSE.equals(operationLogProperties.getIncludeInnerIp())) { return false; } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java index e4bde07c..2461eb88 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.entity; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -36,6 +37,7 @@ import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; @TableName("sys_log") public class LogDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java index c810f3a7..2d5c676d 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -41,6 +42,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum; @Schema(description = "登录日志查询条件") public class LoginLogQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java index 26160847..5101c97f 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -41,6 +42,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum; @Schema(description = "操作日志查询条件") public class OperationLogQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java index 57e8b565..45fee12a 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -41,6 +42,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum; @Schema(description = "系统日志查询条件") public class SystemLogQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LogResp.java index 49943c49..37494a82 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LogResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.monitor.model.resp; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -34,6 +35,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; @Data public class LogResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LoginLogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LoginLogResp.java index 37471d4d..2db994c3 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LoginLogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LoginLogResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.monitor.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,6 +34,7 @@ import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; @Schema(description = "登录日志信息") public class LoginLogResp extends LogResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/OperationLogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/OperationLogResp.java index 4a967e60..a5e3ffb1 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/OperationLogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/OperationLogResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.monitor.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,6 +34,7 @@ import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; @Schema(description = "操作日志信息") public class OperationLogResp extends LogResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogDetailResp.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogDetailResp.java index 98094071..a9364606 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogDetailResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogDetailResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.monitor.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -30,6 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "系统日志详情信息") public class SystemLogDetailResp extends LogResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogResp.java index 36621402..e21bbdd5 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.monitor.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -30,6 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "系统日志信息") public class SystemLogResp extends LogResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java index 5445298a..70cab3fa 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -38,6 +39,7 @@ import cn.hutool.core.date.DatePattern; @Schema(description = "在线用户查询条件") public class OnlineUserQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/AccountLoginReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/AccountLoginReq.java index 01226b6f..c54ae4dc 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/AccountLoginReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/req/AccountLoginReq.java @@ -16,9 +16,10 @@ package top.charles7c.cnadmin.auth.model.req; +import java.io.Serial; import java.io.Serializable; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "账号登录信息") public class AccountLoginReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/MetaResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/MetaResp.java index e9e5ff17..87ca70fe 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/MetaResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/MetaResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "元数据信息") public class MetaResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/OnlineUserResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/OnlineUserResp.java index 0808ee32..dfad31ab 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/OnlineUserResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/OnlineUserResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.resp; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; @@ -33,6 +34,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "在线用户信息") public class OnlineUserResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/RouteResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/RouteResp.java index b7267edf..e7efbcb1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/RouteResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/RouteResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.resp; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -36,6 +37,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouteResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/UserInfoResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/UserInfoResp.java index bea86e71..f6c5d52a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/UserInfoResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/resp/UserInfoResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.auth.model.resp; +import java.io.Serial; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; @@ -41,6 +42,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum; @Schema(description = "用户信息") public class UserInfoResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java index 389c45e4..2d95aac1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/DeptDO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; + import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; @@ -33,6 +35,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @TableName("sys_dept") public class DeptDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java index 185cd502..296c6dd2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/MenuDO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; + import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; @@ -34,6 +36,7 @@ import top.charles7c.cnadmin.common.enums.MenuTypeEnum; @TableName("sys_menu") public class MenuDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java index 3ade9518..759254d5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDO.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; + import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; @@ -34,6 +36,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @TableName("sys_role") public class RoleDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDeptDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDeptDO.java index b1cdc3ba..54f5bd7a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDeptDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleDeptDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("sys_role_dept") public class RoleDeptDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleMenuDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleMenuDO.java index 8e66ccb1..4db870bf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleMenuDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/RoleMenuDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("sys_role_menu") public class RoleMenuDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java index 098c4ffa..aef28d0c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.time.LocalDateTime; import lombok.Data; @@ -36,6 +37,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum; @TableName("sys_user") public class UserDO extends BaseDO { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserRoleDO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserRoleDO.java index 1a676556..6a1091b5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserRoleDO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/entity/UserRoleDO.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.entity; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import com.baomidou.mybatisplus.annotation.TableName; @TableName("sys_user_role") public class UserRoleDO implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java index bce274c8..4f8a0e65 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -35,6 +36,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum; @Schema(description = "部门查询条件") public class DeptQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java index 25cf5ce4..a7fbed5a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -35,6 +36,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum; @Schema(description = "菜单查询条件") public class MenuQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java index 8ea212ba..5cd2b7dd 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -34,6 +35,7 @@ import top.charles7c.cnadmin.common.annotation.Query; @Schema(description = "角色查询条件") public class RoleQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java index 69167d69..39647288 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.query; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -41,6 +42,7 @@ import top.charles7c.cnadmin.common.enums.QueryTypeEnum; @Schema(description = "用户查询条件") public class UserQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DeptReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DeptReq.java index 15b979ee..35dfed83 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DeptReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/DeptReq.java @@ -16,10 +16,12 @@ package top.charles7c.cnadmin.system.model.req; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import java.io.Serial; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.Data; @@ -42,6 +44,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "创建或修改部门信息") public class DeptReq extends BaseReq { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MenuReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MenuReq.java index 746b78fa..e9d0d3da 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MenuReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/MenuReq.java @@ -16,10 +16,12 @@ package top.charles7c.cnadmin.system.model.req; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import java.io.Serial; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.Data; @@ -42,6 +44,7 @@ import top.charles7c.cnadmin.common.enums.MenuTypeEnum; @Schema(description = "创建或修改菜单信息") public class MenuReq extends BaseReq { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/RoleReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/RoleReq.java index 3eeafa61..ccb0224c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/RoleReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/RoleReq.java @@ -16,12 +16,13 @@ package top.charles7c.cnadmin.system.model.req; +import java.io.Serial; import java.util.ArrayList; import java.util.List; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.Data; @@ -44,6 +45,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "创建或修改角色信息") public class RoleReq extends BaseReq { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserBasicInfoUpdateReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserBasicInfoUpdateReq.java index fcc27269..8df966c6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserBasicInfoUpdateReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserBasicInfoUpdateReq.java @@ -16,11 +16,12 @@ package top.charles7c.cnadmin.system.model.req; +import java.io.Serial; import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.Data; @@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum; @Schema(description = "用户基础信息修改信息") public class UserBasicInfoUpdateReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserEmailUpdateRequest.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserEmailUpdateRequest.java index a3a5e718..b55fdbc2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserEmailUpdateRequest.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserEmailUpdateRequest.java @@ -16,10 +16,11 @@ package top.charles7c.cnadmin.system.model.req; +import java.io.Serial; import java.io.Serializable; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.Data; @@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.constant.RegexConsts; @Schema(description = "用户邮箱修改信息") public class UserEmailUpdateRequest implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPasswordUpdateReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPasswordUpdateReq.java index 3792afc6..ce7350a9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPasswordUpdateReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserPasswordUpdateReq.java @@ -16,9 +16,10 @@ package top.charles7c.cnadmin.system.model.req; +import java.io.Serial; import java.io.Serializable; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "用户密码修改信息") public class UserPasswordUpdateReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserReq.java index 92f129f9..a1611ce2 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserReq.java @@ -16,12 +16,13 @@ package top.charles7c.cnadmin.system.model.req; +import java.io.Serial; import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import lombok.Data; @@ -44,6 +45,7 @@ import top.charles7c.cnadmin.common.enums.GenderEnum; @Schema(description = "创建或修改用户信息") public class UserReq extends BaseReq { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserRoleUpdateReq.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserRoleUpdateReq.java index 311f5507..24ba805b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserRoleUpdateReq.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/req/UserRoleUpdateReq.java @@ -16,10 +16,11 @@ package top.charles7c.cnadmin.system.model.req; +import java.io.Serial; import java.io.Serializable; import java.util.List; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import lombok.Data; @@ -35,6 +36,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "用户角色修改信息") public class UserRoleUpdateReq implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AvatarResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AvatarResp.java index 18ae591f..908d1c0e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AvatarResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/AvatarResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.io.Serializable; import lombok.Builder; @@ -34,6 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "头像信息") public class AvatarResp implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptDetailResp.java index 7a9b3ee0..d4639a69 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptDetailResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -39,6 +41,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "部门详情信息") public class DeptDetailResp extends BaseDetailResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptResp.java index 58a0816a..673ea47e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/DeptResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -35,6 +37,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "部门信息") public class DeptResp extends BaseResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MenuResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MenuResp.java index 3987fc4d..ad81cd95 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MenuResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/MenuResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -41,6 +43,7 @@ import top.charles7c.cnadmin.common.enums.MenuTypeEnum; @Schema(description = "菜单信息") public class MenuResp extends BaseResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleDetailResp.java index 8cadf6c7..c06a0e70 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleDetailResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.util.List; import lombok.Data; @@ -41,6 +42,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "角色详情信息") public class RoleDetailResp extends BaseDetailResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleResp.java index 9e47443e..eaee69b5 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/RoleResp.java @@ -16,6 +16,8 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; + import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -34,6 +36,7 @@ import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; @Schema(description = "角色信息") public class RoleResp extends BaseResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserDetailResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserDetailResp.java index 7b46f0a1..de8d2b37 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserDetailResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserDetailResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.time.LocalDateTime; import java.util.List; import java.util.Objects; @@ -44,6 +45,7 @@ import top.charles7c.cnadmin.common.util.helper.LoginHelper; @Schema(description = "用户详情信息") public class UserDetailResp extends BaseDetailResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserResp.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserResp.java index 6d2c7e2d..76d95552 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserResp.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/resp/UserResp.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.system.model.resp; +import java.io.Serial; import java.util.Objects; import lombok.Data; @@ -39,6 +40,7 @@ import top.charles7c.cnadmin.common.util.helper.LoginHelper; @Schema(description = "用户信息") public class UserResp extends BaseResp { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index e3e0d0e3..81834463 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; @@ -127,8 +127,7 @@ public class DeptServiceImpl extends BaseServiceImpl list = menuService.list(null, null); List menuIds = list.stream().map(MenuResp::getId).collect(Collectors.toList()); - detailVO.setMenuIds(menuIds); + detail.setMenuIds(menuIds); } else { - detailVO.setMenuIds(roleMenuService.listMenuIdByRoleIds(CollUtil.newArrayList(roleId))); + detail.setMenuIds(roleMenuService.listMenuIdByRoleIds(CollUtil.newArrayList(roleId))); } - detailVO.setDeptIds(roleDeptService.listDeptIdByRoleId(roleId)); + detail.setDeptIds(roleDeptService.listDeptIdByRoleId(roleId)); } } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index dcdc8250..8fb400ba 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -20,7 +20,7 @@ import java.io.File; import java.time.LocalDateTime; import java.util.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; @@ -152,12 +152,12 @@ public class UserServiceImpl extends BaseServiceImpl deptService.get(detailVO.getDeptId()).getName())); - List roleIdList = userRoleService.listRoleIdByUserId(detailVO.getId()); - detailVO.setRoleIds(roleIdList); - detailVO.setRoleNames(String.join(StringConsts.CHINESE_COMMA, roleService.listNameByIds(roleIdList))); + if (detailObj instanceof UserDetailResp detail) { + UserDetailResp detail = (UserDetailResp)detailObj; + detail.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detail.getDeptId()).getName())); + List roleIdList = userRoleService.listRoleIdByUserId(detail.getId()); + detail.setRoleIds(roleIdList); + detail.setRoleNames(String.join(StringConsts.CHINESE_COMMA, roleService.listNameByIds(roleIdList))); } } diff --git a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/query/TableQuery.java b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/query/TableQuery.java index 0154e2a5..dfb88454 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/query/TableQuery.java +++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/query/TableQuery.java @@ -16,6 +16,7 @@ package top.charles7c.cnadmin.tool.model.query; +import java.io.Serial; import java.io.Serializable; import lombok.Data; @@ -32,6 +33,7 @@ import io.swagger.v3.oas.annotations.media.Schema; @Schema(description = "表信息查询条件") public class TableQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java index 9b1a4115..59bac3a8 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java @@ -20,9 +20,9 @@ import java.time.Duration; import java.util.LinkedHashMap; import java.util.Map; -import javax.mail.MessagingException; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import jakarta.mail.MessagingException; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java index 7349eca6..5b65da19 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserCenterController.java @@ -19,7 +19,7 @@ package top.charles7c.cnadmin.webapi.controller.system; import java.util.List; import java.util.stream.Collectors; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-webapi/src/main/resources/config/application-dev.yml b/continew-admin-webapi/src/main/resources/config/application-dev.yml index 8a94a2ad..ada06690 100644 --- a/continew-admin-webapi/src/main/resources/config/application-dev.yml +++ b/continew-admin-webapi/src/main/resources/config/application-dev.yml @@ -1,8 +1,3 @@ ---- ### 项目配置 -project: - # URL - url: http://localhost:5173 - --- ### 服务器配置 server: # HTTP 端口（默认 8080） @@ -56,7 +51,7 @@ spring.liquibase: change-log: classpath:/db/changelog/db.changelog-master.yaml --- ### Redis 配置（单机版） -spring: +spring.data: redis: # 地址 host: ${REDIS_HOST:127.0.0.1} diff --git a/continew-admin-webapi/src/main/resources/config/application-prod.yml b/continew-admin-webapi/src/main/resources/config/application-prod.yml index 5cfa614f..2b7031ed 100644 --- a/continew-admin-webapi/src/main/resources/config/application-prod.yml +++ b/continew-admin-webapi/src/main/resources/config/application-prod.yml @@ -58,7 +58,7 @@ spring.liquibase: change-log: classpath:/db/changelog/db.changelog-master.yaml --- ### Redis 配置（单机版） -spring: +spring.data: redis: # 地址 host: ${REDIS_HOST:127.0.0.1} diff --git a/pom.xml b/pom.xml index 6075d9bf..cd4da42d 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ limitations under the License. org.springframework.boot spring-boot-starter-parent - 2.7.16 + 3.0.5 @@ -63,10 +63,7 @@ limitations under the License. 2.0.0-SNAPSHOT - 1.8 2.30.0 - 8 - 8 UTF-8 @@ -77,7 +74,7 @@ limitations under the License. cn.dev33 - sa-token-spring-boot-starter + sa-token-spring-boot3-starter ${sa-token.version} @@ -174,17 +171,6 @@ limitations under the License. org.redisson redisson-spring-boot-starter ${redisson.version} - - - org.redisson - redisson-spring-data-30 - - - - - org.redisson - redisson-spring-data-27 - ${redisson.version} @@ -278,7 +264,7 @@ limitations under the License. - java,javax,lombok,io,org,com,cn,top.charles7c, + java,jakarta,lombok,io,org,com,cn,top.charles7c,