Sfoglia il codice sorgente

update springcloud 2024

疯狂的狮子Li 1 anno fa
parent
commit
20614184ec

+ 1 - 1
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>

+ 2 - 1
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();
     }