diff --git a/pom.xml b/pom.xml index 74e26cf65..24f1ac0fb 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,15 @@ import + + + com.ruoyi + ruoyi-common-bom + ${ruoyi-vue-plus.version} + pom + import + + org.springdoc springdoc-openapi-webmvc-core @@ -122,6 +131,13 @@ sa-token-spring-boot-starter ${satoken.version} + + + cn.dev33 + sa-token-core + ${satoken.version} + + cn.dev33 @@ -152,6 +168,11 @@ mybatis-plus-extension ${mybatis-plus.version} + + com.baomidou + mybatis-plus-annotation + ${mybatis-plus.version} + p6spy @@ -240,13 +261,6 @@ ${ruoyi-vue-plus.version} - - - com.ruoyi - ruoyi-framework - ${ruoyi-vue-plus.version} - - com.ruoyi @@ -261,20 +275,6 @@ ${ruoyi-vue-plus.version} - - - com.ruoyi - ruoyi-oss - ${ruoyi-vue-plus.version} - - - - - com.ruoyi - ruoyi-sms - ${ruoyi-vue-plus.version} - - com.ruoyi @@ -287,15 +287,12 @@ ruoyi-admin - ruoyi-framework ruoyi-system - ruoyi-job ruoyi-generator ruoyi-common + ruoyi-job ruoyi-demo ruoyi-extend - ruoyi-oss - ruoyi-sms pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index a588f62da..3457de13a 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -45,15 +45,24 @@ mssql-jdbc - com.ruoyi - ruoyi-framework + ruoyi-system com.ruoyi - ruoyi-system + ruoyi-common-doc + + + + com.ruoyi + ruoyi-common-satoken + + + + com.ruoyi + ruoyi-common-web @@ -63,7 +72,12 @@ com.ruoyi - ruoyi-oss + ruoyi-common-log + + + + com.ruoyi + ruoyi-common-oss diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java index 795359c5b..a5d1f4a25 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -5,18 +5,18 @@ import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.constant.CacheConstants; +import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.enums.CaptchaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.CaptchaProperties; -import com.ruoyi.sms.config.properties.SmsProperties; -import com.ruoyi.sms.core.SmsTemplate; -import com.ruoyi.sms.entity.SmsResult; +import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.utils.reflect.ReflectUtils; +import com.ruoyi.common.redis.utils.RedisUtils; +import com.ruoyi.common.sms.config.properties.SmsProperties; +import com.ruoyi.common.sms.core.SmsTemplate; +import com.ruoyi.common.sms.entity.SmsResult; +import com.ruoyi.common.web.config.properties.CaptchaProperties; +import com.ruoyi.common.web.enums.CaptchaType; import com.ruoyi.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java index 74585fc48..9a94c07de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java @@ -2,13 +2,13 @@ package com.ruoyi.web.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.collection.CollUtil; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.CacheNames; +import com.ruoyi.common.core.constant.CacheConstants; +import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.CacheUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.common.core.utils.JsonUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.redis.utils.CacheUtils; +import com.ruoyi.common.redis.utils.RedisUtils; import com.ruoyi.system.domain.SysCache; import lombok.RequiredArgsConstructor; import org.redisson.spring.data.connection.RedissonConnectionFactory; diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index d625156c9..05135114b 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -214,8 +214,10 @@ springdoc: - group: 1.演示模块 packages-to-scan: com.ruoyi.demo - group: 2.系统模块 + packages-to-scan: com.ruoyi.system + - group: 3.WEB模块 packages-to-scan: com.ruoyi.web - - group: 3.代码生成模块 + - group: 4.代码生成模块 packages-to-scan: com.ruoyi.generator # 防止XSS攻击 @@ -254,3 +256,6 @@ management: show-details: ALWAYS logfile: external-file: ./logs/sys-console.log + metrics: + tags: + application: ${spring.application.name} diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java index a40fd8275..b40c1234e 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java @@ -1,6 +1,6 @@ package com.ruoyi.test; -import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.config.RuoYiConfig; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java index 04bf1b5cc..9d6138373 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java @@ -1,6 +1,6 @@ package com.ruoyi.test; -import com.ruoyi.common.enums.UserType; +import com.ruoyi.common.core.enums.UserType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 90d29940b..bb666f4bc 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -9,149 +9,30 @@ 4.0.0 + + ruoyi-common-bom + ruoyi-common-core + 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 + + ruoyi-common + pom - common通用工具 + common通用模块 - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - cn.dev33 - sa-token-spring-boot-starter - - - - cn.dev33 - sa-token-jwt - - - - - org.springframework.boot - spring-boot-starter-validation - - - - - org.apache.commons - commons-lang3 - - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.alibaba - easyexcel - - - - - org.yaml - snakeyaml - - - - - javax.servlet - javax.servlet-api - - - - com.baomidou - mybatis-plus-boot-starter - - - com.baomidou - mybatis-plus-extension - - - - - com.baomidou - dynamic-datasource-spring-boot-starter - - - - cn.hutool - hutool-core - - - - cn.hutool - hutool-http - - - - cn.hutool - hutool-captcha - - - - cn.hutool - hutool-jwt - - - - cn.hutool - hutool-extra - - - - com.sun.mail - jakarta.mail - - - - org.projectlombok - lombok - - - - org.springdoc - springdoc-openapi-webmvc-core - - - - org.springdoc - springdoc-openapi-javadoc - - - - - org.springframework.boot - spring-boot-configuration-processor - - - - - org.redisson - redisson-spring-boot-starter - - - - com.baomidou - lock4j-redisson-spring-boot-starter - - - - diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml new file mode 100644 index 000000000..5a08fb011 --- /dev/null +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -0,0 +1,125 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common-bom + 4.4.0 + pom + + + ruoyi-common-bom common依赖项 + + + + + + + com.ruoyi + ruoyi-common-core + ${project.version} + + + + + com.ruoyi + ruoyi-common-mybatis + ${project.version} + + + + + com.ruoyi + ruoyi-common-dict + ${project.version} + + + + + com.ruoyi + ruoyi-common-doc + ${project.version} + + + + + com.ruoyi + ruoyi-common-excel + ${project.version} + + + + + com.ruoyi + ruoyi-common-idempotent + ${project.version} + + + + + com.ruoyi + ruoyi-common-log + ${project.version} + + + + + com.ruoyi + ruoyi-common-mail + ${project.version} + + + + + com.ruoyi + ruoyi-common-oss + ${project.version} + + + + + com.ruoyi + ruoyi-common-rateLimiter + ${project.version} + + + + + com.ruoyi + ruoyi-common-redis + ${project.version} + + + + + com.ruoyi + ruoyi-common-satoken + ${project.version} + + + + + com.ruoyi + ruoyi-common-security + ${project.version} + + + + + com.ruoyi + ruoyi-common-sms + ${project.version} + + + + + com.ruoyi + ruoyi-common-web + ${project.version} + + + + + diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml new file mode 100644 index 000000000..c1d9c3e85 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -0,0 +1,107 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-core + + + ruoyi-common-core核心模块 + + + + + + org.springframework + spring-context-support + + + + + org.springframework + spring-web + + + + com.baomidou + mybatis-plus-annotation + + + + + org.springframework.boot + spring-boot-starter-validation + + + + + org.apache.commons + commons-lang3 + + + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + + javax.servlet + javax.servlet-api + + + + org.projectlombok + lombok + + + + cn.hutool + hutool-core + + + + cn.hutool + hutool-http + + + + cn.hutool + hutool-captcha + + + + cn.hutool + hutool-jwt + + + + cn.hutool + hutool-extra + + + + + org.springframework.boot + spring-boot-configuration-processor + + + + + org.yaml + snakeyaml + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Sensitive.java similarity index 77% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Sensitive.java index 2ad9777cc..0b2fbc193 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Sensitive.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.common.core.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.enums.SensitiveStrategy; -import com.ruoyi.common.jackson.SensitiveJsonSerializer; +import com.ruoyi.common.core.enums.SensitiveStrategy; +import com.ruoyi.common.core.jackson.SensitiveJsonSerializer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java similarity index 69% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ApplicationConfig.java index 072eef96a..ef741a077 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/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.framework.config; +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-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java index d011b583d..dc17475ea 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.core.config; import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.common.exception.ServiceException; +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-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java similarity index 85% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java index eace537a5..1a8c90bff 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/JacksonConfig.java @@ -1,14 +1,15 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.core.config; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import com.ruoyi.framework.jackson.BigNumberSerializer; +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/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java index 8ce7a8c4f..6185fbcbd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/RuoYiConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config; +package com.ruoyi.common.core.config; import lombok.Data; import lombok.Getter; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ThreadPoolConfig.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ThreadPoolConfig.java index a85ad1e57..b829ac824 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ThreadPoolConfig.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.core.config; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.framework.config.properties.ThreadPoolProperties; +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-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java index 0a2007c81..4a1b483f7 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/ValidatorConfig.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.config; +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-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/properties/ThreadPoolProperties.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/properties/ThreadPoolProperties.java index fe0673321..d967ad3e0 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/properties/ThreadPoolProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.common.core.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java index 1cdf07eec..38a31eea6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.common.core.constant; /** * 缓存的key 常量 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheNames.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheNames.java index 591ca2546..ba09e9c41 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheNames.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.common.core.constant; /** * 缓存组名称常量 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java index e634ed297..155d0dc4f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.common.core.constant; /** * 通用常量信息 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java index bb08d50a5..46591cdcd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.common.core.constant; /** * 代码生成通用常量 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java index f007b8c83..d19931aac 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.common.core.constant; /** * 返回状态码 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java index 9f800be2f..4a73c0867 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.ruoyi.common.core.constant; /** * 用户常量信息 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java index 381a6f602..1f28bd5e3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java @@ -1,6 +1,6 @@ package com.ruoyi.common.core.domain; -import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.constant.HttpStatus; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java index 4a4cfb518..ba3b5cecb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java @@ -1,6 +1,6 @@ package com.ruoyi.common.core.domain.model; -import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.constant.UserConstants; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java index c93b9efe1..83fcf9fe8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -1,7 +1,6 @@ package com.ruoyi.common.core.domain.model; import com.ruoyi.common.core.domain.dto.RoleDTO; -import com.ruoyi.common.helper.LoginHelper; import lombok.Data; import lombok.NoArgsConstructor; @@ -111,7 +110,7 @@ public class LoginUser implements Serializable { if (userId == null) { throw new IllegalArgumentException("用户ID不能为空"); } - return userType + LoginHelper.JOIN_CODE + userId; + return userType + ":" + userId; } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/DeviceType.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/DeviceType.java index 118a2128a..b15b91c52 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/DeviceType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/LoginType.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/LoginType.java index c91a4b94f..fcd48dfbb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/LoginType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/SensitiveStrategy.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/SensitiveStrategy.java index f667173c6..c58ea499e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/SensitiveStrategy.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.core.enums; import cn.hutool.core.util.DesensitizedUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java index 673ddebd2..b546f37b2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.core.enums; /** * 用户状态 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserType.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserType.java index ec6510d98..46e400587 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.core.enums; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java index 9178131d7..456055239 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.ruoyi.common.core.exception; /** * 演示模式异常 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java index 080785c9f..184f309e7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.ruoyi.common.core.exception; /** * 全局异常 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java index 53f41b3b9..f5b2cdcde 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.ruoyi.common.core.exception; /** * 业务异常 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java index 01cc8782b..1e383235b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.ruoyi.common.core.exception; /** * 工具类异常 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java index dc0b84bf6..33b28e712 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.exception.base; +package com.ruoyi.common.core.exception.base; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.MessageUtils; +import com.ruoyi.common.core.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java similarity index 71% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java index 794f4e1a7..8a6a70a15 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.exception.file; +package com.ruoyi.common.core.exception.file; -import com.ruoyi.common.exception.base.BaseException; +import com.ruoyi.common.core.exception.base.BaseException; /** * 文件信息异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java index 64a5020d0..7c54c6ae2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.ruoyi.common.core.exception.file; /** * 文件名称超长限制异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java index 93e9e1c60..bc89b6fce 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.ruoyi.common.core.exception.file; /** * 文件名大小限制异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaException.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaException.java index 2345c2045..a2df75f42 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.common.core.exception.user; /** * 验证码错误异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java index bb4c0376f..3aa9d51c9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.common.core.exception.user; /** * 验证码失效异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java similarity index 71% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java index 99a888056..58d2a9f9e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.common.core.exception.user; -import com.ruoyi.common.exception.base.BaseException; +import com.ruoyi.common.core.exception.base.BaseException; /** * 用户信息异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java index 863ba7658..794c6753a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.common.core.exception.user; /** * 用户密码不正确或不符合规范异常类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordRetryLimitExceedException.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordRetryLimitExceedException.java index 3d2b640e0..2422cbfea 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordRetryLimitExceedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.ruoyi.common.core.exception.user; /** * 用户错误最大次数异常类 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/BigNumberSerializer.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/BigNumberSerializer.java index a4aee1552..0882c144e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/BigNumberSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.jackson; +package com.ruoyi.common.core.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/SensitiveJsonSerializer.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/SensitiveJsonSerializer.java index 41e578163..946c5c32c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/jackson/SensitiveJsonSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.jackson; +package com.ruoyi.common.core.jackson; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.ruoyi.common.annotation.Sensitive; +import com.ruoyi.common.core.annotation.Sensitive; +import com.ruoyi.common.core.enums.SensitiveStrategy; import com.ruoyi.common.core.service.SensitiveService; -import com.ruoyi.common.enums.SensitiveStrategy; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.utils.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/ShutdownManager.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/ShutdownManager.java index 9d27874e9..5c543ab58 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/ShutdownManager.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.manager; +package com.ruoyi.common.core.manager; -import com.ruoyi.common.utils.Threads; +import com.ruoyi.common.core.utils.Threads; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/ConfigService.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/ConfigService.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/DictService.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/DictService.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/SensitiveService.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/SensitiveService.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java index 88161daac..215a4decf 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.SimpleCache; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java index c64f1f8a1..804f1a272 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JsonUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JsonUtils.java index e5c471e55..f8245b3d3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ArrayUtil; @@ -7,7 +7,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.ruoyi.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MessageUtils.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MessageUtils.java index c9c091d6f..24928f882 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MessageUtils.java @@ -1,6 +1,5 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; -import com.ruoyi.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.context.MessageSource; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java index 91ddd3f66..7b1c86282 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HttpStatus; -import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.constant.Constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.http.MediaType; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java index 8b37e416d..807700dc1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.ruoyi.common.core.utils; import cn.hutool.extra.spring.SpringUtil; import org.springframework.aop.framework.AopContext; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StreamUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StreamUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StreamUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StreamUtils.java index fccd9e3d1..b11fa5194 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StreamUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StreamUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java index 16f8861c1..15ece2042 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Validator; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/Threads.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/Threads.java index 1952929dd..89ca66254 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TreeBuildUtils.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TreeBuildUtils.java index f9f8fa140..0d249456a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TreeBuildUtils.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.parser.NodeParser; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.ruoyi.common.core.utils.reflect.ReflectUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ValidatorUtils.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ValidatorUtils.java index 1fe2eaf64..8ba84da05 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ValidatorUtils.java @@ -1,6 +1,5 @@ -package com.ruoyi.common.utils; +package com.ruoyi.common.core.utils; -import com.ruoyi.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java index 1ef222907..2e80c05c5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.ruoyi.common.core.utils.file; import cn.hutool.core.io.FileUtil; import lombok.AccessLevel; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java index 6ca97fe60..7291c0ff2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.ruoyi.common.core.utils.file; /** * 媒体类型工具类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/AddressUtils.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/AddressUtils.java index 8d3515e7f..15c3085c6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/AddressUtils.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.utils.ip; +package com.ruoyi.common.core.utils.ip; import cn.hutool.core.lang.Dict; import cn.hutool.core.net.NetUtil; import cn.hutool.http.HtmlUtil; import cn.hutool.http.HttpUtil; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.config.RuoYiConfig; +import com.ruoyi.common.core.constant.Constants; +import com.ruoyi.common.core.utils.JsonUtils; +import com.ruoyi.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java index 0e0d7e7f5..af0c56009 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils.reflect; +package com.ruoyi.common.core.utils.reflect; import cn.hutool.core.util.ReflectUtil; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java index 789149615..4c878d3b0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils.sql; +package com.ruoyi.common.core.utils.sql; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.exception.UtilException; +import com.ruoyi.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/validate/AddGroup.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/validate/AddGroup.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/validate/EditGroup.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/validate/EditGroup.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java new file mode 100644 index 000000000..35a228010 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java @@ -0,0 +1,40 @@ +package com.ruoyi.common.core.web.controller; + +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.StringUtils; + +/** + * web层通用数据处理 + * + * @author Lion Li + */ +public class BaseController { + + /** + * 响应返回结果 + * + * @param rows 影响行数 + * @return 操作结果 + */ + protected R toAjax(int rows) { + return rows > 0 ? R.ok() : R.fail(); + } + + /** + * 响应返回结果 + * + * @param result 结果 + * @return 操作结果 + */ + protected R toAjax(boolean result) { + return result ? R.ok() : R.fail(); + } + + /** + * 页面跳转 + */ + public String redirect(String url) { + return StringUtils.format("redirect:{}", url); + } + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java index bd316079a..c0a3a0ffb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.ruoyi.common.core.web.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java index c7bb9b4ff..fffb8f6cd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.ruoyi.common.core.web.domain; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java index 0a26d60a5..91349726a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.ruoyi.common.core.xss; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java index 03102df66..b8601d63d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.ruoyi.common.core.xss; import cn.hutool.core.util.ReUtil; import cn.hutool.http.HtmlUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..b42155856 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,7 @@ +com.ruoyi.common.core.config.ApplicationConfig +com.ruoyi.common.core.config.AsyncConfig +com.ruoyi.common.core.config.JacksonConfig +com.ruoyi.common.core.config.RuoYiConfig +com.ruoyi.common.core.config.ThreadPoolConfig +com.ruoyi.common.core.config.ValidatorConfig +com.ruoyi.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-dict/pom.xml b/ruoyi-common/ruoyi-common-dict/pom.xml new file mode 100644 index 000000000..d03a7f2cb --- /dev/null +++ b/ruoyi-common/ruoyi-common-dict/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-dict + + + ruoyi-common-dict 字典 + + + + + com.ruoyi + ruoyi-common-core + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java b/ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/annotation/DictDataMapper.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java rename to ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/annotation/DictDataMapper.java index 5c14a5520..c005bd790 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java +++ b/ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/annotation/DictDataMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.common.dict.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.jackson.DictDataJsonSerializer; +import com.ruoyi.common.dict.jackson.DictDataJsonSerializer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java b/ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/jackson/DictDataJsonSerializer.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java rename to ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/jackson/DictDataJsonSerializer.java index caa059b92..f6d900b73 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java +++ b/ruoyi-common/ruoyi-common-dict/src/main/java/com/ruoyi/common/dict/jackson/DictDataJsonSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.jackson; +package com.ruoyi.common.dict.jackson; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.ruoyi.common.annotation.DictDataMapper; import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.dict.annotation.DictDataMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/ruoyi-common/ruoyi-common-doc/pom.xml new file mode 100644 index 000000000..207ad2da3 --- /dev/null +++ b/ruoyi-common/ruoyi-common-doc/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-doc + + + ruoyi-common-swagger系统接口 + + + + + com.ruoyi + ruoyi-common-core + + + + org.springdoc + springdoc-openapi-webmvc-core + + + + org.springdoc + springdoc-openapi-javadoc + + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java rename to ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java index ab92cf591..b0427bc3c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.doc.config; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.SwaggerProperties; -import com.ruoyi.framework.handler.OpenApiHandler; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.doc.config.properties.SwaggerProperties; +import com.ruoyi.common.doc.handler.OpenApiHandler; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.info.Info; @@ -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-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/properties/SwaggerProperties.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java rename to ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/properties/SwaggerProperties.java index 736d70a45..3af27965d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/properties/SwaggerProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.common.doc.config.properties; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OpenApiHandler.java b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/handler/OpenApiHandler.java similarity index 99% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OpenApiHandler.java rename to ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/handler/OpenApiHandler.java index 608cae5de..357ce172e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OpenApiHandler.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/handler/OpenApiHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.handler; +package com.ruoyi.common.doc.handler; import cn.hutool.core.io.IoUtil; import io.swagger.v3.core.jackson.TypeNameResolver; diff --git a/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..8ae5a185a --- /dev/null +++ b/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.doc.config.SwaggerConfig diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/ruoyi-common/ruoyi-common-excel/pom.xml new file mode 100644 index 000000000..97765107c --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-excel + + + ruoyi-common-excel + + + + + com.ruoyi + ruoyi-common-core + + + + com.alibaba + easyexcel + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/CellMerge.java similarity index 76% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/CellMerge.java index 4af822eda..5c0f552d9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/CellMerge.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.common.excel.annotation; -import com.ruoyi.common.excel.CellMergeStrategy; +import com.ruoyi.common.excel.core.CellMergeStrategy; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/ExcelDictFormat.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/ExcelDictFormat.java index 400080ea7..a9671fb62 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/annotation/ExcelDictFormat.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.common.excel.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/convert/ExcelBigNumberConvert.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/convert/ExcelBigNumberConvert.java index 432ab74ec..1e10334c2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/convert/ExcelBigNumberConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.ruoyi.common.excel.convert; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/convert/ExcelDictConvert.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/convert/ExcelDictConvert.java index 03dad1f8d..3b7af930e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/convert/ExcelDictConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.ruoyi.common.excel.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -9,11 +9,11 @@ import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.excel.annotation.ExcelDictFormat; +import com.ruoyi.common.excel.utils.ExcelUtil; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/CellMergeStrategy.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/CellMergeStrategy.java index 6102eec50..b5bdd9405 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/CellMergeStrategy.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.excel; +package com.ruoyi.common.excel.core; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.write.merge.AbstractMergeStrategy; -import com.ruoyi.common.annotation.CellMerge; +import com.ruoyi.common.excel.annotation.CellMerge; import lombok.AllArgsConstructor; import lombok.Data; import lombok.SneakyThrows; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/DefaultExcelListener.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/DefaultExcelListener.java index 6cd6d2816..cd4c8efca 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/DefaultExcelListener.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.excel; +package com.ruoyi.common.excel.core; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.exception.ExcelAnalysisException; import com.alibaba.excel.exception.ExcelDataConvertException; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.ValidatorUtils; +import com.ruoyi.common.core.utils.JsonUtils; +import com.ruoyi.common.core.utils.StreamUtils; +import com.ruoyi.common.core.utils.ValidatorUtils; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/DefautExcelResult.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/DefautExcelResult.java index c852ce65f..af678efae 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/DefautExcelResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.ruoyi.common.excel.core; import cn.hutool.core.util.StrUtil; import lombok.Setter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/ExcelListener.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/ExcelListener.java index 2064cad36..093b94f07 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/ExcelListener.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.ruoyi.common.excel.core; import com.alibaba.excel.read.listener.ReadListener; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/ExcelResult.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/ExcelResult.java index 63f8b8ac6..81aab5dd3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/core/ExcelResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.ruoyi.common.excel.core; import java.util.List; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/utils/ExcelUtil.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/utils/ExcelUtil.java index 211c6214c..4fa8c0800 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/com/ruoyi/common/excel/utils/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.ruoyi.common.excel.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.resource.ClassPathResource; @@ -10,13 +10,13 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; import com.alibaba.excel.write.metadata.fill.FillWrapper; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; -import com.ruoyi.common.convert.ExcelBigNumberConvert; -import com.ruoyi.common.excel.CellMergeStrategy; -import com.ruoyi.common.excel.DefaultExcelListener; -import com.ruoyi.common.excel.ExcelListener; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.utils.file.FileUtils; +import com.ruoyi.common.excel.convert.ExcelBigNumberConvert; +import com.ruoyi.common.excel.core.CellMergeStrategy; +import com.ruoyi.common.excel.core.DefaultExcelListener; +import com.ruoyi.common.excel.core.ExcelListener; +import com.ruoyi.common.excel.core.ExcelResult; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/ruoyi-common/ruoyi-common-idempotent/pom.xml new file mode 100644 index 000000000..4daaaa1f1 --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 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/src/main/java/com/ruoyi/common/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/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/annotation/RepeatSubmit.java index d30962d0e..8801e4911 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/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.annotation; +package com.ruoyi.common.idempotent.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/aspectj/RepeatSubmitAspect.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java rename to ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/aspectj/RepeatSubmitAspect.java index 7c2fa2a41..0dd682926 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/aspectj/RepeatSubmitAspect.java @@ -1,25 +1,22 @@ -package com.ruoyi.framework.aspectj; +package com.ruoyi.common.idempotent.aspectj; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.SecureUtil; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.constant.CacheConstants; +import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import com.ruoyi.common.core.exception.ServiceException; +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 org.aspectj.lang.JoinPoint; 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.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; @@ -34,10 +31,7 @@ import java.util.Map; * * @author Lion Li */ -@Slf4j -@RequiredArgsConstructor @Aspect -@Component public class RepeatSubmitAspect { private static final ThreadLocal KEY_CACHE = new ThreadLocal<>(); diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentConfig.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentConfig.java new file mode 100644 index 000000000..79f8d144a --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/com/ruoyi/common/idempotent/config/IdempotentConfig.java @@ -0,0 +1,21 @@ +package com.ruoyi.common.idempotent.config; + +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; + +/** + * 幂等功能配置 + * + * @author Lion Li + */ +@AutoConfiguration(after = RedisConfiguration.class) +public class IdempotentConfig { + + @Bean + public RepeatSubmitAspect repeatSubmitAspect() { + return new RepeatSubmitAspect(); + } + +} 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/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml new file mode 100644 index 000000000..5e47d06f3 --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-log + + + ruoyi-common-log日志记录 + + + + + com.ruoyi + ruoyi-common-satoken + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java index 32c39a3b0..fb79861dd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.annotation; +package com.ruoyi.common.log.annotation; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OperatorType; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.log.enums.OperatorType; import java.lang.annotation.*; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index 64ab736a6..f120ef791 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -1,22 +1,23 @@ -package com.ruoyi.framework.aspectj; +package com.ruoyi.common.log.aspect; import cn.hutool.core.lang.Dict; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.event.OperLogEvent; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.utils.JsonUtils; +import com.ruoyi.common.core.utils.ServletUtils; +import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessStatus; +import com.ruoyi.common.log.event.OperLogEvent; +import com.ruoyi.common.satoken.utils.LoginHelper; import lombok.extern.slf4j.Slf4j; 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; import org.springframework.web.multipart.MultipartFile; @@ -34,6 +35,7 @@ import java.util.Map; @Slf4j @Aspect @Component +@AutoConfiguration public class LogAspect { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java similarity index 81% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java index ce32cb41c..716c4cc5b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.log.enums; /** * 操作状态 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java index 2d2f2e463..7314de586 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.log.enums; /** * 业务操作类型 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java index 3c4127d98..a93394a1d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.log.enums; /** * 操作人类别 diff --git a/ruoyi-common/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/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/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/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/event/OperLogEvent.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java rename to ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/event/OperLogEvent.java index 3a2997810..2eceebeab 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/event/OperLogEvent.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-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..b8e32230d --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/ruoyi-common/ruoyi-common-mail/pom.xml new file mode 100644 index 000000000..1128f0d52 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mail/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-mail + + + ruoyi-common-mail 邮件模块 + + + + + com.ruoyi + ruoyi-common-core + + + + com.sun.mail + jakarta.mail + + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java similarity index 73% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java rename to ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java index 20769aa19..44a95b6ce 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/MailConfig.java @@ -1,21 +1,23 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.mail.config; import cn.hutool.extra.mail.MailAccount; -import com.ruoyi.framework.config.properties.MailProperties; +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-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/properties/MailProperties.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java rename to ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/properties/MailProperties.java index 95e6cb8ba..4472fff39 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/config/properties/MailProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.common.mail.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/utils/MailUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java rename to ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/utils/MailUtils.java index 32a3f8252..2c8775f2e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/com/ruoyi/common/mail/utils/MailUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.email; +package com.ruoyi.common.mail.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -6,8 +6,8 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.mail.*; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..f067b8b6e --- /dev/null +++ b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.mail.config.MailConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml new file mode 100644 index 000000000..dcb338626 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-mybatis + + + ruoyi-common-mybatis 数据库服务 + + + + + com.ruoyi + ruoyi-common-core + + + + com.ruoyi + ruoyi-common-satoken + + + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + + com.baomidou + mybatis-plus-boot-starter + + + + com.baomidou + mybatis-plus-extension + + + + + p6spy + p6spy + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataColumn.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataColumn.java index df416edc8..bf703a232 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/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.annotation; +package com.ruoyi.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataPermission.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/annotation/DataPermission.java index 73d9c039c..288c195b3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/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.annotation; +package com.ruoyi.common.mybatis.annotation; import java.lang.annotation.*; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/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-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/config/MybatisPlusConfig.java index ffd2c1553..ea76cb3ac 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/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.framework.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.framework.handler.CreateAndUpdateMetaObjectHandler; -import com.ruoyi.framework.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/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java index 862887d16..574f4c086 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/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.core.mapper; +package com.ruoyi.common.mybatis.core.mapper; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.toolkit.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.ruoyi.common.utils.BeanCopyUtils; +import com.ruoyi.common.core.utils.BeanCopyUtils; import org.apache.ibatis.binding.MapperMethod; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/PageQuery.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/PageQuery.java index 60abde623..91396cb4e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/PageQuery.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain; +package com.ruoyi.common.mybatis.core.page; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.utils.sql.SqlUtil; import lombok.Data; import java.io.Serializable; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/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/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/page/TableDataInfo.java index 5f3f2d1ad..95286427d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/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.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/src/main/java/com/ruoyi/common/enums/DataBaseType.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataBaseType.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataBaseType.java index 5d0f05ad7..b50667e65 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataBaseType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.mybatis.enums; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataScopeType.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/enums/DataScopeType.java index 64324652b..fef69f91d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/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.enums; +package com.ruoyi.common.mybatis.enums; -import com.ruoyi.common.utils.StringUtils; +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.helper.DataPermissionHelper} 操作 + * 如需扩展数据 可使用 {@link DataPermissionHelper} 操作 * 内置服务 sdss 系统数据权限服务 内容参考 SysDataScopeService * 如需扩展更多自定义服务 可以参考 sdss 自行编写 * diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java index 6d7c977de..4ab329de8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/CreateAndUpdateMetaObjectHandler.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.handler; +package com.ruoyi.common.mybatis.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.web.domain.BaseEntity; +import com.ruoyi.common.satoken.utils.LoginHelper; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java index 3825a0ba7..955352527 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/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.framework.handler; +package com.ruoyi.common.mybatis.handler; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; @@ -6,17 +6,17 @@ import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.DataColumn; -import com.ruoyi.common.annotation.DataPermission; import com.ruoyi.common.core.domain.dto.RoleDTO; import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.DataScopeType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.DataPermissionHelper; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +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.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; import net.sf.jsqlparser.expression.Expression; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataBaseHelper.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataBaseHelper.java index 196035629..c09017959 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/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.helper; +package com.ruoyi.common.mybatis.helper; import cn.hutool.core.convert.Convert; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import com.ruoyi.common.enums.DataBaseType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.mybatis.enums.DataBaseType; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/DataPermissionHelper.java index 0e60485ad..9555b0143 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/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.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-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/MybatisExceptionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/MybatisExceptionHandler.java new file mode 100644 index 000000000..e3761cca9 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/helper/MybatisExceptionHandler.java @@ -0,0 +1,46 @@ +package com.ruoyi.common.mybatis.helper; + +import com.ruoyi.common.core.domain.R; +import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.MyBatisSystemException; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import javax.servlet.http.HttpServletRequest; + +/** + * Mybatis异常处理器 + * + * @author Lion Li + */ +@Slf4j +@RestControllerAdvice +public class MybatisExceptionHandler { + + /** + * 主键或UNIQUE索引，数据重复异常 + */ + @ExceptionHandler(DuplicateKeyException.class) + public R handleDuplicateKeyException(DuplicateKeyException e, HttpServletRequest request) { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',数据库中已存在记录'{}'", requestURI, e.getMessage()); + return R.fail("数据库中已存在该记录，请联系管理员确认"); + } + + /** + * Mybatis系统异常 通用处理 + */ + @ExceptionHandler(MyBatisSystemException.class) + public R handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) { + String requestURI = request.getRequestURI(); + String message = e.getMessage(); + if (message.contains("CannotFindDataSourceException")) { + log.error("请求地址'{}', 未找到数据源", requestURI); + return R.fail("未找到数据源，请联系管理员确认"); + } + log.error("请求地址'{}', Mybatis系统异常", requestURI, e); + return R.fail(message); + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/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-framework/src/main/java/com/ruoyi/framework/interceptor/PlusDataPermissionInterceptor.java rename to ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/interceptor/PlusDataPermissionInterceptor.java index 508f42167..9b6a0b07a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/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.framework.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.framework.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-oss/pom.xml b/ruoyi-common/ruoyi-common-oss/pom.xml similarity index 68% rename from ruoyi-oss/pom.xml rename to ruoyi-common/ruoyi-common-oss/pom.xml index 78e618e95..ed2249af2 100644 --- a/ruoyi-oss/pom.xml +++ b/ruoyi-common/ruoyi-common-oss/pom.xml @@ -2,32 +2,34 @@ + 4.0.0 - ruoyi-vue-plus com.ruoyi + ruoyi-common 4.4.0 - 4.0.0 - ruoyi-oss + ruoyi-common-oss - OSS对象存储模块 + ruoyi-common-oss oss服务 - - com.ruoyi - ruoyi-common + ruoyi-common-core + + + + com.ruoyi + ruoyi-common-redis com.amazonaws aws-java-sdk-s3 - diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/constant/OssConstant.java similarity index 94% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java rename to ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/constant/OssConstant.java index 06202d0f2..50a3292f9 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/constant/OssConstant.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.constant; +package com.ruoyi.common.oss.constant; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/core/OssClient.java similarity index 95% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java rename to ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/core/OssClient.java index fe409ce7d..0e5e881ba 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/core/OssClient.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.core; +package com.ruoyi.common.oss.core; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; @@ -14,14 +14,14 @@ import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.amazonaws.services.s3.model.*; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.constant.OssConstant; -import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.AccessPolicyType; -import com.ruoyi.oss.enumd.PolicyType; -import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.oss.constant.OssConstant; +import com.ruoyi.common.oss.entity.UploadResult; +import com.ruoyi.common.oss.enumd.AccessPolicyType; +import com.ruoyi.common.oss.enumd.PolicyType; +import com.ruoyi.common.oss.exception.OssException; +import com.ruoyi.common.oss.properties.OssProperties; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/entity/UploadResult.java similarity index 87% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java rename to ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/entity/UploadResult.java index 379d283c8..fd2e7fc18 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/entity/UploadResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.entity; +package com.ruoyi.common.oss.entity; import lombok.Builder; import lombok.Data; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/AccessPolicyType.java b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/enumd/AccessPolicyType.java similarity index 96% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/AccessPolicyType.java rename to ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/enumd/AccessPolicyType.java index 1cae67094..140f67a91 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/AccessPolicyType.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/enumd/AccessPolicyType.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.enumd; +package com.ruoyi.common.oss.enumd; import com.amazonaws.services.s3.model.CannedAccessControlList; import lombok.AllArgsConstructor; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/PolicyType.java b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/enumd/PolicyType.java similarity index 91% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/PolicyType.java rename to ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/enumd/PolicyType.java index 606f0f484..c019d3bf4 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/PolicyType.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/enumd/PolicyType.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.enumd; +package com.ruoyi.common.oss.enumd; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/exception/OssException.java similarity index 84% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java rename to ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/exception/OssException.java index 540b1cc0b..061165b43 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/exception/OssException.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.exception; +package com.ruoyi.common.oss.exception; /** * OSS异常类 diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/factory/OssFactory.java similarity index 80% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java rename to ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/factory/OssFactory.java index c3312d730..a47e94959 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/factory/OssFactory.java @@ -1,14 +1,14 @@ -package com.ruoyi.oss.factory; +package com.ruoyi.common.oss.factory; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.CacheUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.oss.constant.OssConstant; -import com.ruoyi.oss.core.OssClient; -import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.OssProperties; +import com.ruoyi.common.core.constant.CacheNames; +import com.ruoyi.common.core.utils.JsonUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.oss.constant.OssConstant; +import com.ruoyi.common.oss.core.OssClient; +import com.ruoyi.common.oss.exception.OssException; +import com.ruoyi.common.oss.properties.OssProperties; +import com.ruoyi.common.redis.utils.CacheUtils; +import com.ruoyi.common.redis.utils.RedisUtils; import lombok.extern.slf4j.Slf4j; import java.util.Map; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/properties/OssProperties.java similarity index 94% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java rename to ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/properties/OssProperties.java index 781a17005..bf7ab2f94 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java +++ b/ruoyi-common/ruoyi-common-oss/src/main/java/com/ruoyi/common/oss/properties/OssProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.properties; +package com.ruoyi.common.oss.properties; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-rateLimiter/pom.xml b/ruoyi-common/ruoyi-common-rateLimiter/pom.xml new file mode 100644 index 000000000..00a014e95 --- /dev/null +++ b/ruoyi-common/ruoyi-common-rateLimiter/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-rateLimiter + + + ruoyi-common-rateLimiter 限流功能 + + + + + com.ruoyi + ruoyi-common-core + + + + com.ruoyi + ruoyi-common-redis + + + + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/annotation/RateLimiter.java similarity index 76% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java rename to ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/annotation/RateLimiter.java index 2e3ff7a82..b949f44ce 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/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.annotation; +package com.ruoyi.common.rateLimiter.annotation; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.enums.LimitType; +import com.ruoyi.common.core.constant.CacheConstants; +import com.ruoyi.common.rateLimiter.enums.LimitType; import java.lang.annotation.*; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/aspectj/RateLimiterAspect.java similarity index 86% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/aspectj/RateLimiterAspect.java index 542b16bfd..30bdd3786 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/aspectj/RateLimiterAspect.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.aspectj; +package com.ruoyi.common.rateLimiter.aspectj; -import com.ruoyi.common.annotation.RateLimiter; -import com.ruoyi.common.enums.LimitType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +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.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; import org.aspectj.lang.annotation.Aspect; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/enums/LimitType.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java rename to ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/enums/LimitType.java index 897f7068f..417213bce 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java +++ b/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/enums/LimitType.java @@ -1,24 +1,24 @@ -package com.ruoyi.common.enums; - -/** - * 限流类型 - * - * @author ruoyi - */ - -public enum LimitType { - /** - * 默认策略全局限流 - */ - DEFAULT, - - /** - * 根据请求者IP进行限流 - */ - IP, - - /** - * 实例限流(集群多后端实例) - */ - CLUSTER -} +package com.ruoyi.common.rateLimiter.enums; + +/** + * 限流类型 + * + * @author ruoyi + */ + +public enum LimitType { + /** + * 默认策略全局限流 + */ + DEFAULT, + + /** + * 根据请求者IP进行限流 + */ + IP, + + /** + * 实例限流(集群多后端实例) + */ + CLUSTER +} diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml new file mode 100644 index 000000000..139955594 --- /dev/null +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-redis + + + ruoyi-common-redis缓存服务 + + + + + + com.ruoyi + ruoyi-common-core + + + + + org.redisson + redisson-spring-boot-starter + + + + com.baomidou + lock4j-redisson-spring-boot-starter + + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfig.java index 8016ab869..1cbb6eb60 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfig.java @@ -1,19 +1,19 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.redis.config; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.framework.config.properties.RedissonProperties; -import com.ruoyi.framework.handler.KeyPrefixHandler; -import com.ruoyi.framework.manager.PlusSpringCacheManager; +import com.ruoyi.common.redis.config.properties.RedissonProperties; +import com.ruoyi.common.redis.handler.KeyPrefixHandler; +import com.ruoyi.common.redis.manager.PlusSpringCacheManager; 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-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/properties/RedissonProperties.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/properties/RedissonProperties.java index b0bf285f3..e03017f64 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/properties/RedissonProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.common.redis.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/handler/KeyPrefixHandler.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/handler/KeyPrefixHandler.java index 161c271b3..ff1dbba58 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/handler/KeyPrefixHandler.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.handler; +package com.ruoyi.common.redis.handler; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; import org.redisson.api.NameMapper; /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/PlusSpringCacheManager.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/manager/PlusSpringCacheManager.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/PlusSpringCacheManager.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/manager/PlusSpringCacheManager.java index d8bfce7c5..736f0da85 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/PlusSpringCacheManager.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/manager/PlusSpringCacheManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ruoyi.framework.manager; +package com.ruoyi.common.redis.manager; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.common.redis.utils.RedisUtils; import org.redisson.api.RMap; import org.redisson.api.RMapCache; import org.redisson.spring.cache.CacheConfig; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/CacheUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/CacheUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/CacheUtils.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/CacheUtils.java index 9e0b09b07..e953d03a8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/CacheUtils.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/CacheUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.redis; +package com.ruoyi.common.redis.utils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.utils.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.RMap; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/QueueUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/QueueUtils.java index 7a4bce4b3..81e210524 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/QueueUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.redis; +package com.ruoyi.common.redis.utils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.utils.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/RedisUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/RedisUtils.java index 162380890..b665160d8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/utils/RedisUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.redis; +package com.ruoyi.common.redis.utils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.utils.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..fe5d8b91e --- /dev/null +++ b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.redis.config.RedisConfig diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/ruoyi-common/ruoyi-common-satoken/pom.xml new file mode 100644 index 000000000..14a1ef132 --- /dev/null +++ b/ruoyi-common/ruoyi-common-satoken/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 4.4.0 + + + ruoyi-common-satoken + + + + com.ruoyi + ruoyi-common-core + + + + + com.ruoyi + ruoyi-common-redis + + + + + cn.dev33 + sa-token-spring-boot-starter + + + + cn.dev33 + sa-token-jwt + + + + 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 new file mode 100644 index 000000000..d1d5260a2 --- /dev/null +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/config/SaTokenConfig.java @@ -0,0 +1,23 @@ +package com.ruoyi.common.satoken.config; + +import cn.dev33.satoken.jwt.StpLogicJwtForSimple; +import cn.dev33.satoken.stp.StpLogic; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * sa-token 配置 + * + * @author Lion Li + */ +@AutoConfiguration +public class SaTokenConfig implements WebMvcConfigurer { + + @Bean + public StpLogic getStpLogicJwt() { + // Sa-Token 整合 jwt (简单模式) + return new StpLogicJwtForSimple(); + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/dao/PlusSaTokenDao.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java rename to ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/dao/PlusSaTokenDao.java index 83c3d5455..52dd9036e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/dao/PlusSaTokenDao.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.satoken.dao; +package com.ruoyi.common.satoken.core.dao; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.util.SaFoxUtil; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.common.redis.utils.RedisUtils; import org.springframework.stereotype.Component; import java.time.Duration; @@ -31,11 +31,11 @@ public class PlusSaTokenDao implements SaTokenDao { */ @Override public void set(String key, String value, long timeout) { - if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { + if (timeout == 0 || timeout <= NOT_VALUE_EXPIRE) { return; } // 判断是否为永不过期 - if (timeout == SaTokenDao.NEVER_EXPIRE) { + if (timeout == NEVER_EXPIRE) { RedisUtils.setCacheObject(key, value); } else { RedisUtils.setCacheObject(key, value, Duration.ofSeconds(timeout)); @@ -49,7 +49,7 @@ public class PlusSaTokenDao implements SaTokenDao { public void update(String key, String value) { long expire = getTimeout(key); // -2 = 无此键 - if (expire == SaTokenDao.NOT_VALUE_EXPIRE) { + if (expire == NOT_VALUE_EXPIRE) { return; } this.set(key, value, expire); @@ -78,9 +78,9 @@ public class PlusSaTokenDao implements SaTokenDao { @Override public void updateTimeout(String key, long timeout) { // 判断是否想要设置为永久 - if (timeout == SaTokenDao.NEVER_EXPIRE) { + if (timeout == NEVER_EXPIRE) { long expire = getTimeout(key); - if (expire == SaTokenDao.NEVER_EXPIRE) { + if (expire == NEVER_EXPIRE) { // 如果其已经被设置为永久，则不作任何处理 } else { // 如果尚未被设置为永久，那么再次set一次 @@ -105,11 +105,11 @@ public class PlusSaTokenDao implements SaTokenDao { */ @Override public void setObject(String key, Object object, long timeout) { - if (timeout == 0 || timeout <= SaTokenDao.NOT_VALUE_EXPIRE) { + if (timeout == 0 || timeout <= NOT_VALUE_EXPIRE) { return; } // 判断是否为永不过期 - if (timeout == SaTokenDao.NEVER_EXPIRE) { + if (timeout == NEVER_EXPIRE) { RedisUtils.setCacheObject(key, object); } else { RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout)); @@ -123,7 +123,7 @@ public class PlusSaTokenDao implements SaTokenDao { public void updateObject(String key, Object object) { long expire = getObjectTimeout(key); // -2 = 无此键 - if (expire == SaTokenDao.NOT_VALUE_EXPIRE) { + if (expire == NOT_VALUE_EXPIRE) { return; } this.setObject(key, object, expire); @@ -152,9 +152,9 @@ public class PlusSaTokenDao implements SaTokenDao { @Override public void updateObjectTimeout(String key, long timeout) { // 判断是否想要设置为永久 - if (timeout == SaTokenDao.NEVER_EXPIRE) { + if (timeout == NEVER_EXPIRE) { long expire = getObjectTimeout(key); - if (expire == SaTokenDao.NEVER_EXPIRE) { + if (expire == NEVER_EXPIRE) { // 如果其已经被设置为永久，则不作任何处理 } else { // 如果尚未被设置为永久，那么再次set一次 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaPermissionImpl.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/service/SaPermissionImpl.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaPermissionImpl.java rename to ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/service/SaPermissionImpl.java index 057d18336..c1f9a2914 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaPermissionImpl.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/core/service/SaPermissionImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.satoken.service; +package com.ruoyi.common.satoken.core.service; import cn.dev33.satoken.stp.StpInterface; import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.common.core.enums.UserType; +import com.ruoyi.common.satoken.utils.LoginHelper; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/listener/UserActionListener.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java rename to ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/listener/UserActionListener.java index a9de17e60..e1070fb82 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/listener/UserActionListener.java @@ -1,18 +1,18 @@ -package com.ruoyi.framework.listener; +package com.ruoyi.common.satoken.listener; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.listener.SaTokenListener; import cn.dev33.satoken.stp.SaLoginModel; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; -import com.ruoyi.common.constant.CacheConstants; +import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.domain.dto.UserOnlineDTO; import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.common.core.enums.UserType; +import com.ruoyi.common.core.utils.ServletUtils; +import com.ruoyi.common.core.utils.ip.AddressUtils; +import com.ruoyi.common.redis.utils.RedisUtils; +import com.ruoyi.common.satoken.utils.LoginHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java rename to ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java index 1cef0278b..b3b3f99e6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/com/ruoyi/common/satoken/utils/LoginHelper.java @@ -1,15 +1,15 @@ -package com.ruoyi.common.helper; +package com.ruoyi.common.satoken.utils; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.DeviceType; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.enums.DeviceType; +import com.ruoyi.common.core.enums.UserType; +import com.ruoyi.common.core.exception.UtilException; +import com.ruoyi.common.core.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; 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 new file mode 100644 index 000000000..fd02ac56d --- /dev/null +++ b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.ruoyi.common.satoken.core.dao.PlusSaTokenDao +com.ruoyi.common.satoken.core.service.SaPermissionImpl diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml new file mode 100644 index 000000000..fbf847b58 --- /dev/null +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + com.ruoyi + ruoyi-common + 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-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java similarity index 77% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java rename to ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java index 291228667..3959bb9a9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/SecurityConfig.java @@ -1,27 +1,25 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.security.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.framework.config.properties.SecurityProperties; +import com.ruoyi.common.security.config.properties.SecurityProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Bean; +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; /** - * sa-token 配置 + * 权限安全配置 * * @author Lion Li */ @RequiredArgsConstructor @Slf4j -@Configuration -public class SaTokenConfig implements WebMvcConfigurer { +@AutoConfiguration +public class SecurityConfig implements WebMvcConfigurer { private final SecurityProperties securityProperties; @@ -53,10 +51,4 @@ public class SaTokenConfig implements WebMvcConfigurer { .excludePathPatterns(securityProperties.getExcludes()); } - @Bean - public StpLogic getStpLogicJwt() { - // Sa-Token 整合 jwt (简单模式) - return new StpLogicJwtForSimple(); - } - } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/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-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java rename to ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/properties/SecurityProperties.java index b37418181..938ab947e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/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.framework.config.properties; +package com.ruoyi.common.security.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java similarity index 78% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java index 40f2d27c3..c16a58dea 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/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.framework.web.exception; +package com.ruoyi.common.security.handler; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; @@ -6,13 +6,11 @@ import cn.dev33.satoken.exception.NotRoleException; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StreamUtils; +import com.ruoyi.common.core.exception.DemoModeException; +import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.StreamUtils; import lombok.extern.slf4j.Slf4j; -import org.mybatis.spring.MyBatisSystemException; import org.springframework.context.support.DefaultMessageSourceResolvable; -import org.springframework.dao.DuplicateKeyException; import org.springframework.validation.BindException; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -73,31 +71,6 @@ public class GlobalExceptionHandler { return R.fail(e.getMessage()); } - /** - * 主键或UNIQUE索引，数据重复异常 - */ - @ExceptionHandler(DuplicateKeyException.class) - public R handleDuplicateKeyException(DuplicateKeyException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - log.error("请求地址'{}',数据库中已存在记录'{}'", requestURI, e.getMessage()); - return R.fail("数据库中已存在该记录，请联系管理员确认"); - } - - /** - * Mybatis系统异常 通用处理 - */ - @ExceptionHandler(MyBatisSystemException.class) - public R handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) { - String requestURI = request.getRequestURI(); - String message = e.getMessage(); - if (message.contains("CannotFindDataSourceException")) { - log.error("请求地址'{}', 未找到数据源", requestURI); - return R.fail("未找到数据源，请联系管理员确认"); - } - log.error("请求地址'{}', Mybatis系统异常", requestURI, e); - return R.fail(message); - } - /** * 业务异常 */ 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-sms/pom.xml b/ruoyi-common/ruoyi-common-sms/pom.xml similarity index 79% rename from ruoyi-sms/pom.xml rename to ruoyi-common/ruoyi-common-sms/pom.xml index 0ebabbb25..2cda030b8 100644 --- a/ruoyi-sms/pom.xml +++ b/ruoyi-common/ruoyi-common-sms/pom.xml @@ -2,25 +2,23 @@ + 4.0.0 - ruoyi-vue-plus com.ruoyi + ruoyi-common 4.4.0 - 4.0.0 - ruoyi-sms + ruoyi-common-sms - SMS短信模块 + ruoyi-common-sms 短信模块 - - com.ruoyi - ruoyi-common + ruoyi-common-core @@ -32,9 +30,7 @@ com.tencentcloudapi tencentcloud-sdk-java-sms - true - diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/config/SmsConfig.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java similarity index 70% rename from ruoyi-sms/src/main/java/com/ruoyi/sms/config/SmsConfig.java rename to ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java index 753773e87..ecc89afb6 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/config/SmsConfig.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java @@ -1,11 +1,13 @@ -package com.ruoyi.sms.config; +package com.ruoyi.common.sms.config; -import com.ruoyi.sms.config.properties.SmsProperties; -import com.ruoyi.sms.core.AliyunSmsTemplate; -import com.ruoyi.sms.core.SmsTemplate; -import com.ruoyi.sms.core.TencentSmsTemplate; +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-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/properties/SmsProperties.java similarity index 94% rename from ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java rename to ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/properties/SmsProperties.java index 39359cdfd..55621784e 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/properties/SmsProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.sms.config.properties; +package com.ruoyi.common.sms.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/AliyunSmsTemplate.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/core/AliyunSmsTemplate.java similarity index 87% rename from ruoyi-sms/src/main/java/com/ruoyi/sms/core/AliyunSmsTemplate.java rename to ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/core/AliyunSmsTemplate.java index 3c16a5b41..28f67d2b7 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/AliyunSmsTemplate.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/core/AliyunSmsTemplate.java @@ -1,14 +1,14 @@ -package com.ruoyi.sms.core; +package com.ruoyi.common.sms.core; import com.aliyun.dysmsapi20170525.Client; import com.aliyun.dysmsapi20170525.models.SendSmsRequest; import com.aliyun.dysmsapi20170525.models.SendSmsResponse; import com.aliyun.teaopenapi.models.Config; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.sms.config.properties.SmsProperties; -import com.ruoyi.sms.entity.SmsResult; -import com.ruoyi.sms.exception.SmsException; +import com.ruoyi.common.core.utils.JsonUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.sms.config.properties.SmsProperties; +import com.ruoyi.common.sms.entity.SmsResult; +import com.ruoyi.common.sms.exception.SmsException; import lombok.SneakyThrows; import java.util.Map; diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/SmsTemplate.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/core/SmsTemplate.java similarity index 87% rename from ruoyi-sms/src/main/java/com/ruoyi/sms/core/SmsTemplate.java rename to ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/core/SmsTemplate.java index 0aec3ddbe..eb61b8631 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/SmsTemplate.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/core/SmsTemplate.java @@ -1,6 +1,6 @@ -package com.ruoyi.sms.core; +package com.ruoyi.common.sms.core; -import com.ruoyi.sms.entity.SmsResult; +import com.ruoyi.common.sms.entity.SmsResult; import java.util.Map; diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/TencentSmsTemplate.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/core/TencentSmsTemplate.java similarity index 90% rename from ruoyi-sms/src/main/java/com/ruoyi/sms/core/TencentSmsTemplate.java rename to ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/core/TencentSmsTemplate.java index 17f5b5b16..8c45a02eb 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/core/TencentSmsTemplate.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/core/TencentSmsTemplate.java @@ -1,12 +1,12 @@ -package com.ruoyi.sms.core; +package com.ruoyi.common.sms.core; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.sms.config.properties.SmsProperties; -import com.ruoyi.sms.entity.SmsResult; -import com.ruoyi.sms.exception.SmsException; +import com.ruoyi.common.core.utils.JsonUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.sms.config.properties.SmsProperties; +import com.ruoyi.common.sms.entity.SmsResult; +import com.ruoyi.common.sms.exception.SmsException; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.profile.ClientProfile; import com.tencentcloudapi.common.profile.HttpProfile; diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/entity/SmsResult.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/entity/SmsResult.java similarity index 91% rename from ruoyi-sms/src/main/java/com/ruoyi/sms/entity/SmsResult.java rename to ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/entity/SmsResult.java index 89c39b403..d43680525 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/entity/SmsResult.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/entity/SmsResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.sms.entity; +package com.ruoyi.common.sms.entity; import lombok.Builder; import lombok.Data; diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/exception/SmsException.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/exception/SmsException.java similarity index 84% rename from ruoyi-sms/src/main/java/com/ruoyi/sms/exception/SmsException.java rename to ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/exception/SmsException.java index 28632a375..f855a29aa 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/exception/SmsException.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/exception/SmsException.java @@ -1,4 +1,4 @@ -package com.ruoyi.sms.exception; +package com.ruoyi.common.sms.exception; /** * Sms异常类 diff --git a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..2eaa24907 --- /dev/null +++ b/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.sms.config.SmsConfig diff --git a/ruoyi-framework/pom.xml b/ruoyi-common/ruoyi-common-web/pom.xml similarity index 55% rename from ruoyi-framework/pom.xml rename to ruoyi-common/ruoyi-common-web/pom.xml index 52e1b0651..36cc21cf4 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-common/ruoyi-common-web/pom.xml @@ -2,31 +2,40 @@ + 4.0.0 - ruoyi-vue-plus com.ruoyi + ruoyi-common 4.4.0 - 4.0.0 - ruoyi-framework + ruoyi-common-web - framework框架核心 + ruoyi-common-web web服务 + + com.ruoyi + ruoyi-common-core + + + + com.ruoyi + ruoyi-common-redis + - + org.springframework.boot spring-boot-starter-web - - - spring-boot-starter-tomcat - org.springframework.boot - - + + + spring-boot-starter-tomcat + org.springframework.boot + + @@ -34,39 +43,20 @@ spring-boot-starter-undertow - - org.springframework.boot - spring-boot-starter-aop - - - - - p6spy - p6spy + cn.dev33 + sa-token-core - org.springframework.boot - spring-boot-starter-actuator - - - - de.codecentric - spring-boot-admin-starter-client + cn.hutool + hutool-crypto com.alibaba transmittable-thread-local - - - - com.ruoyi - ruoyi-common - - diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/CaptchaConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/CaptchaConfig.java index b284216f5..cd31ffa32 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.web.config; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/FilterConfig.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/FilterConfig.java index 6f3b099ab..6ebe5c2c9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/FilterConfig.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.web.config; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.XssProperties; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.web.config.properties.XssProperties; +import com.ruoyi.common.web.filter.RepeatableFilter; +import com.ruoyi.common.web.filter.XssFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/I18nConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/I18nConfig.java new file mode 100644 index 000000000..dd7661992 --- /dev/null +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/I18nConfig.java @@ -0,0 +1,22 @@ +package com.ruoyi.common.web.config; + +import com.ruoyi.common.web.core.I18nLocaleResolver; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.web.servlet.LocaleResolver; + +/** + * 国际化配置 + * + * @author Lion Li + */ +@AutoConfiguration(before = WebMvcAutoConfiguration.class) +public class I18nConfig { + + @Bean + public LocaleResolver localeResolver() { + return new I18nLocaleResolver(); + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/ResourcesConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/ResourcesConfig.java index ea83338ba..3bb68c263 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/ResourcesConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.config; +package com.ruoyi.common.web.config; -import com.ruoyi.framework.interceptor.PlusWebInvokeTimeInterceptor; +import com.ruoyi.common.web.interceptor.PlusWebInvokeTimeInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/UndertowConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/UndertowConfig.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java index 64e745a86..6659c3c0e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/UndertowConfig.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/UndertowConfig.java @@ -1,17 +1,17 @@ -package com.ruoyi.framework.config; +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-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/properties/CaptchaProperties.java similarity index 80% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/properties/CaptchaProperties.java index 1b41c66cf..9821fdfd5 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/properties/CaptchaProperties.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.common.web.config.properties; -import com.ruoyi.common.enums.CaptchaCategory; -import com.ruoyi.common.enums.CaptchaType; +import com.ruoyi.common.web.enums.CaptchaCategory; +import com.ruoyi.common.web.enums.CaptchaType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/properties/XssProperties.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/properties/XssProperties.java index d8a68a86a..83312f88a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.ruoyi.common.web.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/core/I18nLocaleResolver.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/core/I18nLocaleResolver.java new file mode 100644 index 000000000..73fe5b0c7 --- /dev/null +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/core/I18nLocaleResolver.java @@ -0,0 +1,31 @@ +package com.ruoyi.common.web.core; + +import org.springframework.web.servlet.LocaleResolver; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Locale; + +/** + * 获取请求头国际化信息 + * + * @author Lion Li + */ +public class I18nLocaleResolver implements LocaleResolver { + + @Override + public Locale resolveLocale(HttpServletRequest httpServletRequest) { + String language = httpServletRequest.getHeader("content-language"); + Locale locale = Locale.getDefault(); + if (language != null && language.length() > 0) { + String[] split = language.split("_"); + locale = new Locale(split[0], split[1]); + } + return locale; + } + + @Override + public void setLocale(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Locale locale) { + + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/enums/CaptchaCategory.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/enums/CaptchaCategory.java index 35d3ea3cf..7fca5c217 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/enums/CaptchaCategory.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.web.enums; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/enums/CaptchaType.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/enums/CaptchaType.java index b1c50ca75..f78d572a5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/enums/CaptchaType.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.enums; +package com.ruoyi.common.web.enums; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.RandomGenerator; -import com.ruoyi.common.captcha.UnsignedMathGenerator; +import com.ruoyi.common.web.utils.UnsignedMathGenerator; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/RepeatableFilter.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/RepeatableFilter.java index 8927366e0..f966492d8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/RepeatableFilter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.filter; +package com.ruoyi.common.web.filter; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; import org.springframework.http.MediaType; import javax.servlet.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/RepeatedlyRequestWrapper.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/RepeatedlyRequestWrapper.java index c1cbe3f2f..c661ad5a1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/RepeatedlyRequestWrapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.filter; +package com.ruoyi.common.web.filter; import cn.hutool.core.io.IoUtil; -import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.constant.Constants; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/XssFilter.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/XssFilter.java index 5a0879472..a985f6e6c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/XssFilter.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.filter; +package com.ruoyi.common.web.filter; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; +import org.springframework.http.HttpMethod; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/XssHttpServletRequestWrapper.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/XssHttpServletRequestWrapper.java index a7fbd4ca9..3bca428c5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/filter/XssHttpServletRequestWrapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.filter; +package com.ruoyi.common.web.filter; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/interceptor/PlusWebInvokeTimeInterceptor.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/interceptor/PlusWebInvokeTimeInterceptor.java index 78bffab4f..f01cc41a9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/interceptor/PlusWebInvokeTimeInterceptor.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.interceptor; +package com.ruoyi.common.web.interceptor; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; import com.alibaba.ttl.TransmittableThreadLocal; -import com.ruoyi.common.filter.RepeatedlyRequestWrapper; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.common.core.utils.JsonUtils; +import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.web.filter.RepeatedlyRequestWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.StopWatch; import org.springframework.http.MediaType; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/utils/UnsignedMathGenerator.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java rename to ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/utils/UnsignedMathGenerator.java index 5dd00ec08..e89f5cc8e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/utils/UnsignedMathGenerator.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.captcha; +package com.ruoyi.common.web.utils; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.math.Calculator; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.RandomUtil; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; /** * 无符号计算生成器 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 new file mode 100644 index 000000000..cdf8c66c4 --- /dev/null +++ b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +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.ResourcesConfig +com.ruoyi.common.web.config.UndertowConfig diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java deleted file mode 100644 index 1e0a5d524..000000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ruoyi.common.core.controller; - -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; - -/** - * web层通用数据处理 - * - * @author Lion Li - */ -public class BaseController { - - /** - * 响应返回结果 - * - * @param rows 影响行数 - * @return 操作结果 - */ - protected R toAjax(int rows) { - return rows > 0 ? R.ok() : R.fail(); - } - - /** - * 响应返回结果 - * - * @param result 结果 - * @return 操作结果 - */ - protected R toAjax(boolean result) { - return result ? R.ok() : R.fail(); - } - - /** - * 页面跳转 - */ - public String redirect(String url) { - return StringUtils.format("redirect:{}", url); - } - - /** - * 获取用户缓存信息 - */ - public LoginUser getLoginUser() { - return LoginHelper.getLoginUser(); - } - - /** - * 获取登录用户id - */ - public Long getUserId() { - return LoginHelper.getUserId(); - } - - /** - * 获取登录部门id - */ - public Long getDeptId() { - return LoginHelper.getDeptId(); - } - - /** - * 获取登录用户名 - */ - public String getUsername() { - return LoginHelper.getUsername(); - } -} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java deleted file mode 100644 index bd1bfcc46..000000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.ruoyi.common.enums; - -import org.springframework.lang.Nullable; - -import java.util.HashMap; -import java.util.Map; - -/** - * 请求方式 - * - * @author ruoyi - */ -public enum HttpMethod { - GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE; - - private static final Map mappings = new HashMap<>(16); - - static { - for (HttpMethod httpMethod : values()) { - mappings.put(httpMethod.name(), httpMethod); - } - } - - @Nullable - public static HttpMethod resolve(@Nullable String method) { - return (method != null ? mappings.get(method) : null); - } - - public boolean matches(String method) { - return (this == resolve(method)); - } -} diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index 46b45981d..e133a0da8 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -20,12 +20,43 @@ com.ruoyi - ruoyi-common + ruoyi-common-core - com.ruoyi - ruoyi-sms + ruoyi-common-sms + + + com.ruoyi + ruoyi-common-mail + + + com.ruoyi + ruoyi-common-redis + + + com.ruoyi + ruoyi-common-idempotent + + + com.ruoyi + ruoyi-common-mybatis + + + com.ruoyi + ruoyi-common-log + + + com.ruoyi + ruoyi-common-excel + + + com.ruoyi + ruoyi-common-web + + + com.ruoyi + ruoyi-common-rateLimiter diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java index 6db4dc4e7..3d890acd2 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java @@ -1,7 +1,7 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.email.MailUtils; +import com.ruoyi.common.mail.utils.MailUtils; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java index 7342cba98..20083ba61 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java @@ -1,8 +1,8 @@ package com.ruoyi.demo.controller; -import com.ruoyi.common.constant.CacheNames; +import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java index 0c2af3951..6ad80ce4a 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java @@ -1,7 +1,7 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.ruoyi.common.redis.utils.RedisUtils; import lombok.RequiredArgsConstructor; 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/RedisRateLimiterController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java index ee2e530ba..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.annotation.RateLimiter; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.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/SmsController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java index cc6012f44..bda995546 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java @@ -1,9 +1,9 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.sms.config.properties.SmsProperties; -import com.ruoyi.sms.core.SmsTemplate; +import com.ruoyi.common.core.utils.SpringUtils; +import com.ruoyi.common.sms.config.properties.SmsProperties; +import com.ruoyi.common.sms.core.SmsTemplate; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java index 3bd2867ee..84468c6e7 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java @@ -1,8 +1,8 @@ package com.ruoyi.demo.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.demo.domain.TestDemo; import com.ruoyi.demo.mapper.TestDemoMapper; import lombok.RequiredArgsConstructor; 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 873facc3b..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 @@ -2,19 +2,19 @@ package com.ruoyi.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.utils.ValidatorUtils; 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.enums.BusinessType; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.utils.ValidatorUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +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.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/TestExcelController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java index 51b81c582..0129ef6ef 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java @@ -1,7 +1,7 @@ package com.ruoyi.demo.controller; import cn.hutool.core.collection.CollUtil; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.excel.utils.ExcelUtil; import lombok.AllArgsConstructor; import lombok.Data; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java index 0cc529a61..303bf8573 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java @@ -1,7 +1,7 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.core.utils.MessageUtils; import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java index 6bf904caf..259c12bb8 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java @@ -1,9 +1,9 @@ package com.ruoyi.demo.controller; -import com.ruoyi.common.annotation.Sensitive; -import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.annotation.Sensitive; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.enums.SensitiveStrategy; +import com.ruoyi.common.core.enums.SensitiveStrategy; +import com.ruoyi.common.core.web.controller.BaseController; import lombok.Data; 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/TestTreeController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java index db54230c6..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 @@ -1,15 +1,15 @@ package com.ruoyi.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.R; 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.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +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.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/controller/queue/BoundedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java index 968a4193f..604a38db9 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java @@ -1,7 +1,7 @@ package com.ruoyi.demo.controller.queue; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.QueueUtils; +import com.ruoyi.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java index e6dbee863..3587c2bcb 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java @@ -1,7 +1,7 @@ package com.ruoyi.demo.controller.queue; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.QueueUtils; +import com.ruoyi.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java index 4a60232c7..fcccf141a 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java @@ -2,7 +2,7 @@ package com.ruoyi.demo.controller.queue; import cn.hutool.core.util.RandomUtil; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.QueueUtils; +import com.ruoyi.common.redis.utils.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java index dc19ce2c7..8c28d4960 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java @@ -1,7 +1,7 @@ package com.ruoyi.demo.domain; import com.baomidou.mybatisplus.annotation.*; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.core.web.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java index b480aa0c1..b8064648c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; -import com.ruoyi.common.core.domain.TreeEntity; +import com.ruoyi.common.core.web.domain.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java index 54ecae117..d539c986c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java @@ -1,8 +1,8 @@ package com.ruoyi.demo.domain.bo; -import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.core.web.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java index a51b3fe37..53d2b437f 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java @@ -1,8 +1,8 @@ package com.ruoyi.demo.domain.bo; -import com.ruoyi.common.core.domain.TreeEntity; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.core.web.domain.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; 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 11a3d50e2..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.annotation.DataColumn; -import com.ruoyi.common.annotation.DataPermission; -import com.ruoyi.common.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 e37a9a75e..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.annotation.DataColumn; -import com.ruoyi.common.annotation.DataPermission; -import com.ruoyi.common.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 f6b82fd6d..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.core.domain.PageQuery; -import com.ruoyi.common.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 7ed7cd5b2..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 @@ -4,9 +4,9 @@ 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 com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; +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/TestTreeServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java index 3e7fa20d7..801a0ea4a 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.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 com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.demo.domain.TestTree; import com.ruoyi.demo.domain.bo.TestTreeBo; import com.ruoyi.demo.domain.vo.TestTreeVo; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java deleted file mode 100644 index e64fa3a7f..000000000 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.ruoyi.framework.config; - -import cn.hutool.core.util.StrUtil; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.LocaleResolver; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Locale; - -/** - * 国际化配置 - * - * @author Lion Li - */ -@Configuration -public class I18nConfig { - - @Bean - public LocaleResolver localeResolver() { - return new I18nLocaleResolver(); - } - - /** - * 获取请求头国际化信息 - */ - static class I18nLocaleResolver implements LocaleResolver { - - @Override - public Locale resolveLocale(HttpServletRequest httpServletRequest) { - String language = httpServletRequest.getHeader("content-language"); - Locale locale = Locale.getDefault(); - if (StrUtil.isNotBlank(language)) { - String[] split = language.split("_"); - locale = new Locale(split[0], split[1]); - } - return locale; - } - - @Override - public void setLocale(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Locale locale) { - - } - } -} diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 3e55d4424..d9a593a58 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -16,19 +16,31 @@ + + + com.ruoyi + ruoyi-common-core + + + + com.ruoyi + ruoyi-common-mybatis + + + + com.ruoyi + ruoyi-common-web + org.apache.velocity velocity-engine-core - - com.ruoyi - ruoyi-common + ruoyi-common-log - 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 77df9fd92..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 @@ -3,12 +3,12 @@ package com.ruoyi.generator.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.core.web.controller.BaseController; +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; import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.service.IGenTableService; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java index 45e9168e5..5aa4be6f8 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java @@ -1,9 +1,9 @@ package com.ruoyi.generator.domain; import com.baomidou.mybatisplus.annotation.*; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.constant.GenConstants; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.web.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.ArrayUtils; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java index 280204b55..9f85f1531 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.utils.StringUtils; +import com.ruoyi.common.core.web.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; 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 93578f2e9..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.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 f70a11eb6..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.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 7a80229b1..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 @@ -11,16 +11,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.common.core.constant.Constants; +import com.ruoyi.common.core.constant.GenConstants; +import com.ruoyi.common.core.exception.ServiceException; +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.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; import com.ruoyi.generator.mapper.GenTableColumnMapper; 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 c432d067a..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.core.domain.PageQuery; -import com.ruoyi.common.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/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java index b6c2248e6..cb0a065b9 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java @@ -1,7 +1,7 @@ package com.ruoyi.generator.util; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.constant.GenConstants; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.generator.config.GenConfig; import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java index 67769a8dd..045e30347 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java @@ -1,6 +1,6 @@ package com.ruoyi.generator.util; -import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.constant.Constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.app.Velocity; 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 d8eeb6dd7..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 @@ -4,11 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.helper.DataBaseHelper; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; +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.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 fc44d8cbc..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"