diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java index b050c978f..e92e4236d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java @@ -51,7 +51,7 @@ public interface IAuthStrategy { /** * 按客户端配置构建统一登录参数，并预留自定义扩展入口。 * - * @param client 客户端配置 + * @param client 客户端配置 * @param customizer 自定义扩展逻辑 * @return Sa-Token 登录参数 */ diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java index 350abf3be..e49cebd9d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java @@ -48,8 +48,8 @@ public class SocialAuthStrategy implements IAuthStrategy { /** * 执行第三方授权登录，并校验授权账号与系统账号的绑定关系。 * - * @param body 登录信息 - * @param client 客户端信息 + * @param body 登录信息 + * @param client 客户端信息 * @return 登录结果 */ @Override @@ -57,8 +57,8 @@ public class SocialAuthStrategy implements IAuthStrategy { SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class); ValidatorUtils.validate(loginBody); AuthResponse response = SocialUtils.loginAuth( - loginBody.getSource(), loginBody.getSocialCode(), - loginBody.getSocialState(), socialProperties); + loginBody.getSource(), loginBody.getSocialCode(), + loginBody.getSocialState(), socialProperties); if (!response.ok()) { throw new ServiceException(response.getMsg()); } diff --git a/ruoyi-api/src/main/java/org/dromara/system/api/domain/PushPayloadDTO.java b/ruoyi-api/src/main/java/org/dromara/system/api/domain/PushPayloadDTO.java index a405d93e9..ef61d5dc9 100644 --- a/ruoyi-api/src/main/java/org/dromara/system/api/domain/PushPayloadDTO.java +++ b/ruoyi-api/src/main/java/org/dromara/system/api/domain/PushPayloadDTO.java @@ -57,10 +57,10 @@ public class PushPayloadDTO implements Serializable { /** * 构建推送消息体，缺省消息类型与来源时使用系统默认值。 * - * @param type 消息类型 - * @param source 消息来源 + * @param type 消息类型 + * @param source 消息来源 * @param message 文本消息 - * @param data 扩展数据 + * @param data 扩展数据 * @return 推送消息体 */ public static PushPayloadDTO of(String type, String source, String message, Object data) { @@ -76,10 +76,10 @@ public class PushPayloadDTO implements Serializable { /** * 通过枚举值构建推送消息体。 * - * @param type 消息类型枚举 - * @param source 消息来源枚举 + * @param type 消息类型枚举 + * @param source 消息来源枚举 * @param message 文本消息 - * @param data 扩展数据 + * @param data 扩展数据 * @return 推送消息体 */ public static PushPayloadDTO of(PushTypeEnum type, PushSourceEnum source, String message, Object data) { @@ -94,11 +94,11 @@ public class PushPayloadDTO implements Serializable { /** * 构建带前端跳转路径的推送消息体。 * - * @param type 消息类型枚举 - * @param source 消息来源枚举 + * @param type 消息类型枚举 + * @param source 消息来源枚举 * @param message 文本消息 - * @param data 扩展数据 - * @param path 前端跳转路径 + * @param data 扩展数据 + * @param path 前端跳转路径 * @return 推送消息体 */ public static PushPayloadDTO of(PushTypeEnum type, PushSourceEnum source, String message, Object data, String path) { diff --git a/ruoyi-api/src/main/java/org/dromara/system/api/domain/TaskAssigneeDTO.java b/ruoyi-api/src/main/java/org/dromara/system/api/domain/TaskAssigneeDTO.java index 867565c09..0abe6f55a 100644 --- a/ruoyi-api/src/main/java/org/dromara/system/api/domain/TaskAssigneeDTO.java +++ b/ruoyi-api/src/main/java/org/dromara/system/api/domain/TaskAssigneeDTO.java @@ -38,7 +38,7 @@ public class TaskAssigneeDTO implements Serializable { * 创建任务受让人分页结果。 * * @param total 总大小 - * @param list 受让人列表 + * @param list 受让人列表 */ public TaskAssigneeDTO(Long total, List list) { this.total = total; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java index 86bb96e5e..452d3485d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java @@ -85,7 +85,7 @@ public interface SystemConstants { /** * 排除敏感属性字段 */ - String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" }; + String[] EXCLUDE_PROPERTIES = {"password", "oldPassword", "newPassword", "confirmPassword"}; } 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 af5ca42e9..dbdaf8e09 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 @@ -50,7 +50,7 @@ public final class ServiceException extends RuntimeException { * 使用错误消息和错误码构造业务异常。 * * @param message 错误消息 - * @param code 错误码 + * @param code 错误码 */ public ServiceException(String message, Integer code) { this.message = message; @@ -61,7 +61,7 @@ public final class ServiceException extends RuntimeException { * 使用错误消息和根因构造业务异常。 * * @param message 错误消息 - * @param cause 根因 + * @param cause 根因 */ public ServiceException(String message, Throwable cause) { super(cause); @@ -72,7 +72,7 @@ public final class ServiceException extends RuntimeException { * 使用占位符参数格式化错误消息。 * * @param message 模板消息 - * @param args 参数 + * @param args 参数 */ public ServiceException(String message, Object... args) { this.message = StrFormatter.format(message, args); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java index 8151bdcfb..e997453a9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java @@ -49,7 +49,7 @@ public final class SseException extends RuntimeException { * 使用错误消息和错误码构造 SSE 异常。 * * @param message 错误消息 - * @param code 错误码 + * @param code 错误码 */ public SseException(String message, Integer code) { this.message = message; 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 206c3e4af..000c55ba5 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 @@ -1,11 +1,11 @@ package org.dromara.common.core.exception.base; import lombok.AllArgsConstructor; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.MessageUtils; +import org.dromara.common.core.utils.StringUtils; import java.io.Serial; @@ -47,8 +47,8 @@ public class BaseException extends RuntimeException { * 使用模块、错误码和参数构造异常。 * * @param module 所属模块 - * @param code 错误码 - * @param args 参数 + * @param code 错误码 + * @param args 参数 */ public BaseException(String module, String code, Object[] args) { this(module, code, args, null); @@ -57,7 +57,7 @@ public class BaseException extends RuntimeException { /** * 使用模块和默认消息构造异常。 * - * @param module 所属模块 + * @param module 所属模块 * @param defaultMessage 默认消息 */ public BaseException(String module, String defaultMessage) { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java index d7db79a91..ea2e8313f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java @@ -12,7 +12,7 @@ public interface PermissionService { /** * 获取角色数据权限 * - * @param userId 用户id + * @param userId 用户id * @return 角色权限信息 */ Set getRolePermission(Long userId); @@ -20,7 +20,7 @@ public interface PermissionService { /** * 获取菜单数据权限 * - * @param userId 用户id + * @param userId 用户id * @return 菜单权限信息 */ Set getMenuPermission(Long userId); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java index 1c2cd1b8a..b349de644 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java @@ -27,9 +27,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * 日期解析格式集合。 */ private static final String[] PARSE_PATTERNS = { - "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", - "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", - "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM" + "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", + "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", + "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM" }; /** @@ -411,7 +411,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { // 本周 if (DateUtil.isSameWeek(date, now, true)) { return DateUtil.dayOfWeekEnum(date).toChinese("周") - + " " + DateUtil.format(date, "HH:mm"); + + " " + DateUtil.format(date, "HH:mm"); } // 今年内其它时间 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java index b6acff7b8..a3fcb8e66 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java @@ -14,7 +14,6 @@ import java.util.Map; * Mapstruct 工具类 *

参考文档：mapstruct-plus

* - * * @author Michelle.Chung */ @NoArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java index f0223a515..40630fd68 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java @@ -86,7 +86,7 @@ public class NetUtils extends NetUtil { /** * 匹配 IP 规则，支持精确值、通配符与 CIDR。 * - * @param rule IP 规则 + * @param rule IP 规则 * @param clientIp 客户端 IP * @return 是否匹配 */ @@ -114,7 +114,7 @@ public class NetUtils extends NetUtil { /** * 匹配 CIDR 网段。 * - * @param cidr CIDR 规则 + * @param cidr CIDR 规则 * @param clientIp 客户端 IP * @return 是否命中 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java index 93617b018..b859bbb90 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java @@ -17,7 +17,7 @@ public class ObjectUtils extends ObjectUtil { /** * 如果对象不为空，则获取对象中的某个字段 ObjectUtils.notNullGetter(user, User::getName); * - * @param obj 对象 + * @param obj 对象 * @param func 获取方法 * @return 对象字段 */ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java index c5487c0b6..b608e16d7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java @@ -60,7 +60,7 @@ public class StreamUtils { * @return 找到符合条件的第一个元素，没有则返回 null */ public static E findFirstValue(Collection collection, Predicate function) { - return findFirst(collection,function).orElse(null); + return findFirst(collection, function).orElse(null); } /** @@ -87,7 +87,7 @@ public class StreamUtils { * @return 找到符合条件的任意一个元素，没有则返回null */ public static E findAnyValue(Collection collection, Predicate function) { - return findAny(collection,function).orElse(null); + return findAny(collection, function).orElse(null); } /** @@ -179,11 +179,12 @@ public class StreamUtils { /** * 获取 map 中的数据作为新 Map 的 value ，key 不变 - * @param map 需要处理的map + * + * @param map 需要处理的map * @param take 取值函数 - * @param map中的key类型 - * @param map中的value类型 - * @param 新map中的value类型 + * @param map中的key类型 + * @param map中的value类型 + * @param 新map中的value类型 * @return 新的map */ public static Map toMap(Map map, BiFunction take) { 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 fdff26f8d..acffb78d4 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 @@ -320,11 +320,11 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return new ArrayList<>(0); } return StrUtil.split(str, separator) - .stream() - .filter(Objects::nonNull) - .map(mapper) - .filter(Objects::nonNull) - .collect(Collectors.toList()); + .stream() + .filter(Objects::nonNull) + .map(mapper) + .filter(Objects::nonNull) + .collect(Collectors.toList()); } /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ThreadUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ThreadUtils.java index 9a3bd0ad1..bb1ac778d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ThreadUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ThreadUtils.java @@ -6,7 +6,10 @@ import lombok.NoArgsConstructor; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.function.Supplier; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java index 087b8d155..dd4685631 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java @@ -61,16 +61,16 @@ public class MimeTypeUtils { * 默认允许上传的文件扩展名数组 */ public static final String[] DEFAULT_ALLOWED_EXTENSION = { - // 图片 - "bmp", "gif", "jpg", "jpeg", "png", - // word excel powerpoint - "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", - // 压缩文件 - "rar", "zip", "gz", "bz2", - // 视频格式 - "mp4", "avi", "rmvb", - // pdf - "pdf" + // 图片 + "bmp", "gif", "jpg", "jpeg", "png", + // word excel powerpoint + "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", + // 压缩文件 + "rar", "zip", "gz", "bz2", + // 视频格式 + "mp4", "avi", "rmvb", + // pdf + "pdf" }; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java index d9accb091..10181efd1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java @@ -29,7 +29,7 @@ public class AddressUtils { */ public static String getRealAddressByIP(String ip) { // 处理空串并过滤HTML标签 - ip = HtmlUtil.cleanHtmlTag(StringUtils.blankToDefault(ip,"")); + ip = HtmlUtil.cleanHtmlTag(StringUtils.blankToDefault(ip, "")); // 判断是否为IPv4 boolean isIPv4 = NetUtils.isIPv4(ip); // 判断是否为IPv6 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java index 9853faf63..34f6eadde 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java @@ -55,12 +55,12 @@ public class RegionUtils { // IPv4配置 Config v4Config = Config.custom() - .setCachePolicy(Config.BufferCache) - //.setXdbFile(v4TempXdb) - .setXdbInputStream(v4InputStream) - // - .setCacheSliceBytes(DEFAULT_CACHE_SLICE_BYTES) - .asV4(); + .setCachePolicy(Config.BufferCache) + //.setXdbFile(v4TempXdb) + .setXdbInputStream(v4InputStream) + // + .setCacheSliceBytes(DEFAULT_CACHE_SLICE_BYTES) + .asV4(); // IPv6配置 Config v6Config = null; @@ -69,11 +69,11 @@ public class RegionUtils { log.warn("未加载 IPv6 地址库：未在类路径下找到文件 {}。当前仅启用 IPv4 查询。如需启用 IPv6，请将 ip2region_v6.xdb 放置到 resources 目录", DEFAULT_IPV6_XDB_PATH); } else { v6Config = Config.custom() - .setCachePolicy(Config.BufferCache) - //.setXdbFile(v6TempXdb) - .setXdbInputStream(v6XdbInputStream) - .setCacheSliceBytes(DEFAULT_CACHE_SLICE_BYTES) - .asV6(); + .setCachePolicy(Config.BufferCache) + //.setXdbFile(v6TempXdb) + .setXdbInputStream(v6XdbInputStream) + .setCacheSliceBytes(DEFAULT_CACHE_SLICE_BYTES) + .asV6(); } // 初始化Ip2Region实例 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/AnnotationUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/AnnotationUtils.java index e9b558d74..7c91ad3e9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/AnnotationUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/AnnotationUtils.java @@ -23,7 +23,7 @@ public final class AnnotationUtils extends AnnotationUtil { /** * 获取指定注解 * - * @param annotationEle {@link AnnotatedElement}，可以是Class、Method、Field、Constructor、ReflectPermission + * @param annotationEle {@link AnnotatedElement}，可以是Class、Method、Field、Constructor、ReflectPermission * @param annotationTypeName 注解类型名称 * @return 注解对象 */ @@ -34,7 +34,7 @@ public final class AnnotationUtils extends AnnotationUtil { } catch (final ClassNotFoundException | ClassCastException e) { // ignore log.error("AnnotationUtils.getAnnotation(AnnotatedElement, String) error.", e); - return null; + return null; } } @@ -42,7 +42,7 @@ public final class AnnotationUtils extends AnnotationUtil { * 获取指定注解中所有属性值
* 如果无指定的属性方法返回null * - * @param annotationEle {@link AnnotatedElement}，可以是Class、Method、Field、Constructor、ReflectPermission + * @param annotationEle {@link AnnotatedElement}，可以是Class、Method、Field、Constructor、ReflectPermission * @param annotationTypeName 注解类型名称 * @return 注解对象所有属性键值 * @throws UtilException 调用注解中的方法时执行异常 @@ -55,7 +55,7 @@ public final class AnnotationUtils extends AnnotationUtil { } catch (final ClassNotFoundException | ClassCastException e) { // ignore log.error("AnnotationUtils.getAnnotationValueMap(AnnotatedElement, String) error.", e); - return null; + return null; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java index 367e8c98c..073983f9e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java @@ -1,9 +1,9 @@ package org.dromara.common.core.utils.reflect; import cn.hutool.core.util.ReflectUtil; -import org.dromara.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.StringUtils; import java.lang.reflect.Method; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enums/EnumPattern.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enums/EnumPattern.java index 552682df9..736896fcb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enums/EnumPattern.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enums/EnumPattern.java @@ -3,7 +3,10 @@ package org.dromara.common.core.validate.enums; import jakarta.validation.Constraint; import jakarta.validation.Payload; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java index d2516c155..91c2f213a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java @@ -2,6 +2,7 @@ package org.dromara.common.core.xss; import jakarta.validation.Constraint; import jakarta.validation.Payload; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java index fabe10f4e..d6ba25c02 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java @@ -6,9 +6,9 @@ import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.security.SecurityRequirement; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.doc.config.properties.SpringDocProperties; import org.dromara.common.doc.core.customizer.ClassTagOperationCustomizer; import org.dromara.common.doc.core.customizer.JavadocOperationCustomizer; -import org.dromara.common.doc.config.properties.SpringDocProperties; import org.dromara.common.doc.core.resolver.JavadocResolver; import org.dromara.common.doc.core.resolver.SaTokenAnnotationMetadataJavadocResolver; import org.springdoc.core.configuration.SpringDocConfiguration; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java index eae3b4c62..43f853c2f 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java @@ -56,7 +56,7 @@ public class SpringDocProperties { *

* * @see io.swagger.v3.oas.models.info.Info - * + *

* 为了 springboot 自动生产配置提示信息，所以这里复制一个类出来 */ @Data diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/customizer/ClassTagOperationCustomizer.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/customizer/ClassTagOperationCustomizer.java index 85855db8f..4ff276a55 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/customizer/ClassTagOperationCustomizer.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/customizer/ClassTagOperationCustomizer.java @@ -18,13 +18,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.method.HandlerMethod; import java.io.StringReader; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/model/SaTokenSecurityMetadata.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/model/SaTokenSecurityMetadata.java index 2fbad8fda..292dfe9f2 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/model/SaTokenSecurityMetadata.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/model/SaTokenSecurityMetadata.java @@ -86,7 +86,7 @@ public class SaTokenSecurityMetadata { return sb.toString(); } - if (!ignore && permissions.isEmpty() && roles.isEmpty()){ + if (!ignore && permissions.isEmpty() && roles.isEmpty()) { sb.append("> **权限策略**：需要登录

"); return sb.toString(); } diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/AbstractMetadataJavadocResolver.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/AbstractMetadataJavadocResolver.java index ed01c88c1..a3e7e8fc8 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/AbstractMetadataJavadocResolver.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/AbstractMetadataJavadocResolver.java @@ -82,76 +82,84 @@ public abstract class AbstractMetadataJavadocResolver implements JavadocResol /** * 执行解析并返回解析到的 Javadoc 内容 + * * @param handlerMethod 处理器方法 - * @param operation Swagger Operation实例 - * @param metadata 元信息 + * @param operation Swagger Operation实例 + * @param metadata 元信息 * @return 解析到的 Javadoc 内容 */ public abstract String resolve(HandlerMethod handlerMethod, Operation operation, M metadata); /** * 检查处理器方法所属的类上是否存在注解 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationClass 注解类 * @return 是否存在注解 */ - public boolean hasClassAnnotation(HandlerMethod handlerMethod,Class annotationClass){ + public boolean hasClassAnnotation(HandlerMethod handlerMethod, Class annotationClass) { return AnnotationUtil.hasAnnotation(handlerMethod.getBeanType(), annotationClass); } /** * 检查处理器方法所属的类上是否存在注解 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationTypeName 注解类名称 * @return 是否存在注解 */ - public boolean hasClassAnnotation(HandlerMethod handlerMethod, String annotationTypeName){ + public boolean hasClassAnnotation(HandlerMethod handlerMethod, String annotationTypeName) { return AnnotationUtil.hasAnnotation(handlerMethod.getBeanType(), annotationTypeName); } /** * 检查处理器方法上是否存在注解 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationClass 注解类 * @return 是否存在注解 */ - public boolean hasMethodAnnotation(HandlerMethod handlerMethod,Class annotationClass){ + public boolean hasMethodAnnotation(HandlerMethod handlerMethod, Class annotationClass) { return AnnotationUtil.hasAnnotation(handlerMethod.getMethod(), annotationClass); } /** * 检查处理器方法上是否存在注解 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationTypeName 注解类名称 * @return 是否存在注解 */ - public boolean hasMethodAnnotation(HandlerMethod handlerMethod, String annotationTypeName){ + public boolean hasMethodAnnotation(HandlerMethod handlerMethod, String annotationTypeName) { return AnnotationUtil.hasAnnotation(handlerMethod.getMethod(), annotationTypeName); } /** * 检查处理器方法上是否存在注解 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationClass 注解类 * @return 是否存在注解 */ - public boolean hasAnnotation(HandlerMethod handlerMethod,Class annotationClass){ + public boolean hasAnnotation(HandlerMethod handlerMethod, Class annotationClass) { return this.hasClassAnnotation(handlerMethod, annotationClass) || this.hasMethodAnnotation(handlerMethod, annotationClass); } /** * 检查处理器方法上是否存在注解 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationTypeName 注解类名称 * @return 是否存在注解 */ - public boolean hasAnnotation(HandlerMethod handlerMethod, String annotationTypeName){ + public boolean hasAnnotation(HandlerMethod handlerMethod, String annotationTypeName) { return this.hasClassAnnotation(handlerMethod, annotationTypeName) || this.hasMethodAnnotation(handlerMethod, annotationTypeName); } /** * 获取处理器方法所属类上的注解的值 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationClass 注解类 * @return 注解的值 */ @@ -161,7 +169,8 @@ public abstract class AbstractMetadataJavadocResolver implements JavadocResol /** * 获取处理器方法所属类上的注解的值 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationClassName 注解类名称 * @return 注解的值 */ @@ -173,7 +182,8 @@ public abstract class AbstractMetadataJavadocResolver implements JavadocResol /** * 获取处理器方法上的注解的值 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationClass 注解类 * @return 注解的值 */ @@ -183,7 +193,8 @@ public abstract class AbstractMetadataJavadocResolver implements JavadocResol /** * 获取处理器方法所属类上的注解的值 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationClassName 注解类名称 * @return 注解的值 */ diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/JavadocResolver.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/JavadocResolver.java index df23db3a0..f7047b7d8 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/JavadocResolver.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/JavadocResolver.java @@ -25,7 +25,7 @@ public interface JavadocResolver extends Comparable, Ordered { * 执行解析并返回解析到的 Javadoc 内容 * * @param handlerMethod 处理器方法 - * @param operation Swagger Operation实例 + * @param operation Swagger Operation实例 * @return 解析到的 Javadoc 内容 */ String resolve(HandlerMethod handlerMethod, Operation operation); diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/SaTokenAnnotationMetadataJavadocResolver.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/SaTokenAnnotationMetadataJavadocResolver.java index 64b087a2d..5b1abef7c 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/SaTokenAnnotationMetadataJavadocResolver.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/resolver/SaTokenAnnotationMetadataJavadocResolver.java @@ -106,17 +106,17 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa * @param order 顺序值 */ public SaTokenAnnotationMetadataJavadocResolver(int order) { - this(DEFAULT_METADATA_PROVIDER,order); + this(DEFAULT_METADATA_PROVIDER, order); } /** * 使用自定义元数据提供者和顺序创建解析器。 * * @param metadataProvider 元数据提供者 - * @param order 顺序值 + * @param order 顺序值 */ public SaTokenAnnotationMetadataJavadocResolver(Supplier metadataProvider, int order) { - super(metadataProvider,order); + super(metadataProvider, order); } /** @@ -134,14 +134,14 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa * 解析 Sa-Token 注解并转换为文档说明。 * * @param handlerMethod Handler 方法 - * @param operation OpenAPI 操作对象 - * @param metadata 权限元数据 + * @param operation OpenAPI 操作对象 + * @param metadata 权限元数据 * @return Markdown 描述 */ @Override public String resolve(HandlerMethod handlerMethod, Operation operation, SaTokenSecurityMetadata metadata) { // 检查是否忽略校验 - if(hasAnnotation(handlerMethod, SA_IGNORE_CLASS_NAME)){ + if (hasAnnotation(handlerMethod, SA_IGNORE_CLASS_NAME)) { metadata.setIgnore(true); return metadata.toMarkdownString(); } @@ -176,10 +176,10 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa private void resolvePermissionAnnotation(SaTokenSecurityMetadata metadata, Map annotationValueMap) { try { // 反射获取注解属性 - Object value = annotationValueMap.get( "value"); - Object mode = annotationValueMap.get( "mode"); - Object type = annotationValueMap.get( "type"); - Object orRole = annotationValueMap.get( "orRole"); + Object value = annotationValueMap.get("value"); + Object mode = annotationValueMap.get("mode"); + Object type = annotationValueMap.get("type"); + Object orRole = annotationValueMap.get("orRole"); String[] values = Convert.toStrArray(value); String modeStr = mode != null ? mode.toString() : "AND"; diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java index 56e6ee110..d4035312d 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java @@ -25,9 +25,9 @@ public class ApiDecryptAutoConfiguration { /** * 注册 API 加解密过滤器。 * - * @param properties API 解密配置 + * @param properties API 解密配置 * @param requestMappingHandlerMapping 请求映射处理器 - * @param handlerExceptionResolver 异常处理器 + * @param handlerExceptionResolver 异常处理器 * @return API 加解密过滤器 */ @Bean diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java index 61c875cd2..053342863 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java @@ -1,8 +1,8 @@ package org.dromara.common.encrypt.core; +import lombok.Data; import org.dromara.common.encrypt.enums.AlgorithmType; import org.dromara.common.encrypt.enums.EncodeType; -import lombok.Data; /** * 加密上下文 用于encryptor传递必要的参数。 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java index e5716904b..4a8bbbec3 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java @@ -171,10 +171,10 @@ public class EncryptorManager { /** * 加密器缓存键。 * - * @param algorithm 加密算法 - * @param encode 编码方式 - * @param password 密码 - * @param publicKey 公钥 + * @param algorithm 加密算法 + * @param encode 编码方式 + * @param password 密码 + * @param publicKey 公钥 * @param privateKey 私钥 */ private record EncryptorCacheKey( diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java index f8b7480dd..1bdccd3aa 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java @@ -28,7 +28,7 @@ public interface IEncryptor { /** * 解密 * - * @param value 待加密字符串 + * @param value 待加密字符串 * @return 解密后的字符串 */ String decrypt(String value); diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java index 340669e5d..eedc666f1 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java @@ -46,7 +46,7 @@ public class AesEncryptor extends AbstractEncryptor { /** * 解密 * - * @param value 待加密字符串 + * @param value 待加密字符串 */ @Override public String decrypt(String value) { diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java index a6709c95a..db7ab8b63 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java @@ -44,7 +44,7 @@ public class Base64Encryptor extends AbstractEncryptor { /** * 解密 * - * @param value 待加密字符串 + * @param value 待加密字符串 */ @Override public String decrypt(String value) { diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java index 314028f36..675262f98 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java @@ -31,7 +31,7 @@ public class DecryptRequestBodyWrapper extends HttpServletRequestWrapper { /** * 解密请求体并缓存为可重复读取的 JSON 请求体。 * - * @param request 原始请求 + * @param request 原始请求 * @param privateKey RSA 私钥 * @param headerFlag 加密密钥请求头 * @throws IOException 读取请求体异常 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java index 969efbf2b..4c3e4c372 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java @@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * api解密属性配置类 + * * @author wdhcr */ @Data diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java index 04b9e1aca..1098be35e 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java @@ -1,8 +1,8 @@ package org.dromara.common.encrypt.properties; +import lombok.Data; import org.dromara.common.encrypt.enums.AlgorithmType; import org.dromara.common.encrypt.enums.EncodeType; -import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java index 459b164b1..1b8bc8246 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java @@ -259,9 +259,9 @@ public class EncryptUtils { /** * SM2公钥验签（Hex编码） * - * @param dataHex 原文数据（Hex编码） - * @param signHex 签名值（Hex编码） - * @param publicKey 公钥 + * @param dataHex 原文数据（Hex编码） + * @param signHex 签名值（Hex编码） + * @param publicKey 公钥 * @return true-验签成功，false-验签失败 */ public static boolean verifySm2SignHex(String dataHex, String signHex, String publicKey) { diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java index 6b9211b53..21a5b4cd1 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; /** * excel 列单元格合并(合并列相同项) - * + *

* 需搭配 {@link CellMergeStrategy} 策略使用 * * @author Lion Li @@ -16,10 +16,10 @@ import java.lang.annotation.*; @Inherited public @interface CellMerge { - /** - * col index - */ - int index() default -1; + /** + * col index + */ + int index() default -1; /** * 合并需要依赖的其他字段名称 diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java index ed42371d7..6652f8018 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java @@ -7,6 +7,7 @@ import java.lang.annotation.Target; /** * 批注 此注解仅用于单表头 不支持多层级表头 + * * @author guzhouyanyu */ @Target({ElementType.FIELD}) diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java index ca8083bc8..cb12085bd 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java @@ -9,6 +9,7 @@ import java.lang.annotation.Target; /** * 是否必填 此注解仅用于单表头 不支持多层级表头 + * * @author guzhouyanyu */ @Target({ElementType.FIELD}) diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java index fc6745ae2..b23d2fecf 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java @@ -44,8 +44,8 @@ public class ExcelBigNumberConvert implements Converter { /** * 将 Excel 单元格数据转换为 Long。 * - * @param cellData 单元格数据 - * @param contentProperty 内容属性 + * @param cellData 单元格数据 + * @param contentProperty 内容属性 * @param globalConfiguration 全局配置 * @return Long 值 */ @@ -57,8 +57,8 @@ public class ExcelBigNumberConvert implements Converter { /** * 将 Long 转换为 Excel 单元格数据，超长数字按字符串写出。 * - * @param object Java 值 - * @param contentProperty 内容属性 + * @param object Java 值 + * @param contentProperty 内容属性 * @param globalConfiguration 全局配置 * @return Excel 写入数据 */ diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java index 30cee03bd..3fe604f97 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java @@ -3,6 +3,7 @@ package org.dromara.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.fesod.sheet.converters.Converter; import org.apache.fesod.sheet.enums.CellDataTypeEnum; import org.apache.fesod.sheet.metadata.GlobalConfiguration; @@ -11,7 +12,6 @@ import org.apache.fesod.sheet.metadata.data.WriteCellData; import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; import org.dromara.common.core.utils.reflect.ReflectUtils; import org.dromara.common.excel.annotation.ExcelEnumFormat; -import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; import java.util.HashMap; @@ -58,8 +58,8 @@ public class ExcelEnumConvert implements Converter { /** * 将 Excel 枚举文本转换为 Java 字段值。 * - * @param cellData 单元格数据 - * @param contentProperty 内容属性 + * @param cellData 单元格数据 + * @param contentProperty 内容属性 * @param globalConfiguration 全局配置 * @return Java 字段值 */ @@ -103,8 +103,8 @@ public class ExcelEnumConvert implements Converter { /** * 将 Java 枚举编码转换为 Excel 显示文本。 * - * @param object Java 字段值 - * @param contentProperty 内容属性 + * @param object Java 字段值 + * @param contentProperty 内容属性 * @param globalConfiguration 全局配置 * @return Excel 写入数据 */ diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java index 2d6490741..245d84b3a 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java @@ -3,10 +3,10 @@ package org.dromara.common.excel.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; +import lombok.SneakyThrows; import org.apache.fesod.sheet.annotation.ExcelIgnore; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; -import lombok.SneakyThrows; import org.apache.poi.ss.util.CellRangeAddress; import org.dromara.common.core.utils.reflect.ReflectUtils; import org.dromara.common.excel.annotation.CellMerge; @@ -165,8 +165,8 @@ public class CellMergeHandler { * 判断当前行是否满足依赖字段合并条件。 * * @param currentRow 当前行数据 - * @param preRow 上一行数据 - * @param cellMerge 合并配置 + * @param preRow 上一行数据 + * @param cellMerge 合并配置 * @return 是否允许合并 */ private boolean isMerge(Object currentRow, Object preRow, CellMerge cellMerge) { @@ -198,10 +198,10 @@ public class CellMergeHandler { /** * 追加有效的合并区域。 * - * @param result 合并区域结果集 + * @param result 合并区域结果集 * @param repeatCell 连续重复单元格信息 - * @param endIndex 结束行索引 - * @param colNum 列索引 + * @param endIndex 结束行索引 + * @param colNum 列索引 */ private void appendMergeResult(List result, RepeatCell repeatCell, int endIndex, int colNum) { if (repeatCell == null || endIndex <= repeatCell.current()) { @@ -217,7 +217,7 @@ public class CellMergeHandler { /** * 创建连续重复单元格信息。 * - * @param value 单元格值 + * @param value 单元格值 * @param current 当前行索引 * @return 连续重复单元格信息 */ @@ -233,7 +233,7 @@ public class CellMergeHandler { /** * 创建字段列索引和合并注解信息。 * - * @param colIndex 列索引 + * @param colIndex 列索引 * @param cellMerge 合并注解 * @return 字段列索引和合并注解信息 */ 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 79f0e6576..8c1092398 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 @@ -38,7 +38,7 @@ public class CellMergeStrategy extends AbstractMergeStrategy implements SheetWri /** * 根据数据列表创建单元格合并策略。 * - * @param list 数据列表 + * @param list 数据列表 * @param hasTitle 是否存在标题行 */ public CellMergeStrategy(List list, boolean hasTitle) { @@ -48,7 +48,7 @@ public class CellMergeStrategy extends AbstractMergeStrategy implements SheetWri /** * 根据数据列表和起始行创建单元格合并策略。 * - * @param list 数据列表 + * @param list 数据列表 * @param hasTitle 是否存在标题行 * @param rowIndex 起始行索引 */ @@ -59,9 +59,9 @@ public class CellMergeStrategy extends AbstractMergeStrategy implements SheetWri /** * 写入单元格时清理合并区域非首行内容。 * - * @param sheet 工作表 - * @param cell 当前单元格 - * @param head 表头 + * @param sheet 工作表 + * @param cell 当前单元格 + * @param head 表头 * @param relativeRowIndex 相对行索引 */ @Override @@ -83,7 +83,7 @@ public class CellMergeStrategy extends AbstractMergeStrategy implements SheetWri * 工作表创建后写入合并区域。 * * @param writeWorkbookHolder 工作簿上下文 - * @param writeSheetHolder 工作表上下文 + * @param writeSheetHolder 工作表上下文 */ @Override public void afterSheetCreate(final WriteWorkbookHolder writeWorkbookHolder, final WriteSheetHolder writeSheetHolder) { 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 cace7a3ae..a6574da0e 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 @@ -1,6 +1,10 @@ package org.dromara.common.excel.core; import cn.hutool.core.util.StrUtil; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.fesod.sheet.context.AnalysisContext; import org.apache.fesod.sheet.event.AnalysisEventListener; import org.apache.fesod.sheet.exception.ExcelAnalysisException; @@ -8,10 +12,6 @@ import org.apache.fesod.sheet.exception.ExcelDataConvertException; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.json.utils.JsonUtils; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; import java.util.Map; import java.util.Set; @@ -59,7 +59,7 @@ public class DefaultExcelListener extends AnalysisEventListener implements * 构造 Excel 导入监听器。 * * @param isValidate 是否执行 Validator 校验 - * @param failFast 发生异常时是否立即终止读取 + * @param failFast 发生异常时是否立即终止读取 */ public DefaultExcelListener(boolean isValidate, boolean failFast) { this.isValidate = isValidate; @@ -118,7 +118,7 @@ public class DefaultExcelListener extends AnalysisEventListener implements /** * 处理一行导入数据。 * - * @param data 行数据 + * @param data 行数据 * @param context 解析上下文 */ @Override diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java index e69292b51..6981074b1 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java @@ -37,7 +37,7 @@ public class DefaultExcelResult implements ExcelResult { /** * 创建导入结果。 * - * @param list 成功数据列表 + * @param list 成功数据列表 * @param errorList 错误信息列表 */ public DefaultExcelResult(List list, List errorList) { diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java index 7cdb5c5c0..41d953521 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java @@ -25,23 +25,28 @@ import java.util.stream.Collectors; @NoArgsConstructor @SuppressWarnings("unused") public class DropDownOptions { + /** * 一级下拉所在列index，从0开始算 */ private int index = 0; + /** * 二级下拉所在的index，从0开始算，不能与一级相同 */ private int nextIndex = 0; + /** * 一级下拉所包含的数据 */ private List options = new ArrayList<>(); + /** * 二级下拉所包含的数据Map *

以每一个一级选项值为Key，每个一级选项对应的二级数据为Value

*/ private Map> nextOptions = new HashMap<>(); + /** * 分隔符 */ diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelBuilder.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelBuilder.java index 42743e47e..d1ce4f6c0 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelBuilder.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelBuilder.java @@ -25,19 +25,10 @@ import org.apache.fesod.sheet.write.style.row.SimpleRowHeightStyleStrategy; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.FileUtils; import org.dromara.common.excel.convert.ExcelBigNumberConvert; -import org.dromara.common.excel.core.CellMergeStrategy; -import org.dromara.common.excel.core.DefaultExcelListener; -import org.dromara.common.excel.core.DropDownOptions; -import org.dromara.common.excel.core.ExcelDownHandler; -import org.dromara.common.excel.core.ExcelListener; -import org.dromara.common.excel.core.ExcelResult; +import org.dromara.common.excel.core.*; import org.dromara.common.excel.handler.DataWriteHandler; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -173,7 +164,7 @@ public final class ExcelBuilder { /** * 创建 Excel 导出构造器。 * - * @param data 导出数据 + * @param data 导出数据 * @param headType 表头类型 */ private ExcelBuilder(List data, Class headType) { @@ -580,7 +571,7 @@ public final class ExcelBuilder { /** * 构建 ZIP 内单个 Excel 文件内容。 * - * @param pageData 当前分页数据 + * @param pageData 当前分页数据 * @param exportSheetName 导出工作表名称 * @return Excel 文件字节 */ @@ -720,7 +711,7 @@ public final class ExcelBuilder { * 创建 Excel 导入读取构造器。 * * @param inputStream 输入流 - * @param headType 表头类型 + * @param headType 表头类型 */ private ReadBuilder(InputStream inputStream, Class headType) { this.inputStream = inputStream; diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelWriterWrapper.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelWriterWrapper.java index 376a8d378..4d44693ba 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelWriterWrapper.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelWriterWrapper.java @@ -121,12 +121,10 @@ public record ExcelWriterWrapper(ExcelWriter excelWriter) { * @param excelWriter ExcelWriter * @return ExcelWriterWrapper */ - public static ExcelWriterWrapper of(ExcelWriter excelWriter) { + public static ExcelWriterWrapper of(ExcelWriter excelWriter) { return new ExcelWriterWrapper<>(excelWriter); } - // -------------------------------- sheet start - /** * 创建工作表。 * @@ -207,10 +205,6 @@ public record ExcelWriterWrapper(ExcelWriter excelWriter) { return FesodSheet.writerSheet(); } - // -------------------------------- sheet end - - // -------------------------------- table start - /** * 创建表格。 * diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/enhance/JsonValueEnhancer.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/enhance/JsonValueEnhancer.java index b651be61c..4f19a984e 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/enhance/JsonValueEnhancer.java +++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/enhance/JsonValueEnhancer.java @@ -354,7 +354,7 @@ public class JsonValueEnhancer { * JSON 属性元数据。 * * @param propertyName 属性名称 - * @param member Jackson 属性成员 + * @param member Jackson 属性成员 */ private record PropertyMetadata(String propertyName, AnnotatedMember member) { diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java index 7bf928033..a7bed8b9e 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java +++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java @@ -13,6 +13,10 @@ import tools.jackson.databind.ser.jdk.NumberSerializer; @JacksonStdImpl public class BigNumberSerializer extends NumberSerializer { + /** + * 提供实例 + */ + public static final BigNumberSerializer INSTANCE = new BigNumberSerializer(Number.class); /** * 根据 JS Number.MAX_SAFE_INTEGER 与 Number.MIN_SAFE_INTEGER 得来 */ @@ -22,11 +26,6 @@ public class BigNumberSerializer extends NumberSerializer { */ private static final long MIN_SAFE_INTEGER = -9007199254740991L; - /** - * 提供实例 - */ - public static final BigNumberSerializer INSTANCE = new BigNumberSerializer(Number.class); - /** * 构造大数字序列化器。 * diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java index 186cea20b..515430a49 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java @@ -9,9 +9,9 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.StopWatch; import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.core.utils.SpringUtils; @@ -58,7 +58,7 @@ public class LogAspect { /** * 执行目标方法并记录操作日志。 * - * @param joinPoint 切点 + * @param joinPoint 切点 * @param controllerLog 日志注解 * @return 目标方法返回值 * @throws Throwable 目标方法异常 @@ -80,11 +80,11 @@ public class LogAspect { /** * 组装并发布操作日志事件。 * - * @param joinPoint 切点 + * @param joinPoint 切点 * @param controllerLog 日志注解 - * @param e 异常信息 - * @param jsonResult 返回结果 - * @param stopWatch 耗时统计 + * @param e 异常信息 + * @param jsonResult 返回结果 + * @param stopWatch 耗时统计 */ protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult, StopWatch stopWatch) { try { @@ -138,9 +138,9 @@ public class LogAspect { /** * 获取注解中对方法的描述信息 用于Controller层注解 * - * @param joinPoint 切点 - * @param log 日志 - * @param operLog 操作日志 + * @param joinPoint 切点 + * @param log 日志 + * @param operLog 操作日志 * @param jsonResult 返回结果 * @throws Exception 异常 */ @@ -165,8 +165,8 @@ public class LogAspect { /** * 获取请求的参数，放到log中 * - * @param joinPoint 切点 - * @param operLog 操作日志 + * @param joinPoint 切点 + * @param operLog 操作日志 * @param excludeParamNames 排除参数名 * @throws Exception 异常 */ @@ -186,7 +186,7 @@ public class LogAspect { /** * 将方法参数序列化为日志字符串。 * - * @param paramsArray 参数数组 + * @param paramsArray 参数数组 * @param excludeParamNames 排除字段名 * @return 参数字符串 */ @@ -207,7 +207,7 @@ public class LogAspect { /** * 序列化单个方法参数，并移除排除字段。 * - * @param arg 参数对象 + * @param arg 参数对象 * @param exclude 排除字段名 * @return 参数日志字符串 */ @@ -234,7 +234,7 @@ public class LogAspect { /** * 将参数转为已排除指定字段的字典。 * - * @param value 参数值 + * @param value 参数值 * @param exclude 排除字段名 * @return 已过滤字段的字典 */ @@ -250,7 +250,7 @@ public class LogAspect { /** * 限制日志字段长度。 * - * @param value 原始字符串 + * @param value 原始字符串 * @param maxLength 最大长度 * @return 截断后的字符串 */ @@ -303,6 +303,6 @@ public class LogAspect { */ private boolean isFilterValue(Object value) { return value instanceof MultipartFile || value instanceof HttpServletRequest || value instanceof HttpServletResponse - || value instanceof BindingResult; + || value instanceof BindingResult; } } diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LoginInfoEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LoginInfoEvent.java index 428fb84bc..27563cbf1 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LoginInfoEvent.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LoginInfoEvent.java @@ -1,8 +1,7 @@ package org.dromara.common.log.event; -import lombok.Data; - import jakarta.servlet.http.HttpServletRequest; +import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpResourceReadResult.java b/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpResourceReadResult.java index 499f9d503..fc85ac072 100644 --- a/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpResourceReadResult.java +++ b/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpResourceReadResult.java @@ -18,7 +18,7 @@ public record McpResourceReadResult( * 将 MCP SDK 资源读取结果转换为带服务端名称的项目结果对象。 * * @param serverName MCP 服务端名称 - * @param result MCP SDK 资源读取结果 + * @param result MCP SDK 资源读取结果 * @return MCP 资源读取结果 */ public static McpResourceReadResult of(String serverName, McpSchema.ReadResourceResult result) { diff --git a/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpToolCallResult.java b/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpToolCallResult.java index a67d298aa..4b2248c85 100644 --- a/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpToolCallResult.java +++ b/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpToolCallResult.java @@ -20,7 +20,7 @@ public record McpToolCallResult( * 将 MCP SDK 工具调用结果转换为带服务端名称的项目结果对象。 * * @param serverName MCP 服务端名称 - * @param result MCP SDK 工具调用结果 + * @param result MCP SDK 工具调用结果 * @return MCP 工具调用结果 */ public static McpToolCallResult of(String serverName, McpSchema.CallToolResult result) { diff --git a/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientGlobalMessageListener.java b/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientGlobalMessageListener.java index f360725a3..0c76a343b 100644 --- a/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientGlobalMessageListener.java +++ b/ruoyi-common/ruoyi-common-mqtt/src/main/java/org/dromara/common/mqtt/listener/MqttClientGlobalMessageListener.java @@ -19,7 +19,7 @@ public class MqttClientGlobalMessageListener implements IMqttClientGlobalMessage * 接收并记录全局 MQTT 消息。 * * @param context 通道上下文 - * @param topic 主题 + * @param topic 主题 * @param message MQTT 消息对象 * @param payload 消息载荷 */ diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcutAdvisor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcutAdvisor.java index 438a32f3d..0830d5e20 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcutAdvisor.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionPointcutAdvisor.java @@ -27,7 +27,7 @@ public class DataPermissionPointcutAdvisor extends AbstractPointcutAdvisor { */ public DataPermissionPointcutAdvisor() { this.advice = new DataPermissionAdvice(); - this.pointcut = new DataPermissionPointcut(); + this.pointcut = new DataPermissionPointcut(); } /** diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/AggregateSelectUtils.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/AggregateSelectUtils.java index 587ef6494..90451698a 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/AggregateSelectUtils.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/AggregateSelectUtils.java @@ -80,7 +80,7 @@ public final class AggregateSelectUtils { */ public static String checkAlias(String alias) { Assert.isTrue(StringUtils.isNotBlank(alias) && ALIAS_PATTERN.matcher(alias).matches(), - "查询别名只能包含字母、数字、下划线且不能以数字开头: %s", alias); + "查询别名只能包含字母、数字、下划线且不能以数字开头: %s", alias); return alias; } diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/SubQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/SubQuery.java index 5ecec9a3d..55f5cd935 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/SubQuery.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/SubQuery.java @@ -2,22 +2,13 @@ package org.dromara.common.mybatis.core.query; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; -import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.LambdaUtils; -import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.*; import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache; import com.baomidou.mybatisplus.core.toolkit.support.LambdaMeta; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import org.apache.ibatis.reflection.property.PropertyNamer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Consumer; import java.util.stream.Collectors; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java index 5be5b8db6..538af9df4 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java @@ -23,7 +23,7 @@ public class MybatisExceptionHandler { /** * 处理主键或唯一索引冲突异常。 * - * @param e 异常信息 + * @param e 异常信息 * @param request 当前请求 * @return 统一失败响应 */ @@ -37,7 +37,7 @@ public class MybatisExceptionHandler { /** * 处理 MyBatis 系统异常。 * - * @param e 异常信息 + * @param e 异常信息 * @param request 当前请求 * @return 统一失败响应 */ 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 50f28e0bf..ea980d644 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 @@ -65,8 +65,8 @@ public class PlusDataPermissionHandler { /** * 获取数据过滤条件的 SQL 片段 * - * @param where 原始的查询条件表达式 - * @param isSelect 是否为查询语句 + * @param where 原始的查询条件表达式 + * @param isSelect 是否为查询语句 * @return 数据过滤条件的 SQL 片段 */ public Expression getSqlSegment(Expression where, boolean isSelect) { @@ -283,7 +283,7 @@ public class PlusDataPermissionHandler { /** * 优先从方法、再从类上查找指定注解。 * - * @param handlerMethod 当前请求处理方法 + * @param handlerMethod 当前请求处理方法 * @param annotationType 注解类型 * @param 注解类型 * @return 注解对象，未配置时返回 null diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/DefaultOssClientImpl.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/DefaultOssClientImpl.java index beb64ea70..fd2f6d0cf 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/DefaultOssClientImpl.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/DefaultOssClientImpl.java @@ -29,7 +29,7 @@ public class DefaultOssClientImpl extends AbstractOssClientImpl { * 构造默认 S3 存储客户端。 * * @param clientId 客户端 ID - * @param config S3 存储客户端配置 + * @param config S3 存储客户端配置 */ public DefaultOssClientImpl(String clientId, OssClientConfig config) { super(clientId, config); diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/OssClient.java index e8a038ab4..461367b7b 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/OssClient.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/OssClient.java @@ -133,9 +133,9 @@ public interface OssClient extends AutoCloseable { /** * 将本地路径对应的文件上传到指定存储桶。 * - * @param bucket 存储桶名称 - * @param key 对象键 - * @param path 文件路径 + * @param bucket 存储桶名称 + * @param key 对象键 + * @param path 文件路径 * @param options 可选项 * @return 上传结果 */ @@ -154,9 +154,9 @@ public interface OssClient extends AutoCloseable { /** * 将文件上传到指定存储桶。 * - * @param bucket 存储桶名称 - * @param key 对象键 - * @param file 文件对象 + * @param bucket 存储桶名称 + * @param key 对象键 + * @param file 文件对象 * @param options 可选项 * @return 上传结果 */ @@ -175,9 +175,9 @@ public interface OssClient extends AutoCloseable { /** * 将随机访问文件上传到指定存储桶。 * - * @param bucket 存储桶名称 - * @param key 对象键 - * @param file 随机访问文件 + * @param bucket 存储桶名称 + * @param key 对象键 + * @param file 随机访问文件 * @param options 可选项 * @return 上传结果 */ @@ -200,7 +200,7 @@ public interface OssClient extends AutoCloseable { * @param key 对象键 * @param channel 数据通道 * @param contentLength 内容长度 - * @param options 可选项 + * @param options 可选项 * @return 上传结果 */ PutObjectResult bucketUpload(String bucket, String key, ReadableByteChannel channel, long contentLength, Options options); @@ -223,7 +223,7 @@ public interface OssClient extends AutoCloseable { * @param key 对象键 * @param in 输入流 * @param contentLength 内容长度 - * @param options 可选项 + * @param options 可选项 * @return 上传结果 */ PutObjectResult bucketUpload(String bucket, String key, InputStream in, long contentLength, Options options); @@ -242,9 +242,9 @@ public interface OssClient extends AutoCloseable { /** * 将字节数组上传到指定存储桶。 * - * @param bucket 存储桶名称 - * @param key 对象键 - * @param data 字节数组 + * @param bucket 存储桶名称 + * @param key 对象键 + * @param data 字节数组 * @param options 可选项 * @return 上传结果 */ @@ -374,8 +374,8 @@ public interface OssClient extends AutoCloseable { /** * 将本地路径对应的文件上传到默认存储桶。 * - * @param key 对象键 - * @param path 文件路径 + * @param key 对象键 + * @param path 文件路径 * @param options 可选项 * @return 上传结果 */ @@ -393,8 +393,8 @@ public interface OssClient extends AutoCloseable { /** * 将文件上传到默认存储桶。 * - * @param key 对象键 - * @param file 文件对象 + * @param key 对象键 + * @param file 文件对象 * @param options 可选项 * @return 上传结果 */ @@ -412,8 +412,8 @@ public interface OssClient extends AutoCloseable { /** * 将随机访问文件上传到默认存储桶。 * - * @param key 对象键 - * @param file 随机访问文件 + * @param key 对象键 + * @param file 随机访问文件 * @param options 可选项 * @return 上传结果 */ @@ -431,10 +431,10 @@ public interface OssClient extends AutoCloseable { /** * 将可读通道中的数据上传到默认存储桶。 * - * @param key 对象键 - * @param channel 数据通道 + * @param key 对象键 + * @param channel 数据通道 * @param contentLength 内容长度 - * @param options 可选项 + * @param options 可选项 * @return 上传结果 */ PutObjectResult upload(String key, ReadableByteChannel channel, long contentLength, Options options); @@ -452,10 +452,10 @@ public interface OssClient extends AutoCloseable { /** * 将输入流中的数据上传到默认存储桶。 * - * @param key 对象键 + * @param key 对象键 * @param in 输入流 * @param contentLength 内容长度 - * @param options 可选项 + * @param options 可选项 * @return 上传结果 */ PutObjectResult upload(String key, InputStream in, long contentLength, Options options); @@ -473,8 +473,8 @@ public interface OssClient extends AutoCloseable { /** * 将字节数组上传到默认存储桶。 * - * @param key 对象键 - * @param data 字节数组 + * @param key 对象键 + * @param data 字节数组 * @param options 可选项 * @return 上传结果 */ diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/config/Config.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/config/Config.java index 6ef1d06f4..8ed64e842 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/config/Config.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/config/Config.java @@ -5,19 +5,20 @@ package org.dromara.common.oss.config; * * @param 配置类型 * @param 配置构建器类型 - * * @author 秋辞未寒 */ -public interface Config { +public interface Config { /** * 配置对象拷贝 + * * @return 拷贝后的新配置对象 */ T copy(); /** * 转为构建器对象 + * * @return 构建器对象 */ B toBuilder(); diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java index 149a47302..621982fc1 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java @@ -35,6 +35,6 @@ public interface OssConstant { /** * 云服务商 */ - String[] CLOUD_SERVICE = new String[] {"aliyun", "qcloud", "qiniu", "obs"}; + String[] CLOUD_SERVICE = new String[]{"aliyun", "qcloud", "qiniu", "obs"}; } diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicy.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicy.java index bce67dd9e..4e80e9558 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicy.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicy.java @@ -20,17 +20,17 @@ public enum AccessPolicy { /** * 私有 */ - PRIVATE(0,BucketCannedACL.PRIVATE, ObjectCannedACL.PRIVATE), + PRIVATE(0, BucketCannedACL.PRIVATE, ObjectCannedACL.PRIVATE), /** * 公有读写 */ - PUBLIC_READ_WRITE(1,BucketCannedACL.PUBLIC_READ_WRITE, ObjectCannedACL.PUBLIC_READ_WRITE), + PUBLIC_READ_WRITE(1, BucketCannedACL.PUBLIC_READ_WRITE, ObjectCannedACL.PUBLIC_READ_WRITE), /** * 公有只读 */ - PUBLIC_READ(2,BucketCannedACL.PUBLIC_READ, ObjectCannedACL.PUBLIC_READ); + PUBLIC_READ(2, BucketCannedACL.PUBLIC_READ, ObjectCannedACL.PUBLIC_READ); /** * 访问策略类型 diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/GetObjectResult.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/GetObjectResult.java index 6170bd198..50a2fe873 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/GetObjectResult.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/GetObjectResult.java @@ -19,36 +19,36 @@ import java.util.Map; * @author 秋辞未寒 */ public record GetObjectResult( - String key, - String eTag, - LocalDateTime lastModified, - long size, - String contentType, - String contentDisposition, - String contentRange, - String contentEncoding, - String contentLanguage, - Map metadata + String key, + String eTag, + LocalDateTime lastModified, + long size, + String contentType, + String contentDisposition, + String contentRange, + String contentEncoding, + String contentLanguage, + Map metadata ) { /** * 构建文件对象获取结果。 * - * @param key 对象 Key - * @param eTag 对象 ETag - * @param lastModified 最后修改时间 - * @param size 对象大小 - * @param contentType 内容类型 + * @param key 对象 Key + * @param eTag 对象 ETag + * @param lastModified 最后修改时间 + * @param size 对象大小 + * @param contentType 内容类型 * @param contentDisposition 内容处置方式 - * @param contentRange 内容范围 - * @param contentEncoding 内容编码 - * @param contentLanguage 内容语言 - * @param metadata 自定义元数据 + * @param contentRange 内容范围 + * @param contentEncoding 内容编码 + * @param contentLanguage 内容语言 + * @param metadata 自定义元数据 * @return 文件对象获取结果 */ public static GetObjectResult form(String key, String eTag, LocalDateTime lastModified, long size - , String contentType, String contentDisposition, String contentRange, String contentEncoding, String contentLanguage - , Map metadata) { + , String contentType, String contentDisposition, String contentRange, String contentEncoding, String contentLanguage + , Map metadata) { return new GetObjectResult(key, eTag, lastModified, size, contentType, contentDisposition, contentRange, contentEncoding, contentLanguage, metadata); } diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/HandleAsyncResult.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/HandleAsyncResult.java index 361855899..c4ba48a5d 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/HandleAsyncResult.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/HandleAsyncResult.java @@ -11,8 +11,8 @@ import java.util.Optional; * @author 秋辞未寒 */ public record HandleAsyncResult( - T result, - Throwable error + T result, + Throwable error ) { /** diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/PutObjectResult.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/PutObjectResult.java index 26b4c8bd3..2fca58691 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/PutObjectResult.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/model/PutObjectResult.java @@ -10,10 +10,10 @@ package org.dromara.common.oss.model; * @author 秋辞未寒 */ public record PutObjectResult( - String url, - String key, - String eTag, - long size + String url, + String key, + String eTag, + long size ) { /** diff --git a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/annotation/ConditionalOnMessageTransport.java b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/annotation/ConditionalOnMessageTransport.java index 3a2bed5f1..6034ebf10 100644 --- a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/annotation/ConditionalOnMessageTransport.java +++ b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/annotation/ConditionalOnMessageTransport.java @@ -3,11 +3,7 @@ package org.dromara.common.push.annotation; import org.dromara.common.push.condition.MessageTransportCondition; import org.springframework.context.annotation.Conditional; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * 按消息推送传输方式启用组件。 diff --git a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/condition/MessageTransportCondition.java b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/condition/MessageTransportCondition.java index 8bb2b7123..791afc900 100644 --- a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/condition/MessageTransportCondition.java +++ b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/condition/MessageTransportCondition.java @@ -19,7 +19,7 @@ public class MessageTransportCondition implements Condition { /** * 判断当前消息推送配置是否匹配注解声明的传输方式。 * - * @param context 条件上下文 + * @param context 条件上下文 * @param metadata 注解元数据 * @return 是否匹配 */ diff --git a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/config/MessageWebSocketConfiguration.java b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/config/MessageWebSocketConfiguration.java index 434357833..6a899577c 100644 --- a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/config/MessageWebSocketConfiguration.java +++ b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/config/MessageWebSocketConfiguration.java @@ -1,10 +1,10 @@ package org.dromara.common.push.config; import org.dromara.common.push.annotation.ConditionalOnMessageTransport; -import org.dromara.common.push.listener.MessageTopicListener; import org.dromara.common.push.core.WebSocketSessionManager; import org.dromara.common.push.handler.PlusWebSocketHandler; import org.dromara.common.push.interceptor.PlusWebSocketInterceptor; +import org.dromara.common.push.listener.MessageTopicListener; import org.dromara.common.push.properties.MessageProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/core/SseEmitterSessionManager.java b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/core/SseEmitterSessionManager.java index 19ca28f60..3b0a0ec43 100644 --- a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/core/SseEmitterSessionManager.java +++ b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/core/SseEmitterSessionManager.java @@ -37,7 +37,7 @@ public class SseEmitterSessionManager implements PushSessionManager { * 构造 SSE 会话管理器并启动心跳检测。 * * @param scheduledExecutorService 定时任务线程池 - * @param messageProperties 消息推送配置 + * @param messageProperties 消息推送配置 */ public SseEmitterSessionManager(ScheduledExecutorService scheduledExecutorService, MessageProperties messageProperties) { this.messageProperties = messageProperties; @@ -218,7 +218,7 @@ public class SseEmitterSessionManager implements PushSessionManager { /** * 向指定用户的全部本地 SSE 会话发送统一 JSON 消息。 * - * @param userId 要发送消息的用户id + * @param userId 要发送消息的用户id * @param pushDTO 要发送的消息内容 */ public void sendMessage(Long userId, PushDTO pushDTO) { diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RateLimiterAspect.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RateLimiterAspect.java index 5cb4862c9..9eb60934a 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RateLimiterAspect.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RateLimiterAspect.java @@ -100,11 +100,11 @@ public class RateLimiterAspect { Method targetMethod = signature.getMethod(); Object[] args = point.getArgs(); MethodBasedEvaluationContext context = - new MethodBasedEvaluationContext(null, targetMethod, args, pnd); + new MethodBasedEvaluationContext(null, targetMethod, args, pnd); context.setBeanResolver(new BeanFactoryResolver(SpringUtils.getBeanFactory())); Expression expression; if (StringUtils.startsWith(key, parserContext.getExpressionPrefix()) - && StringUtils.endsWith(key, parserContext.getExpressionSuffix())) { + && StringUtils.endsWith(key, parserContext.getExpressionSuffix())) { expression = parser.parseExpression(key, parserContext); } else { expression = parser.parseExpression(key); diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RepeatSubmitAspect.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RepeatSubmitAspect.java index c9ad5d310..8a5490ac4 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RepeatSubmitAspect.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RepeatSubmitAspect.java @@ -163,7 +163,7 @@ public class RepeatSubmitAspect { } } return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse - || o instanceof BindingResult; + || o instanceof BindingResult; } } diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java index 7941ef096..05d5097cb 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java @@ -24,7 +24,6 @@ import tools.jackson.databind.module.SimpleModule; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.List; import java.util.TimeZone; /** diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java index 25049bb3d..f36afbd19 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java @@ -20,7 +20,7 @@ public class RedisExceptionHandler { /** * 处理 Lock4j 分布式锁获取失败异常。 * - * @param e 异常信息 + * @param e 异常信息 * @param request 当前请求 * @return 统一失败响应 */ diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java index a64f5ae65..140d57a11 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java @@ -173,8 +173,8 @@ public class PlusSpringCacheManager implements CacheManager { * 解析缓存配置，支持从模板配置复制并叠加缓存名称中的扩展参数。 * * @param cacheName 完整缓存名称 - * @param name 基础缓存名称 - * @param array 缓存名称拆分参数 + * @param name 基础缓存名称 + * @param array 缓存名称拆分参数 * @return 缓存配置 */ private CacheConfig resolveCacheConfig(String cacheName, String name, String[] array) { @@ -239,9 +239,9 @@ public class PlusSpringCacheManager implements CacheManager { /** * 创建普通 Map 类型缓存。 * - * @param name 缓存名称 + * @param name 缓存名称 * @param config 缓存配置 - * @param local 是否启用本地一级缓存 + * @param local 是否启用本地一级缓存 * @return 缓存实例 */ private Cache createMap(String cacheName, String name, CacheConfig config, int local) { @@ -264,9 +264,9 @@ public class PlusSpringCacheManager implements CacheManager { /** * 创建带过期策略的 MapCache 类型缓存。 * - * @param name 缓存名称 + * @param name 缓存名称 * @param config 缓存配置 - * @param local 是否启用本地一级缓存 + * @param local 是否启用本地一级缓存 * @return 缓存实例 */ private Cache createMapCache(String cacheName, String name, CacheConfig config, int local) { diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java index abb4a9d0f..795679389 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java @@ -561,32 +561,33 @@ public class RedisUtils { /** * 获得缓存的基本对象列表(全局匹配忽略租户 自行拼接租户id) - *

+ *

* limit-设置扫描的限制数量(默认为0,查询全部) * pattern-设置键的匹配模式(默认为null) * chunkSize-设置每次扫描的块大小(默认为0,本方法设置为1000) * type-设置键的类型(默认为null,查询全部类型) *

- * @see KeysScanOptions + * * @param pattern 字符串前缀 * @return 对象列表 + * @see KeysScanOptions */ public static Collection keys(final String pattern) { - return keys(KeysScanOptions.defaults().pattern(pattern).chunkSize(1000)); + return keys(KeysScanOptions.defaults().pattern(pattern).chunkSize(1000)); } /** * 通过扫描参数获取缓存的基本对象列表 * * @param keysScanOptions 扫描参数 - *

- * limit-设置扫描的限制数量(默认为0,查询全部) - * pattern-设置键的匹配模式(默认为null) - * chunkSize-设置每次扫描的块大小(默认为0) - * type-设置键的类型(默认为null,查询全部类型) - *

- * @see KeysScanOptions + *

+ * limit-设置扫描的限制数量(默认为0,查询全部) + * pattern-设置键的匹配模式(默认为null) + * chunkSize-设置每次扫描的块大小(默认为0) + * type-设置键的类型(默认为null,查询全部类型) + *

* @return 对象列表 + * @see KeysScanOptions */ public static Collection keys(final KeysScanOptions keysScanOptions) { Stream keysStream = CLIENT.getKeys().getKeysStream(keysScanOptions); diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java index 53d85fa00..9fedeac88 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; public class PlusSaTokenDao implements SaTokenDaoBySessionFollowObject { private static final Cache CAFFEINE = Caffeine.newBuilder() - // 设置最后一次写入或访问后经过固定时间过期 - .expireAfterWrite(5, TimeUnit.SECONDS) - // 初始的缓存空间大小 - .initialCapacity(100) - // 缓存的最大条数 - .maximumSize(1000) - .build(); + // 设置最后一次写入或访问后经过固定时间过期 + .expireAfterWrite(5, TimeUnit.SECONDS) + // 初始的缓存空间大小 + .initialCapacity(100) + // 缓存的最大条数 + .maximumSize(1000) + .build(); /** * 获取Value，如无返空 diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java index 8423792ec..ddd4c1f4b 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java @@ -9,8 +9,8 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.api.model.LoginUser; -import java.util.Collection; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.function.BiFunction; @@ -24,7 +24,7 @@ public class SaPermissionImpl implements StpInterface { /** * 获取指定登录对象的菜单权限列表。 * - * @param loginId 登录ID + * @param loginId 登录ID * @param loginType 登录类型 * @return 菜单权限列表 */ @@ -36,7 +36,7 @@ public class SaPermissionImpl implements StpInterface { /** * 获取指定登录对象的角色权限列表。 * - * @param loginId 登录ID + * @param loginId 登录ID * @param loginType 登录类型 * @return 角色权限列表 */ @@ -48,8 +48,8 @@ public class SaPermissionImpl implements StpInterface { /** * 解析当前登录对象的权限列表。 * - * @param loginId 登录ID - * @param localPermissionExtractor 当前登录用户权限提取器 + * @param loginId 登录ID + * @param localPermissionExtractor 当前登录用户权限提取器 * @param remotePermissionExtractor 远程权限提取器 * @return 权限列表 */ diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java index 0a5ce1f51..857291033 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java @@ -22,7 +22,7 @@ public class SaTokenExceptionHandler { /** * 处理权限码校验失败异常。 * - * @param e 异常信息 + * @param e 异常信息 * @param request 当前请求 * @return 统一失败响应 */ @@ -37,7 +37,7 @@ public class SaTokenExceptionHandler { /** * 处理未登录或登录态失效异常。 * - * @param e 异常信息 + * @param e 异常信息 * @param request 当前请求 * @return 统一失败响应 */ diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java index 47b8be926..5e37963f8 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java @@ -1,9 +1,9 @@ package org.dromara.common.satoken.utils; +import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; -import cn.dev33.satoken.exception.NotLoginException; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.useragent.UserAgent; @@ -68,7 +68,7 @@ public class LoginHelper { * 在登录时补充当前请求上下文，避免登录态中的终端信息缺失。 * * @param loginUser 登录用户 - * @param model 登录参数 + * @param model 登录参数 */ private static void fillRequestContext(LoginUser loginUser, SaLoginParameter model) { HttpServletRequest request = ServletUtils.getRequest(); diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java index e1f7f1d74..663239ba4 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java @@ -61,7 +61,7 @@ public class SecurityConfig implements WebMvcConfigurer { */ @Bean public FilterRegistrationBean saTokenContextFilterRegistration( - SaTokenContextFilterForJakartaServlet filter) { + SaTokenContextFilterForJakartaServlet filter) { FilterRegistrationBean registration = new FilterRegistrationBean<>(); registration.setFilter(filter); registration.setName("saTokenContextFilterForServlet"); @@ -81,41 +81,41 @@ public class SecurityConfig implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { // 注册路由拦截器，自定义验证规则 registry.addInterceptor(new SaInterceptor(handler -> { - AllUrlHandler allUrlHandler = SpringUtils.getBean(AllUrlHandler.class); - // 登录验证 -- 排除多个路径 - SaRouter - // 获取所有的 - .match(allUrlHandler.getUrls()) - // 对未排除的路径进行检查 - .check(() -> { - HttpServletRequest request = ServletUtils.getRequest(); - HttpServletResponse response = ServletUtils.getResponse(); - response.setContentType(SaTokenConsts.CONTENT_TYPE_APPLICATION_JSON); - // 检查是否登录 是否有token - StpUtil.checkLogin(); + AllUrlHandler allUrlHandler = SpringUtils.getBean(AllUrlHandler.class); + // 登录验证 -- 排除多个路径 + SaRouter + // 获取所有的 + .match(allUrlHandler.getUrls()) + // 对未排除的路径进行检查 + .check(() -> { + HttpServletRequest request = ServletUtils.getRequest(); + HttpServletResponse response = ServletUtils.getResponse(); + response.setContentType(SaTokenConsts.CONTENT_TYPE_APPLICATION_JSON); + // 检查是否登录 是否有token + StpUtil.checkLogin(); - // 检查 header 与 param 里的 clientid 与 token 里的是否一致 - String headerCid = request.getHeader(LoginHelper.CLIENT_KEY); - String paramCid = ServletUtils.getParameter(LoginHelper.CLIENT_KEY); - String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString(); - if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) { - // token 无效 - throw NotLoginException.newInstance(StpUtil.getLoginType(), - "-100", "客户端ID与Token不匹配", - StpUtil.getTokenValue()); - } - validateClientAccessRules(request); + // 检查 header 与 param 里的 clientid 与 token 里的是否一致 + String headerCid = request.getHeader(LoginHelper.CLIENT_KEY); + String paramCid = ServletUtils.getParameter(LoginHelper.CLIENT_KEY); + String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString(); + if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) { + // token 无效 + throw NotLoginException.newInstance(StpUtil.getLoginType(), + "-100", "客户端ID与Token不匹配", + StpUtil.getTokenValue()); + } + validateClientAccessRules(request); - // 有效率影响 用于临时测试 - // if (log.isDebugEnabled()) { - // log.info("剩余有效时间: {}", StpUtil.getTokenTimeout()); - // log.info("临时有效时间: {}", StpUtil.getTokenActivityTimeout()); - // } + // 有效率影响 用于临时测试 + // if (log.isDebugEnabled()) { + // log.info("剩余有效时间: {}", StpUtil.getTokenTimeout()); + // log.info("临时有效时间: {}", StpUtil.getTokenActivityTimeout()); + // } - }); - })).addPathPatterns("/**") - // 排除不需要拦截的路径 - .excludePathPatterns(securityProperties.getExcludes()); + }); + })).addPathPatterns("/**") + // 排除不需要拦截的路径 + .excludePathPatterns(securityProperties.getExcludes()); } /** @@ -128,15 +128,15 @@ public class SecurityConfig implements WebMvcConfigurer { String username = SpringUtils.getProperty("spring.boot.admin.client.username"); String password = SpringUtils.getProperty("spring.boot.admin.client.password"); return new SaServletFilter() - .addInclude("/actuator", "/actuator/**") - .setAuth(obj -> { - SaHttpBasicUtil.check(username + StringUtils.COLON + password); - }) - .setError(e -> { - HttpServletResponse response = ServletUtils.getResponse(); - response.setContentType(SaTokenConsts.CONTENT_TYPE_APPLICATION_JSON); - return SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED); - }); + .addInclude("/actuator", "/actuator/**") + .setAuth(obj -> { + SaHttpBasicUtil.check(username + StringUtils.COLON + password); + }) + .setError(e -> { + HttpServletResponse response = ServletUtils.getResponse(); + response.setContentType(SaTokenConsts.CONTENT_TYPE_APPLICATION_JSON); + return SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED); + }); } /** diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java index 158738e4f..2e882ff7c 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java @@ -1,8 +1,8 @@ package org.dromara.common.security.handler; import cn.hutool.core.util.ReUtil; -import org.dromara.common.core.utils.SpringUtils; import lombok.Data; +import org.dromara.common.core.utils.SpringUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; @@ -34,7 +34,7 @@ public class AllUrlHandler implements InitializingBean { map.keySet().forEach(info -> { // 获取注解上边的 path 替代 path variable 为 * Objects.requireNonNull(info.getPathPatternsCondition().getPatterns()) - .forEach(url -> set.add(ReUtil.replaceAll(url.getPatternString(), PATTERN, "*"))); + .forEach(url -> set.add(ReUtil.replaceAll(url.getPatternString(), PATTERN, "*"))); }); urls.addAll(set); } diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java index d722c72dd..55799d6bf 100644 --- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java +++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java @@ -2,11 +2,7 @@ package org.dromara.common.sensitive.annotation; import org.dromara.common.sensitive.core.SensitiveStrategy; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * 数据脱敏注解 diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java index b1890623a..268d7a923 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java @@ -31,15 +31,15 @@ public abstract class AbstractAuthWeChatEnterpriseRequest extends AuthDefaultReq * @param source 授权来源 */ public AbstractAuthWeChatEnterpriseRequest(AuthConfig config, AuthSource source) { - super(config,source); + super(config, source); } /** * 创建企业微信认证请求。 * - * @param config 授权配置 - * @param source 授权来源 + * @param config 授权配置 + * @param source 授权来源 * @param authStateCache 授权状态缓存 */ public AbstractAuthWeChatEnterpriseRequest(AuthConfig config, AuthSource source, AuthStateCache authStateCache) { diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java index 38309c607..798e8b38c 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AuthDingTalkV2Request.java @@ -38,7 +38,7 @@ public class AuthDingTalkV2Request extends AuthDefaultRequest { /** * 创建钉钉 V2 认证请求。 * - * @param config 授权配置 + * @param config 授权配置 * @param authStateCache 授权状态缓存 */ public AuthDingTalkV2Request(AuthConfig config, AuthStateCache authStateCache) { diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java index 977b0eaa6..a13ca0161 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java @@ -35,7 +35,7 @@ public class AuthGiteaRequest extends AuthDefaultRequest { /** * 创建 Gitea 认证请求。 * - * @param config 授权配置 + * @param config 授权配置 * @param authStateCache 授权状态缓存 */ public AuthGiteaRequest(AuthConfig config, AuthStateCache authStateCache) { @@ -61,12 +61,12 @@ public class AuthGiteaRequest extends AuthDefaultRequest { throw new AuthException(object.getStr("message")); } return AuthToken.builder() - .accessToken(object.getStr("access_token")) - .refreshToken(object.getStr("refresh_token")) - .idToken(object.getStr("id_token")) - .tokenType(object.getStr("token_type")) - .scope(object.getStr("scope")) - .build(); + .accessToken(object.getStr("access_token")) + .refreshToken(object.getStr("refresh_token")) + .idToken(object.getStr("id_token")) + .tokenType(object.getStr("token_type")) + .scope(object.getStr("scope")) + .build(); } /** @@ -78,11 +78,11 @@ public class AuthGiteaRequest extends AuthDefaultRequest { @Override protected String doPostAuthorizationCode(String code) { HttpRequest request = HttpRequest.post(source.accessToken()) - .form("client_id", config.getClientId()) - .form("client_secret", config.getClientSecret()) - .form("grant_type", "authorization_code") - .form("code", code) - .form("redirect_uri", config.getRedirectUri()); + .form("client_id", config.getClientId()) + .form("client_secret", config.getClientSecret()) + .form("grant_type", "authorization_code") + .form("code", code) + .form("redirect_uri", config.getRedirectUri()); HttpResponse response = request.execute(); return response.body(); } @@ -106,14 +106,14 @@ public class AuthGiteaRequest extends AuthDefaultRequest { throw new AuthException(object.getStr("message")); } return AuthUser.builder() - .uuid(object.getStr("sub")) - .username(object.getStr("name")) - .nickname(object.getStr("preferred_username")) - .avatar(object.getStr("picture")) - .email(object.getStr("email")) - .token(authToken) - .source(source.toString()) - .build(); + .uuid(object.getStr("sub")) + .username(object.getStr("name")) + .nickname(object.getStr("preferred_username")) + .avatar(object.getStr("picture")) + .email(object.getStr("email")) + .token(authToken) + .source(source.toString()) + .build(); } } diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java index b19b75314..e730d3c05 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java @@ -12,7 +12,7 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.json.utils.JsonUtils; /** - * @author 长春叭哥 2023年03月26日 + * @author 长春叭哥 2023年03月26日 */ public class AuthMaxKeyRequest extends AuthDefaultRequest { @@ -31,7 +31,7 @@ public class AuthMaxKeyRequest extends AuthDefaultRequest { /** * 创建 MaxKey 认证请求。 * - * @param config 授权配置 + * @param config 授权配置 * @param authStateCache 授权状态缓存 */ public AuthMaxKeyRequest(AuthConfig config, AuthStateCache authStateCache) { diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java index 4cb932984..de8c73792 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java @@ -45,7 +45,7 @@ public class AuthTopIamRequest extends AuthDefaultRequest { /** * 创建 TopIAM 认证请求。 * - * @param config 授权配置 + * @param config 授权配置 * @param authStateCache 授权状态缓存 */ public AuthTopIamRequest(AuthConfig config, AuthStateCache authStateCache) { @@ -124,7 +124,6 @@ public class AuthTopIamRequest extends AuthDefaultRequest { .add("Authorization", "Bearer " + authToken.getAccessToken()), false).getBody(); } - /** * 生成 TopIAM 授权地址。 * diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java index b9681494d..e74601b45 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java @@ -19,16 +19,16 @@ import org.dromara.common.social.topiam.AuthTopIamRequest; * * @author thiszhc */ -public class SocialUtils { +public class SocialUtils { private static final AuthRedisStateCache STATE_CACHE = SpringUtils.getBean(AuthRedisStateCache.class); /** * 执行第三方登录授权回调。 * - * @param source 社交平台类型 - * @param code 授权码 - * @param state 状态值 + * @param source 社交平台类型 + * @param code 授权码 + * @param state 状态值 * @param socialProperties 社交平台配置 * @return 授权响应 * @throws AuthException 授权异常 @@ -45,14 +45,14 @@ public class SocialUtils { /** * 根据平台类型构建授权请求实例。 * - * @param source 社交平台类型 + * @param source 社交平台类型 * @param socialProperties 社交平台配置 * @return 授权请求 * @throws AuthException 授权异常 */ public static AuthRequest getAuthRequest(String source, SocialProperties socialProperties) throws AuthException { SocialLoginConfigProperties obj = socialProperties.getType().get(source); - if (ObjectUtil.isNull(obj)) { + if (ObjectUtil.isNull(obj)) { throw new AuthException("不支持的第三方登录类型"); } AuthConfig.AuthConfigBuilder builder = AuthConfig.builder() @@ -69,7 +69,8 @@ public class SocialUtils { case "coding" -> new AuthCodingRequest(builder.build(), STATE_CACHE); case "oschina" -> new AuthOschinaRequest(builder.build(), STATE_CACHE); // 支付宝在创建回调地址时，不允许使用localhost或者127.0.0.1，所以这儿的回调地址使用的局域网内的ip - case "alipay_wallet" -> new AuthAlipayRequest(builder.build(), socialProperties.getType().get("alipay_wallet").getAlipayPublicKey(), STATE_CACHE); + case "alipay_wallet" -> + new AuthAlipayRequest(builder.build(), socialProperties.getType().get("alipay_wallet").getAlipayPublicKey(), STATE_CACHE); case "qq" -> new AuthQqRequest(builder.build(), STATE_CACHE); case "wechat_open" -> new AuthWeChatOpenRequest(builder.build(), STATE_CACHE); case "taobao" -> new AuthTaobaoRequest(builder.build(), STATE_CACHE); @@ -77,9 +78,11 @@ public class SocialUtils { case "linkedin" -> new AuthLinkedinRequest(builder.build(), STATE_CACHE); case "microsoft" -> new AuthMicrosoftRequest(builder.tenantId(obj.getTenantId()).build(), STATE_CACHE); case "renren" -> new AuthRenrenRequest(builder.build(), STATE_CACHE); - case "stack_overflow" -> new AuthStackOverflowRequest(builder.stackOverflowKey(obj.getStackOverflowKey()).build(), STATE_CACHE); + case "stack_overflow" -> + new AuthStackOverflowRequest(builder.stackOverflowKey(obj.getStackOverflowKey()).build(), STATE_CACHE); case "huawei" -> new AuthHuaweiV3Request(builder.build(), STATE_CACHE); - case "wechat_enterprise" -> new AuthWeChatEnterpriseQrcodeV2Request(builder.agentId(obj.getAgentId()).build(), STATE_CACHE); + case "wechat_enterprise" -> + new AuthWeChatEnterpriseQrcodeV2Request(builder.agentId(obj.getAgentId()).build(), STATE_CACHE); case "gitlab" -> new AuthGitlabRequest(builder.build(), STATE_CACHE); case "wechat_mp" -> new AuthWeChatMpRequest(builder.build(), STATE_CACHE); case "aliyun" -> new AuthAliyunRequest(builder.build(), STATE_CACHE); diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java index 64d4baa05..89d37b7ff 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java @@ -1,10 +1,6 @@ package org.dromara.common.translation.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * 通用翻译注解 diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java index 996dcf4d5..9bb82a53c 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java @@ -7,13 +7,7 @@ import org.dromara.common.translation.annotation.TranslationType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.function.Function; /** @@ -37,7 +31,7 @@ public interface TranslationInterface { /** * 批量翻译。 * - * @param keys 需要被翻译的键集合 + * @param keys 需要被翻译的键集合 * @param other 其他参数 * @return 翻译结果映射 */ @@ -88,8 +82,8 @@ public interface TranslationInterface { * * @param ids 原始 ID 字符串 * @param mapper ID 到值的映射函数 + * @param 值类型 * @return 拼接后的结果字符串 - * @param 值类型 */ default String joinMappedValues(String ids, Function mapper) { return StreamUtils.join(parseLongIds(ids), id -> { diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationJsonFieldProcessor.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationJsonFieldProcessor.java index ed36bd2bf..8c7455f48 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationJsonFieldProcessor.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationJsonFieldProcessor.java @@ -12,12 +12,7 @@ import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.core.TranslationInterface; import org.springframework.core.annotation.Order; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * 翻译响应处理器。 diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java index b5c968973..9828a645b 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java @@ -25,7 +25,7 @@ public class DeptNameTranslationImpl implements TranslationInterface { /** * 将部门 ID 或 ID 集合翻译为部门名称。 * - * @param key 部门 ID 或逗号分隔的 ID 字符串 + * @param key 部门 ID 或逗号分隔的 ID 字符串 * @param other 额外参数 * @return 部门名称 */ @@ -42,7 +42,7 @@ public class DeptNameTranslationImpl implements TranslationInterface { /** * 批量将部门 ID 翻译为部门名称。 * - * @param keys 部门 ID 集合 + * @param keys 部门 ID 集合 * @param other 额外参数 * @return 部门 ID 与部门名称映射 */ @@ -63,7 +63,7 @@ public class DeptNameTranslationImpl implements TranslationInterface { /** * 根据原始键构建部门名称翻译值。 * - * @param source 原始键 + * @param source 原始键 * @param deptNames 部门 ID 与部门名称映射 * @return 部门名称 */ diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java index f0d964ac4..ea13812a2 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java @@ -27,7 +27,7 @@ public class DictTypeTranslationImpl implements TranslationInterface { /** * 根据字典类型和字典值翻译显示标签。 * - * @param key 字典值 + * @param key 字典值 * @param other 字典类型 * @return 字典标签 */ @@ -42,7 +42,7 @@ public class DictTypeTranslationImpl implements TranslationInterface { /** * 批量根据字典类型和字典值翻译显示标签。 * - * @param keys 字典值集合 + * @param keys 字典值集合 * @param other 字典类型 * @return 字典值与字典标签映射 */ diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java index 7fa4d23fa..b21d05dbe 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java @@ -25,7 +25,7 @@ public class NicknameTranslationImpl implements TranslationInterface { /** * 将用户 ID 或 ID 集合翻译为用户昵称。 * - * @param key 用户 ID 或逗号分隔的 ID 字符串 + * @param key 用户 ID 或逗号分隔的 ID 字符串 * @param other 额外参数 * @return 用户昵称 */ @@ -42,7 +42,7 @@ public class NicknameTranslationImpl implements TranslationInterface { /** * 批量将用户 ID 翻译为用户昵称。 * - * @param keys 用户 ID 集合 + * @param keys 用户 ID 集合 * @param other 额外参数 * @return 用户 ID 与用户昵称映射 */ @@ -63,7 +63,7 @@ public class NicknameTranslationImpl implements TranslationInterface { /** * 根据原始键构建用户昵称翻译值。 * - * @param source 原始键 + * @param source 原始键 * @param userNames 用户 ID 与用户昵称映射 * @return 用户昵称 */ diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java index ca7f2314c..5993568c9 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java @@ -28,7 +28,7 @@ public class OssUrlTranslationImpl implements TranslationInterface { /** * 将 OSS ID 或 ID 集合翻译为访问地址。 * - * @param key OSS ID 或逗号分隔的 ID 字符串 + * @param key OSS ID 或逗号分隔的 ID 字符串 * @param other 额外参数 * @return 访问地址 */ @@ -45,7 +45,7 @@ public class OssUrlTranslationImpl implements TranslationInterface { /** * 批量将 OSS ID 翻译为访问地址。 * - * @param keys OSS ID 集合 + * @param keys OSS ID 集合 * @param other 额外参数 * @return OSS ID 与访问地址映射 */ @@ -67,7 +67,7 @@ public class OssUrlTranslationImpl implements TranslationInterface { /** * 根据原始键构建 OSS 地址翻译值。 * - * @param source 原始键 + * @param source 原始键 * @param ossUrls OSS ID 与访问地址映射 * @return OSS 访问地址 */ diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java index 4b7d5a05f..911c36814 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java @@ -27,7 +27,7 @@ public class UserNameTranslationImpl implements TranslationInterface { /** * 将用户 ID 翻译为用户名。 * - * @param key 用户 ID + * @param key 用户 ID * @param other 额外参数 * @return 用户名 */ @@ -39,7 +39,7 @@ public class UserNameTranslationImpl implements TranslationInterface { /** * 批量将用户 ID 翻译为用户名。 * - * @param keys 用户 ID 集合 + * @param keys 用户 ID 集合 * @param other 额外参数 * @return 用户 ID 与用户名映射 */ @@ -60,7 +60,7 @@ public class UserNameTranslationImpl implements TranslationInterface { /** * 根据原始键构建用户名翻译值。 * - * @param source 原始键 + * @param source 原始键 * @param userNames 用户 ID 与用户名映射 * @return 用户名 */ diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java index 6499abfcd..6246d5aba 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java @@ -1,9 +1,9 @@ package org.dromara.common.web.core; -import org.springframework.web.servlet.LocaleResolver; - import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.servlet.LocaleResolver; + import java.util.Locale; /** @@ -32,9 +32,9 @@ public class I18nLocaleResolver implements LocaleResolver { /** * 当前项目不在服务端主动切换区域信息，因此保留空实现。 * - * @param httpServletRequest 当前请求 + * @param httpServletRequest 当前请求 * @param httpServletResponse 当前响应 - * @param locale 目标区域 + * @param locale 目标区域 */ @Override public void setLocale(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Locale locale) { diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/WaveAndCircleCaptcha.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/WaveAndCircleCaptcha.java index b0207b885..308134dcd 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/WaveAndCircleCaptcha.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/WaveAndCircleCaptcha.java @@ -26,7 +26,7 @@ public class WaveAndCircleCaptcha extends AbstractCaptcha { /** * 构造默认长度为 4 的验证码。 * - * @param width 图片宽度 + * @param width 图片宽度 * @param height 图片高度 */ public WaveAndCircleCaptcha(int width, int height) { @@ -36,8 +36,8 @@ public class WaveAndCircleCaptcha extends AbstractCaptcha { /** * 构造指定验证码长度的验证码对象。 * - * @param width 图片宽度 - * @param height 图片高度 + * @param width 图片宽度 + * @param height 图片高度 * @param codeCount 验证码字符数 */ public WaveAndCircleCaptcha(int width, int height, int codeCount) { @@ -47,9 +47,9 @@ public class WaveAndCircleCaptcha extends AbstractCaptcha { /** * 构造指定字符数与干扰数的验证码对象。 * - * @param width 图片宽度 - * @param height 图片高度 - * @param codeCount 验证码字符数 + * @param width 图片宽度 + * @param height 图片高度 + * @param codeCount 验证码字符数 * @param interfereCount 干扰元素数量 */ public WaveAndCircleCaptcha(int width, int height, int codeCount, int interfereCount) { @@ -59,9 +59,9 @@ public class WaveAndCircleCaptcha extends AbstractCaptcha { /** * 使用指定验证码生成器构造验证码对象。 * - * @param width 图片宽度 - * @param height 图片高度 - * @param generator 验证码生成器 + * @param width 图片宽度 + * @param height 图片高度 + * @param generator 验证码生成器 * @param interfereCount 干扰元素数量 */ public WaveAndCircleCaptcha(int width, int height, CodeGenerator generator, int interfereCount) { @@ -71,11 +71,11 @@ public class WaveAndCircleCaptcha extends AbstractCaptcha { /** * 构造带字体缩放比例的验证码对象。 * - * @param width 图片宽度 - * @param height 图片高度 - * @param codeCount 验证码字符数 + * @param width 图片宽度 + * @param height 图片高度 + * @param codeCount 验证码字符数 * @param interfereCount 干扰元素数量 - * @param size 字体相对尺寸 + * @param size 字体相对尺寸 */ public WaveAndCircleCaptcha(int width, int height, int codeCount, int interfereCount, float size) { super(width, height, new RandomGenerator(codeCount), interfereCount, size); @@ -111,7 +111,7 @@ public class WaveAndCircleCaptcha extends AbstractCaptcha { /** * 绘制验证码文本并开启文字抗锯齿。 * - * @param g 图形上下文 + * @param g 图形上下文 * @param code 验证码文本 */ private void drawString(Graphics2D g, String code) { @@ -155,7 +155,7 @@ public class WaveAndCircleCaptcha extends AbstractCaptcha { /** * 绘制平滑波浪线干扰轨迹。 * - * @param g 图形上下文 + * @param g 图形上下文 * @param random 随机数生成器 */ private void drawSmoothWave(Graphics2D g, ThreadLocalRandom random) { @@ -185,8 +185,8 @@ public class WaveAndCircleCaptcha extends AbstractCaptcha { /** * 生成指定 RGB 范围内的随机颜色。 * - * @param min 最小颜色值 - * @param max 最大颜色值 + * @param min 最小颜色值 + * @param max 最大颜色值 * @param random 随机数生成器 * @return 随机颜色 */ diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java index c51a6704d..82086c0a3 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java @@ -1,10 +1,10 @@ package org.dromara.common.web.filter; -import org.dromara.common.core.utils.StringUtils; -import org.springframework.http.MediaType; - import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; +import org.dromara.common.core.utils.StringUtils; +import org.springframework.http.MediaType; + import java.io.IOException; /** @@ -28,10 +28,10 @@ public class RepeatableFilter implements Filter { /** * 为 JSON 请求创建可重复读取的包装器，便于日志、验签等场景多次读取请求体。 * - * @param request 原始请求 + * @param request 原始请求 * @param response 当前响应 - * @param chain 过滤器链 - * @throws IOException IO 异常 + * @param chain 过滤器链 + * @throws IOException IO 异常 * @throws ServletException Servlet 异常 */ @Override diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java index 669abe79a..a629c16f7 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java @@ -1,13 +1,12 @@ package org.dromara.common.web.filter; import cn.hutool.core.io.IoUtil; -import org.dromara.common.core.constant.Constants; - import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; +import org.dromara.common.core.constant.Constants; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -29,7 +28,7 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { /** * 读取原始请求体并缓存到内存，统一设置请求与响应编码。 * - * @param request 原始请求 + * @param request 原始请求 * @param response 当前响应 * @throws IOException 读取请求体异常 */ diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java index 6104f043b..32cc02bf2 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java @@ -1,13 +1,13 @@ package org.dromara.common.web.filter; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.web.config.properties.XssProperties; import org.springframework.http.HttpMethod; -import jakarta.servlet.*; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -42,10 +42,10 @@ public class XssFilter implements Filter { /** * 对请求执行 XSS 包装处理，命中排除规则时直接放行。 * - * @param request 原始请求 + * @param request 原始请求 * @param response 当前响应 - * @param chain 过滤器链 - * @throws IOException IO 异常 + * @param chain 过滤器链 + * @throws IOException IO 异常 * @throws ServletException Servlet 异常 */ @Override @@ -64,7 +64,7 @@ public class XssFilter implements Filter { /** * 判断当前请求是否需要跳过 XSS 过滤。 * - * @param request 当前请求 + * @param request 当前请求 * @param response 当前响应 * @return true 表示跳过过滤 */ diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java index a56153a65..40016357e 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java @@ -43,9 +43,9 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor { /** * 请求进入控制器前记录入参并启动耗时统计。 * - * @param request 当前请求 + * @param request 当前请求 * @param response 当前响应 - * @param handler 目标处理器 + * @param handler 目标处理器 * @return 始终返回 true，继续后续处理流程 * @throws Exception 读取请求体或解析 JSON 失败时抛出 */ @@ -84,7 +84,7 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor { /** * 递归移除 JSON 节点中的敏感字段，避免在日志中输出密码等敏感信息。 * - * @param node 当前 JSON 节点 + * @param node 当前 JSON 节点 * @param excludeProperties 需要排除的字段名集合 */ private void removeSensitiveFields(JsonNode node, String[] excludeProperties) { @@ -142,10 +142,10 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor { /** * 请求完成后输出最终耗时，并清理线程内缓存的计时器。 * - * @param request 当前请求 + * @param request 当前请求 * @param response 当前响应 - * @param handler 目标处理器 - * @param ex 请求处理过程中的异常 + * @param handler 目标处理器 + * @param ex 请求处理过程中的异常 * @throws Exception 拦截器链路抛出的异常 */ @Override diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java index e9ba450ef..2cf56dd19 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java @@ -32,7 +32,7 @@ public class CustomNotifier extends AbstractEventNotifier { /** * 处理实例事件并记录状态变化日志。 * - * @param event 实例事件 + * @param event 实例事件 * @param instance 当前实例 * @return Reactor 执行结果 */ diff --git a/ruoyi-extend/ruoyi-snailai-server/src/main/java/com/aizuda/snail/ai/starter/filter/ActuatorAuthFilter.java b/ruoyi-extend/ruoyi-snailai-server/src/main/java/com/aizuda/snail/ai/starter/filter/ActuatorAuthFilter.java index 2dd564c2d..9d5138f2f 100644 --- a/ruoyi-extend/ruoyi-snailai-server/src/main/java/com/aizuda/snail/ai/starter/filter/ActuatorAuthFilter.java +++ b/ruoyi-extend/ruoyi-snailai-server/src/main/java/com/aizuda/snail/ai/starter/filter/ActuatorAuthFilter.java @@ -1,11 +1,6 @@ package com.aizuda.snail.ai.starter.filter; -import jakarta.servlet.Filter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.FilterConfig; -import jakarta.servlet.ServletException; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletResponse; +import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -43,10 +38,10 @@ public class ActuatorAuthFilter implements Filter { /** * 校验 Actuator Basic Auth 请求。 * - * @param servletRequest 原始请求 + * @param servletRequest 原始请求 * @param servletResponse 原始响应 - * @param filterChain 过滤器链 - * @throws IOException IO 异常 + * @param filterChain 过滤器链 + * @throws IOException IO 异常 * @throws ServletException Servlet 异常 */ @Override diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java b/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java index 7847b42f3..6e5ddccfd 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java +++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java @@ -38,10 +38,10 @@ public class ActuatorAuthFilter implements Filter { /** * 校验 Actuator Basic Auth 请求。 * - * @param servletRequest 原始请求 + * @param servletRequest 原始请求 * @param servletResponse 原始响应 - * @param filterChain 过滤器链 - * @throws IOException IO 异常 + * @param filterChain 过滤器链 + * @throws IOException IO 异常 * @throws ServletException Servlet 异常 */ @Override diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java index 9bf51afa2..7b879b90e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java @@ -39,9 +39,9 @@ public class MailSendController { /** * 发送邮件（带附件） * - * @param to 接收人 - * @param subject 标题 - * @param text 内容 + * @param to 接收人 + * @param subject 标题 + * @param text 内容 */ @GetMapping("/sendMessageWithAttachment") public R sendMessageWithAttachment(String to, String subject, String text) { @@ -53,9 +53,9 @@ public class MailSendController { /** * 发送邮件（多附件） * - * @param to 接收人 - * @param subject 标题 - * @param text 内容 + * @param to 接收人 + * @param subject 标题 + * @param text 内容 */ @GetMapping("/sendMessageWithAttachments") public R sendMessageWithAttachments(String to, String subject, String text) { diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MqttController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MqttController.java index 56dc4d0a3..6fe2804c6 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MqttController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MqttController.java @@ -50,7 +50,7 @@ public class MqttController { /** * 订阅 QoS0 测试主题并打印原始消息。 * - * @param topic 消息主题 + * @param topic 消息主题 * @param payload 消息内容 */ @MqttClientSubscribe("/test/#") @@ -61,7 +61,7 @@ public class MqttController { /** * 订阅 QoS1 测试主题并打印原始消息。 * - * @param topic 消息主题 + * @param topic 消息主题 * @param payload 消息内容 */ @MqttClientSubscribe(value = "/qos1/#", qos = MqttQoS.QOS1) @@ -72,7 +72,7 @@ public class MqttController { /** * 订阅带产品和设备占位符的注册主题。 * - * @param topic 消息主题 + * @param topic 消息主题 * @param payload 消息内容 */ @MqttClientSubscribe("/sys/${productKey}/${deviceName}/thing/sub/register") @@ -85,9 +85,9 @@ public class MqttController { /** * 订阅 JSON 测试主题并演示自定义反序列化。 * - * @param topic 消息主题 + * @param topic 消息主题 * @param message MQTT 原始消息 - * @param data 反序列化后的演示数据 + * @param data 反序列化后的演示数据 */ @MqttClientSubscribe( value = "/test/json", diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java index bdbf0334a..88227b6fd 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java @@ -1,8 +1,8 @@ package org.dromara.demo.controller; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.redis.utils.RedisUtils; -import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java index b993f60b5..245f00f3c 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java @@ -61,7 +61,7 @@ public class SmsController { * @param phone 手机号 */ @GetMapping("/addBlacklist") - public R addBlacklist(String phone){ + public R addBlacklist(String phone) { SmsBlend smsBlend = SmsFactory.getSmsBlend("config1"); smsBlend.joinInBlacklist(phone); return R.ok(); @@ -73,7 +73,7 @@ public class SmsController { * @param phone 手机号 */ @GetMapping("/removeBlacklist") - public R removeBlacklist(String phone){ + public R removeBlacklist(String phone) { SmsBlend smsBlend = SmsFactory.getSmsBlend("config1"); smsBlend.removeFromBlacklist(phone); return R.ok(); diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java index cb1ba9680..2671477ba 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java @@ -1,36 +1,36 @@ package org.dromara.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.redis.annotation.RepeatSubmit; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.excel.utils.ExcelBuilder; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.redis.annotation.RepeatSubmit; +import org.dromara.common.web.core.BaseController; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoImportVo; import org.dromara.demo.domain.vo.TestDemoVo; import org.dromara.demo.service.ITestDemoService; -import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; - -import java.util.*; +import java.util.Arrays; +import java.util.List; import java.util.concurrent.TimeUnit; /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java index dda91d9e9..734fab2fd 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java @@ -1,17 +1,16 @@ package org.dromara.demo.controller; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.MessageUtils; -import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; - /** * 测试国际化 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java index b5f388780..fe4ed6c3c 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java @@ -1,11 +1,11 @@ package org.dromara.demo.controller; -import org.dromara.common.core.domain.R; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.sensitive.annotation.Sensitive; -import org.dromara.common.sensitive.core.SensitiveStrategy; import lombok.Data; +import org.dromara.common.core.domain.R; +import org.dromara.common.sensitive.annotation.Sensitive; import org.dromara.common.sensitive.core.SensitiveService; +import org.dromara.common.sensitive.core.SensitiveStrategy; +import org.dromara.common.web.core.BaseController; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java index 4e61d482c..c382c7512 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java @@ -1,25 +1,25 @@ package org.dromara.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; import org.dromara.common.excel.utils.ExcelBuilder; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.redis.annotation.RepeatSubmit; +import org.dromara.common.web.core.BaseController; import org.dromara.demo.domain.bo.TestTreeBo; import org.dromara.demo.domain.vo.TestTreeVo; import org.dromara.demo.service.ITestTreeService; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java index 9c03e97ec..560a7b5c7 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java @@ -29,7 +29,7 @@ public class WebSocketController { /** * 发布消息 * - * @param userId 目标用户 + * @param userId 目标用户 * @param message 发送内容 */ @GetMapping("/send") diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java index 02c739650..c5d9f797e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java @@ -1,10 +1,10 @@ package org.dromara.demo.controller.queue; import cn.hutool.core.util.RandomUtil; -import org.dromara.common.core.domain.R; -import org.dromara.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.R; +import org.dromara.common.redis.utils.QueueUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java index 771f3fadb..70cd3e60e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java @@ -1,10 +1,10 @@ package org.dromara.demo.domain; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.encrypt.annotation.EncryptField; -import org.dromara.common.encrypt.enums.AlgorithmType; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.encrypt.annotation.EncryptField; +import org.dromara.common.encrypt.enums.AlgorithmType; /** * 测试加密字段实体。 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java index fbefc5e6f..adf27fe33 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java @@ -1,12 +1,12 @@ package org.dromara.demo.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; +import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.core.enums.UserStatus; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java index 247d01677..c444196ea 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java @@ -1,11 +1,10 @@ package org.dromara.demo.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.demo.domain.TestDemo; /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java index 265881ff2..3afa2529d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java @@ -1,5 +1,7 @@ package org.dromara.demo.domain.vo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.apache.fesod.sheet.annotation.format.DateTimeFormat; @@ -8,8 +10,6 @@ import org.dromara.common.excel.annotation.ExcelRequired; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.demo.domain.TestDemo; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java index f39dd3c53..bd650716b 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java @@ -1,10 +1,10 @@ package org.dromara.demo.domain.vo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.demo.domain.TestTree; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java index 7e9772cad..0335b39ba 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java @@ -29,7 +29,7 @@ public class ExportDemoListener extends DefaultExcelListener { /** * 解析并校验一行下拉框演示数据。 * - * @param data 行数据 + * @param data 行数据 * @param context 解析上下文 */ @Override diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java index 4342f5f87..145e0c368 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java @@ -26,7 +26,7 @@ public interface TestDemoMapper extends BaseMapperPlus { /** * 自定义分页查询演示数据。 * - * @param page 分页对象 + * @param page 分页对象 * @param wrapper 查询条件 * @return 分页结果 */ @@ -39,7 +39,7 @@ public interface TestDemoMapper extends BaseMapperPlus { /** * 分页查询演示 VO 列表并应用数据权限。 * - * @param page 分页对象 + * @param page 分页对象 * @param wrapper 查询条件 * @return 分页结果 */ diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java index 9575d12c2..14723ebc2 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java @@ -1,7 +1,7 @@ package org.dromara.demo.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoVo; @@ -28,7 +28,7 @@ public interface ITestDemoService { /** * 分页查询测试单表列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 分页结果 */ @@ -37,7 +37,7 @@ public interface ITestDemoService { /** * 按自定义 SQL 分页查询测试单表列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 分页结果 */ diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java index 6a28f4bc2..48e6cf638 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java @@ -1,10 +1,10 @@ package org.dromara.demo.service.impl; import cn.hutool.core.util.RandomUtil; -import org.apache.fesod.sheet.write.metadata.WriteSheet; import jakarta.servlet.http.HttpServletResponse; import lombok.Data; import lombok.RequiredArgsConstructor; +import org.apache.fesod.sheet.write.metadata.WriteSheet; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; @@ -115,7 +115,7 @@ public class ExportExcelServiceImpl implements IExportExcelService { * 构建下拉框显示值。 * * @param cityDataList 城市演示数据列表 - * @param id 选项 id + * @param id 选项 id * @return 下拉框显示值 */ private String buildOptions(List cityDataList, Integer id) { diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java index 872246dbf..f3885646d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java @@ -45,7 +45,7 @@ public class TestDemoServiceImpl implements ITestDemoService { /** * 分页查询测试单表列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 分页结果 */ @@ -59,7 +59,7 @@ public class TestDemoServiceImpl implements ITestDemoService { /** * 通过自定义 SQL 分页查询测试单表列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 分页结果 */ @@ -139,7 +139,7 @@ public class TestDemoServiceImpl implements ITestDemoService { /** * 按主键集合删除测试单表数据，并按需执行删除前校验。 * - * @param ids 主键集合 + * @param ids 主键集合 * @param isValid 是否执行删除校验 * @return 是否删除成功 */ diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java index acf87a699..f353a5d89 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java @@ -39,13 +39,13 @@ public class TestTreeServiceImpl implements ITestTreeService { return treeMapper.selectVoById(id); } - // @DS("slave") // 切换从库查询 /** * 查询符合条件的测试树表列表。 * * @param bo 查询条件 * @return 结果列表 */ + // @DS("slave") // 切换从库查询 @Override public List queryList(TestTreeBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); @@ -109,7 +109,7 @@ public class TestTreeServiceImpl implements ITestTreeService { /** * 按主键集合删除测试树表数据，并按需执行删除前校验。 * - * @param ids 主键集合 + * @param ids 主键集合 * @param isValid 是否执行删除校验 * @return 是否删除成功 */ diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java index 6ddcc8985..e76cdd9eb 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java @@ -82,9 +82,9 @@ public class MyBatisDataSourceMonitor implements DataSourceMonitor { */ @Override public String key(DataRuntime runtime, Object datasource) { - if(datasource instanceof JdbcTemplate jdbc){ + if (datasource instanceof JdbcTemplate jdbc) { DataSource ds = jdbc.getDataSource(); - if(ds instanceof DynamicRoutingDataSource){ + if (ds instanceof DynamicRoutingDataSource) { return DynamicDataSourceContextHolder.peek(); } } 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 5ddb47ec5..5122cb212 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 @@ -6,13 +6,13 @@ import cn.hutool.core.io.IoUtil; import com.baomidou.lock.annotation.Lock4j; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; -import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.helper.DataBaseHelper; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.gen.domain.GenTable; import org.dromara.gen.domain.GenTableColumn; @@ -41,7 +41,7 @@ public class GenController extends BaseController { /** * 分页查询代码生成业务列表。 * - * @param genTable 查询条件 + * @param genTable 查询条件 * @param pageQuery 分页参数 * @return 代码生成列表 */ @@ -72,7 +72,7 @@ public class GenController extends BaseController { /** * 分页查询数据库表列表。 * - * @param genTable 查询条件 + * @param genTable 查询条件 * @param pageQuery 分页参数 * @return 数据库表列表 */ @@ -162,7 +162,7 @@ public class GenController extends BaseController { * 生成代码（下载方式） * * @param response HTTP 响应 - * @param tableId 表ID + * @param tableId 表ID */ @SaCheckPermission("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @@ -190,7 +190,7 @@ public class GenController extends BaseController { /** * 批量生成代码 * - * @param response HTTP 响应 + * @param response HTTP 响应 * @param tableIdStr 表ID串 */ @SaCheckPermission("tool:gen:code") @@ -206,7 +206,7 @@ public class GenController extends BaseController { * 将生成结果写出为 zip 文件流。 * * @param response HTTP 响应 - * @param data zip 二进制数据 + * @param data zip 二进制数据 */ private void genCode(HttpServletResponse response, byte[] data) throws IOException { response.reset(); diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java index 51555b038..1f4da6243 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java @@ -3,13 +3,13 @@ package org.dromara.gen.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.gen.constant.GenConstants; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.gen.constant.GenConstants; import java.util.HashMap; import java.util.List; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java index d74050ed3..5e5278e92 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java @@ -20,7 +20,6 @@ public interface GenTableMapper extends BaseMapperPlus { * * @param dataName 数据源名称，用于选择不同的数据源 * @return 当前数据库中的表名列表 - * * @DS("") 使用默认数据源执行查询操作 */ @DS("") diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java index 2a98d6b36..411006491 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java @@ -1,7 +1,7 @@ package org.dromara.gen.service; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.gen.domain.GenTable; import org.dromara.gen.domain.GenTableColumn; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java index 14b37de7b..6e6047d18 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java @@ -29,7 +29,7 @@ public class TestMapJobAnnotation { /** * 根 Map 任务，将示例数据拆分为多个分片任务。 * - * @param mapArgs Map 任务参数 + * @param mapArgs Map 任务参数 * @param mapHandler 分片调度处理器 * @return 分片调度结果 */ diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java index 31f6c4219..f31310ad9 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java @@ -31,7 +31,7 @@ public class TestMapReduceAnnotation1 { /** * 根 Map 任务，将示例数据拆分为多个分片任务。 * - * @param mapArgs Map 任务参数 + * @param mapArgs Map 任务参数 * @param mapHandler 分片调度处理器 * @return 分片调度结果 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java index 976d6ceef..40ce04075 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java @@ -37,18 +37,18 @@ public class CacheController { try { Properties commandStats = connection.commands().info("commandstats"); List> pieList = new ArrayList<>(); - if (commandStats != null) { - commandStats.stringPropertyNames().forEach(key -> { - Map data = new HashMap<>(2); - String property = commandStats.getProperty(key); - data.put("name", StringUtils.removeStart(key, "cmdstat_")); - data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); - pieList.add(data); - }); - } - return R.ok(new CacheListInfoVo( - connection.commands().info(), - connection.commands().dbSize(), pieList)); + if (commandStats != null) { + commandStats.stringPropertyNames().forEach(key -> { + Map data = new HashMap<>(2); + String property = commandStats.getProperty(key); + data.put("name", StringUtils.removeStart(key, "cmdstat_")); + data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); + pieList.add(data); + }); + } + return R.ok(new CacheListInfoVo( + connection.commands().info(), + connection.commands().dbSize(), pieList)); } finally { // 归还连接给连接池 RedisConnectionUtils.releaseConnection(connection, connectionFactory); @@ -62,6 +62,7 @@ public class CacheController { * @param dbSize 数据库 * @param commandStats 命令统计 */ - public record CacheListInfoVo(Properties info, Long dbSize, List> commandStats) {} + public record CacheListInfoVo(Properties info, Long dbSize, List> commandStats) { + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java index 336b0bec5..6690b4ba2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java @@ -52,7 +52,7 @@ public class SysLoginInfoController extends BaseController { * 导出系统访问记录列表。 * * @param loginInfo 查询条件 - * @param response HTTP 响应 + * @param response HTTP 响应 */ @Log(title = "登录日志", businessType = BusinessType.EXPORT) @SaCheckPermission("monitor:logininfo:export") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java index 8b5974bfd..edf4bb222 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java @@ -35,7 +35,7 @@ public class SysOperlogController extends BaseController { /** * 分页查询操作日志记录。 * - * @param operLog 查询条件 + * @param operLog 查询条件 * @param pageQuery 分页参数 * @return 操作日志分页结果 */ @@ -48,7 +48,7 @@ public class SysOperlogController extends BaseController { /** * 导出操作日志记录列表。 * - * @param operLog 查询条件 + * @param operLog 查询条件 * @param response HTTP 响应 */ @Log(title = "操作日志", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java index 4be7e7abd..a30339d94 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -40,7 +40,7 @@ public class SysClientController extends BaseController { /** * 分页查询客户端管理列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 客户端分页数据 */ @@ -53,7 +53,7 @@ public class SysClientController extends BaseController { /** * 导出客户端管理列表，便于离线审计与配置核查。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param response 响应流 */ @SaCheckPermission("system:client:export") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index 131c1e2e9..bd7ee7170 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -40,7 +40,7 @@ public class SysDictDataController extends BaseController { /** * 分页查询字典数据列表。 * - * @param dictData 查询条件 + * @param dictData 查询条件 * @param pageQuery 分页参数 * @return 字典数据分页结果 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java index b18d0ad4d..21c0581b8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java @@ -37,7 +37,7 @@ public class SysDictTypeController extends BaseController { /** * 分页查询字典类型列表。 * - * @param dictType 查询条件 + * @param dictType 查询条件 * @param pageQuery 分页参数 * @return 字典类型分页结果 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java index 23a7fd323..fc36cfcb1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -41,7 +41,7 @@ public class SysNoticeController extends BaseController { /** * 分页查询通知公告列表。 * - * @param notice 查询条件 + * @param notice 查询条件 * @param pageQuery 分页参数 * @return 公告分页结果 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java index 752155d9f..d633a3ce8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java @@ -40,7 +40,7 @@ public class SysOssConfigController extends BaseController { /** * 分页查询对象存储配置列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 配置分页数据 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java index 36f520ab0..b36559373 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -40,7 +40,7 @@ public class SysOssController extends BaseController { /** * 分页查询 OSS 对象存储列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return OSS 分页结果 */ @@ -108,9 +108,9 @@ public class SysOssController extends BaseController { /** * OSS 上传响应对象。 * - * @param url 文件访问地址 + * @param url 文件访问地址 * @param fileName 原始文件名 - * @param ossId OSS 对象 ID + * @param ossId OSS 对象 ID */ public record SysOssUploadVo(String url, String fileName, String ossId) { } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java index 2df12437b..04203978b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -43,7 +43,7 @@ public class SysPostController extends BaseController { /** * 分页查询岗位列表。 * - * @param post 查询条件 + * @param post 查询条件 * @param pageQuery 分页参数 * @return 岗位分页结果 */ @@ -56,7 +56,7 @@ public class SysPostController extends BaseController { /** * 导出岗位列表。 * - * @param post 查询条件 + * @param post 查询条件 * @param response HTTP 响应 */ @Log(title = "岗位管理", businessType = BusinessType.EXPORT) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java index 2e04cb403..62b0ece0d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java @@ -162,8 +162,8 @@ public class SysProfileController extends BaseController { * @param newPassword 新密码 */ public record SysUserPasswordBo( - @NotBlank(message = "旧密码不能为空") String oldPassword, - @NotBlank(message = "新密码不能为空") String newPassword) { + @NotBlank(message = "旧密码不能为空") String oldPassword, + @NotBlank(message = "新密码不能为空") String newPassword) { } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java index 12a921106..25b03cf6c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java @@ -148,7 +148,7 @@ public class SysMenu extends BaseEntity { } // 非外链并且是一级目录（类型为目录） if (Constants.TOP_PARENT_ID.equals(getParentId()) && SystemConstants.TYPE_DIR.equals(getMenuType()) - && SystemConstants.NO.equals(getIsFrame())) { + && SystemConstants.NO.equals(getIsFrame())) { routerPath = "/" + this.path; } // 非外链并且是一级目录（类型为菜单） diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java index 74c13ce3e..07255b4bd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java @@ -28,7 +28,7 @@ public class SysClientBo implements Serializable { /** * id */ - @NotNull(message = "id不能为空", groups = { EditGroup.class }) + @NotNull(message = "id不能为空", groups = {EditGroup.class}) private Long id; /** @@ -39,19 +39,19 @@ public class SysClientBo implements Serializable { /** * 客户端key */ - @NotBlank(message = "客户端key不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "客户端key不能为空", groups = {AddGroup.class, EditGroup.class}) private String clientKey; /** * 客户端秘钥 */ - @NotBlank(message = "客户端秘钥不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "客户端秘钥不能为空", groups = {AddGroup.class, EditGroup.class}) private String clientSecret; /** * 授权类型 */ - @NotNull(message = "授权类型不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "授权类型不能为空", groups = {AddGroup.class, EditGroup.class}) private List grantTypeList; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java index e596da022..66a992465 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java @@ -28,25 +28,25 @@ public class SysSocialBo implements Serializable { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) private Long id; /** * 认证唯一ID */ - @NotBlank(message = "认证唯一ID不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "认证唯一ID不能为空", groups = {AddGroup.class, EditGroup.class}) private String authId; /** * 用户来源 */ - @NotBlank(message = "用户来源不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "用户来源不能为空", groups = {AddGroup.class, EditGroup.class}) private String source; /** * 用户的授权令牌 */ - @NotBlank(message = "用户的授权令牌不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "用户的授权令牌不能为空", groups = {AddGroup.class, EditGroup.class}) private String accessToken; /** @@ -67,7 +67,7 @@ public class SysSocialBo implements Serializable { /** * 用户的 ID */ - @NotBlank(message = "用户的ID不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "用户的ID不能为空", groups = {AddGroup.class, EditGroup.class}) private Long userId; /** 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 589d5323a..ba293e632 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 @@ -10,8 +10,8 @@ import org.dromara.system.domain.SysDept; import java.io.Serial; import java.io.Serializable; -import java.util.ArrayList; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java index d779ecd3f..ed094625b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLoginInfoVo.java @@ -13,7 +13,6 @@ import java.io.Serializable; import java.time.LocalDateTime; - /** * 系统访问记录视图对象 sys_login_info * 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 142f8bb8f..0c48eae5b 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 @@ -6,8 +6,8 @@ import org.dromara.system.domain.SysMenu; import java.io.Serial; import java.io.Serializable; -import java.util.ArrayList; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; 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 2b0fba348..15decbccd 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 @@ -11,7 +11,6 @@ import java.io.Serializable; import java.time.LocalDateTime; - /** * 通知公告视图对象 sys_notice * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/event/OssConfigChangeEvent.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/event/OssConfigChangeEvent.java index 081ffb861..64265e6b6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/event/OssConfigChangeEvent.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/event/OssConfigChangeEvent.java @@ -3,9 +3,9 @@ package org.dromara.system.event; /** * OSS 配置变更事件。 * - * @param configKey 当前配置 key - * @param oldConfigKey 变更前配置 key - * @param configJson 当前配置 JSON，为空表示清理缓存 + * @param configKey 当前配置 key + * @param oldConfigKey 变更前配置 key + * @param configJson 当前配置 JSON，为空表示清理缓存 * @param defaultConfig 是否设置为默认配置 */ public record OssConfigChangeEvent( @@ -18,9 +18,9 @@ public record OssConfigChangeEvent( /** * 创建保存 OSS 配置后的变更事件。 * - * @param configKey 当前配置 key + * @param configKey 当前配置 key * @param oldConfigKey 变更前配置 key - * @param configJson 当前配置 JSON + * @param configJson 当前配置 JSON * @return OSS 配置变更事件 */ public static OssConfigChangeEvent save(String configKey, String oldConfigKey, String configJson) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java index 9c6c6834f..89196f5e9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java @@ -59,8 +59,8 @@ public interface SysUserMapper extends BaseMapperPlus, MPJBa /** * 根据条件分页查询用户列表 * - * @param user 查询条件 - * @param deptIds 部门ID集合 + * @param user 查询条件 + * @param deptIds 部门ID集合 * @return 用户信息集合信息 */ @DataPermission({ @@ -87,8 +87,8 @@ public interface SysUserMapper extends BaseMapperPlus, MPJBa /** * 根据条件分页查询已配用户角色列表 * - * @param page 分页信息 - * @param user 查询条件 + * @param page 分页信息 + * @param user 查询条件 * @return 用户信息集合信息 */ @DataPermission({ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java index 532ffc623..ff0136a29 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java @@ -18,7 +18,7 @@ public interface ISysLoginInfoService { * 分页查询登录日志列表 * * @param loginInfo 查询条件 - * @param pageQuery 分页参数 + * @param pageQuery 分页参数 * @return 登录日志分页列表 */ PageResult selectPageLoginInfoList(SysLoginInfoBo loginInfo, PageQuery pageQuery); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java index 52870e874..d39e0086d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java @@ -62,7 +62,7 @@ public interface ISysOssService { /** * 文件下载方法，支持一次性下载完整文件 * - * @param ossId OSS对象ID + * @param ossId OSS对象ID */ ResponseEntity download(Long ossId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java index cebb0c4b9..ea63a14b4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java @@ -16,7 +16,7 @@ public interface ISysPermissionService { /** * 获取角色数据权限 * - * @param userId 用户id + * @param userId 用户id * @return 角色权限信息 */ Set getRolePermission(Long userId); @@ -24,7 +24,7 @@ public interface ISysPermissionService { /** * 获取菜单数据权限 * - * @param userId 用户id + * @param userId 用户id * @return 菜单权限信息 */ Set getMenuPermission(Long userId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index c90ca335c..106e903a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -38,7 +38,7 @@ public interface ISysUserService { * 根据条件分页查询已分配用户角色列表 * * @param user 用户信息 - * @param pageQuery 分页 + * @param pageQuery 分页 * @return 已分配角色的用户分页信息 */ PageResult selectAllocatedList(SysUserBo user, PageQuery pageQuery); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java index 5c94e350d..c68ef5913 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java @@ -213,8 +213,8 @@ public class SysClientServiceImpl implements ISysClientService { /** * 统一处理白名单与路径规则的入库格式。 * - * @param rawValue 原始字符串 - * @param listValue 列表值 + * @param rawValue 原始字符串 + * @param listValue 列表值 * @param normalizer 单条规则归一化器 * @return 逗号拼接后的规则串 */ @@ -234,7 +234,7 @@ public class SysClientServiceImpl implements ISysClientService { /** * 将规则串转换为列表。 * - * @param value 规则串 + * @param value 规则串 * @param normalizer 单条规则归一化器 * @return 规则列表 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java index c8ae64de9..4e460dd9d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java @@ -14,8 +14,8 @@ 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.event.LoginInfoEvent; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.mapper.LambdaCrudChainWrapper; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysLoginInfo; import org.dromara.system.domain.bo.SysLoginInfoBo; @@ -66,14 +66,13 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { } String address = AddressUtils.getRealAddressByIP(ip); - StringBuilder s = new StringBuilder(); - s.append(getBlock(ip)); - s.append(address); - s.append(getBlock(loginInfoEvent.getUsername())); - s.append(getBlock(loginInfoEvent.getStatus())); - s.append(getBlock(loginInfoEvent.getMessage())); + String s = getBlock(ip) + + address + + getBlock(loginInfoEvent.getUsername()) + + getBlock(loginInfoEvent.getStatus()) + + getBlock(loginInfoEvent.getMessage()); // 打印信息到日志 - log.info(s.toString(), loginInfoEvent.getArgs()); + log.info(s, loginInfoEvent.getArgs()); // 获取客户端操作系统 String os = userAgent.getOs().getName(); // 获取客户端浏览器 @@ -110,14 +109,14 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { if (msg == null) { msg = ""; } - return "[" + msg.toString() + "]"; + return "[" + msg + "]"; } /** * 分页查询登录日志列表 * * @param loginInfo 查询条件 - * @param pageQuery 分页参数 + * @param pageQuery 分页参数 * @return 登录日志分页列表 */ @Override diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java index 6813e271e..f4e3567bd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java @@ -211,8 +211,8 @@ public class SysMessageServiceImpl implements ISysMessageService, MessageService // 全局消息 或 当前用户在接收人范围内 .and(wrapper -> wrapper.eq(SysMessage::getSendUserIds, GLOBAL_USER_IDS) - .or() - .findInSet(userId, SysMessage::getSendUserIds) + .or() + .findInSet(userId, SysMessage::getSendUserIds) ) .orderByDesc(SysMessage::getCreateTime, SysMessage::getMessageId) // 分页查询（只查第一页，最多100条） diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index a57d70806..82bb387d9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -11,11 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.ThreadUtils; +import org.dromara.common.core.utils.*; import org.dromara.common.core.utils.file.FileUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index b1ec91e5d..caa15c4a5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -365,7 +365,6 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { } - /** * 新增角色菜单信息 * diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java index e844398e2..225bc9cb9 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java @@ -23,7 +23,7 @@ import java.lang.annotation.Target; * @author Lion Li */ @Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.TYPE, ElementType.METHOD }) +@Target({ElementType.TYPE, ElementType.METHOD}) @ConditionalOnProperty(value = "warm-flow.enabled", havingValue = "true") public @interface ConditionalOnEnable { } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java index e435c3060..8e68fdbcf 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java @@ -102,7 +102,6 @@ public enum TaskAssigneeEnum { .collect(Collectors.toList()); } - /** /** * 获取所有办理人类型的代码列表，通常用于程序内部逻辑判断。 * diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java index 929017c39..19807dd96 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java @@ -77,21 +77,19 @@ public enum TaskStatusEnum { */ TIMEOUT("timeout", "超时"); - /** - * 状态 - */ - private final String status; - - /** - * 状态描述。 - */ - private final String desc; - /** * 状态编码与描述缓存。 */ private static final Map STATUS_DESC_MAP = Arrays.stream(values()) .collect(Collectors.toConcurrentMap(TaskStatusEnum::getStatus, TaskStatusEnum::getDesc)); + /** + * 状态 + */ + private final String status; + /** + * 状态描述。 + */ + private final String desc; /** * 根据状态编码获取任务业务状态描述。 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java index 4c04e0c3e..c37be9372 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java @@ -53,7 +53,7 @@ public class FlwCategoryController extends BaseController { /** * 导出流程分类列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param response 响应流 */ @SaCheckPermission("workflow:category:export") diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java index 67c573068..05f14e93e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java @@ -40,7 +40,7 @@ public class FlwSpelController extends BaseController { /** * 分页查询流程 SpEL 表达式定义列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 表达式分页数据 */ @@ -63,7 +63,7 @@ public class FlwSpelController extends BaseController { } /** - /** + * /** * 新增流程 SpEL 表达式定义。 * * @param bo 表达式信息 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index 622a34369..fb89f3f70 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -89,7 +89,7 @@ public class FlwTaskController extends BaseController { } /** - /** + * /** * 查询全部待办任务。 * * @param flowTaskBo 参数 @@ -126,7 +126,7 @@ public class FlwTaskController extends BaseController { } /** - /** + * /** * 根据任务 id 查询任务详情。 * * @param taskId 任务id @@ -138,7 +138,7 @@ public class FlwTaskController extends BaseController { } /** - /** + * /** * 获取流程下一节点信息。 * * @param bo 参数 @@ -150,7 +150,7 @@ public class FlwTaskController extends BaseController { } /** - /** + * /** * 终止流程任务。 * * @param bo 参数 @@ -207,8 +207,8 @@ public class FlwTaskController extends BaseController { /** * 获取当前任务可驳回的前置节点。 * - * @param taskId 任务id - * @param nowNodeCode 当前节点 + * @param taskId 任务id + * @param nowNodeCode 当前节点 * @return 可驳回节点列表 */ @GetMapping("/getBackTaskNode/{taskId}/{nowNodeCode}") @@ -216,7 +216,6 @@ public class FlwTaskController extends BaseController { return R.ok(flwTaskService.getBackTaskNode(taskId, nowNodeCode)); } - /** /** * 获取当前任务的所有办理人。 * diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java index 3b6cb6a23..817096a3d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java @@ -42,7 +42,7 @@ public class TestLeaveController extends BaseController { /** * 分页查询请假列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 请假分页数据 */ @@ -53,10 +53,10 @@ public class TestLeaveController extends BaseController { } /** - /** + * /** * 导出请假列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param response 响应流 */ @SaCheckPermission("workflow:leave:export") diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java index c2482fb92..a86b835bf 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java @@ -27,7 +27,7 @@ public class FlowCategoryBo implements Serializable { /** * 流程分类ID */ - @NotNull(message = "流程分类ID不能为空", groups = { EditGroup.class }) + @NotNull(message = "流程分类ID不能为空", groups = {EditGroup.class}) private Long categoryId; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java index 55481bd86..d51378c42 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java @@ -48,13 +48,13 @@ public class FlowSpelBo implements Serializable { /** * 预览spel值 */ - @NotBlank(message = "预览spel值不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "预览spel值不能为空", groups = {AddGroup.class, EditGroup.class}) private String viewSpel; /** * 状态（0正常 1停用） */ - @NotBlank(message = "状态（0正常 1停用）不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "状态（0正常 1停用）不能为空", groups = {AddGroup.class, EditGroup.class}) private String status; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java index e300b1681..c4aefbf56 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java @@ -1,7 +1,6 @@ package org.dromara.workflow.domain.vo; import lombok.Data; -import org.dromara.common.core.utils.DateUtils; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.warm.flow.core.entity.User; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java index 618daf77d..d61d685cf 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java @@ -26,11 +26,11 @@ public class FlowProcessEventHandler { /** * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成等) * - * @param flowCode 流程定义编码 - * @param instance 实例数据 - * @param status 流程状态 - * @param params 办理参数 - * @param submit 当为true时为申请人节点办理 + * @param flowCode 流程定义编码 + * @param instance 实例数据 + * @param status 流程状态 + * @param params 办理参数 + * @param submit 当为true时为申请人节点办理 */ public void processHandler(String flowCode, Instance instance, String status, Map params, boolean submit) { log.info("【流程事件发布】流程编码: {}, 业务ID: {}, 流程状态: {}, 节点类型: {}, 节点编码: {}, 节点名称: {}, 是否申请人节点: {}, 参数: {}", @@ -51,10 +51,10 @@ public class FlowProcessEventHandler { /** * 执行创建任务监听 * - * @param flowCode 流程定义编码 - * @param instance 实例数据 - * @param nextTask 任务 - * @param params 上一个任务的办理参数 + * @param flowCode 流程定义编码 + * @param instance 实例数据 + * @param nextTask 任务 + * @param params 上一个任务的办理参数 */ public void processTaskHandler(String flowCode, Instance instance, Task nextTask, Map params) { log.info("【流程任务事件发布】流程编码: {}, 业务ID: {}, 节点类型: {}, 节点编码: {}, 节点名称: {}, 任务ID: {}", @@ -75,8 +75,8 @@ public class FlowProcessEventHandler { /** * 删除流程监听 * - * @param flowCode 流程定义编码 - * @param businessId 业务ID + * @param flowCode 流程定义编码 + * @param businessId 业务ID */ public void processDeleteHandler(String flowCode, String businessId) { log.info("【流程删除事件发布】流程编码: {}, 业务ID: {}", flowCode, businessId); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java index 8f26a3aad..d222b9282 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java @@ -207,7 +207,7 @@ public class WorkflowGlobalListener implements GlobalListener { } if (!BusinessStatusEnum.initialState(instance.getFlowStatus())) { if (task != null && CollUtil.isNotEmpty(nextTasks) && nextTasks.size() == 1 - && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.get(0).getNodeCode())) { + && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.get(0).getNodeCode())) { // 如果为画线指定驳回 线条指定为驳回 驳回得节点为申请人节点 则修改流程状态为退回 flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, BusinessStatusEnum.BACK.getStatus(), params, false); notifyInitiatorIfNeeded(definition, instance, BusinessStatusEnum.BACK.getStatus(), variable); @@ -250,10 +250,10 @@ public class WorkflowGlobalListener implements GlobalListener { } } FlowEngine.insService().removeVariables(instance.getId(), - FlowConstant.FLOW_COPY_LIST, - FlowConstant.MESSAGE_TYPE, - FlowConstant.MESSAGE_NOTICE, - FlowConstant.SUBMIT + FlowConstant.FLOW_COPY_LIST, + FlowConstant.MESSAGE_TYPE, + FlowConstant.MESSAGE_NOTICE, + FlowConstant.SUBMIT ); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java index 372c81ca0..5cc2e8c9d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java @@ -27,10 +27,10 @@ public interface FlwHisTaskMapper extends BaseMapperPlus getListFinishTask(Page page, FlowTaskBo bo, List categoryIds, String userId) { diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java index 4d58ad468..25bb30293 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java @@ -25,10 +25,10 @@ public interface FlwTaskMapper extends BaseMapperPlus, MPJ /** * 分页查询运行中的待办任务。 * - * @param page 分页对象 - * @param bo 查询条件 + * @param page 分页对象 + * @param bo 查询条件 * @param categoryIds 流程分类 id 列表 - * @param userId 当前用户 id + * @param userId 当前用户 id * @return 待办任务分页结果 */ default Page getListRunTask(Page page, FlowTaskBo bo, List categoryIds, String userId) { @@ -66,10 +66,10 @@ public interface FlwTaskMapper extends BaseMapperPlus, MPJ /** * 分页查询抄送任务。 * - * @param page 分页对象 - * @param bo 查询条件 + * @param page 分页对象 + * @param bo 查询条件 * @param categoryIds 流程分类 id 列表 - * @param userId 当前用户 id + * @param userId 当前用户 id * @return 抄送任务分页结果 */ default Page getTaskCopyByPage(Page page, FlowTaskBo bo, List categoryIds, String userId) { diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/rule/SpelRuleComponent.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/rule/SpelRuleComponent.java index 8c9a4adf4..ef89fdcfc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/rule/SpelRuleComponent.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/rule/SpelRuleComponent.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; /** * spel表达式规则组件 *

- * 通过该组件统一管理流程定义中的spel表达式 + * 通过该组件统一管理流程定义中的spel表达式 *

* * @author Michelle.Chung diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java index a14634440..c67fcbca2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java @@ -27,7 +27,7 @@ public interface ITestLeaveService { /** * 分页查询请假列表。 * - * @param bo 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 请假分页数据 */ diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java index 365b2da24..dfe4f6b9e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java @@ -32,7 +32,7 @@ public class CategoryNameTranslationImpl implements TranslationInterface /** * 将流程分类 ID 翻译为分类名称。 * - * @param key 流程分类 ID + * @param key 流程分类 ID * @param other 额外参数 * @return 流程分类名称 */ @@ -44,7 +44,7 @@ public class CategoryNameTranslationImpl implements TranslationInterface /** * 批量将流程分类 ID 翻译为分类名称。 * - * @param keys 流程分类 ID 集合 + * @param keys 流程分类 ID 集合 * @param other 额外参数 * @return 流程分类 ID 与分类名称映射 */ @@ -65,7 +65,7 @@ public class CategoryNameTranslationImpl implements TranslationInterface /** * 根据原始键构建流程分类名称翻译值。 * - * @param source 原始键 + * @param source 原始键 * @param categoryNames 流程分类 ID 与分类名称映射 * @return 流程分类名称 */ diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java index 79c6839fa..fcb08f692 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java @@ -49,7 +49,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { * @return 流程spel表达式定义 */ @Override - public FlowSpelVo queryById(Long id){ + public FlowSpelVo queryById(Long id) { return spelMapper.selectVoById(id); } @@ -132,7 +132,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { * * @param entity 待保存的 SpEL 表达式实体 */ - private void validEntityBeforeSave(FlowSpel entity){ + private void validEntityBeforeSave(FlowSpel entity) { if (StringUtils.isNotBlank(entity.getViewSpel())) { boolean exists = spelMapper.lambda() .eq(FlowSpel::getViewSpel, entity.getViewSpel()) @@ -153,7 +153,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return spelMapper.deleteByIds(ids) > 0; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java index 2df56789c..d9ab0ca4e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java @@ -106,14 +106,14 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand Map> nameMap = this.getNamesByTypes(typeIdMap); // 组装返回结果，保持原始顺序 return parsedMap.entrySet().stream() - .map(entry -> { - String storageId = entry.getKey(); - Pair parsed = entry.getValue(); - String handlerName = (parsed == null) ? null - : nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap()) - .get(parsed.getValue()); - return new HandlerFeedBackVo(storageId, handlerName); - }).toList(); + .map(entry -> { + String storageId = entry.getKey(); + Pair parsed = entry.getValue(); + String handlerName = (parsed == null) ? null + : nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap()) + .get(parsed.getValue()); + return new HandlerFeedBackVo(storageId, handlerName); + }).toList(); } /** @@ -171,9 +171,9 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand */ private TreeFunDto buildDeptTree(List depts) { return new TreeFunDto<>(depts) - .setId(dept -> Convert.toStr(dept.getDeptId())) - .setName(DeptDTO::getDeptName) - .setParentId(dept -> Convert.toStr(dept.getParentId())); + .setId(dept -> Convert.toStr(dept.getDeptId())) + .setName(DeptDTO::getDeptName) + .setParentId(dept -> Convert.toStr(dept.getParentId())); } /** @@ -185,11 +185,11 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand */ private HandlerFunDto buildHandlerData(TaskAssigneeDTO dto, TaskAssigneeEnum type) { return new HandlerFunDto<>(dto.getList(), dto.getTotal()) - .setStorageId(assignee -> type.getCode() + assignee.getStorageId()) - .setHandlerCode(assignee -> StringUtils.blankToDefault(assignee.getHandlerCode(), "无")) - .setHandlerName(assignee -> StringUtils.blankToDefault(assignee.getHandlerName(), "无")) - .setGroupName(assignee -> this.getGroupName(type, assignee.getGroupName())) - .setCreateTime(assignee -> DateUtils.formatDateTime(assignee.getCreateTime())); + .setStorageId(assignee -> type.getCode() + assignee.getStorageId()) + .setHandlerCode(assignee -> StringUtils.blankToDefault(assignee.getHandlerCode(), "无")) + .setHandlerName(assignee -> StringUtils.blankToDefault(assignee.getHandlerName(), "无")) + .setGroupName(assignee -> this.getGroupName(type, assignee.getGroupName())) + .setCreateTime(assignee -> DateUtils.formatDateTime(assignee.getCreateTime())); } /** @@ -213,8 +213,8 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand } } return this.getUsersByTypes(typeIdMap).stream() - .distinct() - .toList(); + .distinct() + .toList(); } /** @@ -225,10 +225,10 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand */ private List getUsersByTypes(Map> typeIdMap) { return typeIdMap.entrySet().stream() - .map(entry -> this.getUsersByType(entry.getKey(), entry.getValue())) - .filter(CollUtil::isNotEmpty) - .flatMap(Collection::stream) - .toList(); + .map(entry -> this.getUsersByType(entry.getKey(), entry.getValue())) + .filter(CollUtil::isNotEmpty) + .flatMap(Collection::stream) + .toList(); } /** @@ -291,11 +291,11 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand return Collections.emptyMap(); } return rawMap.entrySet() - .stream() - .collect(Collectors.toMap( - e -> Convert.toStr(e.getKey()), - Map.Entry::getValue - )); + .stream() + .collect(Collectors.toMap( + e -> Convert.toStr(e.getKey()), + Map.Entry::getValue + )); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 39a31ff31..2ea66e2d6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -121,8 +121,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService { // 获取已有流程实例 FlowInstance flowInstance = flowInstanceMapper.selectOne(QueryBuilder.lambda(FlowInstance.class) - .eq(FlowInstance::getBusinessId, businessId) - .build()); + .eq(FlowInstance::getBusinessId, businessId) + .build()); if (ObjectUtil.isNotNull(flowInstance)) { // 已存在流程 @@ -149,10 +149,10 @@ public class FlwTaskServiceImpl implements IFlwTaskService { variables.put(AUTO_PASS, autoPass); variables.put(BUSINESS_CODE, this.generateBusinessCode(bizExt)); FlowParams flowParams = FlowParams.build() - .handler(startProcessBo.getHandler()) - .flowCode(startProcessBo.getFlowCode()) - .variable(startProcessBo.getVariables()) - .flowStatus(BusinessStatusEnum.DRAFT.getStatus()); + .handler(startProcessBo.getHandler()) + .flowCode(startProcessBo.getFlowCode()) + .variable(startProcessBo.getVariables()) + .flowStatus(BusinessStatusEnum.DRAFT.getStatus()); Instance instance = insService.start(businessId, flowParams); // 保存流程实例业务信息 this.buildFlowInstanceBizExt(instance, bizExt); @@ -240,16 +240,16 @@ public class FlwTaskServiceImpl implements IFlwTaskService { } // 构建流程参数，包括变量、跳转类型、消息、处理人、权限等信息 FlowParams flowParams = FlowParams.build() - .handler(completeTaskBo.getHandler()) - .variable(variables) - .ignore(Convert.toBool(variables.getOrDefault(VAR_IGNORE, false))) - .ignoreDepute(Convert.toBool(variables.getOrDefault(VAR_IGNORE_DEPUTE, false))) - .ignoreCooperate(Convert.toBool(variables.getOrDefault(VAR_IGNORE_COOPERATE, false))) - .skipType(SkipType.PASS.getKey()) - .message(completeTaskBo.getMessage()) - .flowStatus(BusinessStatusEnum.WAITING.getStatus()) - .hisStatus(TaskStatusEnum.PASS.getStatus()) - .hisTaskExt(completeTaskBo.getFileId()); + .handler(completeTaskBo.getHandler()) + .variable(variables) + .ignore(Convert.toBool(variables.getOrDefault(VAR_IGNORE, false))) + .ignoreDepute(Convert.toBool(variables.getOrDefault(VAR_IGNORE_DEPUTE, false))) + .ignoreCooperate(Convert.toBool(variables.getOrDefault(VAR_IGNORE_COOPERATE, false))) + .skipType(SkipType.PASS.getKey()) + .message(completeTaskBo.getMessage()) + .flowStatus(BusinessStatusEnum.WAITING.getStatus()) + .hisStatus(TaskStatusEnum.PASS.getStatus()) + .hisTaskExt(completeTaskBo.getFileId()); Boolean autoPass = Convert.toBool(insVariableMap.getOrDefault(AUTO_PASS, false)); skipTask(taskId, flowParams, flowTask.getInstanceId(), autoPass); return true; @@ -271,7 +271,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { return; } List userList = FlowEngine.userService() - .getByAssociateds(StreamUtils.toList(flowTaskList, FlowTask::getId)); + .getByAssociateds(StreamUtils.toList(flowTaskList, FlowTask::getId)); if (CollUtil.isEmpty(userList)) { return; } @@ -282,11 +282,11 @@ public class FlwTaskServiceImpl implements IFlwTaskService { continue; } flowParams. - message("流程引擎自动审批！"). - variable(Map.of( - SUBMIT, false, - FLOW_COPY_LIST, Collections.emptyList(), - MESSAGE_NOTICE, StringUtils.EMPTY)); + message("流程引擎自动审批！"). + variable(Map.of( + SUBMIT, false, + FLOW_COPY_LIST, Collections.emptyList(), + MESSAGE_NOTICE, StringUtils.EMPTY)); skipTask(task.getId(), flowParams, instanceId, true); } } @@ -339,9 +339,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { } // 添加抄送人记录 FlowHisTask flowHisTask = flowHisTaskMapper.selectList( - QueryBuilder.lambda(FlowHisTask.class) - .eq(FlowHisTask::getTaskId, task.getId()) - .build()).get(0); + QueryBuilder.lambda(FlowHisTask.class) + .eq(FlowHisTask::getTaskId, task.getId()) + .build()).get(0); FlowNode flowNode = new FlowNode(); flowNode.setNodeCode(flowHisTask.getTargetNodeCode()); flowNode.setNodeName(flowHisTask.getTargetNodeName()); @@ -351,27 +351,27 @@ public class FlwTaskServiceImpl implements IFlwTaskService { task.setNodeName("【抄送】" + task.getNodeName()); Date updateTime = new Date(flowHisTask.getUpdateTime().getTime() - 1000); FlowParams flowParams = FlowParams.build() - .skipType(SkipType.NONE.getKey()) - .hisStatus(TaskStatusEnum.COPY.getStatus()) - .message("【抄送给】" + StreamUtils.join(flowCopyList, FlowCopyBo::getNickName)); + .skipType(SkipType.NONE.getKey()) + .hisStatus(TaskStatusEnum.COPY.getStatus()) + .message("【抄送给】" + StreamUtils.join(flowCopyList, FlowCopyBo::getNickName)); HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams); hisTask.setCreateTime(updateTime); hisTask.setUpdateTime(updateTime); hisTaskService.save(hisTask); List userList = StreamUtils.toList(flowCopyList, x -> - new FlowUser() - .setType(TaskAssigneeType.COPY.getCode()) - .setProcessedBy(Convert.toStr(x.getUserId())) - .setAssociated(taskId)); + new FlowUser() + .setType(TaskAssigneeType.COPY.getCode()) + .setProcessedBy(Convert.toStr(x.getUserId())) + .setAssociated(taskId)); // 批量保存抄送人员 FlowEngine.userService().saveBatch(userList); // 抄送消息进入“我的抄送”，不和待办列表混用。 flwCommonService.sendMessage( - List.of(org.dromara.workflow.common.enums.MessageTypeEnum.SYSTEM_MESSAGE.getCode()), - "您收到一条新的流程抄送，请及时查看。", - "单据抄送提醒", - userService.selectListByIds(StreamUtils.toList(flowCopyList, FlowCopyBo::getUserId)), - PATH_TASK_COPY + List.of(org.dromara.workflow.common.enums.MessageTypeEnum.SYSTEM_MESSAGE.getCode()), + "您收到一条新的流程抄送，请及时查看。", + "单据抄送提醒", + userService.selectListByIds(StreamUtils.toList(flowCopyList, FlowCopyBo::getUserId)), + PATH_TASK_COPY ); } @@ -506,13 +506,13 @@ public class FlwTaskServiceImpl implements IFlwTaskService { variable.put(MESSAGE_NOTICE, notice); FlowParams flowParams = FlowParams.build() - .nodeCode(bo.getNodeCode()) - .variable(variable) - .message(message) - .skipType(SkipType.REJECT.getKey()) - .flowStatus(applyNodeCode.equals(bo.getNodeCode()) ? TaskStatusEnum.BACK.getStatus() : TaskStatusEnum.WAITING.getStatus()) - .hisStatus(TaskStatusEnum.BACK.getStatus()) - .hisTaskExt(bo.getFileId()); + .nodeCode(bo.getNodeCode()) + .variable(variable) + .message(message) + .skipType(SkipType.REJECT.getKey()) + .flowStatus(applyNodeCode.equals(bo.getNodeCode()) ? TaskStatusEnum.BACK.getStatus() : TaskStatusEnum.WAITING.getStatus()) + .hisStatus(TaskStatusEnum.BACK.getStatus()) + .hisTaskExt(bo.getFileId()); taskService.skip(task.getId(), flowParams); return true; } @@ -535,7 +535,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { return nodeCodes; } List userList = FlowEngine.userService() - .getByAssociateds(Collections.singletonList(task.getId()), UserType.DEPUTE.getKey()); + .getByAssociateds(Collections.singletonList(task.getId()), UserType.DEPUTE.getKey()); if (CollUtil.isNotEmpty(userList)) { return nodeCodes; } @@ -554,8 +554,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService { for (HisTask hisTask : hisTaskList) { Node nodeValue = nodeMap.get(hisTask.getNodeCode()); if (nodeValue != null - && NodeType.BETWEEN.getKey().equals(nodeValue.getNodeType()) - && added.add(nodeValue.getNodeCode())) { + && NodeType.BETWEEN.getKey().equals(nodeValue.getNodeType()) + && added.add(nodeValue.getNodeCode())) { backNodeList.add(nodeValue); } } @@ -585,9 +585,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { BusinessStatusEnum.checkInvalidStatus(instance.getFlowStatus()); } FlowParams flowParams = FlowParams.build() - .message(bo.comment()) - .flowStatus(BusinessStatusEnum.TERMINATION.getStatus()) - .hisStatus(TaskStatusEnum.TERMINATION.getStatus()); + .message(bo.comment()) + .flowStatus(BusinessStatusEnum.TERMINATION.getStatus()) + .hisStatus(TaskStatusEnum.TERMINATION.getStatus()); taskService.termination(taskId, flowParams); return true; } @@ -601,8 +601,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService { @Override public List selectByIdList(Collection taskIdList) { return flowTaskMapper.selectList(QueryBuilder.lambda(FlowTask.class) - .in(FlowTask::getId, taskIdList) - .build()); + .in(FlowTask::getId, taskIdList) + .build()); } /** @@ -696,13 +696,13 @@ public class FlwTaskServiceImpl implements IFlwTaskService { ExpressionUtil.evalVariable(buildNextTaskList, FlowParams.build().variable(mergeVariable)); for (FlowNode flowNode : nextFlowNodes) { StreamUtils.findFirst(buildNextTaskList, t -> t.getNodeCode().equals(flowNode.getNodeCode())) - .ifPresent(first -> { - List users; - if (CollUtil.isNotEmpty(first.getPermissionList()) - && CollUtil.isNotEmpty(users = flwTaskAssigneeService.fetchUsersByStorageIds(StringUtils.joinComma(first.getPermissionList())))) { - flowNode.setPermissionFlag(StreamUtils.join(users, e -> Convert.toStr(e.getUserId()))); - } - }); + .ifPresent(first -> { + List users; + if (CollUtil.isNotEmpty(first.getPermissionList()) + && CollUtil.isNotEmpty(users = flwTaskAssigneeService.fetchUsersByStorageIds(StringUtils.joinComma(first.getPermissionList())))) { + flowNode.setPermissionFlag(StreamUtils.join(users, e -> Convert.toStr(e.getUserId()))); + } + }); } } return nextFlowNodes; @@ -717,8 +717,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService { @Override public FlowHisTask selectHisTaskById(Long taskId) { return flowHisTaskMapper.selectOne(QueryBuilder.lambda(FlowHisTask.class) - .eq(FlowHisTask::getId, taskId) - .build()); + .eq(FlowHisTask::getId, taskId) + .build()); } /** @@ -730,8 +730,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService { @Override public List selectByInstId(Long instanceId) { return flowTaskMapper.selectList(QueryBuilder.lambda(FlowTask.class) - .eq(FlowTask::getInstanceId, instanceId) - .build()); + .eq(FlowTask::getInstanceId, instanceId) + .build()); } /** @@ -743,8 +743,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService { @Override public List selectByInstIds(Collection instanceIds) { return flowTaskMapper.selectList(QueryBuilder.lambda(FlowTask.class) - .in(FlowTask::getInstanceId, instanceIds) - .build()); + .in(FlowTask::getInstanceId, instanceIds) + .build()); } /** @@ -756,8 +756,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService { @Override public boolean isTaskEnd(Long instanceId) { boolean exists = flowTaskMapper.exists(QueryBuilder.lambda(FlowTask.class) - .eq(FlowTask::getInstanceId, instanceId) - .build()); + .eq(FlowTask::getInstanceId, instanceId) + .build()); return !exists; } @@ -846,11 +846,11 @@ public class FlwTaskServiceImpl implements IFlwTaskService { if (CollUtil.isNotEmpty(userIdList)) { // 转办、委托、加减签等运行时操作，消息接收人统一从“我的待办”进入处理。 flwCommonService.sendMessage( - bo.getMessageType(), - StringUtils.isNotBlank(bo.getMessage()) ? bo.getMessage() : "单据「" + op.getDesc() + "」通知", - "单据「" + op.getDesc() + "」提醒", - userService.selectListByIds(userIdList), - PATH_TASK_WAITING + bo.getMessageType(), + StringUtils.isNotBlank(bo.getMessage()) ? bo.getMessage() : "单据「" + op.getDesc() + "」通知", + "单据「" + op.getDesc() + "」提醒", + userService.selectListByIds(userIdList), + PATH_TASK_WAITING ); } } @@ -874,10 +874,10 @@ public class FlwTaskServiceImpl implements IFlwTaskService { if (CollUtil.isNotEmpty(flowTasks)) { FlowEngine.userService().deleteByTaskIds(StreamUtils.toList(flowTasks, FlowTask::getId)); List userList = StreamUtils.toList(flowTasks, flowTask -> - new FlowUser() - .setType(TaskAssigneeType.APPROVER.getCode()) - .setProcessedBy(userId) - .setAssociated(flowTask.getId())); + new FlowUser() + .setType(TaskAssigneeType.APPROVER.getCode()) + .setProcessedBy(userId) + .setAssociated(flowTask.getId())); if (CollUtil.isNotEmpty(userList)) { FlowEngine.userService().saveBatch(userList); } @@ -909,9 +909,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { @Override public FlowNode getByNodeCode(String nodeCode, Long definitionId) { return flowNodeMapper.selectOne(QueryBuilder.lambda(FlowNode.class) - .eq(FlowNode::getNodeCode, nodeCode) - .eq(FlowNode::getDefinitionId, definitionId) - .build()); + .eq(FlowNode::getNodeCode, nodeCode) + .eq(FlowNode::getDefinitionId, definitionId) + .build()); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java index 84b79a701..bb511acbd 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java @@ -60,10 +60,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { * @return boolean */ public boolean eval(Integer leaveDays) { - if (leaveDays <= 2) { - return true; - } - return false; + return leaveDays <= 2; } /**