From 7fbd6fffcc4afca5a69a1a34233ec0e500ce8593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Thu, 4 Jun 2026 18:11:39 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/RemoteConfigService.java | 1 + .../system/api/RemotePermissionService.java | 4 +- .../dromara/system/api/RemotePostService.java | 1 - .../dromara/system/api/RemoteRoleService.java | 1 - .../system/api/domain/bo/RemoteUserBo.java | 9 +- .../system/api/domain/vo/RemoteClientVo.java | 1 + .../system/api/domain/vo/RemoteSocialVo.java | 1 + .../api/domain/vo/RemoteTaskAssigneeVo.java | 2 +- .../dromara/system/api/model/LoginUser.java | 3 +- .../dromara/auth/config/CaptchaConfig.java | 8 -- .../auth/controller/TokenController.java | 5 +- .../auth/listener/UserActionListener.java | 2 +- .../dromara/auth/service/SysLoginService.java | 6 +- .../service/impl/PasswordAuthStrategy.java | 2 +- .../auth/service/impl/SocialAuthStrategy.java | 5 +- .../NoExternalStreamBinderCondition.java | 2 +- .../config/RedisBusBinderConfiguration.java | 2 +- .../bus/redis/RedisMessageChannelBinder.java | 10 +-- .../common/core/constant/SystemConstants.java | 2 +- .../core/service/PermissionService.java | 4 +- .../dromara/common/core/utils/DateUtils.java | 26 +++--- .../dromara/common/core/utils/NetUtils.java | 4 +- .../common/core/utils/ObjectUtils.java | 2 +- .../common/core/utils/StreamUtils.java | 13 +-- .../common/core/utils/StringUtils.java | 19 +++-- .../common/core/utils/ThreadUtils.java | 5 +- .../common/core/utils/ValidatorUtils.java | 6 +- .../common/core/utils/file/MimeTypeUtils.java | 84 ++++++++++++++++++- .../common/core/utils/ip/AddressUtils.java | 2 +- .../core/utils/reflect/AnnotationUtils.java | 4 +- .../core/utils/reflect/ReflectUtils.java | 2 +- .../common/core/utils/regex/RegexUtils.java | 5 +- .../core/utils/regex/RegexValidator.java | 5 +- .../java/org/dromara/common/core/xss/Xss.java | 1 + .../dromara/common/core/xss/XssValidator.java | 1 - .../config/SpringDocAutoConfiguration.java | 5 +- .../properties/SpringDocProperties.java | 2 +- .../core/model/SaTokenSecurityMetadata.java | 3 +- .../AbstractMetadataJavadocResolver.java | 47 +++++++---- .../doc/core/resolver/JavadocResolver.java | 4 +- ...okenAnnotationMetadataJavadocResolver.java | 14 ++-- .../common/doc/handler/OpenApiHandler.java | 2 +- .../store/redis/RedissonMetadataReport.java | 18 ++-- .../ActuatorEnvironmentPostProcessor.java | 14 ++-- .../config/ApiDecryptAutoConfiguration.java | 4 +- .../config/EncryptorAutoConfiguration.java | 2 +- .../common/encrypt/core/EncryptContext.java | 2 +- .../encrypt/core/EncryptedFieldProcessor.java | 12 +-- .../common/encrypt/core/IEncryptor.java | 2 +- .../encrypt/core/encryptor/AesEncryptor.java | 2 +- .../core/encryptor/Base64Encryptor.java | 2 +- .../encrypt/core/encryptor/RsaEncryptor.java | 2 +- .../encrypt/core/encryptor/Sm2Encryptor.java | 2 +- .../encrypt/core/encryptor/Sm4Encryptor.java | 2 +- .../common/encrypt/enums/AlgorithmType.java | 2 +- .../common/encrypt/filter/CryptoFilter.java | 4 +- .../filter/DecryptRequestBodyWrapper.java | 2 +- .../properties/ApiDecryptProperties.java | 1 + .../properties/EncryptorProperties.java | 2 +- .../common/encrypt/utils/EncryptUtils.java | 6 +- .../common/excel/annotation/CellMerge.java | 10 +-- .../excel/annotation/ExcelNotation.java | 1 + .../excel/annotation/ExcelRequired.java | 1 + .../excel/convert/ExcelDictConvert.java | 4 +- .../excel/convert/ExcelEnumConvert.java | 2 +- .../common/excel/core/CellMergeHandler.java | 4 +- .../excel/core/DefaultExcelListener.java | 10 +-- .../common/excel/core/DropDownOptions.java | 5 ++ .../common/excel/core/ExcelDownHandler.java | 2 +- .../common/excel/utils/ExcelBuilder.java | 13 +-- .../excel/utils/ExcelWriterWrapper.java | 10 +-- .../common/json/config/JacksonConfig.java | 1 - .../json/handler/BigNumberSerializer.java | 15 ++-- .../CustomEnvironmentPostProcessor.java | 14 ++-- .../dromara/common/log/aspect/LogAspect.java | 30 +++---- .../common/log/event/LogEventListener.java | 13 ++- .../dromara/common/mail/core/MailBuilder.java | 4 +- .../common/mcp/core/McpClientTemplate.java | 8 +- .../aspect/DataPermissionPointcutAdvisor.java | 2 +- .../config/MybatisPlusConfiguration.java | 1 + .../common/mybatis/core/page/PageQuery.java | 2 +- .../core/query/AggregateSelectUtils.java | 9 +- .../common/mybatis/core/query/SubQuery.java | 13 +-- .../filter/DubboDataPermissionFilter.java | 2 +- .../handler/PlusDataPermissionHandler.java | 4 +- .../oss/client/DefaultOssClientImpl.java | 2 +- .../dromara/common/oss/client/OssClient.java | 54 ++++++------ .../org/dromara/common/oss/config/Config.java | 5 +- .../common/oss/constant/OssConstant.java | 2 +- .../common/oss/enums/AccessPolicy.java | 6 +- .../common/oss/model/GetObjectResult.java | 24 +++--- .../common/oss/model/HandleAsyncResult.java | 4 +- .../common/oss/model/PutObjectResult.java | 8 +- .../ConditionalOnMessageTransport.java | 6 +- .../condition/MessageTransportCondition.java | 2 +- .../push/core/SseEmitterSessionManager.java | 4 +- .../redis/aspectj/RateLimiterAspect.java | 19 ++++- .../redis/aspectj/RepeatSubmitAspect.java | 12 ++- .../config/IdempotentAutoConfiguration.java | 8 +- .../redis/config/RedisConfiguration.java | 2 - .../redis/handler/KeyPrefixHandler.java | 17 +++- .../redis/manager/CaffeineCacheDecorator.java | 83 +++++++++++++++++- .../redis/manager/PlusSpringCacheManager.java | 8 +- .../common/redis/utils/CacheUtils.java | 2 +- .../common/redis/utils/RedisUtils.java | 20 +++-- .../satoken/core/dao/PlusSaTokenDao.java | 7 +- .../core/service/SaPermissionImpl.java | 4 +- .../common/satoken/utils/LoginHelper.java | 4 +- .../rest/SeataRestTemplateInterceptor.java | 20 ++--- .../seata/web/SeataHandlerInterceptor.java | 80 +++++++++--------- .../config/SecurityConfiguration.java | 3 +- .../AbstractAuthWeChatEnterpriseRequest.java | 2 +- .../config/SocialAutoConfiguration.java | 1 + .../common/social/gitea/AuthGiteaRequest.java | 38 ++++----- .../social/maxkey/AuthMaxKeyRequest.java | 2 +- .../social/maxkey/AuthMaxKeySource.java | 1 - .../social/topiam/AuthTopIamRequest.java | 1 - .../common/social/utils/SocialUtils.java | 29 ++++++- .../translation/annotation/Translation.java | 6 +- .../core/TranslationInterface.java | 12 +-- .../TranslationJsonFieldProcessor.java | 7 +- .../core/impl/DeptNameTranslationImpl.java | 10 +-- .../core/impl/DictTypeTranslationImpl.java | 6 +- .../core/impl/NicknameTranslationImpl.java | 6 +- .../core/impl/OssUrlTranslationImpl.java | 10 +-- .../core/impl/UserNameTranslationImpl.java | 10 +-- .../common/web/core/I18nLocaleResolver.java | 4 +- .../demo/controller/MailSendController.java | 18 ++-- .../demo/controller/RedisCacheController.java | 2 +- .../demo/controller/RedisLockController.java | 2 +- .../controller/RedisPubSubController.java | 4 +- .../demo/controller/SmsController.java | 4 +- .../demo/controller/TestBatchController.java | 2 +- .../demo/controller/TestDemoController.java | 14 ++-- .../demo/controller/TestI18nController.java | 7 +- .../controller/TestSensitiveController.java | 2 +- .../demo/controller/TestTreeController.java | 30 +++---- .../org/dromara/demo/domain/TestDemo.java | 2 +- .../dromara/demo/domain/TestDemoEncrypt.java | 4 +- .../demo/domain/vo/TestDemoImportVo.java | 3 +- .../dromara/demo/domain/vo/TestDemoVo.java | 4 +- .../demo/mapper/ShardingOrderItemMapper.java | 1 - .../demo/mapper/ShardingOrderMapper.java | 1 - .../dromara/demo/mapper/TestDemoMapper.java | 2 +- .../demo/mcp/McpDemoClientService.java | 10 +-- .../demo/service/ITestDemoService.java | 2 +- .../service/impl/ExportExcelServiceImpl.java | 58 ++++++------- .../service/impl/TestDemoServiceImpl.java | 4 +- .../service/impl/TestTreeServiceImpl.java | 2 +- .../src/main/resources/application.yml | 2 +- .../java/org/dromara/demo/DemoUnitTest.java | 21 +++-- .../java/org/dromara/demo/ParamUnitTest.java | 16 ++-- .../java/org/dromara/demo/TOrderTest.java | 11 ++- .../stream/RuoYiTestMqApplication.java | 1 + .../stream/callback/RabbitCallback.java | 1 + .../dromara/stream/config/RabbitConfig.java | 28 +++---- .../stream/consumer/RabbitConsumer.java | 10 +-- .../consumer/TransactionRocketConsumer.java | 4 +- .../controller/PushMessageController.java | 6 +- .../dromara/gateway/config/GatewayConfig.java | 6 +- .../properties/IgnoreWhiteProperties.java | 1 - .../dromara/gateway/filter/AuthFilter.java | 5 +- .../support/MutableHttpServletRequest.java | 8 +- .../gen/config/MyBatisDataSourceMonitor.java | 8 +- .../gen/config/properties/GenProperties.java | 2 - .../dromara/gen/controller/GenController.java | 10 +-- .../java/org/dromara/gen/domain/GenTable.java | 6 +- .../dromara/gen/mapper/GenTableMapper.java | 1 - .../gen/service/GenTableServiceImpl.java | 20 ++--- .../snailjob/TestMapReduceAnnotation1.java | 10 +-- .../controller/SysEmailController.java | 6 +- .../controller/SysOssConfigController.java | 4 +- .../resource/controller/SysOssController.java | 3 +- .../resource/domain/bo/SysOssConfigBo.java | 7 +- .../domain/convert/SysOssVoConvert.java | 1 + .../resource/dubbo/RemoteFileServiceImpl.java | 2 +- .../resource/event/OssConfigChangeEvent.java | 4 +- .../runner/ResourceApplicationRunner.java | 2 +- .../service/ISysOssConfigService.java | 2 +- .../resource/service/ISysOssService.java | 6 +- .../service/impl/SysMessageServiceImpl.java | 4 +- .../service/impl/SysOssConfigServiceImpl.java | 2 +- .../service/impl/SysOssServiceImpl.java | 6 +- .../monitor/SysLoginInfoController.java | 5 +- .../monitor/SysOperlogController.java | 7 +- .../monitor/SysUserOnlineController.java | 8 +- .../system/SysClientController.java | 4 +- .../system/SysConfigController.java | 9 +- .../controller/system/SysDeptController.java | 2 +- .../system/SysDictDataController.java | 8 +- .../system/SysDictTypeController.java | 9 +- .../controller/system/SysMenuController.java | 20 ++--- .../system/SysNoticeController.java | 6 +- .../controller/system/SysPostController.java | 8 +- .../system/SysProfileController.java | 8 +- .../controller/system/SysRoleController.java | 7 +- .../controller/system/SysUserController.java | 13 +-- .../org/dromara/system/domain/SysMenu.java | 2 +- .../org/dromara/system/domain/SysPost.java | 2 +- .../dromara/system/domain/bo/SysClientBo.java | 8 +- .../dromara/system/domain/bo/SysConfigBo.java | 1 - .../system/domain/bo/SysDictDataBo.java | 1 - .../dromara/system/domain/bo/SysSocialBo.java | 10 +-- .../domain/convert/SysLoginInfoBoConvert.java | 1 + .../domain/convert/SysOperLogBoConvert.java | 2 + .../domain/convert/SysUserBoConvert.java | 5 +- .../domain/convert/SysUserVoConvert.java | 1 + .../dromara/system/domain/vo/SysClientVo.java | 4 +- .../dromara/system/domain/vo/SysConfigVo.java | 4 +- .../dromara/system/domain/vo/SysDeptVo.java | 6 +- .../system/domain/vo/SysDictDataVo.java | 4 +- .../system/domain/vo/SysDictTypeVo.java | 4 +- .../system/domain/vo/SysLoginInfoVo.java | 5 +- .../dromara/system/domain/vo/SysMenuVo.java | 2 +- .../dromara/system/domain/vo/SysNoticeVo.java | 1 - .../system/domain/vo/SysOperLogVo.java | 4 +- .../dromara/system/domain/vo/SysPostVo.java | 5 +- .../system/domain/vo/SysUserExportVo.java | 2 +- .../system/domain/vo/SysUserImportVo.java | 2 +- .../dromara/system/domain/vo/SysUserVo.java | 4 +- .../dubbo/RemoteTaskAssigneeServiceImpl.java | 2 +- .../system/dubbo/RemoteUserServiceImpl.java | 5 +- .../dromara/system/mapper/SysUserMapper.java | 8 +- .../system/service/ISysClientService.java | 2 +- .../system/service/ISysConfigService.java | 3 +- .../system/service/ISysDeptService.java | 2 +- .../system/service/ISysDictDataService.java | 2 +- .../system/service/ISysDictTypeService.java | 2 +- .../system/service/ISysLoginInfoService.java | 4 +- .../system/service/ISysNoticeService.java | 2 +- .../system/service/ISysOperLogService.java | 2 +- .../system/service/ISysPermissionService.java | 4 +- .../system/service/ISysPostService.java | 2 +- .../system/service/ISysRoleService.java | 2 +- .../system/service/ISysUserService.java | 2 +- .../service/impl/SysDeptServiceImpl.java | 2 +- .../service/impl/SysLoginInfoServiceImpl.java | 2 +- .../service/impl/SysPostServiceImpl.java | 3 +- .../service/impl/SysRoleServiceImpl.java | 6 +- .../service/impl/SysUserServiceImpl.java | 2 +- .../workflow/common/ConditionalOnEnable.java | 2 +- .../controller/FlwCategoryController.java | 2 +- .../controller/FlwDefinitionController.java | 4 +- .../controller/FlwInstanceController.java | 4 +- .../controller/FlwSpelController.java | 4 +- .../controller/FlwTaskController.java | 8 +- .../controller/TestLeaveController.java | 4 +- .../workflow/domain/bo/FlowCategoryBo.java | 2 +- .../workflow/domain/bo/FlowSpelBo.java | 4 +- .../workflow/domain/vo/FlowCategoryVo.java | 6 +- .../workflow/domain/vo/FlowSpelVo.java | 4 +- .../workflow/domain/vo/FlowTaskVo.java | 1 - .../workflow/domain/vo/TestLeaveVo.java | 4 +- .../handler/FlowProcessEventHandler.java | 12 +-- .../listener/WorkflowGlobalListener.java | 1 - .../workflow/rule/SpelRuleComponent.java | 2 +- .../service/IFlwDefinitionService.java | 2 +- .../workflow/service/IFlwInstanceService.java | 2 +- .../workflow/service/IFlwSpelService.java | 2 +- .../workflow/service/IFlwTaskService.java | 6 +- .../workflow/service/ITestLeaveService.java | 2 +- .../impl/CategoryNameTranslationImpl.java | 7 +- .../impl/FlwDefinitionServiceImpl.java | 2 +- .../service/impl/FlwInstanceServiceImpl.java | 4 +- .../service/impl/FlwSpelServiceImpl.java | 4 +- .../service/impl/FlwTaskServiceImpl.java | 10 +-- .../service/impl/TestLeaveServiceImpl.java | 2 +- ruoyi-visual/pom.xml | 24 +++--- ruoyi-visual/ruoyi-monitor/pom.xml | 4 +- .../src/main/resources/logback-plus.xml | 14 ++-- .../ai/starter/filter/ActuatorAuthFilter.java | 13 +-- 271 files changed, 1064 insertions(+), 894 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java index f66338fc6..d07732376 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java @@ -15,6 +15,7 @@ public interface RemoteConfigService { /** * 获取注册开关 + * * @return true开启，false关闭 */ boolean selectRegisterEnabled(); diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePermissionService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePermissionService.java index 2a815a2ed..4c7417edd 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePermissionService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePermissionService.java @@ -12,7 +12,7 @@ public interface RemotePermissionService { /** * 获取角色数据权限 * - * @param userId 用户id + * @param userId 用户id * @return 角色权限信息 */ Set getRolePermission(Long userId); @@ -20,7 +20,7 @@ public interface RemotePermissionService { /** * 获取菜单数据权限 * - * @param userId 用户id + * @param userId 用户id * @return 菜单权限信息 */ Set getMenuPermission(Long userId); diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePostService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePostService.java index 8b5549563..9eb44a60b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePostService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemotePostService.java @@ -1,7 +1,6 @@ package org.dromara.system.api; import java.util.Collection; -import java.util.List; import java.util.Map; /** diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteRoleService.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteRoleService.java index f651fdd82..f84019c13 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteRoleService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteRoleService.java @@ -1,7 +1,6 @@ package org.dromara.system.api; import java.util.Collection; -import java.util.List; import java.util.Map; /** diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java index 1e6363d3e..82a079759 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java @@ -1,14 +1,13 @@ package org.dromara.system.api.domain.bo; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.dromara.common.core.constant.SystemConstants; -import org.dromara.common.core.xss.Xss; - import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.xss.Xss; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java index 662885582..a778fadce 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java @@ -1,6 +1,7 @@ package org.dromara.system.api.domain.vo; import lombok.Data; + import java.io.Serial; import java.io.Serializable; import java.util.List; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java index d01c96829..0aa244035 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java @@ -1,6 +1,7 @@ package org.dromara.system.api.domain.vo; import lombok.Data; + import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTaskAssigneeVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTaskAssigneeVo.java index b2eb304e7..cce9b42a0 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTaskAssigneeVo.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTaskAssigneeVo.java @@ -6,8 +6,8 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; -import java.util.Collection; import java.time.LocalDateTime; +import java.util.Collection; import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java index 56928d0e4..3823c5678 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java @@ -2,6 +2,7 @@ package org.dromara.system.api.model; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.StringUtils; import java.io.Serial; import java.io.Serializable; @@ -146,7 +147,7 @@ public class LoginUser implements Serializable { if (userId == null) { throw new IllegalArgumentException("用户ID不能为空"); } - return userType + ":" + userId; + return userType + StringUtils.COLON + userId; } } diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java b/ruoyi-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java index f5e4ecd36..118ce8325 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java @@ -1,14 +1,6 @@ package org.dromara.auth.config; -import cn.hutool.captcha.CaptchaUtil; -import cn.hutool.captcha.CircleCaptcha; -import cn.hutool.captcha.LineCaptcha; -import cn.hutool.captcha.ShearCaptcha; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Lazy; - -import java.awt.*; /** * 验证码配置 diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java index b4494333d..4b460399f 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java @@ -17,7 +17,10 @@ import org.dromara.auth.service.SysLoginService; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.model.LoginBody; -import org.dromara.common.core.utils.*; +import org.dromara.common.core.utils.DateUtils; +import org.dromara.common.core.utils.MessageUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.encrypt.annotation.ApiEncrypt; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.satoken.utils.LoginHelper; diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java b/ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java index 3fe476cff..3f4cb64df 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java @@ -3,11 +3,11 @@ package org.dromara.auth.listener; import cn.dev33.satoken.listener.SaTokenListener; import cn.dev33.satoken.stp.parameter.SaLoginParameter; import lombok.extern.slf4j.Slf4j; +import org.dromara.auth.event.UserLoginSuccessEvent; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.auth.event.UserLoginSuccessEvent; import org.springframework.stereotype.Component; /** diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java index e617e063e..c9a1a16f4 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java @@ -1,11 +1,11 @@ package org.dromara.auth.service; import cn.dev33.satoken.exception.NotLoginException; -import cn.hutool.crypto.digest.BCrypt; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.crypto.digest.BCrypt; import com.baomidou.lock.annotation.Lock4j; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -14,7 +14,9 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.auth.form.RegisterBody; import org.dromara.auth.properties.CaptchaProperties; import org.dromara.auth.properties.UserPasswordProperties; -import org.dromara.common.core.constant.*; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.enums.LoginType; import org.dromara.common.core.enums.UserType; import org.dromara.common.core.exception.ServiceException; diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java b/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java index a0b132c11..74378e465 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java @@ -1,8 +1,8 @@ package org.dromara.auth.service.impl; -import cn.hutool.crypto.digest.BCrypt; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; +import cn.hutool.crypto.digest.BCrypt; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java b/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java index c3380ad57..e014909b9 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java @@ -25,6 +25,7 @@ import org.dromara.system.api.model.LoginUser; import org.springframework.stereotype.Service; import java.util.List; + /** * 第三方授权策略 * @@ -45,8 +46,8 @@ public class SocialAuthStrategy implements IAuthStrategy { /** * 登录-第三方授权登录 * - * @param body 登录信息 - * @param client 客户端信息 + * @param body 登录信息 + * @param client 客户端信息 */ @Override public LoginVo login(String body, RemoteClientVo client) { diff --git a/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/NoExternalStreamBinderCondition.java b/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/NoExternalStreamBinderCondition.java index 5af4f5f31..1ce59daa9 100644 --- a/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/NoExternalStreamBinderCondition.java +++ b/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/NoExternalStreamBinderCondition.java @@ -3,10 +3,10 @@ package org.dromara.common.bus.config; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.io.Resource; -import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.core.io.support.ResourcePatternResolver; +import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.util.StringUtils; import java.util.Properties; diff --git a/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/RedisBusBinderConfiguration.java b/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/RedisBusBinderConfiguration.java index 875c7aaef..4c01eaccb 100644 --- a/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/RedisBusBinderConfiguration.java +++ b/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/RedisBusBinderConfiguration.java @@ -1,7 +1,7 @@ package org.dromara.common.bus.config; -import org.dromara.common.bus.redis.RedisMessageChannelBinder; import org.dromara.common.bus.redis.RedisBusHealthIndicator; +import org.dromara.common.bus.redis.RedisMessageChannelBinder; import org.redisson.api.RedissonClient; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/redis/RedisMessageChannelBinder.java b/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/redis/RedisMessageChannelBinder.java index f44618889..259e67c0f 100644 --- a/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/redis/RedisMessageChannelBinder.java +++ b/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/redis/RedisMessageChannelBinder.java @@ -4,21 +4,17 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.bus.config.RedisBusProperties; import org.redisson.api.RStream; import org.redisson.api.RedissonClient; -import org.redisson.api.stream.AutoClaimResult; -import org.redisson.api.stream.StreamAddArgs; -import org.redisson.api.stream.StreamCreateGroupArgs; -import org.redisson.api.stream.StreamMessageId; -import org.redisson.api.stream.StreamReadGroupArgs; +import org.redisson.api.stream.*; import org.springframework.cloud.stream.binder.AbstractBinder; import org.springframework.cloud.stream.binder.Binding; import org.springframework.cloud.stream.binder.ConsumerProperties; import org.springframework.cloud.stream.binder.ProducerProperties; +import org.springframework.core.env.Environment; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.MessageBuilder; -import org.springframework.core.env.Environment; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -71,7 +67,7 @@ public class RedisMessageChannelBinder extends AbstractBinder stream = redissonClient.getStream(buildStreamName(name)); MessageHandler handler = message -> stream.add(StreamAddArgs.entry( - MESSAGE_FIELD, new RedisBusMessage(message.getPayload(), new HashMap<>(message.getHeaders()))) + MESSAGE_FIELD, new RedisBusMessage(message.getPayload(), new HashMap<>(message.getHeaders()))) .trimNonStrict().maxLen(properties.getStreamMaxLen()).noLimit()); ((SubscribableChannel) outboundBindTarget).subscribe(handler); log.info("Redis bus producer bound to stream: {}", name); 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/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 ee25d8edf..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 @@ -2,6 +2,8 @@ package org.dromara.common.core.utils; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.time.DateFormatUtils; import org.dromara.common.core.enums.FormatsType; import org.dromara.common.core.exception.ServiceException; @@ -19,15 +21,16 @@ import java.util.concurrent.TimeUnit; * * @author ruoyi */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) 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"}; - - @Deprecated - private DateUtils() { - } + "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM" + }; /** * 获取当前日期和时间 @@ -124,7 +127,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { } /** - * 将指定 LocalDateTime 格式化为 YYYY-MM-DD HH:MM:SS 格式的字符串 + * 将 LocalDateTime 格式化为 YYYY-MM-DD HH:MM:SS 格式的字符串 * * @param dateTime 要格式化的 LocalDateTime 对象 * @return 格式化后的日期时间字符串 @@ -264,12 +267,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * @return 时间差字符串，格式为 "x天 x小时 x分钟 x秒"，若为 0 则不显示 */ public static String getTimeDifference(LocalDateTime endDate, LocalDateTime nowDate) { - Duration duration = Duration.between(nowDate, endDate); - long day = duration.toDays(); - long hour = duration.toHours() % 24; - long min = duration.toMinutes() % 60; - long sec = duration.toSeconds() % 60; - // 构建时间差字符串，条件是值不为0才显示 + long diffInMillis = java.time.Duration.between(nowDate, endDate).toMillis(); + long day = TimeUnit.MILLISECONDS.toDays(diffInMillis); + long hour = TimeUnit.MILLISECONDS.toHours(diffInMillis) % 24; + long min = TimeUnit.MILLISECONDS.toMinutes(diffInMillis) % 60; + long sec = TimeUnit.MILLISECONDS.toSeconds(diffInMillis) % 60; StringBuilder result = new StringBuilder(); if (day > 0) { result.append(String.format("%d天 ", day)); 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 abcf56998..7a7a4872f 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 199fd8248..401f9a0d3 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 679a74432..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 @@ -23,6 +23,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { public static final String SLASH = "/"; + public static final String COLON = ":"; + private static final AntPathMatcher ANT_PATH_MATCHER = new AntPathMatcher(); @Deprecated @@ -363,6 +365,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return input; } } + /** * 将可迭代对象中的元素使用逗号拼接成字符串 * @@ -397,7 +400,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 判断字符串是否在指定的字符串列表中 * - * @param string 字符串 + * @param string 字符串 * @param searchStrings 字符串列表 * @return 是否在列表中 */ @@ -408,7 +411,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 忽略大小写判断字符串是否在指定的字符串列表中 * - * @param string 字符串 + * @param string 字符串 * @param searchStrings 字符串列表 * @return 是否在列表中 */ @@ -499,8 +502,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { /** * 移除字符串中的指定字符序列。 * - * @param str 要处理的字符串，不能为null - * @param remove 要移除的字符序列，不能为null + * @param str 要处理的字符串，不能为null + * @param remove 要移除的字符序列，不能为null * @return 处理后的字符串 */ public static String remove(final String str, final String remove) { @@ -548,7 +551,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return Strings.CS.containsAny(cs, searchCharSequences); } - /** * 将一个字符串替换为较大字符串内的另一个字符串，一次 */ @@ -563,4 +565,11 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return Strings.CS.endsWithAny(sequence, searchStrings); } + /** + * 测试 CharSequence 是否以指定的后缀结尾。 + */ + public static boolean endsWith(final CharSequence str, final CharSequence suffix) { + return Strings.CS.endsWith(str, suffix); + } + } 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 74b217fd6..340553da0 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/ValidatorUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java index bc9c371ef..06b8fd66e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java @@ -1,11 +1,11 @@ package org.dromara.common.core.utils; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import jakarta.validation.Validator; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + import java.util.Set; /** 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 23fa2cfe2..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 @@ -1,30 +1,65 @@ package org.dromara.common.core.utils.file; +import cn.hutool.core.util.StrUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + /** * 媒体类型工具类 * * @author ruoyi */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public class MimeTypeUtils { + + /** + * PNG 图片 MIME 类型 + */ public static final String IMAGE_PNG = "image/png"; + /** + * JPG 图片 MIME 类型 + */ public static final String IMAGE_JPG = "image/jpg"; + /** + * JPEG 图片 MIME 类型 + */ public static final String IMAGE_JPEG = "image/jpeg"; + /** + * BMP 图片 MIME 类型 + */ public static final String IMAGE_BMP = "image/bmp"; + /** + * GIF 图片 MIME 类型 + */ public static final String IMAGE_GIF = "image/gif"; + /** + * 图片扩展名数组 + */ public static final String[] IMAGE_EXTENSION = {"bmp", "gif", "jpg", "jpeg", "png"}; + /** + * Flash 文件扩展名数组 + */ public static final String[] FLASH_EXTENSION = {"swf", "flv"}; - public static final String[] MEDIA_EXTENSION = {"swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", - "asf", "rm", "rmvb"}; - + /** + * 视频文件扩展名数组 + */ public static final String[] VIDEO_EXTENSION = {"mp4", "avi", "rmvb"}; + /** + * 媒体文件扩展名数组（音频+视频+Flash） + */ + public static final String[] MEDIA_EXTENSION = {"swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", "asf", "rm", "rmvb"}; + + /** + * 默认允许上传的文件扩展名数组 + */ public static final String[] DEFAULT_ALLOWED_EXTENSION = { // 图片 "bmp", "gif", "jpg", "jpeg", "png", @@ -35,6 +70,47 @@ public class MimeTypeUtils { // 视频格式 "mp4", "avi", "rmvb", // pdf - "pdf"}; + "pdf" + }; + + /** + * 判断文件扩展名是否为图片格式（忽略大小写） + * + * @param extension 文件扩展名 + * @return 是图片返回 true，否则返回 false + */ + public static boolean isImage(String extension) { + return StrUtil.equalsAnyIgnoreCase(extension, IMAGE_EXTENSION); + } + + /** + * 判断文件扩展名是否为视频格式（忽略大小写） + * + * @param extension 文件扩展名 + * @return 是视频返回 true，否则返回 false + */ + public static boolean isVideo(String extension) { + return StrUtil.equalsAnyIgnoreCase(extension, VIDEO_EXTENSION); + } + + /** + * 判断文件扩展名是否为媒体格式（忽略大小写） + * + * @param extension 文件扩展名 + * @return 是媒体返回 true，否则返回 false + */ + public static boolean isMedia(String extension) { + return StrUtil.equalsAnyIgnoreCase(extension, MEDIA_EXTENSION); + } + + /** + * 判断文件扩展名是否在默认允许上传范围内（忽略大小写） + * + * @param extension 文件扩展名 + * @return 允许返回 true，不允许返回 false + */ + public static boolean isDefaultAllowed(String extension) { + return StrUtil.equalsAnyIgnoreCase(extension, DEFAULT_ALLOWED_EXTENSION); + } } 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/reflect/AnnotationUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/AnnotationUtils.java index dedd93ca7..32f1bcbe6 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 注解对象 */ @@ -40,7 +40,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 注解对象所有属性键值 * @throws UtilException 调用注解中的方法时执行异常 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/utils/regex/RegexUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java index 6dde12998..5200d5f49 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java @@ -2,13 +2,16 @@ package org.dromara.common.core.utils.regex; import cn.hutool.core.util.ReUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.dromara.common.core.constant.RegexConstants; /** * 正则相关工具类 * - * @author Feng + * @author AprilWind */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class RegexUtils extends ReUtil { /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java index c0dda2020..b63a540d9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java @@ -2,6 +2,8 @@ package org.dromara.common.core.utils.regex; import cn.hutool.core.exceptions.ValidateException; import cn.hutool.core.lang.Validator; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.dromara.common.core.factory.RegexPatternPoolFactory; import java.util.regex.Pattern; @@ -10,8 +12,9 @@ import java.util.regex.Pattern; * 正则字段校验器 * 主要验证字段非空、是否为满足指定格式等 * - * @author Feng + * @author AprilWind */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public class RegexValidator extends Validator { /** 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 eed495f45..6def0633c 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-core/src/main/java/org/dromara/common/core/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java index 330a63009..374ea0b2d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java @@ -2,7 +2,6 @@ package org.dromara.common.core.xss; import cn.hutool.core.util.ReUtil; import cn.hutool.http.HtmlUtil; - import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import org.dromara.common.core.utils.StringUtils; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocAutoConfiguration.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocAutoConfiguration.java index decef8f17..0c7659b68 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocAutoConfiguration.java @@ -29,7 +29,10 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.boot.web.server.autoconfigure.ServerProperties; import org.springframework.context.annotation.Bean; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.Set; /** * 接口文档配置 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/model/SaTokenSecurityMetadata.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/core/model/SaTokenSecurityMetadata.java index e0782a20c..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(); } @@ -162,6 +162,7 @@ public class SaTokenSecurityMetadata { /** * 重写mode的获取方法，返回符号而非文字 + * * @return AND→&，OR→|，默认→& */ public String getModeSymbol() { 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 e9333c044..de87ca871 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 @@ -46,76 +46,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 注解的值 */ @@ -125,7 +133,8 @@ public abstract class AbstractMetadataJavadocResolver implements JavadocResol /** * 获取处理器方法所属类上的注解的值 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationClassName 注解类名称 * @return 注解的值 */ @@ -137,7 +146,8 @@ public abstract class AbstractMetadataJavadocResolver implements JavadocResol /** * 获取处理器方法上的注解的值 - * @param handlerMethod 处理器方法 + * + * @param handlerMethod 处理器方法 * @param annotationClass 注解类 * @return 注解的值 */ @@ -147,7 +157,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 1e295b8a1..c375bd9fe 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 @@ -15,6 +15,7 @@ public interface JavadocResolver extends Comparable, Ordered { /** * 检查解析器是否支持解析 HandlerMethod + * * @param handlerMethod 处理器方法 * @return 是否支持解析 */ @@ -22,8 +23,9 @@ 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 9e09619de..dcf199711 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 @@ -59,11 +59,11 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa } public SaTokenAnnotationMetadataJavadocResolver(int order) { - this(DEFAULT_METADATA_PROVIDER,order); + this(DEFAULT_METADATA_PROVIDER, order); } public SaTokenAnnotationMetadataJavadocResolver(Supplier metadataProvider, int order) { - super(metadataProvider,order); + super(metadataProvider, order); } @Override @@ -74,7 +74,7 @@ public class SaTokenAnnotationMetadataJavadocResolver extends AbstractMetadataJa @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(); } @@ -109,10 +109,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-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java index 32be73227..df5a11a6a 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java @@ -231,7 +231,7 @@ public class OpenApiHandler extends OpenAPIService { if (javadocProvider.isPresent()) { String description = javadocProvider.get().getMethodJavadocDescription(handlerMethod.getMethod()); String summary = javadocProvider.get().getFirstSentence(description); - if (StringUtils.isNotBlank(description)){ + if (StringUtils.isNotBlank(description)) { operation.setSummary(summary); } // 调用解析器提取JavaDoc中的权限信息 diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedissonMetadataReport.java b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedissonMetadataReport.java index 9f50d1225..9b50b8d38 100644 --- a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedissonMetadataReport.java +++ b/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedissonMetadataReport.java @@ -44,23 +44,21 @@ public class RedissonMetadataReport extends AbstractMetadataReport { // Lua script for atomic CAS on a hash field: // If the current value equals ticket (or field is absent, or ticket is empty), update and return 1; else return 0. private static final String CAS_LUA = """ - local old = redis.call('HGET', KEYS[1], ARGV[1]) - if old == false or ARGV[3] == '' or old == ARGV[3] then - redis.call('HSET', KEYS[1], ARGV[1], ARGV[2]) - return 1 - end - return 0"""; + local old = redis.call('HGET', KEYS[1], ARGV[1]) + if old == false or ARGV[3] == '' or old == ARGV[3] then + redis.call('HSET', KEYS[1], ARGV[1], ARGV[2]) + return 1 + end + return 0"""; private final String root; private final long ttlMs; - - // Lazily initialized — Dubbo SPI creates this class before Spring is fully ready - private volatile RedissonClient redissonClient; - // topic key → RTopic (keeps the subscription alive) private final ConcurrentHashMap topicMap = new ConcurrentHashMap<>(); // serviceKey → listeners (for dispatching mapping change events) private final ConcurrentHashMap> listenerMap = new ConcurrentHashMap<>(); + // Lazily initialized — Dubbo SPI creates this class before Spring is fully ready + private volatile RedissonClient redissonClient; public RedissonMetadataReport(URL url) { super(url); diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/ActuatorEnvironmentPostProcessor.java b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/ActuatorEnvironmentPostProcessor.java index a1c94f469..e33a67edc 100644 --- a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/ActuatorEnvironmentPostProcessor.java +++ b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/ActuatorEnvironmentPostProcessor.java @@ -12,15 +12,15 @@ import org.springframework.core.env.ConfigurableEnvironment; */ public class ActuatorEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered { - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { + @Override + public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { String enable = environment.getProperty("easy-es.enable", "false"); System.setProperty("management.health.elasticsearch.enabled", enable); - } + } - @Override - public int getOrder() { - return Ordered.HIGHEST_PRECEDENCE; - } + @Override + public int getOrder() { + return Ordered.HIGHEST_PRECEDENCE; + } } 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/config/EncryptorAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java index ebdfd04b1..6f125873d 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java @@ -57,7 +57,7 @@ public class EncryptorAutoConfiguration { /** * 创建加密字段处理器。 * - * @param encryptorManager 加解密管理器 + * @param encryptorManager 加解密管理器 * @param encryptContextFactory 加密上下文工厂 * @return 加密字段处理器 */ 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/EncryptedFieldProcessor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptedFieldProcessor.java index 5f83062ae..dbe42c031 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptedFieldProcessor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptedFieldProcessor.java @@ -6,15 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; /** * 加密字段处理器。 @@ -31,7 +23,7 @@ public class EncryptedFieldProcessor { * 构造加密字段处理器。 * * @param encryptorManager 加解密管理器 - * @param contextFactory 加密上下文工厂 + * @param contextFactory 加密上下文工厂 */ public EncryptedFieldProcessor(EncryptorManager encryptorManager, EncryptContextFactory contextFactory) { this.encryptorManager = encryptorManager; 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 a7b241608..631128eec 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 @@ -39,7 +39,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/core/encryptor/RsaEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java index 46f3f2539..b200bfce3 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java @@ -53,7 +53,7 @@ public class RsaEncryptor 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/Sm2Encryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java index a1113788a..add3e5f68 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java @@ -52,7 +52,7 @@ public class Sm2Encryptor 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/Sm4Encryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java index 8528fbbbf..358ee65ef 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java @@ -46,7 +46,7 @@ public class Sm4Encryptor 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/enums/AlgorithmType.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/AlgorithmType.java index 45ec3e88a..c2c73072f 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/AlgorithmType.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enums/AlgorithmType.java @@ -1,8 +1,8 @@ package org.dromara.common.encrypt.enums; -import org.dromara.common.encrypt.core.encryptor.*; import lombok.AllArgsConstructor; import lombok.Getter; +import org.dromara.common.encrypt.core.encryptor.*; /** * 算法名称 diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java index 8a13a00af..e9b73499b 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java @@ -32,9 +32,9 @@ public class CryptoFilter implements Filter { /** * 构造加解密过滤器。 * - * @param properties API 解密配置 + * @param properties API 解密配置 * @param requestMappingHandlerMapping 请求映射处理器 - * @param handlerExceptionResolver 异常处理器 + * @param handlerExceptionResolver 异常处理器 */ public CryptoFilter(ApiDecryptProperties properties, RequestMappingHandlerMapping requestMappingHandlerMapping, 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 b5ca633f8..e8b84ef88 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 @@ -28,7 +28,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 1d5396708..65c5ad5e1 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 bcc3afec8..c19200a80 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 fbd31ccef..d34b33f0d 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/ExcelDictConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java index 9b747ab7b..fd66ce017 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java @@ -3,7 +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 org.dromara.common.excel.annotation.ExcelDictFormat; +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; @@ -13,7 +13,7 @@ import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; import org.dromara.common.core.service.DictService; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; -import lombok.extern.slf4j.Slf4j; +import org.dromara.common.excel.annotation.ExcelDictFormat; import java.lang.reflect.Field; import java.util.LinkedHashMap; 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 7c6c787cf..6c9f772e4 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; 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 a8dca7b2f..16b2e6b29 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; @@ -29,6 +29,7 @@ public class CellMergeHandler { // 行合并开始下标 this.rowIndex = hasTitle ? 1 : 0; } + private CellMergeHandler(final boolean hasTitle, final int rowIndex) { this.hasTitle = hasTitle; this.rowIndex = hasTitle ? rowIndex : 0; @@ -187,6 +188,7 @@ public class CellMergeHandler { return new FieldColumnIndex(colIndex, cellMerge); } } + /** * 创建一个单元格合并处理器实例 * 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 dadf6b147..6020de95f 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; 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/core/ExcelDownHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java index 801764c03..2ef96665a 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java @@ -6,13 +6,13 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.EnumUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.fesod.sheet.metadata.FieldCache; import org.apache.fesod.sheet.metadata.FieldWrapper; import org.apache.fesod.sheet.util.ClassUtils; import org.apache.fesod.sheet.write.handler.SheetWriteHandler; import org.apache.fesod.sheet.write.metadata.holder.WriteSheetHolder; import org.apache.fesod.sheet.write.metadata.holder.WriteWorkbookHolder; -import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.ss.util.CellReference; 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 6b87fee20..1cc932a12 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; 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..adae7a457 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 - /** * 创建表格。 * @@ -249,6 +243,4 @@ public record ExcelWriterWrapper(ExcelWriter excelWriter) { return FesodSheet.writerTable(); } - // -------------------------------- table end - } diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java index b244cd640..1d2a375a7 100644 --- a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java +++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java @@ -8,7 +8,6 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; -import tools.jackson.databind.ext.javatime.deser.LocalDateTimeDeserializer; import tools.jackson.databind.ext.javatime.ser.LocalDateTimeSerializer; import tools.jackson.databind.module.SimpleModule; import tools.jackson.databind.ser.std.ToStringSerializer; 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 4db1c9ad7..58d4dffa3 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,16 +13,19 @@ import tools.jackson.databind.ser.jdk.NumberSerializer; @JacksonStdImpl public class BigNumberSerializer extends NumberSerializer { - /** - * 根据 JS Number.MAX_SAFE_INTEGER 与 Number.MIN_SAFE_INTEGER 得来 - */ - private static final long MAX_SAFE_INTEGER = 9007199254740991L; - private static final long MIN_SAFE_INTEGER = -9007199254740991L; - /** * 提供实例 */ public static final BigNumberSerializer INSTANCE = new BigNumberSerializer(Number.class); + /** + * 根据 JS Number.MAX_SAFE_INTEGER 与 Number.MIN_SAFE_INTEGER 得来 + */ + private static final long MAX_SAFE_INTEGER = 9007199254740991L; + /** + * JavaScript 最小安全整数。 + */ + private static final long MIN_SAFE_INTEGER = -9007199254740991L; + public BigNumberSerializer(Class rawType) { super(rawType); diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomEnvironmentPostProcessor.java b/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomEnvironmentPostProcessor.java index 77e8d8e86..0f2483e6c 100644 --- a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomEnvironmentPostProcessor.java +++ b/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomEnvironmentPostProcessor.java @@ -12,14 +12,14 @@ import org.springframework.core.env.ConfigurableEnvironment; */ public class CustomEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered { - @Override - public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { + @Override + public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { System.setProperty("dubbo.consumer.loadbalance", "customDubboLoadBalancer"); - } + } - @Override - public int getOrder() { - return Ordered.HIGHEST_PRECEDENCE; - } + @Override + public int getOrder() { + return Ordered.HIGHEST_PRECEDENCE; + } } 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 d71b66128..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 @@ -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/LogEventListener.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java index 0ddcfc1df..d99127517 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java @@ -59,14 +59,13 @@ public class LogEventListener { } 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(); // 获取客户端浏览器 diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/core/MailBuilder.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/core/MailBuilder.java index 2cd98de7b..7eb00829e 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/core/MailBuilder.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/core/MailBuilder.java @@ -220,7 +220,7 @@ public final class MailBuilder { * 设置正文。 * * @param content 正文 - * @param html 是否 HTML + * @param html 是否 HTML * @return 当前构建器 */ public MailBuilder content(String content, boolean html) { @@ -232,7 +232,7 @@ public final class MailBuilder { /** * 添加内联图片。 * - * @param cid 图片 cid + * @param cid 图片 cid * @param inputStream 图片输入流 * @return 当前构建器 */ diff --git a/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpClientTemplate.java b/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpClientTemplate.java index 962665cdd..a72b5d3b0 100644 --- a/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpClientTemplate.java +++ b/ruoyi-common/ruoyi-common-mcp/src/main/java/org/dromara/common/mcp/core/McpClientTemplate.java @@ -41,7 +41,7 @@ public class McpClientTemplate { /** * 调用所有 MCP Server 上的同名工具。 * - * @param toolName 工具名称 + * @param toolName 工具名称 * @param arguments 工具参数 * @return 各 Server 的工具调用结果 */ @@ -58,8 +58,8 @@ public class McpClientTemplate { * 调用指定 MCP Server 上的工具。 * * @param serverName Server 名称 - * @param toolName 工具名称 - * @param arguments 工具参数 + * @param toolName 工具名称 + * @param arguments 工具参数 * @return 工具调用结果 */ public Optional callTool(String serverName, String toolName, Map arguments) { @@ -86,7 +86,7 @@ public class McpClientTemplate { * 读取指定 MCP Server 上的资源。 * * @param serverName Server 名称 - * @param uri 资源地址 + * @param uri 资源地址 * @return 资源内容 */ public Optional readResource(String serverName, String uri) { 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 351288ce4..f308387ae 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 @@ -17,7 +17,7 @@ public class DataPermissionPointcutAdvisor extends AbstractPointcutAdvisor { public DataPermissionPointcutAdvisor() { this.advice = new DataPermissionAdvice(); - this.pointcut = new DataPermissionPointcut(); + this.pointcut = new DataPermissionPointcut(); } @Override diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java index c11ca8ea5..d17a9645c 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java @@ -71,6 +71,7 @@ public class MybatisPlusConfiguration { public DataPermissionPointcutAdvisor dataPermissionPointcutAdvisor() { return new DataPermissionPointcutAdvisor(); } + /** * 分页插件，自动识别数据库类型 */ diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java index 62e140668..6a0054002 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java @@ -77,7 +77,7 @@ public class PageQuery implements Serializable { /** * 构建排序 - * + *

* 支持的用法如下: * {isAsc:"asc",orderByColumn:"id"} order by id asc * {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc 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 f048470e1..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 @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.support.LambdaMeta; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import org.apache.ibatis.reflection.property.PropertyNamer; import java.util.regex.Pattern; @@ -14,13 +16,14 @@ import java.util.regex.Pattern; * * @author Lion Li */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class AggregateSelectUtils { + /** + * 查询别名合法性匹配规则。 + */ private static final Pattern ALIAS_PATTERN = Pattern.compile("[A-Za-z_][A-Za-z0-9_]*"); - private AggregateSelectUtils() { - } - /** * 追加查询字段 SQL。 * 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 474c6d473..36b6ae3ce 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/filter/DubboDataPermissionFilter.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/filter/DubboDataPermissionFilter.java index 61e549d5b..45ff62e68 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/filter/DubboDataPermissionFilter.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/filter/DubboDataPermissionFilter.java @@ -1,10 +1,10 @@ package org.dromara.common.mybatis.filter; -import org.dromara.common.mybatis.helper.DataPermissionHelper; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.constants.CommonConstants; import org.apache.dubbo.common.extension.Activate; import org.apache.dubbo.rpc.*; +import org.dromara.common.mybatis.helper.DataPermissionHelper; import java.util.Map; 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 abdf49d7a..d04a8a66e 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 @@ -60,8 +60,8 @@ public class PlusDataPermissionHandler { /** * 获取数据过滤条件的 SQL 片段 * - * @param where 原始的查询条件表达式 - * @param isSelect 是否为查询语句 + * @param where 原始的查询条件表达式 + * @param isSelect 是否为查询语句 * @return 数据过滤条件的 SQL 片段 */ public Expression getSqlSegment(Expression where, boolean isSelect) { 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 510043a19..1c24a429b 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 a486b1274..16f85de7b 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,21 +19,21 @@ 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 ) { 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 4fe26aa05..2f6543a3c 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 @@ -18,7 +18,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/core/SseEmitterSessionManager.java b/ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/core/SseEmitterSessionManager.java index e09a3de54..eb4fb22c5 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 81fd9876f..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 @@ -50,6 +50,12 @@ public class RateLimiterAspect { private final ParameterNameDiscoverer pnd = new DefaultParameterNameDiscoverer(); + /** + * 在限流注解方法执行前扣减令牌，令牌不足时阻断请求。 + * + * @param point 切点信息 + * @param rateLimiter 限流注解配置 + */ @Before("@annotation(rateLimiter)") public void doBefore(JoinPoint point, RateLimiter rateLimiter) { int time = rateLimiter.time(); @@ -79,6 +85,13 @@ public class RateLimiterAspect { } } + /** + * 组装限流缓存键。 + * + * @param rateLimiter 限流注解配置 + * @param point 切点信息 + * @return 限流缓存键 + */ private String getCombineKey(RateLimiter rateLimiter, JoinPoint point) { String key = rateLimiter.key(); // 判断 key 不为空 和 不是表达式 @@ -99,13 +112,13 @@ public class RateLimiterAspect { key = expression.getValue(context, String.class); } StringBuilder stringBuffer = new StringBuilder(GlobalConstants.RATE_LIMIT_KEY); - stringBuffer.append(ServletUtils.getRequest().getRequestURI()).append(":"); + stringBuffer.append(ServletUtils.getRequest().getRequestURI()).append(StringUtils.COLON); if (rateLimiter.limitType() == LimitType.IP) { // 获取请求ip - stringBuffer.append(ServletUtils.getClientIP()).append(":"); + stringBuffer.append(ServletUtils.getClientIP()).append(StringUtils.COLON); } else if (rateLimiter.limitType() == LimitType.CLUSTER) { // 获取客户端实例id - stringBuffer.append(RedisUtils.getClient().getId()).append(":"); + stringBuffer.append(RedisUtils.getClient().getId()).append(StringUtils.COLON); } return stringBuffer.append(key).toString(); } 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 c772a33d0..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 @@ -11,8 +11,8 @@ import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.constant.GlobalConstants; +import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.domain.R; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MessageUtils; @@ -42,7 +42,7 @@ public class RepeatSubmitAspect { /** * 请求进入前校验是否重复提交。 * - * @param point 切点 + * @param point 切点 * @param repeatSubmit 防重复提交注解 */ @Before("@annotation(repeatSubmit)") @@ -62,7 +62,7 @@ public class RepeatSubmitAspect { // 唯一值（没有消息头则使用请求地址） String submitKey = StringUtils.trimToEmpty(request.getHeader(SaManager.getConfig().getTokenName())); - submitKey = SecureUtil.md5(submitKey + ":" + nowParams); + submitKey = SecureUtil.md5(submitKey + StringUtils.COLON + nowParams); // 唯一标识（指定key + url + 消息头） String cacheRepeatKey = GlobalConstants.REPEAT_SUBMIT_KEY + url + submitKey; if (RedisUtils.setObjectIfAbsent(cacheRepeatKey, "", Duration.ofMillis(interval))) { @@ -111,6 +111,9 @@ public class RepeatSubmitAspect { } } + /** + * 删除当前请求写入的防重键。 + */ private void deleteRepeatKey() { String key = KEY_CACHE.get(); if (StringUtils.isNotBlank(key)) { @@ -120,6 +123,9 @@ public class RepeatSubmitAspect { /** * 参数拼装 + * + * @param paramsArray 方法参数数组 + * @return 拼装后的参数字符串 */ private String argsArrayToString(Object[] paramsArray) { StringJoiner params = new StringJoiner(" "); diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/IdempotentAutoConfiguration.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/IdempotentAutoConfiguration.java index 795547d38..7deb09513 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/IdempotentAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/IdempotentAutoConfiguration.java @@ -12,9 +12,9 @@ import org.springframework.context.annotation.Bean; @AutoConfiguration(after = RedisConfiguration.class) public class IdempotentAutoConfiguration { - @Bean - public RepeatSubmitAspect repeatSubmitAspect() { - return new RepeatSubmitAspect(); - } + @Bean + public RepeatSubmitAspect repeatSubmitAspect() { + return new RepeatSubmitAspect(); + } } diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java index 06cc87805..7b084254d 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.redis.config.properties.RedissonProperties; import org.dromara.common.redis.handler.KeyPrefixHandler; import org.dromara.common.redis.handler.RedisExceptionHandler; @@ -16,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.core.task.VirtualThreadTaskExecutor; import tools.jackson.databind.DefaultTyping; import tools.jackson.databind.ext.javatime.deser.LocalDateTimeDeserializer; import tools.jackson.databind.ext.javatime.ser.LocalDateTimeSerializer; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java index f34ddc83a..25156b593 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java @@ -14,13 +14,21 @@ public class KeyPrefixHandler implements NameMapper { private final String keyPrefix; + /** + * 创建 Redis Key 前缀处理器。 + * + * @param keyPrefix Key 前缀 + */ public KeyPrefixHandler(String keyPrefix) { //前缀为空 则返回空前缀 - this.keyPrefix = StringUtils.isBlank(keyPrefix) ? "" : keyPrefix + ":"; + this.keyPrefix = StringUtils.isBlank(keyPrefix) ? "" : keyPrefix + StringUtils.COLON; } /** - * 增加前缀 + * 为原始 Key 增加前缀。 + * + * @param name 原始 Key + * @return 带前缀的 Key */ @Override public String map(String name) { @@ -34,7 +42,10 @@ public class KeyPrefixHandler implements NameMapper { } /** - * 去除前缀 + * 去除 Key 前缀。 + * + * @param name 带前缀的 Key + * @return 原始 Key */ @Override public String unmap(String name) { diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java index 37951f9d6..0b69f1da0 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java @@ -1,5 +1,6 @@ package org.dromara.common.redis.manager; +import org.dromara.common.core.utils.StringUtils; import org.springframework.cache.Cache; import java.util.concurrent.Callable; @@ -15,32 +16,68 @@ public class CaffeineCacheDecorator implements Cache { private final Cache cache; private final com.github.benmanes.caffeine.cache.Cache caffeine; + /** + * 创建带 Caffeine 一级缓存的缓存装饰器。 + * + * @param name 缓存名称 + * @param cache 被装饰的缓存实例 + * @param caffeine 本地一级缓存实例 + */ public CaffeineCacheDecorator(String name, Cache cache, com.github.benmanes.caffeine.cache.Cache caffeine) { this.name = name; this.cache = cache; this.caffeine = caffeine; } + /** + * 获取缓存名称。 + * + * @return 缓存名称 + */ @Override public String getName() { return name; } + /** + * 获取底层原生缓存对象。 + * + * @return 原生缓存对象 + */ @Override public Object getNativeCache() { return cache.getNativeCache(); } + /** + * 构造 Caffeine 一级缓存使用的唯一键。 + * + * @param key 缓存键 + * @return 唯一键 + */ public String getUniqueKey(Object key) { - return name + ":" + key; + return name + StringUtils.COLON + key; } + /** + * 获取缓存值。 + * + * @param key 缓存键 + * @return 缓存值包装对象 + */ @Override public ValueWrapper get(Object key) { Object o = caffeine.get(getUniqueKey(key), k -> cache.get(key)); return (ValueWrapper) o; } + /** + * 按指定类型获取缓存值。 + * + * @param key 缓存键 + * @param type 值类型 + * @return 缓存值 + */ @SuppressWarnings("unchecked") @Override public T get(Object key, Class type) { @@ -48,23 +85,47 @@ public class CaffeineCacheDecorator implements Cache { return (T) o; } + /** + * 写入缓存值，并清理本地一级缓存。 + * + * @param key 缓存键 + * @param value 缓存值 + */ @Override public void put(Object key, Object value) { caffeine.invalidate(getUniqueKey(key)); cache.put(key, value); } + /** + * 当键不存在时写入缓存值。 + * + * @param key 缓存键 + * @param value 缓存值 + * @return 原缓存值包装对象 + */ @Override public ValueWrapper putIfAbsent(Object key, Object value) { caffeine.invalidate(getUniqueKey(key)); return cache.putIfAbsent(key, value); } + /** + * 删除缓存值。 + * + * @param key 缓存键 + */ @Override public void evict(Object key) { evictIfPresent(key); } + /** + * 删除缓存值并返回是否删除成功。 + * + * @param key 缓存键 + * @return 是否删除成功 + */ @Override public boolean evictIfPresent(Object key) { boolean b = cache.evictIfPresent(key); @@ -74,12 +135,20 @@ public class CaffeineCacheDecorator implements Cache { return b; } + /** + * 清空缓存。 + */ @Override public void clear() { clearLocalCache(); cache.clear(); } + /** + * 使缓存整体失效。 + * + * @return 是否失效成功 + */ @Override public boolean invalidate() { boolean invalidated = cache.invalidate(); @@ -89,6 +158,13 @@ public class CaffeineCacheDecorator implements Cache { return invalidated; } + /** + * 获取缓存值，不存在时通过回调加载。 + * + * @param key 缓存键 + * @param valueLoader 回调加载器 + * @return 缓存值 + */ @SuppressWarnings("unchecked") @Override public T get(Object key, Callable valueLoader) { @@ -96,8 +172,11 @@ public class CaffeineCacheDecorator implements Cache { return (T) o; } + /** + * 清理当前缓存命名空间下的本地一级缓存。 + */ private void clearLocalCache() { - String prefix = name + ":"; + String prefix = name + StringUtils.COLON; caffeine.asMap().keySet().removeIf(key -> key instanceof String cacheKey && cacheKey.startsWith(prefix)); } 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 0d3842970..1fa5d7ee9 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 @@ -1,12 +1,12 @@ /** * Copyright (c) 2013-2021 Nikita Koksharov - * + *

* Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java index cd0938c9f..782acbec8 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java @@ -1,8 +1,8 @@ package org.dromara.common.redis.utils; -import org.dromara.common.core.utils.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.SpringUtils; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; 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 9a020456a..4c4eaba11 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,29 +561,31 @@ 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,查询全部类型) - *

+ *

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

* @see KeysScanOptions */ public static Collection keys(final KeysScanOptions 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 09fa7a3b4..aee2fd2ba 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 @@ -4,6 +4,7 @@ import cn.dev33.satoken.dao.auto.SaTokenDaoBySessionFollowObject; import cn.dev33.satoken.util.SaFoxUtil; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; +import org.dromara.common.core.utils.StringUtils; import org.dromara.common.redis.utils.RedisUtils; import java.time.Duration; @@ -157,7 +158,7 @@ public class PlusSaTokenDao implements SaTokenDaoBySessionFollowObject { @Override public List searchData(String prefix, String keyword, int start, int size, boolean sortType) { String pattern = prefix + "*" + keyword + "*"; - String cacheKey = pattern + start + ":" + size + ":" + sortType; + String cacheKey = pattern + start + StringUtils.COLON + size + StringUtils.COLON + sortType; return (List) CAFFEINE.get(cacheKey, k -> { Collection keys = RedisUtils.keys(pattern); List list = new ArrayList<>(keys); @@ -179,8 +180,8 @@ public class PlusSaTokenDao implements SaTokenDaoBySessionFollowObject { /** * 写入缓存值并刷新本地缓存。 * - * @param key 缓存键 - * @param value 缓存值 + * @param key 缓存键 + * @param value 缓存值 * @param timeout 超时时间 */ private void writeValue(String key, Object value, long timeout) { 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 53a1d3ecb..3604926d7 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 @@ -41,8 +41,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/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java index 1be7196c4..902c61d97 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,7 +1,7 @@ package org.dromara.common.satoken.utils; -import cn.dev33.satoken.session.SaSession; 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.hutool.core.convert.Convert; @@ -67,7 +67,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-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java b/ruoyi-common/ruoyi-common-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java index 3ddf72bbd..4d30a50c5 100644 --- a/ruoyi-common/ruoyi-common-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java +++ b/ruoyi-common/ruoyi-common-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java @@ -31,17 +31,17 @@ import java.io.IOException; */ public class SeataRestTemplateInterceptor implements ClientHttpRequestInterceptor { - @Override - public ClientHttpResponse intercept(HttpRequest httpRequest, byte[] bytes, - ClientHttpRequestExecution clientHttpRequestExecution) throws IOException { - HttpRequestWrapper requestWrapper = new HttpRequestWrapper(httpRequest); + @Override + public ClientHttpResponse intercept(HttpRequest httpRequest, byte[] bytes, + ClientHttpRequestExecution clientHttpRequestExecution) throws IOException { + HttpRequestWrapper requestWrapper = new HttpRequestWrapper(httpRequest); - String xid = RootContext.getXID(); + String xid = RootContext.getXID(); - if (StringUtils.hasLength(xid)) { - requestWrapper.getHeaders().add(RootContext.KEY_XID, xid); - } - return clientHttpRequestExecution.execute(requestWrapper, bytes); - } + if (StringUtils.hasLength(xid)) { + requestWrapper.getHeaders().add(RootContext.KEY_XID, xid); + } + return clientHttpRequestExecution.execute(requestWrapper, bytes); + } } diff --git a/ruoyi-common/ruoyi-common-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java b/ruoyi-common/ruoyi-common-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java index 3ddacd67d..3c412d9f8 100644 --- a/ruoyi-common/ruoyi-common-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java +++ b/ruoyi-common/ruoyi-common-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java @@ -26,7 +26,7 @@ import org.springframework.web.servlet.HandlerInterceptor; /** * @author xiaojing - * + *

* Seata HandlerInterceptor, Convert Seata information into * @see io.seata.core.context.RootContext from http request's header in * {@link org.springframework.web.servlet.HandlerInterceptor#preHandle(HttpServletRequest, HttpServletResponse, Object)}, @@ -35,50 +35,50 @@ import org.springframework.web.servlet.HandlerInterceptor; */ public class SeataHandlerInterceptor implements HandlerInterceptor { - private static final Logger log = LoggerFactory - .getLogger(SeataHandlerInterceptor.class); + private static final Logger log = LoggerFactory + .getLogger(SeataHandlerInterceptor.class); - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, - Object handler) { - String xid = RootContext.getXID(); - String rpcXid = request.getHeader(RootContext.KEY_XID); - if (log.isDebugEnabled()) { - log.debug("xid in RootContext {} xid in RpcContext {}", xid, rpcXid); - } + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, + Object handler) { + String xid = RootContext.getXID(); + String rpcXid = request.getHeader(RootContext.KEY_XID); + if (log.isDebugEnabled()) { + log.debug("xid in RootContext {} xid in RpcContext {}", xid, rpcXid); + } - if (StringUtils.isBlank(xid) && rpcXid != null) { - RootContext.bind(rpcXid); - if (log.isDebugEnabled()) { - log.debug("bind {} to RootContext", rpcXid); - } - } + if (StringUtils.isBlank(xid) && rpcXid != null) { + RootContext.bind(rpcXid); + if (log.isDebugEnabled()) { + log.debug("bind {} to RootContext", rpcXid); + } + } - return true; - } + return true; + } - @Override - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, - Object handler, Exception e) { - if (StringUtils.isNotBlank(RootContext.getXID())) { - String rpcXid = request.getHeader(RootContext.KEY_XID); + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, + Object handler, Exception e) { + if (StringUtils.isNotBlank(RootContext.getXID())) { + String rpcXid = request.getHeader(RootContext.KEY_XID); - if (StringUtils.isEmpty(rpcXid)) { - return; - } + if (StringUtils.isEmpty(rpcXid)) { + return; + } - String unbindXid = RootContext.unbind(); - if (log.isDebugEnabled()) { - log.debug("unbind {} from RootContext", unbindXid); - } - if (!rpcXid.equalsIgnoreCase(unbindXid)) { - log.warn("xid in change during RPC from {} to {}", rpcXid, unbindXid); - if (unbindXid != null) { - RootContext.bind(unbindXid); - log.warn("bind {} back to RootContext", unbindXid); - } - } - } - } + String unbindXid = RootContext.unbind(); + if (log.isDebugEnabled()) { + log.debug("unbind {} from RootContext", unbindXid); + } + if (!rpcXid.equalsIgnoreCase(unbindXid)) { + log.warn("xid in change during RPC from {} to {}", rpcXid, unbindXid); + if (unbindXid != null) { + RootContext.bind(unbindXid); + log.warn("bind {} back to RootContext", unbindXid); + } + } + } + } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfiguration.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfiguration.java index 92c9e0012..4df3d4729 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfiguration.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfiguration.java @@ -11,6 +11,7 @@ import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -62,7 +63,7 @@ public class SecurityConfiguration implements WebMvcConfigurer { return new SaServletFilter() .addInclude("/actuator", "/actuator/**") .setAuth(obj -> { - SaHttpBasicUtil.check(username + ":" + password); + SaHttpBasicUtil.check(username + StringUtils.COLON + password); }) .setError(e -> SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED)); } 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 f2a1f7b9f..97cec1e94 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 @@ -25,7 +25,7 @@ import me.zhyd.oauth.utils.UrlBuilder; public abstract class AbstractAuthWeChatEnterpriseRequest extends AuthDefaultRequest { public AbstractAuthWeChatEnterpriseRequest(AuthConfig config, AuthSource source) { - super(config,source); + super(config, source); } diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java index 19b39d8fb..19eaf7398 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java @@ -9,6 +9,7 @@ import org.springframework.context.annotation.Bean; /** * Social 配置属性 + * * @author thiszhc */ @AutoConfiguration 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 d3fc7516f..61f84098f 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 @@ -46,22 +46,22 @@ 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(); } @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(); } @@ -79,14 +79,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 97774ac5d..a4d5779f5 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 { diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java index 1ff57f7c5..0f5241ccb 100644 --- a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java +++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java @@ -15,7 +15,6 @@ public enum AuthMaxKeySource implements AuthSource { * 自己搭建的 maxkey 私服 */ MAXKEY { - /** * 授权的api */ 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 080c97a93..7587e254f 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 @@ -91,7 +91,6 @@ public class AuthTopIamRequest extends AuthDefaultRequest { .add("Authorization", "Bearer " + authToken.getAccessToken()), false).getBody(); } - @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) 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 3ed3c5e2e..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,10 +19,20 @@ 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 socialProperties 社交平台配置 + * @return 授权响应 + * @throws AuthException 授权异常 + */ @SuppressWarnings("unchecked") public static AuthResponse loginAuth(String source, String code, String state, SocialProperties socialProperties) throws AuthException { AuthRequest authRequest = getAuthRequest(source, socialProperties); @@ -32,6 +42,14 @@ public class SocialUtils { return authRequest.login(callback); } + /** + * 根据平台类型构建授权请求实例。 + * + * @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)) { @@ -51,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); @@ -59,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 dc269938b..4d37a0d89 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 @@ -5,13 +5,7 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.translation.annotation.TranslationType; -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; /** @@ -33,7 +27,7 @@ public interface TranslationInterface { /** * 批量翻译。 * - * @param keys 需要被翻译的键集合 + * @param keys 需要被翻译的键集合 * @param other 其他参数 * @return 翻译结果映射 */ @@ -81,8 +75,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 8dba3ab6c..458483a18 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 @@ -1,12 +1,12 @@ package org.dromara.common.translation.core.impl; import cn.hutool.core.convert.Convert; +import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.core.TranslationInterface; import org.dromara.system.api.RemoteDeptService; -import lombok.AllArgsConstructor; -import org.apache.dubbo.config.annotation.DubboReference; import java.util.LinkedHashMap; import java.util.Map; @@ -27,7 +27,7 @@ public class DeptNameTranslationImpl implements TranslationInterface { /** * 将部门 ID 或 ID 集合翻译为部门名称。 * - * @param key 部门 ID 或逗号分隔的 ID 字符串 + * @param key 部门 ID 或逗号分隔的 ID 字符串 * @param other 额外参数 * @return 部门名称 */ @@ -39,7 +39,7 @@ public class DeptNameTranslationImpl implements TranslationInterface { /** * 批量将部门 ID 翻译为部门名称。 * - * @param keys 部门 ID 集合 + * @param keys 部门 ID 集合 * @param other 额外参数 * @return 部门 ID 与部门名称映射 */ @@ -60,7 +60,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 debaf37a6..dd122c633 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 @@ -1,12 +1,12 @@ package org.dromara.common.translation.core.impl; +import lombok.AllArgsConstructor; import org.dromara.common.core.service.DictService; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.core.TranslationInterface; -import lombok.AllArgsConstructor; import java.util.Arrays; import java.util.LinkedHashMap; @@ -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 b1254cfb1..5f3e4c455 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 @@ -28,7 +28,7 @@ public class NicknameTranslationImpl implements TranslationInterface { /** * 将用户 ID 或 ID 集合翻译为用户昵称。 * - * @param key 用户 ID 或逗号分隔的 ID 字符串 + * @param key 用户 ID 或逗号分隔的 ID 字符串 * @param other 额外参数 * @return 用户昵称 */ @@ -58,7 +58,7 @@ public class NicknameTranslationImpl implements TranslationInterface { /** * 批量将用户 ID 翻译为用户昵称。 * - * @param keys 用户 ID 集合 + * @param keys 用户 ID 集合 * @param other 额外参数 * @return 用户 ID 与用户昵称映射 */ @@ -79,7 +79,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 5b29b6a35..b51eb46ac 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 @@ -1,13 +1,13 @@ package org.dromara.common.translation.core.impl; import cn.hutool.core.convert.Convert; +import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.core.TranslationInterface; import org.dromara.resource.api.RemoteFileService; -import lombok.AllArgsConstructor; -import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.resource.api.domain.RemoteFile; import java.util.LinkedHashMap; @@ -30,7 +30,7 @@ public class OssUrlTranslationImpl implements TranslationInterface { /** * 将 OSS ID 或 ID 集合翻译为访问地址。 * - * @param key OSS ID 或逗号分隔的 ID 字符串 + * @param key OSS ID 或逗号分隔的 ID 字符串 * @param other 额外参数 * @return 访问地址 */ @@ -42,7 +42,7 @@ public class OssUrlTranslationImpl implements TranslationInterface { /** * 批量将 OSS ID 翻译为访问地址。 * - * @param keys OSS ID 集合 + * @param keys OSS ID 集合 * @param other 额外参数 * @return OSS ID 与访问地址映射 */ @@ -64,7 +64,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 77caf44fc..3d6afca2a 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 @@ -1,6 +1,8 @@ package org.dromara.common.translation.core.impl; import cn.hutool.core.convert.Convert; +import lombok.AllArgsConstructor; +import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,8 +11,6 @@ import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.core.TranslationInterface; import org.dromara.system.api.RemoteUserService; -import lombok.AllArgsConstructor; -import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.system.api.domain.vo.RemoteUserVo; import java.util.LinkedHashMap; @@ -32,7 +32,7 @@ public class UserNameTranslationImpl implements TranslationInterface { /** * 将用户 ID 翻译为用户名。 * - * @param key 用户 ID + * @param key 用户 ID * @param other 额外参数 * @return 用户名 */ @@ -49,7 +49,7 @@ public class UserNameTranslationImpl implements TranslationInterface { /** * 批量将用户 ID 翻译为用户名。 * - * @param keys 用户 ID 集合 + * @param keys 用户 ID 集合 * @param other 额外参数 * @return 用户 ID 与用户名映射 */ @@ -70,7 +70,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 98ddd06b5..cd614dbe3 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; /** diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java index dbdba5181..aaba4adf4 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailSendController.java @@ -1,8 +1,8 @@ package org.dromara.demo.controller; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.mail.core.MailBuilder; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,9 +26,9 @@ public class MailSendController { /** * 发送邮件 * - * @param to 接收人 + * @param to 接收人 * @param subject 标题 - * @param text 内容 + * @param text 内容 */ @GetMapping("/sendSimpleMessage") public R sendSimpleMessage(String to, String subject, String text) { @@ -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-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java index 86031d77c..db72c99cd 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java @@ -1,10 +1,10 @@ package org.dromara.demo.controller; import cn.hutool.core.thread.ThreadUtil; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.domain.R; import org.dromara.common.redis.utils.RedisUtils; -import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java index 7f322989d..c44757ed3 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java @@ -5,8 +5,8 @@ import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.executor.RedissonLockExecutor; -import org.dromara.common.core.domain.R; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java index 5b19610b0..75eac79d8 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java +++ b/ruoyi-example/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; @@ -20,7 +20,7 @@ public class RedisPubSubController { /** * 发布消息 * - * @param key 通道Key + * @param key 通道Key * @param value 发送内容 */ @GetMapping("/pub") diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java index ff36ebe41..f813e9b12 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java +++ b/ruoyi-example/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-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java index 260730524..a58616744 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java @@ -1,9 +1,9 @@ package org.dromara.demo.controller; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.web.core.BaseController; import org.dromara.demo.domain.TestDemo; -import lombok.RequiredArgsConstructor; import org.dromara.demo.mapper.TestDemoMapper; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java index 9e41db46e..70ff0e51f 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java @@ -2,33 +2,33 @@ package org.dromara.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; +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.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.excel.core.ExcelResult; 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.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +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.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java index d6185124b..27029be07 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java +++ b/ruoyi-example/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-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java index 1feaf1bdb..d12dcccea 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java @@ -1,10 +1,10 @@ package org.dromara.demo.controller; +import lombok.Data; import org.dromara.common.core.domain.R; import org.dromara.common.sensitive.annotation.Sensitive; import org.dromara.common.sensitive.core.SensitiveStrategy; import org.dromara.common.web.core.BaseController; -import lombok.Data; 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-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java index dbb777d5c..39b080eb7 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java @@ -1,24 +1,24 @@ package org.dromara.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -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.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.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 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.excel.utils.ExcelBuilder; +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 org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + import java.util.Arrays; import java.util.List; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java index ada6d2b4f..3a5f52183 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java @@ -1,9 +1,9 @@ package org.dromara.demo.domain; import com.baomidou.mybatisplus.annotation.*; -import org.dromara.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java index 40acef101..5ca743cd7 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java +++ b/ruoyi-example/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; @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java index 8024f89ef..c444196ea 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoImportVo.java @@ -1,10 +1,9 @@ package org.dromara.demo.domain.vo; 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-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java index 265881ff2..3afa2529d 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java @@ -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-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderItemMapper.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderItemMapper.java index 00826772a..7f9269578 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderItemMapper.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderItemMapper.java @@ -2,7 +2,6 @@ package org.dromara.demo.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; - import org.apache.ibatis.annotations.Mapper; import org.dromara.demo.domain.ShardingOrderItem; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderMapper.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderMapper.java index 58d3525c0..146207861 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderMapper.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderMapper.java @@ -2,7 +2,6 @@ package org.dromara.demo.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; - import org.apache.ibatis.annotations.Mapper; import org.dromara.demo.domain.ShardingOrder; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java index ec7eac2e6..19b2d52df 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java @@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.vo.TestDemoVo; -import org.apache.ibatis.annotations.Param; import java.io.Serializable; import java.util.Collection; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mcp/McpDemoClientService.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mcp/McpDemoClientService.java index f8983ab7c..15fc491f5 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mcp/McpDemoClientService.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mcp/McpDemoClientService.java @@ -1,9 +1,9 @@ package org.dromara.demo.mcp; +import lombok.RequiredArgsConstructor; import org.dromara.common.mcp.core.McpClientTemplate; import org.dromara.common.mcp.core.McpResourceReadResult; import org.dromara.common.mcp.core.McpToolCallResult; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.ObjectProvider; import org.springframework.stereotype.Service; @@ -42,7 +42,7 @@ public class McpDemoClientService { /** * 调用外部 MCP 工具接收数据。 * - * @param toolName 工具名称 + * @param toolName 工具名称 * @param arguments 工具参数 * @return 工具返回内容 */ @@ -65,7 +65,7 @@ public class McpDemoClientService { *

* MCP 返回数据不建议直接入库，应先转换成业务 BO/DTO，再进入业务 Service。 * - * @param toolName 工具名称 + * @param toolName 工具名称 * @param arguments 工具参数 * @return 处理结果 */ @@ -85,8 +85,8 @@ public class McpDemoClientService { * MCP 数据处理结果。 * * @param sourceType 数据来源类型 - * @param handled 是否已处理 - * @param data MCP 原始返回数据 + * @param handled 是否已处理 + * @param data MCP 原始返回数据 */ public record McpDemoHandleResult( String sourceType, diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java index 3f9b80e8d..ad4da4390 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java +++ b/ruoyi-example/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; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java index 595b0701a..f28755a8b 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java @@ -211,35 +211,6 @@ public class ExportExcelServiceImpl implements IExportExcelService { }); } - /** - * 模拟的数据库省市县 - */ - @Data - private static class DemoCityData { - /** - * 数据库id字段 - */ - private Integer id; - /** - * 数据库pid字段 - */ - private Integer pid; - /** - * 数据库name字段 - */ - private String name; - /** - * MyBatisPlus连带查询父数据 - */ - private DemoCityData pData; - - public DemoCityData(Integer id, Integer pid, String name) { - this.id = id; - this.pid = pid; - this.name = name; - } - } - @Override public void customExport(HttpServletResponse response) { ExcelBuilder.writer(ExportDemoVo.class).sheetName("自定义导出").toResponse(response, wrapper -> { @@ -291,4 +262,33 @@ public class ExportExcelServiceImpl implements IExportExcelService { // wrapper.write(excelDataList2, sheet2); }); } + + /** + * 模拟的数据库省市县 + */ + @Data + private static class DemoCityData { + /** + * 数据库id字段 + */ + private Integer id; + /** + * 数据库pid字段 + */ + private Integer pid; + /** + * 数据库name字段 + */ + private String name; + /** + * MyBatisPlus连带查询父数据 + */ + private DemoCityData pData; + + public DemoCityData(Integer id, Integer pid, String name) { + this.id = id; + this.pid = pid; + this.name = name; + } + } } diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java index 5620f583b..f51be860e 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java @@ -4,16 +4,16 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoVo; import org.dromara.demo.mapper.TestDemoMapper; import org.dromara.demo.service.ITestDemoService; -import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java index 6db64f2e6..0cd96065f 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java @@ -3,13 +3,13 @@ package org.dromara.demo.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.StringUtils; import org.dromara.demo.domain.TestTree; import org.dromara.demo.domain.bo.TestTreeBo; import org.dromara.demo.domain.vo.TestTreeVo; import org.dromara.demo.mapper.TestTreeMapper; import org.dromara.demo.service.ITestTreeService; -import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml index f670ad938..dea9c6cd4 100644 --- a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml +++ b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml @@ -80,7 +80,7 @@ easy-es: # 兼容模式 compatible: true # es连接地址+端口 格式必须为ip:port,如果是集群则可用逗号隔开 - address : localhost:9200 + address: localhost:9200 # 默认为http schema: http # 注意ES建议使用账号认证 不使用会报警告日志 diff --git a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/DemoUnitTest.java b/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/DemoUnitTest.java index a3e96dd5b..3f100260d 100644 --- a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/DemoUnitTest.java +++ b/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/DemoUnitTest.java @@ -18,6 +18,16 @@ public class DemoUnitTest { @Value("${spring.application.name}") private String appName; + @BeforeAll + public static void testBeforeAll() { + System.out.println("@BeforeAll =================="); + } + + @AfterAll + public static void testAfterAll() { + System.out.println("@AfterAll =================="); + } + @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") @Test public void testTest() { @@ -39,18 +49,12 @@ public class DemoUnitTest { System.out.println(appName); } - @DisplayName("测试 @RepeatedTest 注解") @RepeatedTest(3) public void testRepeatedTest() { System.out.println(666); } - @BeforeAll - public static void testBeforeAll() { - System.out.println("@BeforeAll =================="); - } - @BeforeEach public void testBeforeEach() { System.out.println("@BeforeEach =================="); @@ -61,9 +65,4 @@ public class DemoUnitTest { System.out.println("@AfterEach =================="); } - @AfterAll - public static void testAfterAll() { - System.out.println("@AfterAll =================="); - } - } diff --git a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/ParamUnitTest.java b/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/ParamUnitTest.java index ce56d53ab..e4d084e6c 100644 --- a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/ParamUnitTest.java +++ b/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/ParamUnitTest.java @@ -22,6 +22,14 @@ import java.util.stream.Stream; @DisplayName("带参数单元测试案例") public class ParamUnitTest { + public static Stream getParam() { + List list = new ArrayList<>(); + list.add("t1"); + list.add("t2"); + list.add("t3"); + return list.stream(); + } + @DisplayName("测试 @ValueSource 注解") @ParameterizedTest @ValueSource(strings = {"t1", "t2", "t3"}) @@ -50,14 +58,6 @@ public class ParamUnitTest { System.out.println(str); } - public static Stream getParam() { - List list = new ArrayList<>(); - list.add("t1"); - list.add("t2"); - list.add("t3"); - return list.stream(); - } - @BeforeEach public void testBeforeEach() { System.out.println("@BeforeEach =================="); diff --git a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/TOrderTest.java b/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/TOrderTest.java index 300057d5e..49c6947be 100644 --- a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/TOrderTest.java +++ b/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/TOrderTest.java @@ -2,7 +2,6 @@ package org.dromara.demo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - import org.dromara.demo.domain.ShardingOrder; import org.dromara.demo.mapper.ShardingOrderMapper; import org.junit.jupiter.api.Test; @@ -27,19 +26,19 @@ class TOrderTest { page.setCurrent(3L); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.orderByAsc("order_id"); - torderMapper.selectPage(page,queryWrapper); + torderMapper.selectPage(page, queryWrapper); System.out.println(page.getTotal()); - for(ShardingOrder order : page.getRecords()){ - System.out.print(order.getTotalMoney()+" "); + for (ShardingOrder order : page.getRecords()) { + System.out.print(order.getTotalMoney() + " "); } } @Test void insert() { - for(Long i = 1L; i <= 100L; i++){ + for (Long i = 1L; i <= 100L; i++) { ShardingOrder torder = new ShardingOrder(); torder.setUserId(i); - torder.setTotalMoney(100 + Integer.parseInt(i+"")); + torder.setTotalMoney(100 + Integer.parseInt(i + "")); torderMapper.insert(torder); } diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/RuoYiTestMqApplication.java b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/RuoYiTestMqApplication.java index a705c67b6..d1874bd35 100644 --- a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/RuoYiTestMqApplication.java +++ b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/RuoYiTestMqApplication.java @@ -6,6 +6,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt /** * SpringBoot-MQ 案例项目 + * * @author Lion Li */ @SpringBootApplication diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/callback/RabbitCallback.java b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/callback/RabbitCallback.java index 481228c6f..de9e65c4f 100644 --- a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/callback/RabbitCallback.java +++ b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/callback/RabbitCallback.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Component; /** * Rabbit回调 + * * @author JC */ diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/RabbitConfig.java b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/RabbitConfig.java index ba18ccd20..30f1729f8 100644 --- a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/RabbitConfig.java +++ b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/RabbitConfig.java @@ -20,7 +20,7 @@ public class RabbitConfig { /** * 创建交换机 * ExchangeBuilder有四种交换机模式 - * Direct Exchange：直连交换机，根据Routing Key(路由键)进行投递到不同队列。 + * Direct Exchange：直连交换机，根据Routing Key(路由键)进行投递到不同队列。 * Fanout Exchange：扇形交换机，采用广播模式，根据绑定的交换机，路由到与之对应的所有队列。 * Topic Exchange：主题交换机，对路由键进行模式匹配后进行投递，符号#表示一个或多个词，*表示一个词。 * Header Exchange：头交换机，不处理路由键。而是根据发送的消息内容中的headers属性进行匹配。 @@ -31,24 +31,24 @@ public class RabbitConfig { return new TopicExchange(EXCHANGE_NAME); } - /** - * 创建队列 - * durable 队列是否持久化 队列调用此方法就是持久化 可查看方法的源码 - * deliveryMode 消息是否持久化（1 不持久化，2 持久化） - **/ + /** + * 创建队列 + * durable 队列是否持久化 队列调用此方法就是持久化 可查看方法的源码 + * deliveryMode 消息是否持久化（1 不持久化，2 持久化） + **/ @Bean public Queue queue() { return new Queue(QUEUE_NAME, false); } - /** - * 绑定交换机和队列 - * bing 方法参数可以是队列和交换机 - * to 方法参数必须是交换机 - * with 方法参数是路由Key 这里是以rabbit.开头 - * noargs 就是不要参数的意思 - * 这个方法的意思是把rabbit开头的消息 和 上面的队列 和 上面的交换机绑定 - **/ + /** + * 绑定交换机和队列 + * bing 方法参数可以是队列和交换机 + * to 方法参数必须是交换机 + * with 方法参数是路由Key 这里是以rabbit.开头 + * noargs 就是不要参数的意思 + * 这个方法的意思是把rabbit开头的消息 和 上面的队列 和 上面的交换机绑定 + **/ @Bean public Binding binding(Queue queue, TopicExchange exchange) { return BindingBuilder.bind(queue).to(exchange).with(ROUTING_KEY); diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/RabbitConsumer.java b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/RabbitConsumer.java index f12e653c5..aa23568a7 100644 --- a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/RabbitConsumer.java +++ b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/RabbitConsumer.java @@ -20,15 +20,15 @@ public class RabbitConsumer { */ @RabbitListener(queues = RabbitConfig.QUEUE_NAME) public void listenQueue(Message message) { - log.info("【消费者】Start consuming data：{}",new String(message.getBody())); + log.info("【消费者】Start consuming data：{}", new String(message.getBody())); } /** * 处理延迟队列消息 */ @RabbitListener(queues = RabbitTtlQueueConfig.DELAY_QUEUE_NAME) - public void receiveDelayMessage(String message){ - log.info("【消费者】Received delayed message：{}",message); + public void receiveDelayMessage(String message) { + log.info("【消费者】Received delayed message：{}", message); } /** @@ -37,7 +37,7 @@ public class RabbitConsumer { * 它会被自动转发到死信队列中，以便后续的特殊处理或重新尝试。 */ @RabbitListener(queues = RabbitTtlQueueConfig.DEAD_LETTER_QUEUE) - public void receiveDeadMessage(String message){ - log.info("【消费者】Received dead message：{}",message); + public void receiveDeadMessage(String message) { + log.info("【消费者】Received dead message：{}", message); } } diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/TransactionRocketConsumer.java b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/TransactionRocketConsumer.java index 3c56d8db5..a1bc82c34 100644 --- a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/TransactionRocketConsumer.java +++ b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/TransactionRocketConsumer.java @@ -12,11 +12,11 @@ import org.springframework.stereotype.Component; @Slf4j @Component @RocketMQMessageListener(topic = "transaction-topic", consumerGroup = "transaction-group") -public class TransactionRocketConsumer implements RocketMQListener { +public class TransactionRocketConsumer implements RocketMQListener { @Override public void onMessage(String message) { - log.info("【消费者】===>接收事务消息：{}",message); + log.info("【消费者】===>接收事务消息：{}", message); } } diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/controller/PushMessageController.java b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/controller/PushMessageController.java index 788ba3434..1cfb2d301 100644 --- a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/controller/PushMessageController.java +++ b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/controller/PushMessageController.java @@ -47,7 +47,7 @@ public class PushMessageController { * 需要手动创建相关的Topic和group */ @GetMapping("/rocket/send") - public void rocketSend(){ + public void rocketSend() { normalRocketProducer.sendMessage(); } @@ -55,7 +55,7 @@ public class PushMessageController { * rocketmq 事务消息 */ @GetMapping("/rocket/transaction") - public void rocketTransaction(){ + public void rocketTransaction() { transactionRocketProducer.sendTransactionMessage(); } @@ -63,7 +63,7 @@ public class PushMessageController { * kafka 发送消息 */ @GetMapping("/kafka/send") - public void kafkaSend(){ + public void kafkaSend() { normalKafkaProducer.sendKafkaMsg(); } } diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java index 0eeaac4f7..6c17a86e5 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java @@ -1,18 +1,18 @@ package org.dromara.gateway.config; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.LocaleResolver; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; import java.util.Locale; -import org.springframework.core.Ordered; /** * 网关配置 diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java index 50d4799e5..43b207b51 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java @@ -2,7 +2,6 @@ package org.dromara.gateway.config.properties; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java index 4fe635238..a36e3c8c8 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java @@ -5,7 +5,6 @@ import cn.dev33.satoken.exception.NotPermissionException; import cn.dev33.satoken.filter.SaServletFilter; import cn.dev33.satoken.filter.SaTokenContextFilterForJakartaServlet; import cn.dev33.satoken.httpauth.basic.SaHttpBasicUtil; -import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.util.SaResult; @@ -24,8 +23,6 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.util.EnumSet; import java.util.List; @@ -113,7 +110,7 @@ public class AuthFilter { return new SaServletFilter() .addInclude("/actuator", "/actuator/**") .setAuth(obj -> { - SaHttpBasicUtil.check(username + ":" + password); + SaHttpBasicUtil.check(username + StringUtils.COLON + password); }) .setError(e -> { HttpServletResponse response = ServletUtils.getResponse(); diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/support/MutableHttpServletRequest.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/support/MutableHttpServletRequest.java index 41b34c320..51a8f9181 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/support/MutableHttpServletRequest.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/support/MutableHttpServletRequest.java @@ -3,13 +3,7 @@ package org.dromara.gateway.filter.support; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; -import java.util.Collections; -import java.util.Enumeration; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.Vector; +import java.util.*; /** * 可追加请求头的包装类 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..c6afc8904 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 @@ -25,6 +25,8 @@ import java.util.Map; @Component public class MyBatisDataSourceMonitor implements DataSourceMonitor { + private final Map features = new HashMap<>(); + /** * 初始化 anyline 与动态数据源联动所需的元数据解析策略。 */ @@ -35,8 +37,6 @@ public class MyBatisDataSourceMonitor implements DataSourceMonitor { ConfigTable.METADATA_CACHE_SCOPE = 0; } - private final Map features = new HashMap<>(); - /** * 数据源特征 用来定准 adapter 包含数据库或JDBC协议关键字
* 一般会通过 产品名_url 合成 如果返回null 上层方法会通过driver_产品名_url合成 @@ -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/config/properties/GenProperties.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/properties/GenProperties.java index eba7a9a14..060e979e8 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/properties/GenProperties.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/properties/GenProperties.java @@ -2,9 +2,7 @@ package org.dromara.gen.config.properties; import cn.hutool.extra.template.TemplateConfig; import lombok.Data; -import org.dromara.common.core.factory.YmlPropertySourceFactory; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; import java.nio.charset.StandardCharsets; 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 3c427868a..0473293d1 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 @@ -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/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java index 5482a9836..3e33af4da 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java @@ -457,16 +457,6 @@ public class GenTableServiceImpl implements IGenTableService { return new RenderContext(table, context, templates); } - /** - * 模板渲染上下文。 - * - * @param table 生成表信息 - * @param context 模板上下文 - * @param templates 待渲染模板 - */ - private record RenderContext(GenTable table, Dict context, List templates) { - } - /** * 修改保存参数校验 * @@ -650,4 +640,14 @@ public class GenTableServiceImpl implements IGenTableService { } } + /** + * 模板渲染上下文。 + * + * @param table 生成表信息 + * @param context 模板上下文 + * @param templates 待渲染模板 + */ + private record RenderContext(GenTable table, Dict context, List templates) { + } + } 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 17aa9e461..0ee399ccc 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 @@ -32,11 +32,11 @@ public class TestMapReduceAnnotation1 { public ExecuteResult rootMapExecute(MapArgs mapArgs, MapHandler mapHandler) { int partitionSize = 50; List> partition = IntStream.rangeClosed(1, 200) - .boxed() - .collect(Collectors.groupingBy(i -> (i - 1) / partitionSize)) - .values() - .stream() - .toList(); + .boxed() + .collect(Collectors.groupingBy(i -> (i - 1) / partitionSize)) + .values() + .stream() + .toList(); SnailJobLog.REMOTE.info("端口:{}完成分配任务", SpringUtil.getProperty("server.port")); return mapHandler.doMap(partition, "doCalc"); } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java index 5d6883743..c67403bef 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java @@ -2,6 +2,7 @@ package org.dromara.resource.controller; import cn.hutool.core.util.RandomUtil; +import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.Constants; @@ -10,17 +11,16 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.regex.RegexValidator; +import org.dromara.common.mail.config.properties.MailProperties; import org.dromara.common.mail.core.MailBuilder; import org.dromara.common.redis.annotation.RateLimiter; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mail.config.properties.MailProperties; import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.web.core.BaseController; 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 java.time.Duration; /** diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java index c62de3993..5b93d0539 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java @@ -4,15 +4,15 @@ import cn.dev33.satoken.annotation.SaCheckPermission; 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.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.QueryGroup; -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.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.resource.domain.bo.SysOssConfigBo; import org.dromara.resource.domain.vo.SysOssConfigVo; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssController.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssController.java index a2e283dad..e74d8acf3 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssController.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssController.java @@ -2,15 +2,14 @@ package org.dromara.resource.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.QueryGroup; 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.web.core.BaseController; import org.dromara.resource.domain.bo.SysOssBo; import org.dromara.resource.domain.vo.SysOssUploadVo; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java index 8153fef4b..37cb955a1 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java @@ -1,15 +1,14 @@ package org.dromara.resource.domain.bo; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Data; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.resource.domain.SysOssConfig; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; - import java.io.Serial; import java.io.Serializable; import java.util.HashMap; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/convert/SysOssVoConvert.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/convert/SysOssVoConvert.java index 94893d981..6d2f31fcb 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/convert/SysOssVoConvert.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/convert/SysOssVoConvert.java @@ -10,6 +10,7 @@ import org.mapstruct.ReportingPolicy; /** * 用户信息转换器 + * * @author zhujie */ @Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java index a46c8f75d..3265b39f0 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java @@ -90,7 +90,7 @@ public class RemoteFileServiceImpl implements RemoteFileService { * @return 列表 */ @Override - public List selectByIds(String ossIds){ + public List selectByIds(String ossIds) { List sysOssVos = sysOssService.listByIds(StringUtils.splitTo(ossIds, Convert::toLong)); return MapstructUtils.convert(sysOssVos, RemoteFile.class); } diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/event/OssConfigChangeEvent.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/event/OssConfigChangeEvent.java index 03cca2223..5bd6746cf 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/event/OssConfigChangeEvent.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/event/OssConfigChangeEvent.java @@ -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-resource/src/main/java/org/dromara/resource/runner/ResourceApplicationRunner.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/runner/ResourceApplicationRunner.java index 2d96edbfa..10e44eade 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/runner/ResourceApplicationRunner.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/runner/ResourceApplicationRunner.java @@ -1,8 +1,8 @@ package org.dromara.resource.runner; -import org.dromara.resource.service.ISysOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.resource.service.ISysOssConfigService; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java index ce596b4a3..d8a13916b 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java @@ -1,8 +1,8 @@ package org.dromara.resource.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.resource.domain.bo.SysOssConfigBo; import org.dromara.resource.domain.vo.SysOssConfigVo; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java index e84fc6672..7c311188a 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java @@ -1,15 +1,13 @@ package org.dromara.resource.service; -import jakarta.servlet.http.HttpServletResponse; -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.resource.domain.bo.SysOssBo; import org.dromara.resource.domain.vo.SysOssVo; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; import java.io.File; -import java.io.IOException; import java.util.Collection; import java.util.List; @@ -80,7 +78,7 @@ public interface ISysOssService { /** * 文件下载方法，支持一次性下载完整文件 * - * @param ossId OSS对象ID + * @param ossId OSS对象ID */ ResponseEntity download(Long ossId); diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysMessageServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysMessageServiceImpl.java index a1cdefcf2..6f0fe967a 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysMessageServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysMessageServiceImpl.java @@ -133,8 +133,8 @@ public class SysMessageServiceImpl implements ISysMessageService { .ge(SysMessage::getCreateTime, LocalDateTime.now().minusDays(BOX_DAYS)) .and(wrapper -> wrapper.eq(SysMessage::getSendUserIds, GLOBAL_USER_IDS) - .or() - .findInSet(userId, SysMessage::getSendUserIds) + .or() + .findInSet(userId, SysMessage::getSendUserIds) ) .orderByDesc(SysMessage::getCreateTime, SysMessage::getMessageId) .list(new Page<>(1, BOX_LIMIT, false)); diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java index 1302a1481..07523f607 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java @@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +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.ObjectUtils; @@ -15,7 +16,6 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.query.QueryBuilder; import org.dromara.common.oss.constant.OssConstant; import org.dromara.common.redis.utils.CacheUtils; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java index 76e09a09b..230291476 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java @@ -10,11 +10,7 @@ import lombok.RequiredArgsConstructor; 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/controller/monitor/SysLoginInfoController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java index 58aa8320e..a221e92d4 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 @@ -5,13 +5,13 @@ import com.baomidou.lock.annotation.Lock4j; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; 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.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysLoginInfoBo; @@ -57,6 +57,7 @@ public class SysLoginInfoController extends BaseController { /** * 批量删除登录日志 + * * @param infoIds 日志ids */ @SaCheckPermission("monitor:logininfo:remove") 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 9facd643a..391608bde 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 @@ -2,21 +2,21 @@ package org.dromara.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; 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.web.core.BaseController; 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.core.domain.PageResult; +import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; import org.dromara.system.service.ISysOperLogService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** @@ -54,6 +54,7 @@ public class SysOperlogController extends BaseController { /** * 批量删除操作日志记录 + * * @param operIds 日志ids */ @Log(title = "操作日志", businessType = BusinessType.DELETE) 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 0ad652e85..f603f50e3 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 @@ -6,16 +6,16 @@ import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; 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.redis.annotation.RepeatSubmit; -import org.dromara.common.web.core.BaseController; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.web.core.BaseController; import org.dromara.system.api.domain.SysUserOnline; import org.springframework.web.bind.annotation.*; @@ -46,7 +46,7 @@ public class SysUserOnlineController extends BaseController { // 获取所有未过期的 token Collection keys = RedisUtils.keys(CacheNames.ONLINE_TOKEN_KEY + "*"); List> suppliers = keys.stream().map(key -> (Supplier) () -> { - String token = StringUtils.substringAfterLast(key, ":"); + String token = StringUtils.substringAfterLast(key, StringUtils.COLON); // 如果已经过期则跳过 if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) { return null; 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 1765c67b0..77a412bce 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 @@ -5,15 +5,15 @@ 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.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; 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.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java index 558b24bc8..6838b7d33 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -1,23 +1,22 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; +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.web.core.BaseController; 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.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; +import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysConfigBo; import org.dromara.system.domain.vo.SysConfigVo; import org.dromara.system.service.ISysConfigService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; - import java.util.Arrays; import java.util.List; 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 59c6ab63e..5053e48e5 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 @@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; -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.system.domain.bo.SysDeptBo; import org.dromara.system.domain.vo.SysDeptVo; 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 3a9c76582..1cec59ce5 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 @@ -2,15 +2,16 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; +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.web.core.BaseController; 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.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; +import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.service.ISysDictDataService; @@ -18,7 +19,6 @@ import org.dromara.system.service.ISysDictTypeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.List; 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 db36138e1..37c301492 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 @@ -1,23 +1,22 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; +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.web.core.BaseController; 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.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; +import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictTypeBo; import org.dromara.system.domain.vo.SysDictTypeVo; import org.dromara.system.service.ISysDictTypeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletResponse; - import java.util.Arrays; import java.util.List; 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 248c2ba20..52b18e9e3 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 @@ -7,9 +7,9 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; -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.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.SysMenu; @@ -151,15 +151,6 @@ public class SysMenuController extends BaseController { return toAjax(menuService.deleteMenuById(menuId)); } - /** - * 角色菜单列表树信息 - * - * @param checkedKeys 选中菜单列表 - * @param menus 菜单下拉树结构列表 - */ - public record MenuTreeSelectVo(List checkedKeys, List> menus) { - } - /** * 批量级联删除菜单 * @@ -178,4 +169,13 @@ public class SysMenuController extends BaseController { return R.ok(); } + /** + * 角色菜单列表树信息 + * + * @param checkedKeys 选中菜单列表 + * @param menus 菜单下拉树结构列表 + */ + public record MenuTreeSelectVo(List checkedKeys, List> menus) { + } + } 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 f6200b49f..5dc1be24d 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 @@ -3,16 +3,16 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.enums.PushSourceEnum; import org.dromara.common.core.enums.PushTypeEnum; import org.dromara.common.core.service.DictService; -import org.dromara.common.redis.annotation.RepeatSubmit; -import org.dromara.common.web.core.BaseController; 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.redis.annotation.RepeatSubmit; +import org.dromara.common.web.core.BaseController; import org.dromara.resource.api.RemoteMessageService; import org.dromara.resource.api.domain.RemotePushPayLoad; import org.dromara.system.domain.bo.SysNoticeBo; 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 d5f91ac01..42b3c98fc 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 @@ -3,22 +3,22 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ObjectUtil; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; 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.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.vo.SysPostVo; import org.dromara.system.service.ISysDeptService; import org.dromara.system.service.ISysPostService; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; 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 37b80bd8d..e9db64c75 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 @@ -12,10 +12,10 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.MimeTypeUtils; import org.dromara.common.encrypt.annotation.ApiEncrypt; -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.helper.DataPermissionHelper; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.resource.api.RemoteFileService; @@ -141,7 +141,8 @@ public class SysProfileController extends BaseController { * * @param imgUrl 头像地址 */ - public record AvatarVo(String imgUrl) {} + public record AvatarVo(String imgUrl) { + } /** * 用户个人信息 @@ -150,7 +151,8 @@ public class SysProfileController extends BaseController { * @param roleGroup 用户所属角色组 * @param postGroup 用户所属岗位组 */ - public record ProfileVo(ProfileUserVo user, String roleGroup, String postGroup) {} + public record ProfileVo(ProfileUserVo user, String roleGroup, String postGroup) { + } /** * 用户密码修改 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 12772945f..d48f7de3d 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 @@ -4,14 +4,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; 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.core.utils.SpringUtils; 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.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysDeptBo; @@ -257,6 +257,7 @@ public class SysRoleController extends BaseController { * @param checkedKeys 选中部门列表 * @param depts 下拉树结构列表 */ - public record DeptTreeSelectVo(List checkedKeys, List> depts) {} + public record DeptTreeSelectVo(List checkedKeys, List> depts) { + } } 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 10c8078eb..5d9a2d63f 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 @@ -1,28 +1,28 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.crypto.digest.BCrypt; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.crypto.digest.BCrypt; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.encrypt.annotation.ApiEncrypt; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.excel.utils.ExcelBuilder; -import org.dromara.common.redis.annotation.RepeatSubmit; -import org.dromara.common.redis.utils.RedisUtils; 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.DataPermissionHelper; +import org.dromara.common.redis.annotation.RepeatSubmit; +import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.api.model.LoginUser; @@ -32,7 +32,10 @@ import org.dromara.system.domain.bo.SysRoleBo; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.*; import org.dromara.system.listener.SysUserImportListener; -import org.dromara.system.service.*; +import org.dromara.system.service.ISysDeptService; +import org.dromara.system.service.ISysPostService; +import org.dromara.system.service.ISysRoleService; +import org.dromara.system.service.ISysUserService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; 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 b9699a964..0480d90c0 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 @@ -195,7 +195,7 @@ public class SysMenu extends BaseEntity { * 内链域名特殊字符替换 */ public static String innerLinkReplaceEach(String path) { - return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":"}, + return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", StringUtils.COLON}, new String[]{"", "", "", "/", "/"}); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java index 245b80d2e..bd58c7870 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java @@ -2,9 +2,9 @@ package org.dromara.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; /** * 岗位表 sys_post 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 28fceb89f..be1894428 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 @@ -29,7 +29,7 @@ public class SysClientBo implements Serializable { /** * id */ - @NotNull(message = "id不能为空", groups = { EditGroup.class }) + @NotNull(message = "id不能为空", groups = {EditGroup.class}) private Long id; /** @@ -40,19 +40,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/SysConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java index eb6bf480f..525745c2e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java @@ -2,7 +2,6 @@ package org.dromara.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import org.dromara.system.domain.SysConfig; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java index e361802ff..dcd3d3189 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java @@ -2,7 +2,6 @@ package org.dromara.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import org.dromara.system.domain.SysDictData; 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 b04638842..40cef823b 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 @@ -30,25 +30,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; /** @@ -69,7 +69,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/convert/SysLoginInfoBoConvert.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLoginInfoBoConvert.java index 3a604139a..872bc6cec 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLoginInfoBoConvert.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLoginInfoBoConvert.java @@ -9,6 +9,7 @@ import org.mapstruct.ReportingPolicy; /** * 登录日志转换器 + * * @author zhujie */ @Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java index 5f1728137..66f7bfd64 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java @@ -10,6 +10,7 @@ import org.mapstruct.ReportingPolicy; /** * 操作日志转换器 + * * @author zhujie */ @Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE) @@ -17,6 +18,7 @@ public interface SysOperLogBoConvert extends BaseMapper { /** * RemoteUserBoToSysUserBo + * * @param remoteUserBo 待转换对象 * @return 转换后对象 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java index d158031f9..05f0020a6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java @@ -9,6 +9,7 @@ import org.mapstruct.ReportingPolicy; /** * 租户转换器 + * * @author zhujie */ @Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java index b5011c5d2..4a8cb62c0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysClient; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java index 2400af9bf..af1ca4e50 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysConfig; 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 902d29a20..051dbce81 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 @@ -1,17 +1,17 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysDept; import java.io.Serial; import java.io.Serializable; -import java.util.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/SysDictDataVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java index 7f4b9f427..887a8441f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysDictData; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java index fcc5fce32..db54e4696 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.system.domain.SysDictType; import java.io.Serial; 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 04dacbce8..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 @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysLoginInfo; @@ -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/domain/vo/SysOperLogVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java index 88474a969..bf1c033eb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysOperLog; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java index bde9e54db..c637f7439 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java @@ -1,9 +1,9 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.translation.annotation.Translation; @@ -15,7 +15,6 @@ import java.io.Serializable; import java.time.LocalDateTime; - /** * 岗位信息视图对象 sys_post * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java index 1532c2dfb..003635261 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java @@ -1,8 +1,8 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelProperty; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.listener.DeptExcelConverter; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java index 94edf03db..8e0549b20 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java @@ -1,8 +1,8 @@ package org.dromara.system.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelProperty; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.fesod.sheet.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.annotation.ExcelDynamicOptions; import org.dromara.common.excel.convert.ExcelDictConvert; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java index 15c614444..25e765db3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -2,13 +2,13 @@ package org.dromara.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.dromara.common.sensitive.annotation.Sensitive; import org.dromara.common.sensitive.core.SensitiveStrategy; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysUser; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java index 2fe552d34..b7a4e097a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.constant.SystemConstants; -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.system.api.RemoteTaskAssigneeService; import org.dromara.system.api.domain.bo.RemoteTaskAssigneeBo; import org.dromara.system.api.domain.vo.RemoteTaskAssigneeVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java index 6326ae53f..08931639f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java @@ -10,7 +10,10 @@ import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.enums.UserStatus; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.user.UserException; -import org.dromara.common.core.utils.*; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.ThreadUtils; import org.dromara.common.mybatis.helper.DataPermissionHelper; import org.dromara.system.api.RemoteUserService; import org.dromara.system.api.domain.bo.RemoteUserBo; 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/ISysClientService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java index 32e2959d8..f31c2ac2e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java index 482bd5e4d..3071568c7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.bo.SysConfigBo; import org.dromara.system.domain.vo.SysConfigVo; @@ -41,6 +41,7 @@ public interface ISysConfigService { /** * 获取注册开关 + * * @return true开启，false关闭 */ boolean selectRegisterEnabled(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java index e3864fb54..54c3cffb6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -1,8 +1,8 @@ package org.dromara.system.service; import cn.hutool.core.lang.tree.Tree; -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.system.domain.bo.SysDeptBo; import org.dromara.system.domain.vo.SysDeptVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java index f3bd769ac..248e66a1a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java index 1eac2c429..980751a5b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.bo.SysDictTypeBo; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.domain.vo.SysDictTypeVo; 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 c3f0100b0..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 @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.bo.SysLoginInfoBo; import org.dromara.system.domain.vo.SysLoginInfoVo; @@ -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/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java index 81ec4c592..78de4bb5c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.bo.SysNoticeBo; import org.dromara.system.domain.vo.SysNoticeVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java index 51c7e95f9..7c3bf4dcf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; 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 a578f3e3d..5cde7c634 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/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java index e56392e7e..12b20928e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.bo.SysPostBo; import org.dromara.system.domain.vo.SysPostVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java index 6b5a092a3..47aa1847d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysRoleBo; import org.dromara.system.domain.vo.SysRoleVo; 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 24cfcd4d3..ba7ee6692 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 @@ -1,7 +1,7 @@ package org.dromara.system.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.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 9a77854be..171ddf845 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.*; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.query.LambdaQueryBuilder; import org.dromara.common.mybatis.core.query.QueryBuilder; import org.dromara.common.redis.utils.CacheUtils; 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 e04fec05d..f4d1a466d 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 @@ -37,7 +37,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { * 分页查询登录日志列表 * * @param loginInfo 查询条件 - * @param pageQuery 分页参数 + * @param pageQuery 分页参数 * @return 登录日志分页列表 */ @Override diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java index 11824bbef..c7aaa77b8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java @@ -1,6 +1,5 @@ package org.dromara.system.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,8 +9,8 @@ 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.StreamUtils; -import org.dromara.common.mybatis.core.query.LambdaQueryBuilder; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.query.LambdaQueryBuilder; import org.dromara.common.mybatis.core.query.QueryBuilder; import org.dromara.system.domain.SysPost; import org.dromara.system.domain.SysUserPost; 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 9fe699de6..55bae2e4d 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 @@ -10,13 +10,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +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.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.query.QueryBuilder; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.api.model.LoginUser; @@ -539,7 +539,7 @@ public class SysRoleServiceImpl implements ISysRoleService { } // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作 keys.parallelStream().forEach(key -> { - String token = StringUtils.substringAfterLast(key, ":"); + String token = StringUtils.substringAfterLast(key, StringUtils.COLON); // 如果已经过期则跳过 if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) { return; @@ -575,7 +575,7 @@ public class SysRoleServiceImpl implements ISysRoleService { } // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作 keys.parallelStream().forEach(key -> { - String token = StringUtils.substringAfterLast(key, ":"); + String token = StringUtils.substringAfterLast(key, StringUtils.COLON); // 如果已经过期则跳过 if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) { return; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 402fa5cfc..0ff30ae9d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -11,10 +11,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.*; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.query.QueryBuilder; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysUser; 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/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java index 861ecb299..56a34946c 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 @@ -9,9 +9,9 @@ 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.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.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.constant.FlowConstant; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index 1beade23e..f514ce33c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -3,12 +3,12 @@ package org.dromara.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; 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.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.service.DefService; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index a0e0ae98c..c854aa263 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -3,13 +3,13 @@ package org.dromara.workflow.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StreamUtils; -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.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.service.InsService; import org.dromara.workflow.common.ConditionalOnEnable; 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 88fc19c39..4f3065907 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 @@ -4,14 +4,14 @@ import cn.dev33.satoken.annotation.SaCheckPermission; 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.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -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.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.bo.FlowSpelBo; 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 f790bf2d0..596bdb572 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 @@ -1,13 +1,13 @@ package org.dromara.workflow.controller; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; -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.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.system.api.domain.vo.RemoteUserVo; import org.dromara.warm.flow.core.entity.Node; @@ -191,8 +191,8 @@ public class FlwTaskController extends BaseController { /** * 获取可驳回的前置节点 * - * @param taskId 任务id - * @param nowNodeCode 当前节点 + * @param taskId 任务id + * @param nowNodeCode 当前节点 */ @GetMapping("/getBackTaskNode/{taskId}/{nowNodeCode}") public R> getBackTaskNode(@PathVariable Long taskId, @PathVariable String 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 7bb6d110e..e6efa4b08 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 @@ -5,15 +5,15 @@ 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.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; 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.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.bo.TestLeaveBo; 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 780ec1902..966774c0d 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 @@ -29,7 +29,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/FlowCategoryVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java index 68b2b5d11..b933e46d2 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java @@ -1,15 +1,15 @@ package org.dromara.workflow.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.workflow.domain.FlowCategory; 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-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java index 544cea619..63eedaf07 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowSpelVo.java @@ -1,9 +1,9 @@ package org.dromara.workflow.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.workflow.domain.FlowSpel; 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 3ae5d79d3..150e28b76 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/domain/vo/TestLeaveVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java index d0e993e1a..b66c25279 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java @@ -1,9 +1,9 @@ package org.dromara.workflow.domain.vo; -import org.apache.fesod.sheet.annotation.ExcelIgnoreUnannotated; -import org.apache.fesod.sheet.annotation.ExcelProperty; 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.workflow.domain.TestLeave; import java.io.Serial; 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 26f454d46..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 @@ -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 e16da96d7..9ff775e73 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 @@ -13,7 +13,6 @@ import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.api.domain.vo.RemoteUserVo; import org.dromara.system.api.RemoteUserService; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.dto.FlowParams; 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 f9860ed68..20fed3b64 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/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java index dd646e63c..6028ac89b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java @@ -1,8 +1,8 @@ package org.dromara.workflow.service; import jakarta.servlet.http.HttpServletResponse; -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.warm.flow.orm.entity.FlowDefinition; import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java index d2bdbbdb8..4d81dac67 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java @@ -1,7 +1,7 @@ package org.dromara.workflow.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.warm.flow.orm.entity.FlowInstance; import org.dromara.workflow.domain.bo.FlowCancelBo; import org.dromara.workflow.domain.bo.FlowInstanceBo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java index 3f63d5e78..75053e901 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java @@ -1,7 +1,7 @@ package org.dromara.workflow.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.system.api.domain.bo.RemoteTaskAssigneeBo; import org.dromara.system.api.domain.vo.RemoteTaskAssigneeVo; import org.dromara.workflow.domain.bo.FlowSpelBo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java index 42f0afc4b..709595c96 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java @@ -1,7 +1,7 @@ package org.dromara.workflow.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.system.api.domain.vo.RemoteUserVo; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.core.entity.Task; @@ -111,8 +111,8 @@ public interface IFlwTaskService { /** * 获取可驳回的前置节点 * - * @param taskId 任务id - * @param nowNodeCode 当前节点 + * @param taskId 任务id + * @param nowNodeCode 当前节点 * @return 结果 */ List getBackTaskNode(Long taskId, String nowNodeCode); 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 a77ee181e..3967a1ec3 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 @@ -1,7 +1,7 @@ package org.dromara.workflow.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.workflow.domain.bo.TestLeaveBo; import org.dromara.workflow.domain.vo.TestLeaveVo; 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..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; @@ -32,7 +31,7 @@ public class CategoryNameTranslationImpl implements TranslationInterface /** * 将流程分类 ID 翻译为分类名称。 * - * @param key 流程分类 ID + * @param key 流程分类 ID * @param other 额外参数 * @return 流程分类名称 */ @@ -44,7 +43,7 @@ public class CategoryNameTranslationImpl implements TranslationInterface /** * 批量将流程分类 ID 翻译为分类名称。 * - * @param keys 流程分类 ID 集合 + * @param keys 流程分类 ID 集合 * @param other 额外参数 * @return 流程分类 ID 与分类名称映射 */ @@ -65,7 +64,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/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index a4bead488..1634f58de 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; @@ -16,7 +17,6 @@ import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.query.LambdaQueryBuilder; import org.dromara.common.mybatis.core.query.QueryBuilder; -import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.core.dto.DefJson; import org.dromara.warm.flow.core.enums.NodeType; import org.dromara.warm.flow.core.enums.PublishStatus; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 7c496ee15..c2ff17bd8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -9,14 +9,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.query.LambdaJoinQueryBuilder; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.query.LambdaJoinQueryBuilder; import org.dromara.common.mybatis.core.query.QueryBuilder; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.constant.ExceptionCons; 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 b09753d85..511c0b9de 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 @@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.SystemConstants; +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.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.query.QueryBuilder; import org.dromara.system.api.domain.bo.RemoteTaskAssigneeBo; import org.dromara.system.api.domain.vo.RemoteTaskAssigneeVo; @@ -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); } 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 4e32cdd17..b1be88916 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 @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StreamUtils; @@ -20,7 +21,6 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.query.QueryBuilder; import org.dromara.common.mybatis.utils.IdGeneratorUtil; import org.dromara.common.satoken.utils.LoginHelper; @@ -43,7 +43,6 @@ import org.dromara.warm.flow.orm.mapper.FlowNodeMapper; import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; import org.dromara.workflow.api.domain.RemoteStartProcessReturn; import org.dromara.workflow.common.ConditionalOnEnable; -import org.dromara.workflow.common.constant.FlowConstant; import org.dromara.workflow.common.enums.MessageTypeEnum; import org.dromara.workflow.common.enums.TaskAssigneeType; import org.dromara.workflow.common.enums.TaskOperationEnum; @@ -54,11 +53,7 @@ import org.dromara.workflow.domain.vo.FlowCopyVo; import org.dromara.workflow.domain.vo.FlowHisTaskVo; import org.dromara.workflow.domain.vo.FlowTaskVo; import org.dromara.workflow.domain.vo.NodeExtVo; -import org.dromara.workflow.mapper.FlwCategoryMapper; -import org.dromara.workflow.mapper.FlwHisTaskMapper; -import org.dromara.workflow.mapper.FlwInstanceBizExtMapper; -import org.dromara.workflow.mapper.FlwTaskMapper; -import org.dromara.workflow.mapper.FlwUserMapper; +import org.dromara.workflow.mapper.*; import org.dromara.workflow.service.IFlwCommonService; import org.dromara.workflow.service.IFlwNodeExtService; import org.dromara.workflow.service.IFlwTaskAssigneeService; @@ -66,7 +61,6 @@ import org.dromara.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.*; import static org.dromara.workflow.common.constant.FlowConstant.*; 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 216b9cb27..e41b7781d 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 @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; @@ -15,7 +16,6 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.query.QueryBuilder; import org.dromara.workflow.api.domain.RemoteStartProcess; import org.dromara.workflow.api.event.ProcessDeleteEvent; diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 3fd96b5b0..ab85f48b3 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -23,22 +23,22 @@ - - - - + + + + - - - - + + + + - - - - + + + + diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 5e471049a..c4be6114b 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -1,5 +1,5 @@ - org.dromara diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus.xml b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus.xml index 00d308968..09409c251 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus.xml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus.xml @@ -1,8 +1,8 @@ - - + + @@ -14,15 +14,15 @@ - + - + - + - + - + diff --git a/ruoyi-visual/ruoyi-snailai-server/src/main/java/com/aizuda/snail/ai/starter/filter/ActuatorAuthFilter.java b/ruoyi-visual/ruoyi-snailai-server/src/main/java/com/aizuda/snail/ai/starter/filter/ActuatorAuthFilter.java index 2dd564c2d..9d5138f2f 100644 --- a/ruoyi-visual/ruoyi-snailai-server/src/main/java/com/aizuda/snail/ai/starter/filter/ActuatorAuthFilter.java +++ b/ruoyi-visual/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