From 20614184ecaced500aacf1294873a1d338f484c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 17 Jan 2025 17:01:11 +0800
Subject: [PATCH] update springcloud 2024

---
 pom.xml                                                        | 2 +-
 .../sentinel/config/SentinelCustomAutoConfiguration.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a563fc16..879620ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
         <spring-boot.version>3.4.1</spring-boot.version>
-        <spring-cloud.version>2023.0.5</spring-cloud.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
         <spring-boot-admin.version>3.4.1</spring-boot-admin.version>
         <mybatis.version>3.5.16</mybatis.version>
         <mybatis-plus.version>3.5.10</mybatis-plus.version>
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<ServiceInstance> instances = discoveryClient.getInstances(customProperties.getServerName());
             String serverList = StreamUtils.join(instances, instance ->
@@ -45,6 +45,7 @@ public class SentinelCustomAutoConfiguration {
         }
         // 手动初始化 sentinel
         InitExecutor.doInit();
+        return new Object();
     }