From 89c69aab91138a63c900b437723808dd373580cc Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Wed, 10 Jun 2026 11:17:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=BC=82=E5=B8=B8=E5=A3=B0=E6=98=8E=E4=BB=A5?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/AuthController.java | 22 +++-- .../dromara/web/service/SysLoginService.java | 50 ++++++----- .../common/core/config/ThreadPoolConfig.java | 3 +- .../core/utils/reflect/ReflectUtils.java | 1 - .../common/encrypt/enums/EncodeType.java | 2 +- .../filter/EncryptResponseBodyWrapper.java | 12 +-- .../excel/core/DefaultExcelListener.java | 2 +- .../common/excel/utils/ExcelBuilder.java | 3 +- .../json/enhance/JsonValueEnhancer.java | 24 +++--- .../dromara/common/log/aspect/LogAspect.java | 6 +- .../core/query/LambdaQueryBuilder.java | 5 +- .../PlusDataPermissionInterceptor.java | 4 +- .../oss/client/AbstractOssClientImpl.java | 37 ++++----- .../common/oss/model/HandleAsyncResult.java | 6 +- .../common/push/controller/SseController.java | 3 +- .../redis/aspectj/RepeatSubmitAspect.java | 2 +- .../common/redis/config/RedisConfig.java | 4 +- .../common/redis/utils/RedisUtils.java | 6 +- .../security/config/SecurityConfig.java | 4 +- .../common/social/utils/SocialUtils.java | 2 - .../common/web/filter/RepeatableFilter.java | 3 +- .../web/filter/RepeatedlyRequestWrapper.java | 12 +-- .../dromara/common/web/filter/XssFilter.java | 3 +- .../filter/XssHttpServletRequestWrapper.java | 6 +- .../PlusWebInvokeTimeInterceptor.java | 3 +- .../monitor/admin/config/SecurityConfig.java | 3 +- .../controller/RedisPubSubController.java | 8 +- .../demo/controller/TestDemoController.java | 3 +- .../demo/controller/TestTreeController.java | 3 +- .../dromara/gen/controller/GenController.java | 8 +- .../dromara/gen/domain/GenTableColumn.java | 2 +- .../dromara/job/snailjob/AlipayBillTask.java | 3 +- .../dromara/job/snailjob/SummaryBillTask.java | 3 +- .../dromara/job/snailjob/WechatBillTask.java | 3 +- .../controller/monitor/CacheController.java | 2 +- .../monitor/SysLoginInfoController.java | 2 +- .../monitor/SysUserOnlineController.java | 2 +- .../controller/system/SysDeptController.java | 13 ++- .../controller/system/SysMenuController.java | 6 +- .../controller/system/SysOssController.java | 4 +- .../controller/system/SysRoleController.java | 2 +- .../controller/system/SysUserController.java | 2 +- .../runner/SystemApplicationRunner.java | 2 +- .../impl/CategoryNameTranslationImpl.java | 1 - .../service/impl/FlwChartExtServiceImpl.java | 82 +++++++++---------- .../service/impl/FlwCommonServiceImpl.java | 4 +- 46 files changed, 167 insertions(+), 216 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index 3a98ec153..35d804a02 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -92,17 +92,15 @@ public class AuthController { LoginVo loginVo = IAuthStrategy.login(body, client, grantType); Long userId = LoginHelper.getUserId(); - scheduledExecutorService.schedule(() -> { - messageService.publishMessage( - List.of(userId), - PushPayloadDTO.of( - PushTypeEnum.MESSAGE, - PushSourceEnum.BACKEND, - DateUtils.getTodayHour(new Date()) + "好，欢迎登录 RuoYi-Vue-Plus 后台管理系统", - null - ) - ); - }, 5, TimeUnit.SECONDS); + scheduledExecutorService.schedule(() -> messageService.publishMessage( + List.of(userId), + PushPayloadDTO.of( + PushTypeEnum.MESSAGE, + PushSourceEnum.BACKEND, + DateUtils.getTodayHour(new Date()) + "好，欢迎登录 RuoYi-Vue-Plus 后台管理系统", + null + ) + ), 5, TimeUnit.SECONDS); return R.ok(loginVo); } @@ -113,7 +111,7 @@ public class AuthController { * @return 跳转地址 */ @GetMapping("/binding/{source}") - public R authBinding(@PathVariable("source") String source) { + public R authBinding(@PathVariable String source) { SocialLoginConfigProperties obj = socialProperties.getType().get(source); if (ObjectUtil.isNull(obj)) { return R.fail(source + "平台账号暂不支持"); diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java index c25b1ffff..be8c0777e 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java @@ -46,25 +46,22 @@ import java.util.function.Supplier; @Service public class SysLoginService { - /** - * 最大重试次数。 - */ - @Value("${user.password.maxRetryCount}") - private Integer maxRetryCount; - - /** - * 锁定时间。 - */ - @Value("${user.password.lockTime}") - private Integer lockTime; - private final ISysPermissionService permissionService; private final ISysSocialService sysSocialService; private final ISysRoleService roleService; private final ISysDeptService deptService; private final ISysPostService postService; private final SysUserMapper userMapper; - + /** + * 最大重试次数。 + */ + @Value("${user.password.maxRetryCount}") + private Integer maxRetryCount; + /** + * 锁定时间。 + */ + @Value("${user.password.lockTime}") + private Integer lockTime; /** * 绑定第三方用户 @@ -159,19 +156,20 @@ public class SysLoginService { loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY)); loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY)); } - ThreadUtils.virtualInvokeAll(() -> { - loginUser.setMenuPermission(permissionService.getMenuPermission(userId)); - }, () -> { - loginUser.setRolePermission(permissionService.getRolePermission(userId)); - }, () -> { - List roles = roleService.selectRolesByUserId(userId); - List roleDtos = BeanUtil.copyToList(roles, RoleDTO.class); - loginUser.setRoles(roleDtos); - loginUser.setDataScopeRoleMap(permissionService.getDataScopeRoleMap(roleDtos)); - }, () -> { - List posts = postService.selectPostsByUserId(userId); - loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class)); - }); + ThreadUtils.virtualInvokeAll( + () -> loginUser.setMenuPermission(permissionService.getMenuPermission(userId)), + () -> loginUser.setRolePermission(permissionService.getRolePermission(userId)), + () -> { + List roles = roleService.selectRolesByUserId(userId); + List roleDtos = BeanUtil.copyToList(roles, RoleDTO.class); + loginUser.setRoles(roleDtos); + loginUser.setDataScopeRoleMap(permissionService.getDataScopeRoleMap(roleDtos)); + }, + () -> { + List posts = postService.selectPostsByUserId(userId); + loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class)); + } + ); return loginUser; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java index a5f423aea..115cae65c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java @@ -98,9 +98,8 @@ public class ThreadPoolConfig { * @param t 任务执行过程中抛出的异常 */ public static void printException(Runnable r, Throwable t) { - if (t == null && r instanceof Future) { + if (t == null && r instanceof Future future) { try { - Future future = (Future) r; if (future.isDone()) { future.get(); } 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 073983f9e..1ad15501d 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 @@ -12,7 +12,6 @@ import java.lang.reflect.Method; * * @author Lion Li */ -@SuppressWarnings("rawtypes") @NoArgsConstructor(access = AccessLevel.PRIVATE) public class ReflectUtils extends ReflectUtil { diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/EncodeType.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/EncodeType.java index 4193225e2..3d587b7c7 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/EncodeType.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/EncodeType.java @@ -21,6 +21,6 @@ public enum EncodeType { /** * 16进制编码 */ - HEX; + HEX } diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java index 35200db34..f030da98b 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java @@ -33,9 +33,8 @@ public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper { * 构造加密响应包装器。 * * @param response 原始响应 - * @throws IOException 创建输出流异常 */ - public EncryptResponseBodyWrapper(HttpServletResponse response) throws IOException { + public EncryptResponseBodyWrapper(HttpServletResponse response) { super(response); this.byteArrayOutputStream = new ByteArrayOutputStream(); this.servletOutputStream = this.getOutputStream(); @@ -116,7 +115,6 @@ public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper { * @param publicKey RSA公钥 (用于加密 AES 秘钥) * @param headerFlag 请求头标志 * @return 加密内容 - * @throws IOException */ public String getEncryptContent(HttpServletResponse servletResponse, String publicKey, String headerFlag) throws IOException { // 生成秘钥 @@ -147,7 +145,7 @@ public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper { * @return 响应输出流 */ @Override - public ServletOutputStream getOutputStream() throws IOException { + public ServletOutputStream getOutputStream() { return new ServletOutputStream() { /** * 判断响应输出流是否可写。 @@ -173,10 +171,9 @@ public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper { * 写入单个字节到响应缓存。 * * @param b 待写入字节 - * @throws IOException IO 异常 */ @Override - public void write(int b) throws IOException { + public void write(int b) { byteArrayOutputStream.write(b); } @@ -197,10 +194,9 @@ public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper { * @param b 待写入字节数组 * @param off 起始偏移量 * @param len 写入长度 - * @throws IOException IO 异常 */ @Override - public void write(byte[] b, int off, int len) throws IOException { + public void write(byte[] b, int off, int len) { byteArrayOutputStream.write(b, off, len); } }; 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 a6574da0e..1d42e81c4 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 @@ -73,7 +73,7 @@ public class DefaultExcelListener extends AnalysisEventListener implements * @param context Excel 上下文 */ @Override - public void onException(Exception exception, AnalysisContext context) throws Exception { + public void onException(Exception exception, AnalysisContext context) { String errMsg = null; if (exception instanceof ExcelDataConvertException excelDataConvertException) { // 如果是某一个单元格的转换异常 能获取到具体行号 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 d1ce4f6c0..f7e67f9e4 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 @@ -615,9 +615,8 @@ public final class ExcelBuilder { * * @param filename 文件名 * @param response HTTP 响应 - * @throws UnsupportedEncodingException 文件名编码异常 */ - private static void resetResponse(String filename, HttpServletResponse response) throws UnsupportedEncodingException { + private static void resetResponse(String filename, HttpServletResponse response) { FileUtils.setAttachmentResponseHeader(response, encodingFilename(filename)); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8"); } 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 4f19a984e..b3c0b7de6 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 @@ -109,16 +109,20 @@ public class JsonValueEnhancer { * @param visited 已访问对象集合，用于避免循环引用 */ private void collectValue(Object value, JsonEnhancementContext context, IdentityHashMap visited) { - if (value == null) { - return; - } - if (value instanceof Map map) { - map.values().forEach(child -> collectValue(child, context, visited)); - return; - } - if (value instanceof Iterable iterable) { - iterable.forEach(child -> collectValue(child, context, visited)); - return; + switch (value) { + case null -> { + return; + } + case Map map -> { + map.values().forEach(child -> collectValue(child, context, visited)); + return; + } + case Iterable iterable -> { + iterable.forEach(child -> collectValue(child, context, visited)); + return; + } + default -> { + } } if (value.getClass().isArray()) { int length = Array.getLength(value); 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 515430a49..44f72412a 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 @@ -142,9 +142,8 @@ public class LogAspect { * @param log 日志 * @param operLog 操作日志 * @param jsonResult 返回结果 - * @throws Exception 异常 */ - public void getControllerMethodDescription(JoinPoint joinPoint, Log log, OperLogEvent operLog, Object jsonResult) throws Exception { + public void getControllerMethodDescription(JoinPoint joinPoint, Log log, OperLogEvent operLog, Object jsonResult) { // 设置action动作 operLog.setBusinessType(log.businessType().ordinal()); // 设置标题 @@ -168,9 +167,8 @@ public class LogAspect { * @param joinPoint 切点 * @param operLog 操作日志 * @param excludeParamNames 排除参数名 - * @throws Exception 异常 */ - private void setRequestValue(JoinPoint joinPoint, OperLogEvent operLog, String[] excludeParamNames) throws Exception { + private void setRequestValue(JoinPoint joinPoint, OperLogEvent operLog, String[] excludeParamNames) { Map paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest()); String requestMethod = operLog.getRequestMethod(); if (MapUtil.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name())) { diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java index 24fe8015c..dae0facad 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaQueryBuilder.java @@ -718,7 +718,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition allEq(BiPredicate, Object> filter, Map params, boolean null2IsNull) { - wrapper.allEq(true, (BiPredicate) filter, (Map) params, null2IsNull); + wrapper.allEq(true, filter, (Map) params, null2IsNull); return this; } @@ -732,7 +732,7 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition allEq(boolean condition, BiPredicate, Object> filter, Map params, boolean null2IsNull) { - wrapper.allEq(condition, (BiPredicate) filter, (Map) params, null2IsNull); + wrapper.allEq(condition, filter, (Map) params, null2IsNull); return this; } @@ -1368,7 +1368,6 @@ public final class LambdaQueryBuilder implements LambdaQueryCondition aggregateWrapper() { return (AggregateLambdaQueryWrapper) wrapper; } diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java index 6c88915bc..d189781de 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -23,7 +23,6 @@ import org.apache.ibatis.session.RowBounds; import org.dromara.common.mybatis.handler.PlusDataPermissionHandler; import java.sql.Connection; -import java.sql.SQLException; import java.util.List; /** @@ -49,10 +48,9 @@ public class PlusDataPermissionInterceptor extends BaseMultiTableInnerIntercepto * @param rowBounds 分页对象 * @param resultHandler 结果处理器 * @param boundSql 绑定的 SQL 对象 - * @throws SQLException 如果发生 SQL 异常 */ @Override - public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException { + public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) { // 检查是否需要忽略数据权限处理 if (InterceptorIgnoreHelper.willIgnoreDataPermission(ms.getId())) { return; diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/AbstractOssClientImpl.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/AbstractOssClientImpl.java index 0fc385069..f6693b3c3 100644 --- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/AbstractOssClientImpl.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/client/AbstractOssClientImpl.java @@ -222,11 +222,9 @@ public abstract class AbstractOssClientImpl implements OssClient { @Override public T doCustomUpload(AsyncRequestBody body, Consumer putObjectRequestBuilderConsumer, Collection transferListeners, BiFunction handleAsyncAction) { try { - return s3TransferManager.upload(uploadRequestBuilder -> { - uploadRequestBuilder.requestBody(body) - .putObjectRequest(putObjectRequestBuilderConsumer) - .transferListeners(transferListeners); - }) + return s3TransferManager.upload(uploadRequestBuilder -> uploadRequestBuilder.requestBody(body) + .putObjectRequest(putObjectRequestBuilderConsumer) + .transferListeners(transferListeners)) .completionFuture() .handleAsync(handleAsyncAction) .join(); @@ -506,14 +504,12 @@ public abstract class AbstractOssClientImpl implements OssClient { String md5Digest = options.getMd5Digest(); Map metadata = options.getMetadata(); Collection transferListeners = options.getTransferListeners(); - HandleAsyncResult result = doCustomUpload(body, builder -> { - builder.bucket(bucket) - .key(key) - .contentMD5(md5Digest) - .contentType(contentType) - .contentLength(contentLength) - .metadata(metadata); - }, transferListeners); + HandleAsyncResult result = doCustomUpload(body, builder -> builder.bucket(bucket) + .key(key) + .contentMD5(md5Digest) + .contentType(contentType) + .contentLength(contentLength) + .metadata(metadata), transferListeners); if (result.isFailure()) { throw toStorageException(result.error()); } @@ -720,10 +716,8 @@ public abstract class AbstractOssClientImpl implements OssClient { @Override public String bucketPresignGetUrl(String bucket, String key, Duration expiredTime) { try { - return s3Presigner.presignGetObject(getObjectPresignRequestBuilder -> { - getObjectPresignRequestBuilder.signatureDuration(expiredTime) - .getObjectRequest(getObjectRequestBuilder -> getObjectRequestBuilder.bucket(bucket).key(key)); - }) + return s3Presigner.presignGetObject(getObjectPresignRequestBuilder -> getObjectPresignRequestBuilder.signatureDuration(expiredTime) + .getObjectRequest(getObjectRequestBuilder -> getObjectRequestBuilder.bucket(bucket).key(key))) .url() .toExternalForm(); } catch (Exception e) { @@ -743,10 +737,8 @@ public abstract class AbstractOssClientImpl implements OssClient { @Override public String bucketPresignPutUrl(String bucket, String key, Duration expiredTime, Map metadata) { try { - return s3Presigner.presignPutObject(putObjectPresignRequestBuilder -> { - putObjectPresignRequestBuilder.signatureDuration(expiredTime) - .putObjectRequest(putObjectRequestBuilder -> putObjectRequestBuilder.bucket(bucket).key(key).metadata(metadata)); - }) + return s3Presigner.presignPutObject(putObjectPresignRequestBuilder -> putObjectPresignRequestBuilder.signatureDuration(expiredTime) + .putObjectRequest(putObjectRequestBuilder -> putObjectRequestBuilder.bucket(bucket).key(key).metadata(metadata))) .url() .toExternalForm(); } catch (Exception e) { @@ -1127,10 +1119,9 @@ public abstract class AbstractOssClientImpl implements OssClient { /** * 关闭底层 S3 客户端资源。 * - * @throws Exception 关闭资源异常 */ @Override - public void close() throws Exception { + public void close() { if (s3TransferManager != null) { s3TransferManager.close(); } 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 c4ba48a5d..78f6430ca 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 @@ -60,7 +60,7 @@ public record HandleAsyncResult( * @return 异步处理结果 */ public static HandleAsyncResult of(T result, Throwable error) { - return new HandleAsyncResult(result, error); + return new HandleAsyncResult<>(result, error); } /** @@ -71,7 +71,7 @@ public record HandleAsyncResult( * @return 异步处理结果 */ public static HandleAsyncResult success(T result) { - return new HandleAsyncResult(result, null); + return new HandleAsyncResult<>(result, null); } /** @@ -82,6 +82,6 @@ public record HandleAsyncResult( * @return 异步处理结果 */ public static HandleAsyncResult failure(Throwable error) { - return new HandleAsyncResult(null, error); + return new HandleAsyncResult<>(null, error); } } diff --git a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/controller/SseController.java b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/controller/SseController.java index f23c17fae..66fcf268b 100644 --- a/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/controller/SseController.java +++ b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/controller/SseController.java @@ -95,10 +95,9 @@ public class SseController implements DisposableBean { /** * 容器销毁时释放资源占位实现。 * - * @throws Exception 销毁异常 */ @Override - public void destroy() throws Exception { + public void destroy() { // 销毁时不需要做什么 此方法避免无用操作报错 } 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 f24e9159c..120588fec 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 @@ -47,7 +47,7 @@ public class RepeatSubmitAspect { * @param repeatSubmit 防重复提交注解 */ @Before("@annotation(repeatSubmit)") - public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable { + public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) { // 如果注解不为0 则使用注解数值 long interval = repeatSubmit.timeUnit().toMillis(repeatSubmit.interval()); 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 05d5097cb..9bb3391a8 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 @@ -119,7 +119,7 @@ public class RedisConfig { /** * redis集群配置 yml - * + *

* --- # redis 集群配置(单机与集群只能开启一个另一个需要注释掉) * spring.data: * redis: @@ -134,7 +134,7 @@ public class RedisConfig { * timeout: 10s * # 是否开启ssl * ssl.enabled: false - * + *

* redisson: * # 线程池数量 * threads: 16 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 795679389..cb65250c4 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 @@ -22,7 +22,7 @@ import java.util.stream.Stream; * @version 3.1.0 新增 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -@SuppressWarnings(value = {"unchecked", "rawtypes"}) +@SuppressWarnings(value = {"rawtypes"}) public class RedisUtils { private static final RedissonClient CLIENT = SpringUtils.getBean(RedissonClient.class); @@ -280,9 +280,7 @@ public class RedisUtils { return; } RBatch batch = CLIENT.createBatch(); - collection.forEach(t -> { - batch.getBucket(t.toString()).deleteAsync(); - }); + collection.forEach(t -> batch.getBucket(t.toString()).deleteAsync()); batch.execute(); } 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 663239ba4..2c5c9c1e0 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 @@ -129,9 +129,7 @@ public class SecurityConfig implements WebMvcConfigurer { String password = SpringUtils.getProperty("spring.boot.admin.client.password"); return new SaServletFilter() .addInclude("/actuator", "/actuator/**") - .setAuth(obj -> { - SaHttpBasicUtil.check(username + StringUtils.COLON + password); - }) + .setAuth(obj -> SaHttpBasicUtil.check(username + StringUtils.COLON + password)) .setError(e -> { HttpServletResponse response = ServletUtils.getResponse(); response.setContentType(SaTokenConsts.CONTENT_TYPE_APPLICATION_JSON); 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 e74601b45..d5723688f 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 @@ -33,7 +33,6 @@ public class SocialUtils { * @return 授权响应 * @throws AuthException 授权异常 */ - @SuppressWarnings("unchecked") public static AuthResponse loginAuth(String source, String code, String state, SocialProperties socialProperties) throws AuthException { AuthRequest authRequest = getAuthRequest(source, socialProperties); AuthCallback callback = new AuthCallback(); @@ -93,4 +92,3 @@ public class SocialUtils { }; } } - 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 82086c0a3..582434321 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 @@ -18,10 +18,9 @@ public class RepeatableFilter implements Filter { * 过滤器初始化入口，当前无额外初始化逻辑。 * * @param filterConfig 过滤器配置 - * @throws ServletException 过滤器初始化异常 */ @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { } 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 a629c16f7..cd3b671cf 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 @@ -44,10 +44,9 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { * 基于缓存的请求体构造字符读取器。 * * @return 可重复读取的字符流 - * @throws IOException IO 异常 */ @Override - public BufferedReader getReader() throws IOException { + public BufferedReader getReader() { return new BufferedReader(new InputStreamReader(getInputStream(), StandardCharsets.UTF_8)); } @@ -55,20 +54,18 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { * 返回基于缓存请求体重新生成的输入流。 * * @return 可重复读取的输入流 - * @throws IOException IO 异常 */ @Override - public ServletInputStream getInputStream() throws IOException { + public ServletInputStream getInputStream() { final ByteArrayInputStream bais = new ByteArrayInputStream(body); return new ServletInputStream() { /** * 读取缓存请求体的下一个字节。 * * @return 下一个字节 - * @throws IOException IO 异常 */ @Override - public int read() throws IOException { + public int read() { return bais.read(); } @@ -76,10 +73,9 @@ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { * 返回缓存请求体剩余可读字节数。 * * @return 剩余字节数 - * @throws IOException IO 异常 */ @Override - public int available() throws IOException { + public int available() { return bais.available(); } 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 32cc02bf2..fca9e29be 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 @@ -30,10 +30,9 @@ public class XssFilter implements Filter { * 初始化过滤器并加载配置中的排除路径。 * * @param filterConfig 过滤器配置 - * @throws ServletException 过滤器初始化异常 */ @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { if (properties.getExcludeUrls() != null) { excludes.addAll(properties.getExcludeUrls()); } diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java index d2d897eed..d85e76374 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java @@ -148,10 +148,9 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { * 返回清洗后的 JSON 字节数。 * * @return JSON 字节数 - * @throws IOException IO 异常 */ @Override - public int available() throws IOException { + public int available() { return jsonBytes.length; } @@ -168,10 +167,9 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { * 读取清洗后的 JSON 流下一个字节。 * * @return 下一个字节 - * @throws IOException IO 异常 */ @Override - public int read() throws IOException { + public int read() { return bis.read(); } }; 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 40016357e..8d4864d56 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 @@ -146,10 +146,9 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor { * @param response 当前响应 * @param handler 目标处理器 * @param ex 请求处理过程中的异常 - * @throws Exception 拦截器链路抛出的异常 */ @Override - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { StopWatch stopWatch = KEY_CACHE.get(); if (ObjectUtil.isNotNull(stopWatch)) { stopWatch.stop(); diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java index 1b5b0aade..9ca3373a9 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java @@ -40,10 +40,9 @@ public class SecurityConfig { * * @param httpSecurity Spring Security 配置对象 * @return 安全过滤链 - * @throws Exception 构建过滤链异常 */ @Bean - public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { + public SecurityFilterChain filterChain(HttpSecurity httpSecurity) { SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); successHandler.setTargetUrlParameter("redirectTo"); successHandler.setDefaultTargetUrl(adminContextPath + "/"); 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 88227b6fd..2b603bfb8 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 @@ -25,9 +25,7 @@ public class RedisPubSubController { */ @GetMapping("/pub") public R pub(String key, String value) { - RedisUtils.publish(key, value, consumer -> { - System.out.println("发布通道 => " + key + ", 发送值 => " + value); - }); + RedisUtils.publish(key, value, consumer -> System.out.println("发布通道 => " + key + ", 发送值 => " + value)); return R.ok("操作成功"); } @@ -38,9 +36,7 @@ public class RedisPubSubController { */ @GetMapping("/sub") public R sub(String key) { - RedisUtils.subscribe(key, String.class, msg -> { - System.out.println("订阅通道 => " + key + ", 接收值 => " + msg); - }); + RedisUtils.subscribe(key, String.class, msg -> System.out.println("订阅通道 => " + key + ", 接收值 => " + msg)); 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 2671477ba..e4d7538cd 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 @@ -104,8 +104,7 @@ public class TestDemoController extends BaseController { */ @SaCheckPermission("demo:demo:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { + public R getInfo(@PathVariable @NotNull(message = "主键不能为空") Long id) { return R.ok(testDemoService.queryById(id)); } 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 c382c7512..65af83c16 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 @@ -65,8 +65,7 @@ public class TestTreeController extends BaseController { */ @SaCheckPermission("demo:tree:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { + public R getInfo(@PathVariable @NotNull(message = "主键不能为空") Long id) { return R.ok(testTreeService.queryById(id)); } 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 5122cb212..ee589f136 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 @@ -90,7 +90,7 @@ public class GenController extends BaseController { */ @SaCheckPermission("tool:gen:list") @GetMapping(value = "/column/{tableId}") - public R> columnList(@PathVariable("tableId") Long tableId) { + public R> columnList(@PathVariable Long tableId) { List list = genTableService.selectGenTableColumnListByTableId(tableId); return R.ok(PageResult.build(list)); } @@ -153,7 +153,7 @@ public class GenController extends BaseController { */ @SaCheckPermission("tool:gen:preview") @GetMapping("/preview/{tableId}") - public R> preview(@PathVariable("tableId") Long tableId) throws IOException { + public R> preview(@PathVariable Long tableId) { Map dataMap = genTableService.previewCode(tableId); return R.ok(dataMap); } @@ -167,7 +167,7 @@ public class GenController extends BaseController { @SaCheckPermission("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/download/{tableId}") - public void download(HttpServletResponse response, @PathVariable("tableId") Long tableId) throws IOException { + public void download(HttpServletResponse response, @PathVariable Long tableId) throws IOException { byte[] data = genTableService.downloadCode(tableId); genCode(response, data); } @@ -182,7 +182,7 @@ public class GenController extends BaseController { @Log(title = "代码生成", businessType = BusinessType.UPDATE) @Lock4j(keys = {"#tableId"}, acquireTimeout = 5000) @GetMapping("/synchDb/{tableId}") - public R synchDb(@PathVariable("tableId") Long tableId) { + public R synchDb(@PathVariable Long tableId) { genTableService.synchDb(tableId); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java index d1a13bd31..5136177cb 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java @@ -340,7 +340,7 @@ public class GenTableColumn extends BaseEntity { */ public String readConverterExp() { String remarks = StringUtils.substringBetween(this.columnComment, "（", "）"); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (StringUtils.isNotEmpty(remarks)) { for (String value : remarks.split(" ")) { if (StringUtils.isNotEmpty(value)) { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java index 8f28c9885..3a09f1364 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java @@ -27,9 +27,8 @@ public class AlipayBillTask { * * @param jobArgs 任务执行参数 * @return 执行结果 - * @throws InterruptedException 任务被中断时抛出 */ - public ExecuteResult jobExecute(JobArgs jobArgs) throws InterruptedException { + public ExecuteResult jobExecute(JobArgs jobArgs) { // 设置清算日期 String settlementDate = (String) jobArgs.getWfContext().get("settlementDate"); if (StringUtils.equals(settlementDate, "sysdate")) { diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java index 9800d8bdd..62bb94740 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java @@ -26,9 +26,8 @@ public class SummaryBillTask { * * @param jobArgs 任务执行参数 * @return 汇总执行结果 - * @throws InterruptedException 任务被中断时抛出 */ - public ExecuteResult jobExecute(JobArgs jobArgs) throws InterruptedException { + public ExecuteResult jobExecute(JobArgs jobArgs) { // 获得微信账单 BigDecimal wechatAmount = BigDecimal.valueOf(0); String wechat = (String) jobArgs.getWfContext("wechat"); diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java index a162cea90..7112d10ea 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java @@ -27,9 +27,8 @@ public class WechatBillTask { * * @param jobArgs 任务执行参数 * @return 执行结果 - * @throws InterruptedException 任务被中断时抛出 */ - public ExecuteResult jobExecute(JobArgs jobArgs) throws InterruptedException { + public ExecuteResult jobExecute(JobArgs jobArgs) { // 从上下文中获得清算日期并设置，如果上下文中清算日期 // 是sysdate设置为当前日期；否则取管理页面设置的值 String settlementDate = (String) jobArgs.getWfContext().get("settlementDate"); 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 40ce04075..2ac35e29f 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 @@ -32,7 +32,7 @@ public class CacheController { */ @SaCheckPermission("monitor:cache:list") @GetMapping() - public R getInfo() throws Exception { + public R getInfo() { RedisConnection connection = connectionFactory.getConnection(); try { Properties commandStats = connection.commands().info("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 6690b4ba2..3db290c9a 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 @@ -99,7 +99,7 @@ public class SysLoginInfoController extends BaseController { @Log(title = "账户解锁", businessType = BusinessType.OTHER) @RepeatSubmit() @GetMapping("/unlock/{userName}") - public R unlock(@PathVariable("userName") String userName) { + public R unlock(@PathVariable String userName) { String loginName = CacheNames.PWD_ERR_CNT_KEY + userName; if (RedisUtils.hasKey(loginName)) { RedisUtils.deleteObject(loginName); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java index 77f5097aa..6b000637f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java @@ -126,7 +126,7 @@ public class SysUserOnlineController extends BaseController { @Log(title = "在线设备", businessType = BusinessType.FORCE) @RepeatSubmit() @DeleteMapping("/myself/{tokenId}") - public R remove(@PathVariable("tokenId") String tokenId) { + public R remove(@PathVariable String tokenId) { try { // 获取指定账号 id 的 token 集合 List keys = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index 8e014d8e2..794be873e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -53,11 +53,16 @@ public class SysDeptController extends BaseController { * @return 过滤后的部门列表 */ @SaCheckPermission("system:dept:list") - @GetMapping("/list/exclude/{deptId}") - public R> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { + @GetMapping(value = {"/list/exclude", "/list/exclude/{deptId}"}) + public R> excludeChild(@PathVariable(required = false) Long deptId) { List depts = deptService.selectDeptList(new SysDeptBo()); - depts.removeIf(d -> d.getDeptId().equals(deptId) - || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId))); + if (deptId == null) { + return R.ok(depts); + } + String deptIdStr = Convert.toStr(deptId); + // 过滤掉自身 + 所有子节点 + depts.removeIf(d -> deptId.equals(d.getDeptId()) + || StringUtils.splitList(d.getAncestors()).contains(deptIdStr)); return R.ok(depts); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java index 380d0ee2e..939f0b4c3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -99,7 +99,7 @@ public class SysMenuController extends BaseController { */ @SaCheckPermission("system:menu:query") @GetMapping(value = "/roleMenuTreeselect/{roleId}") - public R roleMenuTreeselect(@PathVariable("roleId") Long roleId) { + public R roleMenuTreeselect(@PathVariable Long roleId) { List menus = menuService.selectMenuList(LoginHelper.getUserId()); MenuTreeSelectVo selectVo = new MenuTreeSelectVo( menuService.selectMenuListByRoleId(roleId), @@ -163,7 +163,7 @@ public class SysMenuController extends BaseController { @SaCheckPermission("system:menu:remove") @Log(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") - public R remove(@PathVariable("menuId") Long menuId) { + public R remove(@PathVariable Long menuId) { if (menuService.hasChildByMenuId(menuId)) { return R.warn("存在子菜单,不允许删除"); } @@ -192,7 +192,7 @@ public class SysMenuController extends BaseController { @SaCheckPermission("system:menu:remove") @Log(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/cascade/{menuIds}") - public R remove(@PathVariable("menuIds") Long[] menuIds) { + public R remove(@PathVariable Long[] menuIds) { List menuIdList = List.of(menuIds); if (menuService.hasChildByMenuId(menuIdList)) { return R.warn("存在子菜单,不允许删除"); 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 b36559373..09e140080 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 @@ -20,7 +20,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -83,11 +82,10 @@ public class SysOssController extends BaseController { * 下载OSS对象 * * @param ossId OSS对象ID - * @throws IOException IO 异常 */ @SaCheckPermission("system:oss:download") @GetMapping("/download/{ossId}") - public ResponseEntity download(@PathVariable Long ossId) throws IOException { + public ResponseEntity download(@PathVariable Long ossId) { return ossService.download(ossId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index e25b16ea6..106a58962 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -275,7 +275,7 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping(value = "/deptTree/{roleId}") - public R roleDeptTreeselect(@PathVariable("roleId") Long roleId) { + public R roleDeptTreeselect(@PathVariable Long roleId) { DeptTreeSelectVo selectVo = new DeptTreeSelectVo( deptService.selectDeptListByRoleId(roleId), deptService.selectDeptTreeList(new SysDeptBo())); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index e55390194..b8205cab1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -141,7 +141,7 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:query") @GetMapping(value = {"/", "/{userId}"}) - public R getInfo(@PathVariable(value = "userId", required = false) Long userId) { + public R getInfo(@PathVariable(required = false) Long userId) { SysUserInfoVo userInfoVo = new SysUserInfoVo(); if (ObjectUtil.isNotNull(userId)) { userService.checkUserDataScope(userId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java index 9830b23cc..4145af0c8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java @@ -25,7 +25,7 @@ public class SystemApplicationRunner implements ApplicationRunner { * @param args 启动参数 */ @Override - public void run(ApplicationArguments args) throws Exception { + public void run(ApplicationArguments args) { ossConfigService.init(); log.info("初始化OSS配置成功"); } 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 dfe4f6b9e..6f902a9ef 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 @@ -3,7 +3,6 @@ package org.dromara.workflow.service.impl; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.core.TranslationInterface; import org.dromara.workflow.common.ConditionalOnEnable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java index c5533c198..18b6dce69 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java @@ -116,49 +116,47 @@ public class FlwChartExtServiceImpl implements ChartExtService { } defJson.setTopText("流程名称: " + defJson.getFlowName()); - defJson.getNodeList().forEach(nodeJson -> { - nodeJson.setPromptContent( - new PromptContent() - // 提示信息 - .setInfo( - CollUtil.newArrayList( - new PromptContent.InfoItem() - .setPrefix("任务名称: ") - .setContent(nodeJson.getNodeName()) - .setContentStyle(Map.of( - "border", "1px solid #d1e9ff", - "backgroundColor", "#e8f4ff", - "padding", "4px 8px", - "borderRadius", "4px" - )) - .setRowStyle(Map.of( - "fontWeight", "bold", - "margin", "0 0 6px 0", - "padding", "0 0 8px 0", - "borderBottom", "1px solid #ccc" - )) - ) + defJson.getNodeList().forEach(nodeJson -> nodeJson.setPromptContent( + new PromptContent() + // 提示信息 + .setInfo( + CollUtil.newArrayList( + new PromptContent.InfoItem() + .setPrefix("任务名称: ") + .setContent(nodeJson.getNodeName()) + .setContentStyle(Map.of( + "border", "1px solid #d1e9ff", + "backgroundColor", "#e8f4ff", + "padding", "4px 8px", + "borderRadius", "4px" + )) + .setRowStyle(Map.of( + "fontWeight", "bold", + "margin", "0 0 6px 0", + "padding", "0 0 8px 0", + "borderBottom", "1px solid #ccc" + )) ) - // 弹窗样式 - .setDialogStyle(MapUtil.mergeAll( - "position", "absolute", - "backgroundColor", "#fff", - "border", "1px solid #ccc", - "borderRadius", "4px", - "boxShadow", "0 2px 8px rgba(0, 0, 0, 0.15)", - "padding", "8px 12px", - "fontSize", "14px", - "zIndex", "1000", - "maxWidth", "500px", - "maxHeight", "300px", - "overflowY", "auto", - "overflowX", "hidden", - "color", "#333", - "pointerEvents", "auto", - "scrollbarWidth", "thin" - )) - ); - }); + ) + // 弹窗样式 + .setDialogStyle(MapUtil.mergeAll( + "position", "absolute", + "backgroundColor", "#fff", + "border", "1px solid #ccc", + "borderRadius", "4px", + "boxShadow", "0 2px 8px rgba(0, 0, 0, 0.15)", + "padding", "8px 12px", + "fontSize", "14px", + "zIndex", "1000", + "maxWidth", "500px", + "maxHeight", "300px", + "overflowY", "auto", + "overflowX", "hidden", + "color", "#333", + "pointerEvents", "auto", + "scrollbarWidth", "thin" + )) + )); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java index 4afee8142..3efafb82c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java @@ -149,14 +149,12 @@ public class FlwCommonServiceImpl implements IFlwCommonService { } try { switch (messageTypeEnum) { - case SYSTEM_MESSAGE -> { - // 站内消息直接携带前端路由，消息盒子点击后可按路径分流。 + case SYSTEM_MESSAGE -> // 站内消息直接携带前端路由，消息盒子点击后可按路径分流。 messageService.publishMessage(userIds, PushPayloadDTO.of( PushTypeEnum.MESSAGE, PushSourceEnum.WORKFLOW, message, null, path )); - } case EMAIL_MESSAGE -> MailBuilder.of().to(emails).subject(subject).text(message).send(); case SMS_MESSAGE -> { // LinkedHashMap map = new LinkedHashMap<>(1);