Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud

Author: YunaiV

yudao-module-infra/yudao-module-infra-server/pom.xml

@@ -118,11 +118,10 @@
             <artifactId>yudao-spring-boot-starter-monitor</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-server</artifactId> <!-- 实现 Spring Boot Admin Server 服务端 -->
-            <optional>true</optional>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>de.codecentric</groupId>-->
+<!--            <artifactId>spring-boot-admin-starter-server</artifactId> &lt;!&ndash; 实现 Spring Boot Admin Server 服务端 &ndash;&gt;-->
+<!--        </dependency>-->
 
         <!-- 三方云服务相关 -->
         <dependency>

yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/framework/monitor/config/AdminServerConfiguration.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.infra.framework.monitor.config;
 
-import de.codecentric.boot.admin.server.config.EnableAdminServer;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
-@EnableAdminServer
+//@EnableAdminServer
 public class AdminServerConfiguration {
 }