Merge remote-tracking branch 'origin/master' into springboot3

# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/java/org/jeecg/monitor/JeecgMonitorApplication.java

@@ -0,0 +1,18 @@
+package org.jeecg.monitor;
+
+import de.codecentric.boot.admin.server.config.EnableAdminServer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 监控服务
+ * @author zyf
+ * @date: 2022/4/21 10:55
+ */
+@SpringBootApplication
+@EnableAdminServer
+public class JeecgMonitorApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(JeecgMonitorApplication.class, args);
+    }
+}

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/java/org/jeecg/monitor/config/SecuritySecureConfig.java

@@ -0,0 +1,61 @@
+package org.jeecg.monitor.config;
+
+import de.codecentric.boot.admin.server.config.AdminServerProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
+
+/**
+ * @author scott
+ */
+@Configuration
+public class SecuritySecureConfig {
+
+    private final String adminContextPath;
+
+    public SecuritySecureConfig(AdminServerProperties adminServerProperties) {
+        this.adminContextPath = adminServerProperties.getContextPath();
+    }
+
+
+    public SecurityFilterChain configure(HttpSecurity http) throws Exception {
+        // 登录成功处理类
+        SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
+        successHandler.setTargetUrlParameter("redirectTo");
+        successHandler.setDefaultTargetUrl(adminContextPath + "/");
+
+        http.authorizeRequests(authorize -> {
+                    try {
+                        authorize
+
+                                //静态文件允许访问
+                                .requestMatchers(adminContextPath + "/assets/**").permitAll()
+                                //登录页面允许访问
+                                .requestMatchers(adminContextPath + "/login", "/css/**", "/js/**", "/image/*").permitAll()
+                                //其他所有请求需要登录
+                                .anyRequest().authenticated()
+                                .and()
+                                //登录页面配置，用于替换security默认页面
+                                .formLogin(formLogin -> formLogin.loginPage(adminContextPath + "/login").successHandler(successHandler))
+                                //登出页面配置，用于替换security默认页面
+                                .logout(logout -> logout.logoutUrl(adminContextPath + "/logout"))
+                                .httpBasic(Customizer.withDefaults())
+                                .csrf(csrf -> csrf.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
+                                        .ignoringRequestMatchers(
+                                        "/instances",
+                                        "/actuator/**")
+                                );
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+        );
+
+        return http.build();
+
+    }
+
+}

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-monitor/src/main/resources/application.yml

@@ -0,0 +1,38 @@
+server:
+  port: 9111
+spring:
+  boot:
+    admin:
+      ui:
+        title: JeecgCloud监控中心
+      client:
+        instance:
+          metadata:
+            tags:
+              environment: local
+  security:
+    user:
+      name: "admin"
+      password: "admin"
+  application:
+    name: jeecg-monitor
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @config.server-addr@
+        namespace: @config.namespace@
+        metadata:
+          user.name: ${spring.security.user.name}
+          user.password: ${spring.security.user.password}
+# 服务端点检查
+management:
+  httpexchanges:
+    recording:
+      enabled: true
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: always