dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-09-08 05:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 升级 Spring-Cloud-Alibaba 2021.0.1.0 => 2021.0.4.0

Browse Source
This commit is contained in:
疯狂的狮子li
2022-09-16 10:37:03 +08:00
parent 2b6eb08c07
commit dd84e0d519
10 changed files with 30 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
View File

@@ -14,15 +14,11 @@
</description>
<properties>
<spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
<maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
<spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
<sentinel.version>1.8.5</sentinel.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<nacos.config.version>0.8.0</nacos.config.version>
<maven-source-plugin.version>2.2.1</maven-source-plugin.version>
<flatten-maven-plugin.version>1.1.0</flatten-maven-plugin.version>
<nacos.client.version>2.0.2</nacos.client.version>
<seata.version>1.5.2</seata.version>
<nacos.client.version>2.1.1</nacos.client.version>
<nacos.config.version>2.0.4</nacos.config.version>
<dubbo.version>3.1.0</dubbo.version>
<spring.context.support.version>1.0.11</spring.context.support.version>
</properties>
@@ -105,21 +101,6 @@
<artifactId>sentinel-annotation-aspectj</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-dubbo-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-apache-dubbo-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-apache-dubbo3-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-reactor-adapter</artifactId>
@@ -150,6 +131,21 @@
<artifactId>sentinel-spring-webmvc-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-dubbo-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-apache-dubbo-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.csp</groupId>
<artifactId>sentinel-apache-dubbo3-adapter</artifactId>
<version>${sentinel.version}</version>
</dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>

2
ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +0,0 @@
org.springframework.boot.env.EnvironmentPostProcessor=\
com.ruoyi.common.elasticsearch.config.ActuatorEnvironmentPostProcessor

1
ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports Normal file
View File

@@ -0,0 +1 @@
com.ruoyi.common.elasticsearch.config.ActuatorEnvironmentPostProcessor

2
ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring.factories
View File

@@ -1,2 +0,0 @@
org.springframework.boot.env.EnvironmentPostProcessor=\
com.ruoyi.common.loadbalance.config.CustomEnvironmentPostProcessor

1
ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports Normal file
View File

@@ -0,0 +1 @@
com.ruoyi.common.loadbalance.config.CustomEnvironmentPostProcessor

39
ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/config/NacosConfig.java
View File

@@ -1,39 +0,0 @@
package com.ruoyi.common.web.config;
import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosServiceManager;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration;
import com.alibaba.cloud.nacos.discovery.NacosWatch;
import com.ruoyi.common.web.nacos.CustomNacosWatch;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled;
import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
import org.springframework.context.annotation.Bean;
/**
* 自定义 nacos 监听 解决与 Undertow 整合报错问题
*
* @author Lion Li
*/
@ConditionalOnClass(NacosWatch.class)
@AutoConfiguration(
before = NacosDiscoveryClientConfiguration.class,
after = NacosDiscoveryAutoConfiguration.class
)
@ConditionalOnDiscoveryEnabled
@ConditionalOnBlockingDiscoveryEnabled
@ConditionalOnNacosDiscoveryEnabled
public class NacosConfig {
@Bean
@ConditionalOnProperty(value = "spring.cloud.nacos.discovery.watch.enabled", matchIfMissing = true)
public NacosWatch nacosWatch(NacosServiceManager nacosServiceManager,
NacosDiscoveryProperties nacosDiscoveryProperties) {
return new CustomNacosWatch(nacosServiceManager, nacosDiscoveryProperties);
}
}

25
ruoyi-common/ruoyi-common-web/src/main/java/com/ruoyi/common/web/nacos/CustomNacosWatch.java
View File

@@ -1,25 +0,0 @@
package com.ruoyi.common.web.nacos;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosServiceManager;
import com.alibaba.cloud.nacos.discovery.NacosWatch;
/**
* 自定义 nacos 监听
*
* @author Lion Li
*/
public class CustomNacosWatch extends NacosWatch {
public CustomNacosWatch(NacosServiceManager nacosServiceManager, NacosDiscoveryProperties properties) {
super(nacosServiceManager, properties);
}
/**
* 重写解决与 Undertow 关闭顺序冲突导致报错问题
*/
@Override
public int getPhase() {
return Integer.MAX_VALUE;
}
}

1
ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -1,3 +1,2 @@
com.ruoyi.common.web.config.I18nConfig
com.ruoyi.common.web.config.UndertowConfig
com.ruoyi.common.web.config.NacosConfig

11
ruoyi-example/ruoyi-demo/pom.xml
View File

@@ -29,12 +29,6 @@
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!-- SpringCloud Alibaba Sentinel -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<!-- SpringBoot Actuator -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -47,6 +41,11 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-sentinel</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-log</artifactId>

11
ruoyi-example/ruoyi-stream-mq/pom.xml
View File

@@ -29,12 +29,6 @@
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!-- SpringCloud Alibaba Sentinel -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
@@ -56,6 +50,11 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-sentinel</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-security</artifactId>