diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java b/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java index 0c8881bc..ecc4b16a 100644 --- a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java +++ b/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java @@ -2,6 +2,7 @@ package org.dromara.resource.api.domain; import lombok.Data; +import java.io.Serial; import java.io.Serializable; /** @@ -12,6 +13,7 @@ import java.io.Serializable; @Data public class RemoteFile implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSms.java b/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSms.java index f7e9a892..430eb5bb 100644 --- a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSms.java +++ b/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSms.java @@ -2,6 +2,7 @@ package org.dromara.resource.api.domain; import lombok.Data; +import java.io.Serial; import java.io.Serializable; /** @@ -12,6 +13,7 @@ import java.io.Serializable; @Data public class RemoteSms implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java index d9ee01f6..af084a29 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java @@ -14,7 +14,6 @@ public interface RemoteLogService { * 保存系统日志 * * @param sysOperLog 日志实体 - * @return 结果 */ void saveLog(RemoteOperLogBo sysOperLog); @@ -22,7 +21,6 @@ public interface RemoteLogService { * 保存访问记录 * * @param sysLogininfor 访问实体 - * @return 结果 */ void saveLogininfor(RemoteLogininforBo sysLogininfor); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java index df6e20ab..6b0b4d97 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java @@ -3,6 +3,7 @@ package org.dromara.system.api.domain; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; /** @@ -15,6 +16,9 @@ import java.io.Serializable; @NoArgsConstructor public class SysUserOnline implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + /** * 会话编号 */ diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java index 41d0c0ae..20ca4fee 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java @@ -3,6 +3,7 @@ package org.dromara.system.api.domain.bo; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.HashMap; @@ -17,6 +18,10 @@ import java.util.Map; @Data @NoArgsConstructor public class RemoteLogininforBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + /** * 访问ID */ diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java index 50f01cde..aad49f65 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java @@ -3,6 +3,7 @@ package org.dromara.system.api.domain.bo; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.HashMap; @@ -17,6 +18,10 @@ import java.util.Map; @Data @NoArgsConstructor public class RemoteOperLogBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + /** * 日志主键 */ diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java index 0a7f83d6..5d21b09a 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java @@ -9,6 +9,8 @@ import org.dromara.common.core.xss.Xss; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; + +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -22,6 +24,9 @@ import java.util.Date; @NoArgsConstructor public class RemoteUserBo implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + /** * 用户ID */ diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java index edcddb65..294d3e32 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java @@ -2,6 +2,7 @@ package org.dromara.system.api.domain.vo; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.Date; @Data public class RemoteDictDataVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java index 927d71c9..b9387f9d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java @@ -2,6 +2,7 @@ package org.dromara.system.api.domain.vo; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.Date; @Data public class RemoteTenantVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java index 1e07b1ec..5b8c2323 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java @@ -5,6 +5,7 @@ import org.dromara.common.core.constant.CacheConstants; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.List; import java.util.Set; @@ -17,6 +18,8 @@ import java.util.Set; @Data @NoArgsConstructor public class LoginUser implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java index 9fbf2571..71b9af31 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java @@ -3,6 +3,7 @@ package org.dromara.system.api.model; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; /** @@ -15,6 +16,9 @@ import java.io.Serializable; @NoArgsConstructor public class RoleDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + /** * 角色ID */ diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java index 00e90018..3982e2e1 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.io.Serial; + /** * 小程序登录用户身份权限 * @@ -14,6 +16,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class XcxLoginUser extends LoginUser { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java index df34662c..12d7d479 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java @@ -3,7 +3,6 @@ package org.dromara.auth.controller; import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; -import org.dromara.auth.domain.convert.TenantVoConvert; import org.dromara.auth.domain.vo.LoginTenantVo; import org.dromara.auth.domain.vo.LoginVo; import org.dromara.auth.domain.vo.TenantListVo; @@ -13,6 +12,7 @@ import org.dromara.auth.form.RegisterBody; import org.dromara.auth.form.SmsLoginBody; import org.dromara.auth.service.SysLoginService; import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.tenant.helper.TenantHelper; @@ -51,10 +51,7 @@ public class TokenController { public R login(@Validated @RequestBody LoginBody body) { LoginVo loginVo = new LoginVo(); // 生成令牌 - String token = sysLoginService.login( - body.getTenantId(), - body.getUsername(), - body.getPassword()); + String token = sysLoginService.login(body.getTenantId(), body.getUsername(), body.getPassword()); loginVo.setToken(token); return R.ok(loginVo); } @@ -131,7 +128,7 @@ public class TokenController { @GetMapping("/tenant/list") public R tenantList(HttpServletRequest request) throws Exception { List tenantList = remoteTenantService.queryList(); - List voList = TenantVoConvert.INSTANCE.convertList(tenantList); + List voList = MapstructUtils.convert(tenantList, TenantListVo.class); // 获取域名 String host = new URL(request.getRequestURL().toString()).getHost(); // 根据域名进行筛选 diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java b/ruoyi-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java index 5ced9b1b..7888f2c1 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java @@ -1,35 +1,16 @@ package org.dromara.auth.domain.convert; +import io.github.linpeilie.BaseMapper; import org.dromara.auth.domain.vo.TenantListVo; import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; +import org.mapstruct.MappingConstants; /** * 租户vo转换器 * @author zhujie */ -@Mapper -public interface TenantVoConvert { - - TenantVoConvert INSTANCE = Mappers.getMapper(TenantVoConvert.class); - - /** - * RemoteTenantVoToTenantListVo - * @param remoteTenantVo 待转换对象 - * @return 转换后对象 - */ - TenantListVo convert(RemoteTenantVo remoteTenantVo); - - /** - * RemoteTenantVoToTenantListVo - * @param remoteTenantVo 待转换对象 - * @return 转换后对象 - */ - List convertList(List remoteTenantVo); - - +@Mapper(componentModel = MappingConstants.ComponentModel.SPRING) +public interface TenantVoConvert extends BaseMapper { } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java index 8621e002..689975fb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java @@ -1,5 +1,6 @@ package org.dromara.common.core.config; +import jakarta.validation.Validator; import org.hibernate.validator.HibernateValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -7,7 +8,6 @@ import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; -import jakarta.validation.Validator; import java.util.Properties; /** @@ -26,18 +26,19 @@ public class ValidatorConfig { */ @Bean public Validator validator() { - LocalValidatorFactoryBean factoryBean = new LocalValidatorFactoryBean(); - // 国际化 - factoryBean.setValidationMessageSource(messageSource); - // 设置使用 HibernateValidator 校验器 - factoryBean.setProviderClass(HibernateValidator.class); - Properties properties = new Properties(); - // 设置 快速异常返回 - properties.setProperty("hibernate.validator.fail_fast", "true"); - factoryBean.setValidationProperties(properties); - // 加载配置 - factoryBean.afterPropertiesSet(); - return factoryBean.getValidator(); + try (LocalValidatorFactoryBean factoryBean = new LocalValidatorFactoryBean()) { + // 国际化 + factoryBean.setValidationMessageSource(messageSource); + // 设置使用 HibernateValidator 校验器 + factoryBean.setProviderClass(HibernateValidator.class); + Properties properties = new Properties(); + // 设置 快速异常返回 + properties.setProperty("hibernate.validator.fail_fast", "true"); + factoryBean.setValidationProperties(properties); + // 加载配置 + factoryBean.afterPropertiesSet(); + return factoryBean.getValidator(); + } } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java index 4bf265b4..625f58be 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java @@ -4,6 +4,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.dromara.common.core.constant.HttpStatus; +import java.io.Serial; import java.io.Serializable; /** @@ -14,6 +15,8 @@ import java.io.Serializable; @Data @NoArgsConstructor public class R implements Serializable { + + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CaptchaException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CaptchaException.java index 23f2426c..b828fd4a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CaptchaException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CaptchaException.java @@ -2,12 +2,15 @@ package org.dromara.common.core.exception; import org.dromara.common.core.exception.user.UserException; +import java.io.Serial; + /** * 验证码错误异常类 * * @author Lion Li */ public class CaptchaException extends UserException { + @Serial private static final long serialVersionUID = 1L; public CaptchaException() { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CheckedException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CheckedException.java index d3250984..9a7bbeec 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CheckedException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/CheckedException.java @@ -1,11 +1,14 @@ package org.dromara.common.core.exception; +import java.io.Serial; + /** * 检查异常 * * @author ruoyi */ public class CheckedException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; public CheckedException(String message) { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/DemoModeException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/DemoModeException.java index 92b7d692..9904bc68 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/DemoModeException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/DemoModeException.java @@ -1,11 +1,14 @@ package org.dromara.common.core.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/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/GlobalException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/GlobalException.java index b5d74393..6b404e60 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/GlobalException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/GlobalException.java @@ -1,5 +1,7 @@ package org.dromara.common.core.exception; +import java.io.Serial; + /** * 全局异常 * @@ -7,6 +9,7 @@ package org.dromara.common.core.exception; */ public class GlobalException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java index f96d4a8c..8bb89e6c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java @@ -1,11 +1,14 @@ package org.dromara.common.core.exception; +import java.io.Serial; + /** * 业务异常 * * @author ruoyi */ public final class ServiceException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/UtilException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/UtilException.java index 775f92f1..06fd45a3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/UtilException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/UtilException.java @@ -1,11 +1,14 @@ package org.dromara.common.core.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/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java index 63d43764..f71ddb4d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java @@ -5,6 +5,8 @@ import org.dromara.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; +import java.io.Serial; + /** * 基础异常 * @@ -13,6 +15,7 @@ import lombok.Getter; @Getter @AllArgsConstructor public class BaseException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java index 4d635430..afd69ec4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java @@ -2,12 +2,15 @@ package org.dromara.common.core.exception.file; import org.dromara.common.core.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/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java index b64ede08..e3a5e627 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,11 +1,14 @@ package org.dromara.common.core.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/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java index a897ee2c..ebb35c26 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java @@ -1,11 +1,14 @@ package org.dromara.common.core.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/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java index 08209ee8..e9a3d88c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java @@ -1,11 +1,14 @@ package org.dromara.common.core.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/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java index a8ca3305..0812fa6a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java @@ -2,12 +2,15 @@ package org.dromara.common.core.exception.user; import org.dromara.common.core.exception.base.BaseException; +import java.io.Serial; + /** * 用户信息异常类 * * @author Lion Li */ public class UserException extends BaseException { + @Serial private static final long serialVersionUID = 1L; public UserException(String code, Object... args) { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserPasswordNotMatchException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserPasswordNotMatchException.java index 95165c39..cb8fb67b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserPasswordNotMatchException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserPasswordNotMatchException.java @@ -1,11 +1,14 @@ package org.dromara.common.core.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/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/BeanCopyUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/BeanCopyUtils.java deleted file mode 100644 index 00dba1a8..00000000 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/BeanCopyUtils.java +++ /dev/null @@ -1,200 +0,0 @@ -package org.dromara.common.core.utils; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.SimpleCache; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.ReflectUtil; -import cn.hutool.core.util.StrUtil; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.springframework.cglib.beans.BeanCopier; -import org.springframework.cglib.beans.BeanMap; -import org.springframework.cglib.core.Converter; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * bean拷贝工具(基于 cglib 性能优异) - * - * @author Lion Li - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class BeanCopyUtils { - - /** - * 单对象基于class创建拷贝 - * - * @param source 数据来源实体 - * @param desc 描述对象 转换后的对象 - * @return desc - */ - public static V copy(T source, Class desc) { - if (ObjectUtil.isNull(source)) { - return null; - } - if (ObjectUtil.isNull(desc)) { - return null; - } - final V target = ReflectUtil.newInstanceIfPossible(desc); - return copy(source, target); - } - - /** - * 单对象基于对象创建拷贝 - * - * @param source 数据来源实体 - * @param desc 转换后的对象 - * @return desc - */ - public static V copy(T source, V desc) { - if (ObjectUtil.isNull(source)) { - return null; - } - if (ObjectUtil.isNull(desc)) { - return null; - } - BeanCopier beanCopier = BeanCopierCache.INSTANCE.get(source.getClass(), desc.getClass(), null); - beanCopier.copy(source, desc, null); - return desc; - } - - /** - * 列表对象基于class创建拷贝 - * - * @param sourceList 数据来源实体列表 - * @param desc 描述对象 转换后的对象 - * @return desc - */ - public static List copyList(List sourceList, Class desc) { - if (ObjectUtil.isNull(sourceList)) { - return null; - } - if (CollUtil.isEmpty(sourceList)) { - return CollUtil.newArrayList(); - } - return StreamUtils.toList(sourceList, source -> { - V target = ReflectUtil.newInstanceIfPossible(desc); - copy(source, target); - return target; - }); - } - - /** - * bean拷贝到map - * - * @param bean 数据来源实体 - * @return map对象 - */ - @SuppressWarnings("unchecked") - public static Map copyToMap(T bean) { - if (ObjectUtil.isNull(bean)) { - return null; - } - return BeanMap.create(bean); - } - - /** - * map拷贝到bean - * - * @param map 数据来源 - * @param beanClass bean类 - * @return bean对象 - */ - public static T mapToBean(Map map, Class beanClass) { - if (MapUtil.isEmpty(map)) { - return null; - } - if (ObjectUtil.isNull(beanClass)) { - return null; - } - T bean = ReflectUtil.newInstanceIfPossible(beanClass); - return mapToBean(map, bean); - } - - /** - * map拷贝到bean - * - * @param map 数据来源 - * @param bean bean对象 - * @return bean对象 - */ - public static T mapToBean(Map map, T bean) { - if (MapUtil.isEmpty(map)) { - return null; - } - if (ObjectUtil.isNull(bean)) { - return null; - } - BeanMap.create(bean).putAll(map); - return bean; - } - - /** - * map拷贝到map - * - * @param map 数据来源 - * @param clazz 返回的对象类型 - * @return map对象 - */ - public static Map mapToMap(Map map, Class clazz) { - if (MapUtil.isEmpty(map)) { - return null; - } - if (ObjectUtil.isNull(clazz)) { - return null; - } - Map copyMap = new LinkedHashMap<>(map.size()); - map.forEach((k, v) -> copyMap.put(k, copy(v, clazz))); - return copyMap; - } - - /** - * BeanCopier属性缓存
- * 缓存用于防止多次反射造成的性能问题 - * - * @author Looly - * @since 5.4.1 - */ - public enum BeanCopierCache { - /** - * BeanCopier属性缓存单例 - */ - INSTANCE; - - private final SimpleCache cache = new SimpleCache<>(); - - /** - * 获得类与转换器生成的key在{@link BeanCopier}的Map中对应的元素 - * - * @param srcClass 源Bean的类 - * @param targetClass 目标Bean的类 - * @param converter 转换器 - * @return Map中对应的BeanCopier - */ - public BeanCopier get(Class srcClass, Class targetClass, Converter converter) { - final String key = genKey(srcClass, targetClass, converter); - return cache.get(key, () -> BeanCopier.create(srcClass, targetClass, converter != null)); - } - - /** - * 获得类与转换器生成的key - * - * @param srcClass 源Bean的类 - * @param targetClass 目标Bean的类 - * @param converter 转换器 - * @return 属性名和Map映射的key - */ - private String genKey(Class srcClass, Class targetClass, Converter converter) { - final StringBuilder key = StrUtil.builder() - .append(srcClass.getName()).append('#').append(targetClass.getName()); - if(null != converter){ - key.append('#').append(converter.getClass().getName()); - } - return key.toString(); - } - } - -} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java index 12c361b9..a1316eb8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java @@ -2,9 +2,11 @@ package org.dromara.common.core.utils; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.JakartaServletUtil; -import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HttpStatus; -import org.dromara.common.core.constant.Constants; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.http.MediaType; @@ -13,12 +15,7 @@ import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -215,11 +212,7 @@ public class ServletUtils extends JakartaServletUtil { * @return 编码后的内容 */ public static String urlEncode(String str) { - try { - return URLEncoder.encode(str, Constants.UTF8); - } catch (UnsupportedEncodingException e) { - return StringUtils.EMPTY; - } + return URLEncoder.encode(str, StandardCharsets.UTF_8); } /** @@ -229,11 +222,7 @@ public class ServletUtils extends JakartaServletUtil { * @return 解码后的内容 */ public static String urlDecode(String str) { - try { - return URLDecoder.decode(str, Constants.UTF8); - } catch (UnsupportedEncodingException e) { - return StringUtils.EMPTY; - } + return URLDecoder.decode(str, StandardCharsets.UTF_8); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java index 9ae32c50..5e4db50e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java @@ -256,17 +256,13 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { if (s != null) { final int len = s.length(); if (s.length() <= size) { - for (int i = size - len; i > 0; i--) { - sb.append(c); - } + sb.append(String.valueOf(c).repeat(size - len)); sb.append(s); } else { return s.substring(len - size, len); } } else { - for (int i = size; i > 0; i--) { - sb.append(c); - } + sb.append(String.valueOf(c).repeat(Math.max(0, size))); } return sb.toString(); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java index 540549d0..186b46da 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java @@ -47,8 +47,8 @@ public class FileUtils extends FileUtil { * @param s 需要百分号编码的字符串 * @return 百分号编码后的字符串 */ - public static String percentEncode(String s) throws UnsupportedEncodingException { - String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString()); + public static String percentEncode(String s) { + String encode = URLEncoder.encode(s, StandardCharsets.UTF_8); return encode.replaceAll("\\+", "%20"); } } diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java index 83d4d1fb..b85af964 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java @@ -56,21 +56,20 @@ public class MybatisDecryptInterceptor implements Interceptor { if (ObjectUtil.isNull(sourceObject)) { return; } - if (sourceObject instanceof Map) { - new HashSet<>(((Map) sourceObject).values()).forEach(this::decryptHandler); + if (sourceObject instanceof Map map) { + new HashSet<>(map.values()).forEach(this::decryptHandler); return; } - if (sourceObject instanceof List) { - List sourceList = (List) sourceObject; - if(CollUtil.isEmpty(sourceList)) { + if (sourceObject instanceof List list) { + if(CollUtil.isEmpty(list)) { return; } // 判断第一个元素是否含有注解。如果没有直接返回，提高效率 - Object firstItem = sourceList.get(0); + Object firstItem = list.get(0); if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { return; } - ((List) sourceObject).forEach(this::decryptHandler); + list.forEach(this::decryptHandler); return; } Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java index c841b9fa..49bd08bc 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -46,9 +46,8 @@ public class MybatisEncryptInterceptor implements Interceptor { @Override public Object plugin(Object target) { - if (target instanceof ParameterHandler) { + if (target instanceof ParameterHandler parameterHandler) { // 进行加密操作 - ParameterHandler parameterHandler = (ParameterHandler) target; Object parameterObject = parameterHandler.getParameterObject(); if (ObjectUtil.isNotNull(parameterObject) && !(parameterObject instanceof String)) { this.encryptHandler(parameterObject); @@ -66,21 +65,20 @@ public class MybatisEncryptInterceptor implements Interceptor { if (ObjectUtil.isNull(sourceObject)) { return; } - if (sourceObject instanceof Map) { - new HashSet<>(((Map) sourceObject).values()).forEach(this::encryptHandler); + if (sourceObject instanceof Map map) { + new HashSet<>(map.values()).forEach(this::encryptHandler); return; } - if (sourceObject instanceof List) { - List sourceList = (List) sourceObject; - if(CollUtil.isEmpty(sourceList)) { + if (sourceObject instanceof List list) { + if(CollUtil.isEmpty(list)) { return; } // 判断第一个元素是否含有注解。如果没有直接返回，提高效率 - Object firstItem = sourceList.get(0); + Object firstItem = list.get(0); if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { return; } - ((List) sourceObject).forEach(this::encryptHandler); + list.forEach(this::encryptHandler); return; } Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java index 42ee6e61..ff59034e 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java @@ -28,20 +28,19 @@ import java.util.Map; @Slf4j public class CellMergeStrategy extends AbstractMergeStrategy { - private final List list; + private final List cellList; private final boolean hasTitle; private int rowIndex; public CellMergeStrategy(List list, boolean hasTitle) { - this.list = list; this.hasTitle = hasTitle; // 行合并开始下标 this.rowIndex = hasTitle ? 1 : 0; + this.cellList = handle(list, hasTitle); } @Override protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) { - List cellList = handle(list, hasTitle); // judge the list is not null if (CollUtil.isNotEmpty(cellList)) { // the judge is necessary diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java index a1a4bad6..61eafa28 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java @@ -55,9 +55,8 @@ public class DefaultExcelListener extends AnalysisEventListener implements @Override public void onException(Exception exception, AnalysisContext context) throws Exception { String errMsg = null; - if (exception instanceof ExcelDataConvertException) { + if (exception instanceof ExcelDataConvertException excelDataConvertException) { // 如果是某一个单元格的转换异常 能获取到具体行号 - ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException) exception; Integer rowIndex = excelDataConvertException.getRowIndex(); Integer columnIndex = excelDataConvertException.getColumnIndex(); errMsg = StrUtil.format("第{}行-第{}列-表头{}: 解析异常
", @@ -66,8 +65,7 @@ public class DefaultExcelListener extends AnalysisEventListener implements log.error(errMsg); } } - if (exception instanceof ConstraintViolationException) { - ConstraintViolationException constraintViolationException = (ConstraintViolationException) exception; + if (exception instanceof ConstraintViolationException constraintViolationException) { Set> constraintViolations = constraintViolationException.getConstraintViolations(); String constraintViolationsMsg = StreamUtils.join(constraintViolations, ConstraintViolation::getMessage, ", "); errMsg = StrUtil.format("第{}行数据校验异常: {}", context.readRowHolder().getRowIndex() + 1, constraintViolationsMsg); diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java index eb0e8c3f..a5941c62 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java @@ -276,7 +276,7 @@ public class ExcelUtil { if (StringUtils.containsAny(propertyValue, separator)) { for (String value : propertyValue.split(separator)) { if (itemArray[0].equals(value)) { - propertyString.append(itemArray[1] + separator); + propertyString.append(itemArray[1]).append(separator); break; } } @@ -305,7 +305,7 @@ public class ExcelUtil { if (StringUtils.containsAny(propertyValue, separator)) { for (String value : propertyValue.split(separator)) { if (itemArray[1].equals(value)) { - propertyString.append(itemArray[0] + separator); + propertyString.append(itemArray[0]).append(separator); break; } } diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java index 0f5c45fb..04bf61a8 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java @@ -76,9 +76,8 @@ public class RepeatSubmitAspect { */ @AfterReturning(pointcut = "@annotation(repeatSubmit)", returning = "jsonResult") public void doAfterReturning(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Object jsonResult) { - if (jsonResult instanceof R) { + if (jsonResult instanceof R r) { try { - R r = (R) jsonResult; // 成功则不删除redis数据 保证在有效时间内无法重复提交 if (r.getCode() == R.SUCCESS) { return; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/domain/convert/OperLogEventConvert.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/domain/convert/OperLogEventConvert.java deleted file mode 100644 index e3b01efe..00000000 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/domain/convert/OperLogEventConvert.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.dromara.common.log.domain.convert; - -import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.api.domain.bo.RemoteOperLogBo; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.factory.Mappers; - -/** - * 操作日志转换器 - * @author zhujie - */ -@Mapper -public interface OperLogEventConvert { - - OperLogEventConvert INSTANCE = Mappers.getMapper(OperLogEventConvert.class); - - /** - * OperLogEventToRemoteOperLogBo - * @param operLogEvent 待转换对象 - * @return 转换后对象 - */ - @Mapping(target = "params", ignore = true) - RemoteOperLogBo convert(OperLogEvent operLogEvent); -} diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java index 5f8e7ab1..b7f62649 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java @@ -1,14 +1,15 @@ package org.dromara.common.log.event; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; +import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.constant.Constants; import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ip.AddressUtils; -import org.dromara.common.log.domain.convert.OperLogEventConvert; import org.dromara.system.api.RemoteLogService; import org.dromara.system.api.domain.bo.RemoteLogininforBo; import org.dromara.system.api.domain.bo.RemoteOperLogBo; @@ -16,8 +17,6 @@ import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import jakarta.servlet.http.HttpServletRequest; - /** * 异步调用日志服务 * @@ -36,7 +35,7 @@ public class LogEventListener { @Async @EventListener public void saveLog(OperLogEvent operLogEvent) { - RemoteOperLogBo sysOperLog = OperLogEventConvert.INSTANCE.convert(operLogEvent); + RemoteOperLogBo sysOperLog = BeanUtil.toBean(operLogEvent, RemoteOperLogBo.class); remoteLogService.saveLog(sysOperLog); } diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java index 22b6a2b9..938eaadd 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java @@ -3,6 +3,8 @@ package org.dromara.common.log.event; import lombok.Data; import jakarta.servlet.http.HttpServletRequest; + +import java.io.Serial; import java.io.Serializable; /** @@ -14,6 +16,7 @@ import java.io.Serializable; @Data public class LogininforEvent implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java index bd1b0f8b..03861929 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java @@ -2,6 +2,7 @@ package org.dromara.common.log.event; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -14,6 +15,7 @@ import java.util.Date; @Data public class OperLogEvent implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java index d1a34522..8ef4a578 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java @@ -9,6 +9,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.sql.SqlUtil; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -22,6 +23,7 @@ import java.util.List; @Data public class PageQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java index f95350c6..1a1a9c6b 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -17,6 +18,7 @@ import java.util.List; @Data @NoArgsConstructor public class TableDataInfo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java index cb3cb5bd..f439c994 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java @@ -23,8 +23,8 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { try { - if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) { - BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject(); + if (ObjectUtil.isNotNull(metaObject) + && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime()) ? baseEntity.getCreateTime() : new Date(); baseEntity.setCreateTime(current); @@ -47,8 +47,8 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler { @Override public void updateFill(MetaObject metaObject) { try { - if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) { - BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject(); + if (ObjectUtil.isNotNull(metaObject) + && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { Date current = new Date(); // 更新时间填充(不管为不为空) baseEntity.setUpdateTime(current); diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java index e329dccf..bf7f1c1b 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java @@ -6,6 +6,12 @@ import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; +import net.sf.jsqlparser.JSQLParserException; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.Parenthesis; +import net.sf.jsqlparser.expression.operators.conditional.AndExpression; +import net.sf.jsqlparser.parser.CCJSqlParserUtil; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; @@ -17,12 +23,6 @@ import org.dromara.common.mybatis.helper.DataPermissionHelper; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.api.model.LoginUser; import org.dromara.system.api.model.RoleDTO; -import lombok.extern.slf4j.Slf4j; -import net.sf.jsqlparser.JSQLParserException; -import net.sf.jsqlparser.expression.Expression; -import net.sf.jsqlparser.expression.Parenthesis; -import net.sf.jsqlparser.expression.operators.conditional.AndExpression; -import net.sf.jsqlparser.parser.CCJSqlParserUtil; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.expression.BeanResolver; import org.springframework.expression.ExpressionParser; @@ -35,7 +35,6 @@ import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; -import java.util.stream.Collectors; /** * 数据权限过滤 @@ -163,7 +162,7 @@ public class PlusDataPermissionHandler { String methodName = sb.substring(index + 1, sb.length()); Class clazz = ClassUtil.loadClass(clazzName); List methods = Arrays.stream(ClassUtil.getDeclaredMethods(clazz)) - .filter(method -> method.getName().equals(methodName)).collect(Collectors.toList()); + .filter(method -> method.getName().equals(methodName)).toList(); DataPermission dataPermission; // 获取方法注解 for (Method method : methods) { diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java index 07226451..861653fd 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java @@ -58,15 +58,15 @@ public class DataBaseHelper { String var = Convert.toStr(var1); if (dataBasyType == DataBaseType.SQL_SERVER) { // charindex(',100,' , ',0,100,101,') <> 0 - return "charindex('," + var + ",' , ','+" + var2 + "+',') <> 0"; + return "charindex(',%s,' , ','+%s+',') <> 0".formatted(var, var2); } else if (dataBasyType == DataBaseType.POSTGRE_SQL) { // (select position(',100,' in ',0,100,101,')) <> 0 - return "(select position('," + var + ",' in ','||" + var2 + "||',')) <> 0"; + return "(select position(',%s,' in ','||%s||',')) <> 0".formatted(var, var2); } else if (dataBasyType == DataBaseType.ORACLE) { // instr(',0,100,101,' , ',100,') <> 0 - return "instr(','||" + var2 + "||',' , '," + var + ",') <> 0"; + return "instr(','||%s||',' , ',%s,') <> 0".formatted(var2, var); } // find_in_set('100' , '0,100,101') - return "find_in_set('" + var + "' , " + var2 + ") <> 0"; + return "find_in_set('%s' , %s) <> 0".formatted(var, var2); } } diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java index c490f20b..e49c95b9 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -68,8 +68,7 @@ public class PlusDataPermissionInterceptor extends JsqlParserSupport implements SelectBody selectBody = select.getSelectBody(); if (selectBody instanceof PlainSelect) { this.setWhere((PlainSelect) selectBody, (String) obj); - } else if (selectBody instanceof SetOperationList) { - SetOperationList setOperationList = (SetOperationList) selectBody; + } else if (selectBody instanceof SetOperationList setOperationList) { List selectBodyList = setOperationList.getSelects(); selectBodyList.forEach(s -> this.setWhere((PlainSelect) s, (String) obj)); } diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java index 7adba16e..2578559c 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java @@ -218,12 +218,11 @@ public class OssClient { private static String getPolicy(String bucketName, PolicyType policyType) { StringBuilder builder = new StringBuilder(); builder.append("{\n\"Statement\": [\n{\n\"Action\": [\n"); - if (policyType == PolicyType.WRITE) { - builder.append("\"s3:GetBucketLocation\",\n\"s3:ListBucketMultipartUploads\"\n"); - } else if (policyType == PolicyType.READ_WRITE) { - builder.append("\"s3:GetBucketLocation\",\n\"s3:ListBucket\",\n\"s3:ListBucketMultipartUploads\"\n"); - } else { - builder.append("\"s3:GetBucketLocation\"\n"); + switch (policyType) { + case WRITE -> builder.append("\"s3:GetBucketLocation\",\n\"s3:ListBucketMultipartUploads\"\n"); + case READ_WRITE -> + builder.append("\"s3:GetBucketLocation\",\n\"s3:ListBucket\",\n\"s3:ListBucketMultipartUploads\"\n"); + default -> builder.append("\"s3:GetBucketLocation\"\n"); } builder.append("],\n\"Effect\": \"Allow\",\n\"Principal\": \"*\",\n\"Resource\": \"arn:aws:s3:::"); builder.append(bucketName); @@ -235,15 +234,11 @@ public class OssClient { } builder.append("{\n\"Action\": "); switch (policyType) { - case WRITE: + case WRITE -> builder.append("[\n\"s3:AbortMultipartUpload\",\n\"s3:DeleteObject\",\n\"s3:ListMultipartUploadParts\",\n\"s3:PutObject\"\n],\n"); - break; - case READ_WRITE: + case READ_WRITE -> builder.append("[\n\"s3:AbortMultipartUpload\",\n\"s3:DeleteObject\",\n\"s3:GetObject\",\n\"s3:ListMultipartUploadParts\",\n\"s3:PutObject\"\n],\n"); - break; - default: - builder.append("\"s3:GetObject\",\n"); - break; + default -> builder.append("\"s3:GetObject\",\n"); } builder.append("\"Effect\": \"Allow\",\n\"Principal\": \"*\",\n\"Resource\": \"arn:aws:s3:::"); builder.append(bucketName); diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java index 5dc5aaa9..52e9623d 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java @@ -1,5 +1,7 @@ package org.dromara.common.oss.exception; +import java.io.Serial; + /** * OSS异常类 * @@ -7,6 +9,7 @@ package org.dromara.common.oss.exception; */ public class OssException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; public OssException(String msg) { diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/exception/SmsException.java b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/exception/SmsException.java index c178d855..eb7730ae 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/exception/SmsException.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/exception/SmsException.java @@ -1,5 +1,7 @@ package org.dromara.common.sms.exception; +import java.io.Serial; + /** * Sms异常类 * @@ -7,6 +9,7 @@ package org.dromara.common.sms.exception; */ public class SmsException extends RuntimeException { + @Serial private static final long serialVersionUID = 1L; public SmsException(String msg) { diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java index 37e65629..ddd5410d 100644 --- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java +++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java @@ -3,6 +3,8 @@ package org.dromara.common.tenant.exception; import org.dromara.common.core.exception.base.BaseException; +import java.io.Serial; + /** * 租户异常类 * @@ -10,6 +12,7 @@ import org.dromara.common.core.exception.base.BaseException; */ public class TenantException extends BaseException { + @Serial private static final long serialVersionUID = 1L; public TenantException(String code, Object... args) { diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java index b7e09626..64fc2198 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java @@ -33,13 +33,13 @@ public class RedisLockController { @Lock4j(keys = {"#key"}) @GetMapping("/testLock4j") public R testLock4j(String key, String value) { - System.out.println("start:" + key + ",time:" + LocalTime.now().toString()); + System.out.println("start:" + key + ",time:" + LocalTime.now()); try { Thread.sleep(10000); } catch (InterruptedException e) { e.printStackTrace(); } - System.out.println("end :" + key + ",time:" + LocalTime.now().toString()); + System.out.println("end :" + key + ",time:" + LocalTime.now()); return R.ok("操作成功", value); } diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java index b852dfc5..ada6d2b4 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java @@ -5,6 +5,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serial; + /** * 测试单表对象 test_demo * @@ -16,6 +18,7 @@ import lombok.EqualsAndHashCode; @TableName("test_demo") public class TestDemo extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java index 61ac2bc4..6cd31094 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java @@ -8,6 +8,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; +import java.io.Serial; + /** * 测试树表对象 test_tree * @@ -19,6 +21,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; @TableName("test_tree") public class TestTree extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java index 2e38b375..2896f6c6 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java @@ -1,13 +1,14 @@ package org.dromara.demo.domain.bo; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import org.dromara.demo.domain.TestDemo; /** * 测试单表业务对象 test_demo @@ -18,6 +19,7 @@ import jakarta.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TestDemo.class, reverseConvertGenerate = false) public class TestDemoBo extends BaseEntity { /** diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java index 53f81721..a0a765a3 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java @@ -1,13 +1,14 @@ package org.dromara.demo.domain.bo; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; +import org.dromara.demo.domain.TestTree; /** * 测试树表业务对象 test_tree @@ -18,6 +19,7 @@ import jakarta.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TestTree.class, reverseConvertGenerate = false) public class TestTreeBo extends BaseEntity { /** diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java index 2a9f1810..7afd7ea3 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java @@ -2,7 +2,9 @@ package org.dromara.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.demo.domain.TestDemo; import java.util.Date; @@ -15,6 +17,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = TestDemo.class) public class TestDemoVo { private static final long serialVersionUID = 1L; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java index bc7be6e9..36f2e7c1 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java @@ -2,7 +2,9 @@ package org.dromara.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.demo.domain.TestTree; import java.util.Date; @@ -15,6 +17,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = TestTree.class) public class TestTreeVo { private static final long serialVersionUID = 1L; diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/captcha/UnsignedMathGenerator.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/captcha/UnsignedMathGenerator.java index cc6a28a1..92c5ee20 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/captcha/UnsignedMathGenerator.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/captcha/UnsignedMathGenerator.java @@ -6,6 +6,8 @@ import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.RandomUtil; import org.dromara.common.core.utils.StringUtils; +import java.io.Serial; + /** * 无符号计算生成器 * @@ -13,6 +15,7 @@ import org.dromara.common.core.utils.StringUtils; */ public class UnsignedMathGenerator implements CodeGenerator { + @Serial private static final long serialVersionUID = -5514819971774091076L; private static final String OPERATORS = "+-*"; diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java index 5518f3a2..e89538ec 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java @@ -33,8 +33,7 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler { if (ex instanceof NotFoundException) { msg = "服务未找到"; - } else if (ex instanceof ResponseStatusException) { - ResponseStatusException responseStatusException = (ResponseStatusException) ex; + } else if (ex instanceof ResponseStatusException responseStatusException) { msg = responseStatusException.getMessage(); } else { msg = "内部服务器错误"; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java index 1a28e3e9..24eea210 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java @@ -55,7 +55,7 @@ public class GenController extends BaseController { GenTable table = genTableService.selectGenTableById(tableId); List tables = genTableService.selectGenTableAll(); List list = genTableService.selectGenTableColumnListByTableId(tableId); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("info", table); map.put("rows", list); map.put("tables", tables); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java index e14d3f57..2f736f16 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java @@ -130,7 +130,7 @@ public class VelocityUtils { * @return 模板列表 */ public static List getTemplateList(String tplCategory) { - List templates = new ArrayList(); + List templates = new ArrayList<>(); templates.add("vm/java/domain.java.vm"); templates.add("vm/java/bo.java.vm"); templates.add("vm/java/vo.java.vm"); diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java index 86542a56..dc4046f3 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java @@ -4,6 +4,9 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.resource.domain.SysOssConfig; +import java.io.Serial; +import java.io.Serializable; + /** * 对象存储配置视图对象 sys_oss_config @@ -14,8 +17,9 @@ import org.dromara.resource.domain.SysOssConfig; */ @Data @AutoMapper(target = SysOssConfig.class) -public class SysOssConfigVo { +public class SysOssConfigVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssUploadVo.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssUploadVo.java index 9e8ca2d0..14d7dc73 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssUploadVo.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssUploadVo.java @@ -2,13 +2,19 @@ package org.dromara.resource.domain.vo; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; + /** * 上传对象信息 * * @author Michelle.Chung */ @Data -public class SysOssUploadVo { +public class SysOssUploadVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * URL地址 diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java index 3633af47..cb8b8ddd 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java @@ -4,6 +4,8 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.resource.domain.SysOss; +import java.io.Serial; +import java.io.Serializable; import java.util.Date; /** @@ -13,8 +15,9 @@ import java.util.Date; */ @Data @AutoMapper(target = SysOss.class) -public class SysOssVo { +public class SysOssVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java index 4777c87c..c7b89852 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java @@ -1,32 +1,16 @@ package org.dromara.system.domain.convert; +import io.github.linpeilie.BaseMapper; import org.dromara.system.api.domain.vo.RemoteDictDataVo; import org.dromara.system.domain.vo.SysDictDataVo; import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; +import org.mapstruct.MappingConstants; /** * 字典数据转换器 * @author zhujie */ -@Mapper -public interface SysDictDataVoConvert { - - SysDictDataVoConvert INSTANCE = Mappers.getMapper(SysDictDataVoConvert.class); - - /** - * SysDictDataVoToRemoteDictDataVo - * @param sysDictDataVo 待转换对象 - * @return 转换后对象 - */ - RemoteDictDataVo convert(SysDictDataVo sysDictDataVo); +@Mapper(componentModel = MappingConstants.ComponentModel.SPRING) +public interface SysDictDataVoConvert extends BaseMapper { - /** - * SysDictDataVoListToRemoteDictDataVoList - * @param sysDictDataVos 待转换对象 - * @return 转换后对象 - */ - List convertList(List sysDictDataVos); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java index b8cb8b20..ac0c16ee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java @@ -1,23 +1,16 @@ package org.dromara.system.domain.convert; +import io.github.linpeilie.BaseMapper; import org.dromara.system.api.domain.bo.RemoteLogininforBo; import org.dromara.system.domain.bo.SysLogininforBo; import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; +import org.mapstruct.MappingConstants; /** * 登录日志转换器 * @author zhujie */ -@Mapper -public interface SysLogininforBoConvert { +@Mapper(componentModel = MappingConstants.ComponentModel.SPRING) +public interface SysLogininforBoConvert extends BaseMapper { - SysLogininforBoConvert INSTANCE = Mappers.getMapper(SysLogininforBoConvert.class); - - /** - * RemoteLogininforBoToSysLogininforBo - * @param remoteLogininforBo 待转换对象 - * @return 转换后对象 - */ - SysLogininforBo convert(RemoteLogininforBo remoteLogininforBo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java index 2678c786..f4a7d2a3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java @@ -1,19 +1,18 @@ package org.dromara.system.domain.convert; +import io.github.linpeilie.BaseMapper; import org.dromara.system.api.domain.bo.RemoteOperLogBo; import org.dromara.system.domain.bo.SysOperLogBo; import org.mapstruct.Mapper; import org.mapstruct.Mapping; -import org.mapstruct.factory.Mappers; +import org.mapstruct.MappingConstants; /** * 操作日志转换器 * @author zhujie */ -@Mapper -public interface SysOperLogBoConvert { - - SysOperLogBoConvert INSTANCE = Mappers.getMapper(SysOperLogBoConvert.class); +@Mapper(componentModel = MappingConstants.ComponentModel.SPRING) +public interface SysOperLogBoConvert extends BaseMapper { /** * RemoteOperLogBoToSysOperLogBo diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java index f0aa2c14..41e07dcf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java @@ -1,32 +1,16 @@ package org.dromara.system.domain.convert; +import io.github.linpeilie.BaseMapper; import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.dromara.system.domain.vo.SysTenantVo; import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; +import org.mapstruct.MappingConstants; /** * 租户转换器 * @author zhujie */ -@Mapper -public interface SysTenantVoConvert { - - SysTenantVoConvert INSTANCE = Mappers.getMapper(SysTenantVoConvert.class); - - /** - * SysTenantVoToRemoteTenantVo - * @param sysTenantVo 待转换对象 - * @return 转换后对象 - */ - RemoteTenantVo convert(SysTenantVo sysTenantVo); +@Mapper(componentModel = MappingConstants.ComponentModel.SPRING) +public interface SysTenantVoConvert extends BaseMapper { - /** - * SysTenantVoListToRemoteTenantVoList - * @param sysTenantVos 待转换对象 - * @return 转换后对象 - */ - List convertList(List sysTenantVos); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java index dc3171c3..11324eb0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java @@ -1,19 +1,21 @@ package org.dromara.system.domain.convert; +import io.github.linpeilie.BaseMapper; +import org.dromara.system.api.domain.bo.RemoteOperLogBo; import org.dromara.system.api.domain.bo.RemoteUserBo; +import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.bo.SysUserBo; import org.mapstruct.Mapper; import org.mapstruct.Mapping; +import org.mapstruct.MappingConstants; import org.mapstruct.factory.Mappers; /** * 用户信息转换器 * @author zhujie */ -@Mapper -public interface SysUserBoConvert { - - SysUserBoConvert INSTANCE = Mappers.getMapper(SysUserBoConvert.class); +@Mapper(componentModel = MappingConstants.ComponentModel.SPRING) +public interface SysUserBoConvert extends BaseMapper { /** * RemoteUserBoToSysUserBo diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java index 46c020b7..79046fff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java @@ -2,13 +2,19 @@ package org.dromara.system.domain.vo; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; + /** * 用户头像信息 * * @author Michelle.Chung */ @Data -public class AvatarVo { +public class AvatarVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 头像地址 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java index f827cba0..19a6b027 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java @@ -2,6 +2,8 @@ package org.dromara.system.domain.vo; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Properties; @@ -12,7 +14,10 @@ import java.util.Properties; * @author Michelle.Chung */ @Data -public class CacheListInfoVo { +public class CacheListInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; private Properties info; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java index 6f7db286..e8d3b344 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java @@ -3,6 +3,8 @@ package org.dromara.system.domain.vo; import cn.hutool.core.lang.tree.Tree; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.List; /** @@ -11,7 +13,10 @@ import java.util.List; * @author Michelle.Chung */ @Data -public class DeptTreeSelectVo { +public class DeptTreeSelectVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 选中部门列表 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java index 07245385..ad112fad 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java @@ -3,6 +3,8 @@ package org.dromara.system.domain.vo; import cn.hutool.core.lang.tree.Tree; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.List; /** @@ -11,7 +13,10 @@ import java.util.List; * @author Michelle.Chung */ @Data -public class MenuTreeSelectVo { +public class MenuTreeSelectVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 选中菜单列表 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java index e740a97b..a7e2549d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java @@ -3,6 +3,9 @@ package org.dromara.system.domain.vo; import lombok.Data; import org.dromara.common.core.utils.StringUtils; +import java.io.Serial; +import java.io.Serializable; + /** * 路由显示信息 * @@ -10,7 +13,10 @@ import org.dromara.common.core.utils.StringUtils; */ @Data -public class MetaVo { +public class MetaVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 设置该路由在侧边栏和面包屑中展示的名字 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java index c0476519..f40cfb81 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java @@ -2,13 +2,19 @@ package org.dromara.system.domain.vo; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; + /** * 用户个人信息 * * @author Michelle.Chung */ @Data -public class ProfileVo { +public class ProfileVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 用户信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java index 0d576ef1..824e1042 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java @@ -3,6 +3,8 @@ package org.dromara.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.List; /** @@ -12,7 +14,10 @@ import java.util.List; */ @Data @JsonInclude(JsonInclude.Include.NON_EMPTY) -public class RouterVo { +public class RouterVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 路由名字 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java index 620d21ab..946f3df9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysConfig; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -22,6 +23,7 @@ import java.util.Date; @AutoMapper(target = SysConfig.class) public class SysConfigVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java index cbb62425..ca5bca4a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysDept; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -21,6 +22,7 @@ import java.util.Date; @AutoMapper(target = SysDept.class) public class SysDeptVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java index db37b741..6c34d0c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysDictData; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -22,6 +23,7 @@ import java.util.Date; @AutoMapper(target = SysDictData.class) public class SysDictDataVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java index f1f53a56..9277a0cf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysDictType; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -22,6 +23,7 @@ import java.util.Date; @AutoMapper(target = SysDictType.class) public class SysDictTypeVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java index 24e945f8..abe5fd7d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysLogininfor; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -24,6 +25,7 @@ import java.util.Date; @AutoMapper(target = SysLogininfor.class) public class SysLogininforVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java index 7de51f3d..a51564aa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java @@ -4,6 +4,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.system.domain.SysMenu; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; @@ -19,6 +20,7 @@ import java.util.List; @AutoMapper(target = SysMenu.class) public class SysMenuVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java index 1662ac8a..271ae62b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java @@ -6,6 +6,7 @@ import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysNotice; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -20,6 +21,7 @@ import java.util.Date; @AutoMapper(target = SysNotice.class) public class SysNoticeVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java index a64ee51e..145e11c5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysOperLog; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -23,6 +24,7 @@ import java.util.Date; @AutoMapper(target = SysOperLog.class) public class SysOperLogVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java index 55bd80da..e3ad4ccd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysPost; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -23,6 +24,7 @@ import java.util.Date; @AutoMapper(target = SysPost.class) public class SysPostVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java index fd3ba063..ce8442cc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java @@ -9,6 +9,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysRole; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -22,6 +23,7 @@ import java.util.Date; @AutoMapper(target = SysRole.class) public class SysRoleVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java index a56a0223..a413d63f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysTenantPackage; +import java.io.Serial; import java.io.Serializable; @@ -21,6 +22,7 @@ import java.io.Serializable; @AutoMapper(target = SysTenantPackage.class) public class SysTenantPackageVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java index 49feee17..e6f256e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; +import java.io.Serial; import java.io.Serializable; import java.util.Date; @@ -22,6 +23,7 @@ import java.util.Date; @AutoMapper(target = SysUserVo.class, convertGenerate = false) public class SysUserExportVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java index 6183aba9..d3ac1597 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; +import java.io.Serial; import java.io.Serializable; @@ -20,6 +21,7 @@ import java.io.Serializable; // @Accessors(chain = true) // 导入不允许使用 会找不到set方法 public class SysUserImportVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java index e41355d0..2525c898 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java @@ -2,6 +2,8 @@ package org.dromara.system.domain.vo; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.List; /** @@ -10,7 +12,10 @@ import java.util.List; * @author Michelle.Chung */ @Data -public class SysUserInfoVo { +public class SysUserInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 用户信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java index 9b5b0080..59fb0e51 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -10,6 +10,7 @@ import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysUser; +import java.io.Serial; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -24,6 +25,7 @@ import java.util.List; @AutoMapper(target = SysUser.class) public class SysUserVo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java index 48fa92a5..0606d26b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java @@ -2,6 +2,8 @@ package org.dromara.system.domain.vo; import lombok.Data; +import java.io.Serial; +import java.io.Serializable; import java.util.Set; /** @@ -10,7 +12,10 @@ import java.util.Set; * @author Michelle.Chung */ @Data -public class UserInfoVo { +public class UserInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; /** * 用户基本信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java index f12bae71..10f9dffe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java @@ -2,9 +2,9 @@ package org.dromara.system.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.utils.MapstructUtils; import org.dromara.system.api.RemoteDictService; import org.dromara.system.api.domain.vo.RemoteDictDataVo; -import org.dromara.system.domain.convert.SysDictDataVoConvert; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.service.ISysDictTypeService; import org.springframework.stereotype.Service; @@ -26,8 +26,8 @@ public class RemoteDictServiceImpl implements RemoteDictService { @Override public List selectDictDataByType(String dictType) { - List sysDictDataVos = sysDictTypeService.selectDictDataByType(dictType); - return SysDictDataVoConvert.INSTANCE.convertList(sysDictDataVos); + List list = sysDictTypeService.selectDictDataByType(dictType); + return MapstructUtils.convert(list, RemoteDictDataVo.class); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java index 49f3a08e..fd2a69e3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java @@ -2,13 +2,12 @@ package org.dromara.system.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.utils.MapstructUtils; import org.dromara.system.api.RemoteLogService; import org.dromara.system.api.domain.bo.RemoteLogininforBo; import org.dromara.system.api.domain.bo.RemoteOperLogBo; import org.dromara.system.domain.bo.SysLogininforBo; import org.dromara.system.domain.bo.SysOperLogBo; -import org.dromara.system.domain.convert.SysLogininforBoConvert; -import org.dromara.system.domain.convert.SysOperLogBoConvert; import org.dromara.system.service.ISysLogininforService; import org.dromara.system.service.ISysOperLogService; import org.springframework.stereotype.Service; @@ -28,13 +27,13 @@ public class RemoteLogServiceImpl implements RemoteLogService { @Override public void saveLog(RemoteOperLogBo remoteOperLogBo) { - SysOperLogBo sysOperLogBo = SysOperLogBoConvert.INSTANCE.convert(remoteOperLogBo); + SysOperLogBo sysOperLogBo = MapstructUtils.convert(remoteOperLogBo, SysOperLogBo.class); operLogService.insertOperlog(sysOperLogBo); } @Override public void saveLogininfor(RemoteLogininforBo remoteLogininforBo) { - SysLogininforBo sysLogininforBo = SysLogininforBoConvert.INSTANCE.convert(remoteLogininforBo); + SysLogininforBo sysLogininforBo = MapstructUtils.convert(remoteLogininforBo, SysLogininforBo.class); logininforService.insertLogininfor(sysLogininforBo); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java index 2bdaa425..7dc58397 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java @@ -2,10 +2,10 @@ package org.dromara.system.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.utils.MapstructUtils; import org.dromara.system.api.RemoteTenantService; import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.dromara.system.domain.bo.SysTenantBo; -import org.dromara.system.domain.convert.SysTenantVoConvert; import org.dromara.system.domain.vo.SysTenantVo; import org.dromara.system.service.ISysTenantService; import org.springframework.stereotype.Service; @@ -27,8 +27,8 @@ public class RemoteTenantServiceImpl implements RemoteTenantService { */ @Override public RemoteTenantVo queryByTenantId(String tenantId) { - SysTenantVo sysTenantVo = tenantService.queryByTenantId(tenantId); - return SysTenantVoConvert.INSTANCE.convert(sysTenantVo); + SysTenantVo vo = tenantService.queryByTenantId(tenantId); + return MapstructUtils.convert(vo, RemoteTenantVo.class); } /** @@ -36,8 +36,8 @@ public class RemoteTenantServiceImpl implements RemoteTenantService { */ @Override public List queryList() { - List sysTenantVos = tenantService.queryList(new SysTenantBo()); - return SysTenantVoConvert.INSTANCE.convertList(sysTenantVos); + List list = tenantService.queryList(new SysTenantBo()); + return MapstructUtils.convert(list, RemoteTenantVo.class); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java index 75b862dd..6df7913a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java @@ -8,6 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.enums.UserStatus; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.user.UserException; +import org.dromara.common.core.utils.MapstructUtils; import org.dromara.system.api.RemoteUserService; import org.dromara.system.api.domain.bo.RemoteUserBo; import org.dromara.system.api.model.LoginUser; @@ -15,7 +16,6 @@ import org.dromara.system.api.model.RoleDTO; import org.dromara.system.api.model.XcxLoginUser; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.bo.SysUserBo; -import org.dromara.system.domain.convert.SysUserBoConvert; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.service.ISysConfigService; @@ -110,7 +110,7 @@ public class RemoteUserServiceImpl implements RemoteUserService { @Override public Boolean registerUserInfo(RemoteUserBo remoteUserBo) { - SysUserBo sysUserBo = SysUserBoConvert.INSTANCE.convert(remoteUserBo); + SysUserBo sysUserBo = MapstructUtils.convert(remoteUserBo, SysUserBo.class); String username = sysUserBo.getUserName(); if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { throw new ServiceException("当前系统没有开启注册功能"); diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java b/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java index 6f5d220b..f8fd7620 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java +++ b/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java @@ -28,7 +28,7 @@ public class WebSecurityConfigurer { return httpSecurity .headers().frameOptions().disable() - .and().authorizeRequests() + .and().authorizeHttpRequests() .requestMatchers(adminContextPath + "/assets/**" , adminContextPath + "/login" , adminContextPath + "/actuator/**"