public/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-05-04 11:01:26 +08: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

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