diff --git a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java b/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java index 1af1dbb2..39369ac1 100644 --- a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java @@ -14,10 +14,12 @@ * limitations under the License. */ -package com.alibaba.cloud.sentinel.custom; +package org.alibaba.cloud.sentinel.custom; import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.cloud.sentinel.SentinelProperties; +import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor; +import com.alibaba.cloud.sentinel.custom.SentinelDataSourceHandler; import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter; import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter; import com.alibaba.csp.sentinel.annotation.aspectj.SentinelResourceAspect; @@ -33,6 +35,7 @@ import com.alibaba.csp.sentinel.transport.config.TransportConfig; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import jakarta.annotation.PostConstruct; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.sentinel.config.properties.SentinelCustomProperties; import org.springframework.beans.factory.annotation.Autowired; @@ -49,7 +52,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; -import jakarta.annotation.PostConstruct; import java.util.List; import static com.alibaba.cloud.sentinel.SentinelConstants.BLOCK_PAGE_URL_CONF_KEY; diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml index 5244e610..778912e3 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml @@ -16,11 +16,12 @@ 1.8.6 4.0.1 2.7.12 + 2021.0.7 + 2021.0.5.0 - org.springframework.boot spring-boot-dependencies @@ -28,6 +29,20 @@ pom import + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml index 62f37a39..2b01f611 100644 --- a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml +++ b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml @@ -11,11 +11,13 @@ 2.7.12 + 2021.0.7 + 2021.0.5.0 + 2.2.2 - org.springframework.boot spring-boot-dependencies @@ -23,6 +25,20 @@ pom import + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + @@ -95,6 +111,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter + ${mybatis-spring-boot.version} @@ -102,11 +119,11 @@ mysql-connector-j - - - org.dromara - ruoyi-common-job - + + + com.xuxueli + xxl-job-core +