From aa61bd387ccee3899111e1c3717ce668d86772a0 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: Mon, 26 Dec 2022 14:31:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor=20=E9=87=8D=E6=9E=84=20common=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20:=20-=20=E4=BB=8E=20web=20=E6=8B=86?= =?UTF-8?q?=E5=88=86=20idempotent=20=E5=B9=82=E7=AD=89=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=20,=20-=20=E4=BB=8E=20redis=20=E6=8B=86=E5=88=86=20rateLimiter?= =?UTF-8?q?=20=E9=99=90=E6=B5=81=E6=A8=A1=E5=9D=97=20,=20-=20=E4=BB=8E=20s?= =?UTF-8?q?atoken=20=E6=8B=86=E5=88=86=20security=20=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20;=20update=20=E6=9B=B4=E6=96=B0=20datasour?= =?UTF-8?q?ce=20=E6=A8=A1=E5=9D=97=E5=90=8D=E6=94=B9=E4=B8=BA=20mybatis=20?= =?UTF-8?q?;=20update=20=E7=A7=BB=E5=8A=A8=20LogininforEvent=20=E4=BB=8E?= =?UTF-8?q?=20core=20=E5=88=B0=20log=20=E6=A8=A1=E5=9D=97=20;=20update=20c?= =?UTF-8?q?onfig=20=E6=96=87=E4=BB=B6=E6=B3=A8=E8=A7=A3=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=20@AutoConfiguration=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/pom.xml | 5 +- ruoyi-common/ruoyi-common-bom/pom.xml | 25 ++++++++- .../common/core/config/ApplicationConfig.java | 4 +- .../ruoyi/common/core/config/AsyncConfig.java | 4 +- .../common/core/config/JacksonConfig.java | 5 +- .../common/core/config/ThreadPoolConfig.java | 4 +- .../common/core/config/ValidatorConfig.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 - .../common/doc/config/SwaggerConfig.java | 2 - ruoyi-common/ruoyi-common-idempotent/pom.xml | 41 ++++++++++++++ .../idempotent}/annotation/RepeatSubmit.java | 2 +- .../aspectj/RepeatSubmitAspect.java | 4 +- .../idempotent}/config/IdempotentConfig.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../ruoyi/common/log/aspect/LogAspect.java | 2 + .../common/log}/event/LogininforEvent.java | 2 +- .../ruoyi/common/mail/config/MailConfig.java | 8 +-- .../pom.xml | 6 +-- .../mybatis}/annotation/DataColumn.java | 2 +- .../mybatis}/annotation/DataPermission.java | 2 +- .../mybatis}/config/MybatisPlusConfig.java | 10 ++-- .../mybatis}/core/mapper/BaseMapperPlus.java | 2 +- .../common/mybatis}/core/page/PageQuery.java | 2 +- .../mybatis}/core/page/TableDataInfo.java | 2 +- .../common/mybatis}/enums/DataBaseType.java | 2 +- .../common/mybatis}/enums/DataScopeType.java | 5 +- .../CreateAndUpdateMetaObjectHandler.java | 2 +- .../handler/PlusDataPermissionHandler.java | 10 ++-- .../mybatis}/helper/DataBaseHelper.java | 4 +- .../mybatis}/helper/DataPermissionHelper.java | 2 +- .../helper/MybatisExceptionHandler.java | 2 +- .../PlusDataPermissionInterceptor.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + ruoyi-common/ruoyi-common-rateLimiter/pom.xml | 30 +++++++++++ .../rateLimiter}/annotation/RateLimiter.java | 4 +- .../aspectj/RateLimiterAspect.java | 6 +-- .../common/rateLimiter}/enums/LimitType.java | 2 +- .../common/redis/config/RedisConfig.java | 4 +- .../common/satoken/config/SaTokenConfig.java | 43 +-------------- ...ot.autoconfigure.AutoConfiguration.imports | 1 - ruoyi-common/ruoyi-common-security/pom.xml | 32 +++++++++++ .../security/config/SecurityConfig.java | 54 +++++++++++++++++++ .../config/properties/SecurityProperties.java | 2 +- .../handler/GlobalExceptionHandler.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../ruoyi/common/sms/config/SmsConfig.java | 5 +- .../common/web/config/UndertowConfig.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 - ruoyi-demo/pom.xml | 10 +++- .../RedisRateLimiterController.java | 4 +- .../demo/controller/TestDemoController.java | 7 ++- .../demo/controller/TestTreeController.java | 2 +- .../com/ruoyi/demo/mapper/TestDemoMapper.java | 6 +-- .../com/ruoyi/demo/mapper/TestTreeMapper.java | 6 +-- .../ruoyi/demo/service/ITestDemoService.java | 4 +- .../service/impl/TestDemoServiceImpl.java | 4 +- ruoyi-generator/pom.xml | 2 +- .../generator/controller/GenController.java | 4 +- .../mapper/GenTableColumnMapper.java | 2 +- .../generator/mapper/GenTableMapper.java | 2 +- .../service/GenTableServiceImpl.java | 4 +- .../generator/service/IGenTableService.java | 4 +- .../ruoyi/generator/util/VelocityUtils.java | 2 +- .../mapper/generator/GenTableColumnMapper.xml | 8 +-- .../mapper/generator/GenTableMapper.xml | 24 ++++----- .../main/resources/vm/java/controller.java.vm | 6 +-- .../src/main/resources/vm/java/mapper.java.vm | 2 +- .../main/resources/vm/java/service.java.vm | 4 +- .../resources/vm/java/serviceImpl.java.vm | 4 +- ruoyi-system/pom.xml | 13 ++++- .../controller/SysConfigController.java | 4 +- .../controller/SysDictDataController.java | 4 +- .../controller/SysDictTypeController.java | 4 +- .../controller/SysLogininforController.java | 4 +- .../controller/SysNoticeController.java | 4 +- .../controller/SysOperlogController.java | 4 +- .../controller/SysOssConfigController.java | 6 +-- .../system/controller/SysOssController.java | 4 +- .../system/controller/SysPostController.java | 4 +- .../system/controller/SysRoleController.java | 4 +- .../system/controller/SysUserController.java | 4 +- .../controller/SysUserOnlineController.java | 2 +- .../ruoyi/system/mapper/SysConfigMapper.java | 2 +- .../ruoyi/system/mapper/SysDeptMapper.java | 6 +-- .../system/mapper/SysDictDataMapper.java | 2 +- .../system/mapper/SysDictTypeMapper.java | 2 +- .../system/mapper/SysLogininforMapper.java | 2 +- .../ruoyi/system/mapper/SysMenuMapper.java | 2 +- .../ruoyi/system/mapper/SysNoticeMapper.java | 2 +- .../ruoyi/system/mapper/SysOperLogMapper.java | 2 +- .../system/mapper/SysOssConfigMapper.java | 2 +- .../com/ruoyi/system/mapper/SysOssMapper.java | 2 +- .../ruoyi/system/mapper/SysPostMapper.java | 2 +- .../system/mapper/SysRoleDeptMapper.java | 2 +- .../ruoyi/system/mapper/SysRoleMapper.java | 6 +-- .../system/mapper/SysRoleMenuMapper.java | 2 +- .../ruoyi/system/mapper/SysUserMapper.java | 6 +-- .../system/mapper/SysUserPostMapper.java | 2 +- .../system/mapper/SysUserRoleMapper.java | 2 +- .../system/service/ISysConfigService.java | 4 +- .../system/service/ISysDictDataService.java | 4 +- .../system/service/ISysDictTypeService.java | 4 +- .../system/service/ISysLogininforService.java | 4 +- .../system/service/ISysNoticeService.java | 4 +- .../system/service/ISysOperLogService.java | 4 +- .../system/service/ISysOssConfigService.java | 4 +- .../ruoyi/system/service/ISysOssService.java | 4 +- .../ruoyi/system/service/ISysPostService.java | 4 +- .../ruoyi/system/service/ISysRoleService.java | 4 +- .../ruoyi/system/service/ISysUserService.java | 4 +- .../ruoyi/system/service/SysLoginService.java | 2 +- .../system/service/SysRegisterService.java | 2 +- .../service/impl/SysConfigServiceImpl.java | 4 +- .../service/impl/SysDataScopeServiceImpl.java | 2 +- .../service/impl/SysDeptServiceImpl.java | 2 +- .../service/impl/SysDictDataServiceImpl.java | 4 +- .../service/impl/SysDictTypeServiceImpl.java | 4 +- .../impl/SysLogininforServiceImpl.java | 6 +-- .../service/impl/SysNoticeServiceImpl.java | 4 +- .../service/impl/SysOperLogServiceImpl.java | 4 +- .../service/impl/SysOssConfigServiceImpl.java | 4 +- .../service/impl/SysOssServiceImpl.java | 4 +- .../service/impl/SysPostServiceImpl.java | 4 +- .../service/impl/SysRoleServiceImpl.java | 4 +- .../service/impl/SysUserServiceImpl.java | 6 +-- 125 files changed, 426 insertions(+), 260 deletions(-) delete mode 100644 ruoyi-common/ruoyi-common-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 ruoyi-common/ruoyi-common-idempotent/pom.xml rename ruoyi-common/{ruoyi-common-web/src/main/java/com/ruoyi/common/web => ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent}/annotation/RepeatSubmit.java (92%) rename ruoyi-common/{ruoyi-common-web/src/main/java/com/ruoyi/common/web => ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent}/aspectj/RepeatSubmitAspect.java (98%) rename ruoyi-common/{ruoyi-common-web/src/main/java/com/ruoyi/common/web => ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent}/config/IdempotentConfig.java (80%) create mode 100644 ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename ruoyi-common/{ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain => ruoyi-common-log/src/main/java/com/ruoyi/common/log}/event/LogininforEvent.java (93%) rename ruoyi-common/{ruoyi-common-datasource => ruoyi-common-mybatis}/pom.xml (90%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/annotation/DataColumn.java (89%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/annotation/DataPermission.java (84%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/config/MybatisPlusConfig.java (92%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/core/mapper/BaseMapperPlus.java (99%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/core/page/PageQuery.java (98%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/core/page/TableDataInfo.java (97%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/enums/DataBaseType.java (95%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/enums/DataScopeType.java (90%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/handler/CreateAndUpdateMetaObjectHandler.java (98%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/handler/PlusDataPermissionHandler.java (96%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/helper/DataBaseHelper.java (96%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/helper/DataPermissionHelper.java (96%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/helper/MybatisExceptionHandler.java (97%) rename ruoyi-common/{ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource => ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis}/interceptor/PlusDataPermissionInterceptor.java (97%) create mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 ruoyi-common/ruoyi-common-rateLimiter/pom.xml rename ruoyi-common/{ruoyi-common-redis/src/main/java/com/ruoyi/common/redis => ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter}/annotation/RateLimiter.java (84%) rename ruoyi-common/{ruoyi-common-redis/src/main/java/com/ruoyi/common/redis => ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter}/aspectj/RateLimiterAspect.java (93%) rename ruoyi-common/{ruoyi-common-redis/src/main/java/com/ruoyi/common/redis => ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter}/enums/LimitType.java (85%) create mode 100644 ruoyi-common/ruoyi-common-security/pom.xml create mode 100644 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java rename ruoyi-common/{ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken => ruoyi-common-security/src/main/java/com/ruoyi/common/security}/config/properties/SecurityProperties.java (87%) rename ruoyi-common/{ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken => ruoyi-common-security/src/main/java/com/ruoyi/common/security}/handler/GlobalExceptionHandler.java (99%) create mode 100644 ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 50a8325b8..bb666f4bc 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -12,16 +12,19 @@ ruoyi-common-bom ruoyi-common-core - ruoyi-common-datasource ruoyi-common-dict ruoyi-common-doc ruoyi-common-excel + ruoyi-common-idempotent ruoyi-common-log ruoyi-common-mail + ruoyi-common-mybatis ruoyi-common-oss + ruoyi-common-rateLimiter ruoyi-common-redis ruoyi-common-sms ruoyi-common-satoken + ruoyi-common-security ruoyi-common-web diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index b4fdaafae..5a08fb011 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -25,7 +25,7 @@ com.ruoyi - ruoyi-common-datasource + ruoyi-common-mybatis ${project.version} @@ -50,6 +50,13 @@ ${project.version} + + + com.ruoyi + ruoyi-common-idempotent + ${project.version} + + com.ruoyi @@ -71,6 +78,13 @@ ${project.version} + + + com.ruoyi + ruoyi-common-rateLimiter + ${project.version} + + com.ruoyi @@ -78,13 +92,20 @@ ${project.version} - + com.ruoyi ruoyi-common-satoken ${project.version} + + + com.ruoyi + ruoyi-common-security + ${project.version} + + com.ruoyi diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java index 7dedbb980..ef741a077 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java @@ -1,6 +1,6 @@ package com.ruoyi.common.core.config; -import org.springframework.context.annotation.Configuration; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.EnableAspectJAutoProxy; /** @@ -8,7 +8,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; * * @author Lion Li */ -@Configuration +@AutoConfiguration // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) public class ApplicationConfig { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java index 0c5dd12ed..dc17475ea 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java @@ -5,7 +5,7 @@ import com.ruoyi.common.core.exception.ServiceException; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Configuration; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.scheduling.annotation.AsyncConfigurerSupport; import org.springframework.scheduling.annotation.EnableAsync; @@ -19,7 +19,7 @@ import java.util.concurrent.ScheduledExecutorService; * @author Lion Li */ @EnableAsync(proxyTargetClass = true) -@Configuration +@AutoConfiguration public class AsyncConfig extends AsyncConfigurerSupport { @Autowired diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java index fc09317de..1a8c90bff 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java @@ -6,9 +6,10 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.ruoyi.common.core.jackson.BigNumberSerializer; import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import java.math.BigDecimal; import java.math.BigInteger; @@ -22,7 +23,7 @@ import java.util.TimeZone; * @author Lion Li */ @Slf4j -@Configuration +@AutoConfiguration(before = JacksonAutoConfiguration.class) public class JacksonConfig { @Bean diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ThreadPoolConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ThreadPoolConfig.java index bd0010563..b829ac824 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ThreadPoolConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ThreadPoolConfig.java @@ -4,9 +4,9 @@ import com.ruoyi.common.core.config.properties.ThreadPoolProperties; import com.ruoyi.common.core.utils.Threads; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.ScheduledExecutorService; @@ -18,7 +18,7 @@ import java.util.concurrent.ThreadPoolExecutor; * * @author Lion Li **/ -@Configuration +@AutoConfiguration public class ThreadPoolConfig { /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java index 36d2e4fbf..4a1b483f7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java @@ -2,9 +2,9 @@ package com.ruoyi.common.core.config; import org.hibernate.validator.HibernateValidator; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import javax.validation.Validator; @@ -15,7 +15,7 @@ import java.util.Properties; * * @author Lion Li */ -@Configuration +@AutoConfiguration public class ValidatorConfig { @Autowired diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6d28dfe57..000000000 --- a/ruoyi-common/ruoyi-common-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.ruoyi.common.datasource.config.MybatisPlusConfig diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java index e77522e0c..b0427bc3c 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java @@ -18,7 +18,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import java.util.ArrayList; import java.util.List; @@ -31,7 +30,6 @@ import java.util.Set; * @author Lion Li */ @RequiredArgsConstructor -@Configuration @AutoConfigureBefore(SpringDocConfiguration.class) @ConditionalOnProperty(name = "swagger.enabled", havingValue = "true", matchIfMissing = true) public class SwaggerConfig { diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/ruoyi-common/ruoyi-common-idempotent/pom.xml new file mode 100644 index 000000000..818d00a90 --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-vue-plus + 4.4.0 + + + ruoyi-common-idempotent + + + ruoyi-common-idempotent 幂等功能 + + + + + com.ruoyi + ruoyi-common-core + + + + com.ruoyi + ruoyi-common-redis + + + + cn.dev33 + sa-token-core + + + + cn.hutool + hutool-crypto + + + + + diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/annotation/RepeatSubmit.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/annotation/RepeatSubmit.java similarity index 92% rename from ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/annotation/RepeatSubmit.java rename to ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/annotation/RepeatSubmit.java index 0f9b1a951..8801e4911 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/annotation/RepeatSubmit.java +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.web.annotation; +package com.ruoyi.common.idempotent.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/aspectj/RepeatSubmitAspect.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/aspectj/RepeatSubmitAspect.java similarity index 98% rename from ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/aspectj/RepeatSubmitAspect.java rename to ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/aspectj/RepeatSubmitAspect.java index 66ebbe812..0dd682926 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/aspectj/RepeatSubmitAspect.java +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/aspectj/RepeatSubmitAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.web.aspectj; +package com.ruoyi.common.idempotent.aspectj; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ObjectUtil; @@ -10,8 +10,8 @@ import com.ruoyi.common.core.utils.JsonUtils; import com.ruoyi.common.core.utils.MessageUtils; import com.ruoyi.common.core.utils.ServletUtils; import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.idempotent.annotation.RepeatSubmit; import com.ruoyi.common.redis.utils.RedisUtils; -import com.ruoyi.common.web.annotation.RepeatSubmit; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/IdempotentConfig.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentConfig.java similarity index 80% rename from ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/IdempotentConfig.java rename to ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentConfig.java index 72ca97162..79f8d144a 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/IdempotentConfig.java +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.web.config; +package com.ruoyi.common.idempotent.config; -import com.ruoyi.common.web.aspectj.RepeatSubmitAspect; +import com.ruoyi.common.idempotent.aspectj.RepeatSubmitAspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.connection.RedisConfiguration; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..354151714 --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.idempotent.config.IdempotentConfig diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index 8bf64aed9..f120ef791 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -16,6 +16,7 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; @@ -34,6 +35,7 @@ import java.util.Map; @Slf4j @Aspect @Component +@AutoConfiguration public class LogAspect { /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/event/LogininforEvent.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java rename to ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/event/LogininforEvent.java index 733f97f91..52c0ea7ef 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/event/LogininforEvent.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.event; +package com.ruoyi.common.log.event; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java index c561deefd..44a95b6ce 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java @@ -2,20 +2,22 @@ package com.ruoyi.common.mail.config; import cn.hutool.extra.mail.MailAccount; import com.ruoyi.common.mail.config.properties.MailProperties; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * JavaMail 配置 * * @author Michelle.Chung */ -@Configuration +@AutoConfiguration +@ConditionalOnProperty(value = "mail.enabled", havingValue = "true") +@EnableConfigurationProperties(MailProperties.class) public class MailConfig { @Bean - @ConditionalOnProperty(value = "mail.enabled", havingValue = "true") public MailAccount mailAccount(MailProperties mailProperties) { MailAccount account = new MailAccount(); account.setHost(mailProperties.getHost()); diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml similarity index 90% rename from ruoyi-common/ruoyi-common-datasource/pom.xml rename to ruoyi-common/ruoyi-common-mybatis/pom.xml index 5c96efe4a..ae8cb5441 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml @@ -5,14 +5,14 @@ 4.0.0 com.ruoyi - ruoyi-common + ruoyi-vue-plus 4.4.0 - ruoyi-common-datasource + ruoyi-common-mybatis - ruoyi-common-datasource 数据源服务 + ruoyi-common-mybatis 数据库服务 diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/DataColumn.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataColumn.java similarity index 89% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/DataColumn.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataColumn.java index 78a7854d9..bf703a232 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/DataColumn.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataColumn.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.annotation; +package com.ruoyi.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/DataPermission.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataPermission.java similarity index 84% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/DataPermission.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataPermission.java index 7243a5fa7..288c195b3 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/DataPermission.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.annotation; +package com.ruoyi.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/config/MybatisPlusConfig.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/config/MybatisPlusConfig.java similarity index 92% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/config/MybatisPlusConfig.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/config/MybatisPlusConfig.java index 2dc3cd77c..ea76cb3ac 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/config/MybatisPlusConfig.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.config; +package com.ruoyi.common.mybatis.config; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.ruoyi.common.datasource.handler.CreateAndUpdateMetaObjectHandler; -import com.ruoyi.common.datasource.interceptor.PlusDataPermissionInterceptor; +import com.ruoyi.common.mybatis.handler.CreateAndUpdateMetaObjectHandler; +import com.ruoyi.common.mybatis.interceptor.PlusDataPermissionInterceptor; import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; /** @@ -20,7 +20,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * @author Lion Li */ @EnableTransactionManagement(proxyTargetClass = true) -@Configuration +@AutoConfiguration @MapperScan("${mybatis-plus.mapperPackage}") public class MybatisPlusConfig { diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java similarity index 99% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/core/mapper/BaseMapperPlus.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java index 2423438b2..574f4c086 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/core/mapper/BaseMapperPlus.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.core.mapper; +package com.ruoyi.common.mybatis.core.mapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/core/page/PageQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/PageQuery.java similarity index 98% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/core/page/PageQuery.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/PageQuery.java index e40925740..91396cb4e 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/core/page/PageQuery.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/PageQuery.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.core.page; +package com.ruoyi.common.mybatis.core.page; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/core/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/TableDataInfo.java similarity index 97% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/core/page/TableDataInfo.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/TableDataInfo.java index cbfa2eb53..95286427d 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/core/page/TableDataInfo.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.core.page; +package com.ruoyi.common.mybatis.core.page; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/enums/DataBaseType.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataBaseType.java similarity index 95% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/enums/DataBaseType.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataBaseType.java index c1ba12dc6..b50667e65 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/enums/DataBaseType.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataBaseType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.enums; +package com.ruoyi.common.mybatis.enums; import com.ruoyi.common.core.utils.StringUtils; import lombok.AllArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/enums/DataScopeType.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataScopeType.java similarity index 90% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/enums/DataScopeType.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataScopeType.java index 381e4ec44..fef69f91d 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/enums/DataScopeType.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataScopeType.java @@ -1,6 +1,7 @@ -package com.ruoyi.common.datasource.enums; +package com.ruoyi.common.mybatis.enums; import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.mybatis.helper.DataPermissionHelper; import lombok.AllArgsConstructor; import lombok.Getter; @@ -10,7 +11,7 @@ import lombok.Getter; * 语法支持 spel 模板表达式 *

* 内置数据 user 当前用户 内容参考 LoginUser - * 如需扩展数据 可使用 {@link com.ruoyi.common.datasource.helper.DataPermissionHelper} 操作 + * 如需扩展数据 可使用 {@link DataPermissionHelper} 操作 * 内置服务 sdss 系统数据权限服务 内容参考 SysDataScopeService * 如需扩展更多自定义服务 可以参考 sdss 自行编写 * diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java similarity index 98% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/handler/CreateAndUpdateMetaObjectHandler.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java index 30a86c6f3..4ab329de8 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/handler/CreateAndUpdateMetaObjectHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.handler; +package com.ruoyi.common.mybatis.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java similarity index 96% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/handler/PlusDataPermissionHandler.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java index 0c30f0eb4..955352527 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/handler/PlusDataPermissionHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.handler; +package com.ruoyi.common.mybatis.handler; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; @@ -12,10 +12,10 @@ import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.datasource.annotation.DataColumn; -import com.ruoyi.common.datasource.annotation.DataPermission; -import com.ruoyi.common.datasource.enums.DataScopeType; -import com.ruoyi.common.datasource.helper.DataPermissionHelper; +import com.ruoyi.common.mybatis.annotation.DataColumn; +import com.ruoyi.common.mybatis.annotation.DataPermission; +import com.ruoyi.common.mybatis.enums.DataScopeType; +import com.ruoyi.common.mybatis.helper.DataPermissionHelper; import com.ruoyi.common.satoken.utils.LoginHelper; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/helper/DataBaseHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataBaseHelper.java similarity index 96% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/helper/DataBaseHelper.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataBaseHelper.java index ee10be0e1..c09017959 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/helper/DataBaseHelper.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataBaseHelper.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.datasource.helper; +package com.ruoyi.common.mybatis.helper; import cn.hutool.core.convert.Convert; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.datasource.enums.DataBaseType; +import com.ruoyi.common.mybatis.enums.DataBaseType; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/helper/DataPermissionHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java similarity index 96% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/helper/DataPermissionHelper.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java index 77aec7ba4..9555b0143 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/helper/DataPermissionHelper.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.helper; +package com.ruoyi.common.mybatis.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/helper/MybatisExceptionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/MybatisExceptionHandler.java similarity index 97% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/helper/MybatisExceptionHandler.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/MybatisExceptionHandler.java index 192fd3f1b..e3761cca9 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/helper/MybatisExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/MybatisExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.helper; +package com.ruoyi.common.mybatis.helper; import com.ruoyi.common.core.domain.R; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/interceptor/PlusDataPermissionInterceptor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/interceptor/PlusDataPermissionInterceptor.java similarity index 97% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/interceptor/PlusDataPermissionInterceptor.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/interceptor/PlusDataPermissionInterceptor.java index 98e0eb3d2..9b6a0b07a 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/interceptor/PlusDataPermissionInterceptor.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.datasource.interceptor; +package com.ruoyi.common.mybatis.interceptor; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; -import com.ruoyi.common.datasource.handler.PlusDataPermissionHandler; +import com.ruoyi.common.mybatis.handler.PlusDataPermissionHandler; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.statement.delete.Delete; import net.sf.jsqlparser.statement.select.PlainSelect; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..dbcd9a1b5 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.mybatis.config.MybatisPlusConfig diff --git a/ruoyi-common/ruoyi-common-rateLimiter/pom.xml b/ruoyi-common/ruoyi-common-rateLimiter/pom.xml new file mode 100644 index 000000000..ced3de38e --- /dev/null +++ b/ruoyi-common/ruoyi-common-rateLimiter/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-vue-plus + 4.4.0 + + + ruoyi-common-rateLimiter + + + ruoyi-common-rateLimiter 限流功能 + + + + + com.ruoyi + ruoyi-common-core + + + + com.ruoyi + ruoyi-common-redis + + + + diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/annotation/RateLimiter.java b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/annotation/RateLimiter.java similarity index 84% rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/annotation/RateLimiter.java rename to ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/annotation/RateLimiter.java index b7226d4f3..b949f44ce 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/annotation/RateLimiter.java +++ b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/annotation/RateLimiter.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.redis.annotation; +package com.ruoyi.common.rateLimiter.annotation; import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.redis.enums.LimitType; +import com.ruoyi.common.rateLimiter.enums.LimitType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/aspectj/RateLimiterAspect.java b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/aspectj/RateLimiterAspect.java similarity index 93% rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/aspectj/RateLimiterAspect.java rename to ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/aspectj/RateLimiterAspect.java index e81ada8bf..30bdd3786 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/aspectj/RateLimiterAspect.java +++ b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/aspectj/RateLimiterAspect.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.redis.aspectj; +package com.ruoyi.common.rateLimiter.aspectj; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.MessageUtils; import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.redis.annotation.RateLimiter; -import com.ruoyi.common.redis.enums.LimitType; +import com.ruoyi.common.rateLimiter.annotation.RateLimiter; +import com.ruoyi.common.rateLimiter.enums.LimitType; import com.ruoyi.common.redis.utils.RedisUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/enums/LimitType.java b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/enums/LimitType.java similarity index 85% rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/enums/LimitType.java rename to ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/enums/LimitType.java index a50c2cab7..417213bce 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/enums/LimitType.java +++ b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/enums/LimitType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.redis.enums; +package com.ruoyi.common.rateLimiter.enums; /** * 限流类型 diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfig.java index 838dc573d..1cbb6eb60 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfig.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfig.java @@ -9,11 +9,11 @@ import lombok.extern.slf4j.Slf4j; import org.redisson.codec.JsonJacksonCodec; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * redis配置 @@ -21,7 +21,7 @@ import org.springframework.context.annotation.Configuration; * @author Lion Li */ @Slf4j -@Configuration +@AutoConfiguration @EnableCaching @EnableConfigurationProperties(RedissonProperties.class) public class RedisConfig { diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfig.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfig.java index 886606d1c..d1d5260a2 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfig.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfig.java @@ -1,16 +1,9 @@ package com.ruoyi.common.satoken.config; -import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; -import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpLogic; -import cn.dev33.satoken.stp.StpUtil; -import com.ruoyi.common.satoken.config.properties.SecurityProperties; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** @@ -18,41 +11,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * * @author Lion Li */ -@RequiredArgsConstructor -@Slf4j -@Configuration +@AutoConfiguration public class SaTokenConfig implements WebMvcConfigurer { - private final SecurityProperties securityProperties; - - /** - * 注册sa-token的拦截器 - */ - @Override - public void addInterceptors(InterceptorRegistry registry) { - // 注册路由拦截器，自定义验证规则 - registry.addInterceptor(new SaInterceptor(handler -> { - // 登录验证 -- 排除多个路径 - SaRouter - // 获取所有的 - .match("/**") - // 对未排除的路径进行检查 - .check(() -> { - // 检查是否登录 是否有token - StpUtil.checkLogin(); - - // 有效率影响 用于临时测试 - // if (log.isDebugEnabled()) { - // log.debug("剩余有效时间: {}", StpUtil.getTokenTimeout()); - // log.debug("临时有效时间: {}", StpUtil.getTokenActivityTimeout()); - // } - - }); - })).addPathPatterns("/**") - // 排除不需要拦截的路径 - .excludePathPatterns(securityProperties.getExcludes()); - } - @Bean public StpLogic getStpLogicJwt() { // Sa-Token 整合 jwt (简单模式) diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a84b06728..fd02ac56d 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,2 @@ com.ruoyi.common.satoken.core.dao.PlusSaTokenDao com.ruoyi.common.satoken.core.service.SaPermissionImpl -com.ruoyi.common.satoken.config.SaTokenConfig diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml new file mode 100644 index 000000000..d8e311714 --- /dev/null +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-vue-plus + 4.4.0 + + + ruoyi-common-security + + + ruoyi-common-security 安全模块 + + + + + com.ruoyi + ruoyi-common-satoken + + + + + cn.dev33 + sa-token-spring-boot-starter + ${satoken.version} + + + + diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java new file mode 100644 index 000000000..3959bb9a9 --- /dev/null +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java @@ -0,0 +1,54 @@ +package com.ruoyi.common.security.config; + +import cn.dev33.satoken.interceptor.SaInterceptor; +import cn.dev33.satoken.router.SaRouter; +import cn.dev33.satoken.stp.StpUtil; +import com.ruoyi.common.security.config.properties.SecurityProperties; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * 权限安全配置 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Slf4j +@AutoConfiguration +public class SecurityConfig implements WebMvcConfigurer { + + private final SecurityProperties securityProperties; + + /** + * 注册sa-token的拦截器 + */ + @Override + public void addInterceptors(InterceptorRegistry registry) { + // 注册路由拦截器，自定义验证规则 + registry.addInterceptor(new SaInterceptor(handler -> { + // 登录验证 -- 排除多个路径 + SaRouter + // 获取所有的 + .match("/**") + // 对未排除的路径进行检查 + .check(() -> { + // 检查是否登录 是否有token + StpUtil.checkLogin(); + + // 有效率影响 用于临时测试 + // if (log.isDebugEnabled()) { + // log.debug("剩余有效时间: {}", StpUtil.getTokenTimeout()); + // log.debug("临时有效时间: {}", StpUtil.getTokenActivityTimeout()); + // } + + }); + })).addPathPatterns("/**") + // 排除不需要拦截的路径 + .excludePathPatterns(securityProperties.getExcludes()); + } + +} diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/properties/SecurityProperties.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/properties/SecurityProperties.java similarity index 87% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/properties/SecurityProperties.java rename to ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/properties/SecurityProperties.java index a731abfec..938ab947e 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/properties/SecurityProperties.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/properties/SecurityProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.satoken.config.properties; +package com.ruoyi.common.security.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java similarity index 99% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/handler/GlobalExceptionHandler.java rename to ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java index cbe742c09..c16a58dea 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.satoken.handler; +package com.ruoyi.common.security.handler; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..a09e5d650 --- /dev/null +++ b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.ruoyi.common.security.handler.GlobalExceptionHandler +com.ruoyi.common.security.config.SecurityConfig diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java index 8b80bc29d..ecc89afb6 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java @@ -4,8 +4,10 @@ import com.ruoyi.common.sms.config.properties.SmsProperties; import com.ruoyi.common.sms.core.AliyunSmsTemplate; import com.ruoyi.common.sms.core.SmsTemplate; import com.ruoyi.common.sms.core.TencentSmsTemplate; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -15,7 +17,8 @@ import org.springframework.context.annotation.Configuration; * @author Lion Li * @version 4.2.0 */ -@Configuration +@AutoConfiguration +@EnableConfigurationProperties(SmsProperties.class) public class SmsConfig { @Configuration diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java index fec461d93..6659c3c0e 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java @@ -2,16 +2,16 @@ package com.ruoyi.common.web.config; import io.undertow.server.DefaultByteBufferPool; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; -import org.springframework.context.annotation.Configuration; /** * Undertow 自定义配置 * * @author Lion Li */ -@Configuration +@AutoConfiguration public class UndertowConfig implements WebServerFactoryCustomizer { /** diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 04ee5fff7..cdf8c66c4 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,6 +1,5 @@ com.ruoyi.common.web.config.CaptchaConfig com.ruoyi.common.web.config.FilterConfig com.ruoyi.common.web.config.I18nConfig -com.ruoyi.common.web.config.IdempotentConfig com.ruoyi.common.web.config.ResourcesConfig com.ruoyi.common.web.config.UndertowConfig diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index ef5656271..e133a0da8 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -36,7 +36,11 @@ com.ruoyi - ruoyi-common-datasource + ruoyi-common-idempotent + + + com.ruoyi + ruoyi-common-mybatis com.ruoyi @@ -50,6 +54,10 @@ com.ruoyi ruoyi-common-web + + com.ruoyi + ruoyi-common-rateLimiter + diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java index f2cfbc3d5..c11915169 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java @@ -1,8 +1,8 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.redis.annotation.RateLimiter; -import com.ruoyi.common.redis.enums.LimitType; +import com.ruoyi.common.rateLimiter.annotation.RateLimiter; +import com.ruoyi.common.rateLimiter.enums.LimitType; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java index 8d1e911ed..925b58a0e 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java @@ -8,14 +8,13 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.datasource.core.page.PageQuery; -import com.ruoyi.common.datasource.core.page.TableDataInfo; +import com.ruoyi.common.idempotent.annotation.RepeatSubmit; +import com.ruoyi.common.mybatis.core.page.PageQuery; +import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.excel.core.ExcelResult; import com.ruoyi.common.excel.utils.ExcelUtil; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.redis.utils.RedisUtils; -import com.ruoyi.common.web.annotation.RepeatSubmit; import com.ruoyi.demo.domain.TestDemo; import com.ruoyi.demo.domain.bo.TestDemoBo; import com.ruoyi.demo.domain.bo.TestDemoImportVo; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java index e0a3f211c..87541d28f 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java @@ -7,9 +7,9 @@ import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.excel.utils.ExcelUtil; +import com.ruoyi.common.idempotent.annotation.RepeatSubmit; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.web.annotation.RepeatSubmit; import com.ruoyi.demo.domain.bo.TestTreeBo; import com.ruoyi.demo.domain.vo.TestTreeVo; import com.ruoyi.demo.service.ITestTreeService; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java index d22871e0d..f24c99483 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java @@ -4,9 +4,9 @@ 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 com.ruoyi.common.datasource.annotation.DataColumn; -import com.ruoyi.common.datasource.annotation.DataPermission; -import com.ruoyi.common.datasource.core.mapper.BaseMapperPlus; +import com.ruoyi.common.mybatis.annotation.DataColumn; +import com.ruoyi.common.mybatis.annotation.DataPermission; +import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.demo.domain.TestDemo; import com.ruoyi.demo.domain.vo.TestDemoVo; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java index b16fdf38d..10c880bc0 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java @@ -1,8 +1,8 @@ package com.ruoyi.demo.mapper; -import com.ruoyi.common.datasource.annotation.DataColumn; -import com.ruoyi.common.datasource.annotation.DataPermission; -import com.ruoyi.common.datasource.core.mapper.BaseMapperPlus; +import com.ruoyi.common.mybatis.annotation.DataColumn; +import com.ruoyi.common.mybatis.annotation.DataPermission; +import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.demo.domain.TestTree; import com.ruoyi.demo.domain.vo.TestTreeVo; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java index 91fa56d13..542791ddb 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java @@ -1,7 +1,7 @@ package com.ruoyi.demo.service; -import com.ruoyi.common.datasource.core.page.PageQuery; -import com.ruoyi.common.datasource.core.page.TableDataInfo; +import com.ruoyi.common.mybatis.core.page.PageQuery; +import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.demo.domain.TestDemo; import com.ruoyi.demo.domain.bo.TestDemoBo; import com.ruoyi.demo.domain.vo.TestDemoVo; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java index 801e4e9db..32ed91c9d 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.datasource.core.page.PageQuery; -import com.ruoyi.common.datasource.core.page.TableDataInfo; +import com.ruoyi.common.mybatis.core.page.PageQuery; +import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.demo.domain.TestDemo; import com.ruoyi.demo.domain.bo.TestDemoBo; import com.ruoyi.demo.domain.vo.TestDemoVo; diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 21e5d3822..d9a593a58 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -24,7 +24,7 @@ com.ruoyi - ruoyi-common-datasource + ruoyi-common-mybatis diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index a5bc5cee5..96513a141 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -5,8 +5,8 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.datasource.core.page.PageQuery; -import com.ruoyi.common.datasource.core.page.TableDataInfo; +import com.ruoyi.common.mybatis.core.page.PageQuery; +import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.generator.domain.GenTable; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java index ef14ddfd3..6ae9e8e73 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.ruoyi.common.datasource.core.mapper.BaseMapperPlus; +import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.generator.domain.GenTableColumn; import java.util.List; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java index 0513eb20a..b041fc38f 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java @@ -2,7 +2,7 @@ package com.ruoyi.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.datasource.core.mapper.BaseMapperPlus; +import com.ruoyi.common.mybatis.core.mapper.BaseMapperPlus; import com.ruoyi.generator.domain.GenTable; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index 70dfed39e..3e15de4a6 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -18,8 +18,8 @@ import com.ruoyi.common.core.utils.JsonUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.file.FileUtils; -import com.ruoyi.common.datasource.core.page.PageQuery; -import com.ruoyi.common.datasource.core.page.TableDataInfo; +import com.ruoyi.common.mybatis.core.page.PageQuery; +import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.satoken.utils.LoginHelper; import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java index 80466b8bc..3e6727fa9 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java @@ -1,7 +1,7 @@ package com.ruoyi.generator.service; -import com.ruoyi.common.datasource.core.page.PageQuery; -import com.ruoyi.common.datasource.core.page.TableDataInfo; +import com.ruoyi.common.mybatis.core.page.PageQuery; +import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index 9f96d4d4a..808234558 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -8,7 +8,7 @@ import com.ruoyi.common.core.constant.GenConstants; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.JsonUtils; import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.datasource.helper.DataBaseHelper; +import com.ruoyi.common.mybatis.helper.DataBaseHelper; import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; import lombok.AccessLevel; diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 76e09bca8..e3a948376 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select table_name, table_comment, create_time, update_time from information_schema.tables where table_schema = (select database()) @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - + select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time from user_tables dt, user_tab_comments dtc, user_objects uo where dt.table_name = dtc.table_name @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - + select table_name, table_comment, create_time, update_time from ( SELECT c.relname AS table_name, @@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - + SELECT cast(D.NAME as nvarchar) as table_name, cast(F.VALUE as nvarchar) as table_comment, crdate as create_time, @@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"