diff --git a/pom.xml b/pom.xml index a563fc16..879620ee 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 17 3.4.1 - 2023.0.5 + 2024.0.0 3.4.1 3.5.16 3.5.10 diff --git a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java b/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java index edfdcd19..ad48924a 100644 --- a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java @@ -30,7 +30,7 @@ public class SentinelCustomAutoConfiguration { private DiscoveryClient discoveryClient; @Bean - public void sentinelInit() { + public Object sentinelInit() { if (StringUtils.isNotBlank(customProperties.getServerName())) { List instances = discoveryClient.getInstances(customProperties.getServerName()); String serverList = StreamUtils.join(instances, instance -> @@ -45,6 +45,7 @@ public class SentinelCustomAutoConfiguration { } // 手动初始化 sentinel InitExecutor.doInit(); + return new Object(); }