From 3dd12383dd0f01b7e3fd786261f61510bd355f69 Mon Sep 17 00:00:00 2001
From: javahongxi <javahongxi@qq.com>
Date: Thu, 13 Aug 2020 08:51:33 +0800
Subject: [PATCH] ActuatorWebAutoConfiguration

---
 .../actuator/ActuatorAutoConfiguration.java   | 17 ------------
 .../ActuatorWebAutoConfiguration.java         | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 whatsmars-spring-boot-samples/whatsmars-boot-sample-actuator/src/main/java/org/hongxi/whatsmars/boot/sample/actuator/ActuatorWebAutoConfiguration.java

diff --git a/whatsmars-spring-boot-samples/whatsmars-boot-sample-actuator/src/main/java/org/hongxi/whatsmars/boot/sample/actuator/ActuatorAutoConfiguration.java b/whatsmars-spring-boot-samples/whatsmars-boot-sample-actuator/src/main/java/org/hongxi/whatsmars/boot/sample/actuator/ActuatorAutoConfiguration.java
index 6c045c88..3929d89c 100644
--- a/whatsmars-spring-boot-samples/whatsmars-boot-sample-actuator/src/main/java/org/hongxi/whatsmars/boot/sample/actuator/ActuatorAutoConfiguration.java
+++ b/whatsmars-spring-boot-samples/whatsmars-boot-sample-actuator/src/main/java/org/hongxi/whatsmars/boot/sample/actuator/ActuatorAutoConfiguration.java
@@ -1,11 +1,7 @@
 package org.hongxi.whatsmars.boot.sample.actuator;
 
-import org.hongxi.whatsmars.boot.sample.actuator.filter.ActuatorFilter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
-import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
 
 /**
  * Created by shenhongxi on 2020/7/17.
@@ -13,19 +9,6 @@ import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
 @Configuration
 public class ActuatorAutoConfiguration {
 
-    @Order(99)
-    @Bean
-    @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
-    public WebSecurityConfigurer standardWebSecurityConfigurer() {
-        return new StandardWebSecurityConfigurer();
-    }
-
-    @Bean
-    @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
-    public ActuatorFilter actuatorFilter() {
-        return new ActuatorFilter();
-    }
-
     @Bean
     public ActuatorReporter actuatorReporter() {
         return new  ActuatorReporter();
diff --git a/whatsmars-spring-boot-samples/whatsmars-boot-sample-actuator/src/main/java/org/hongxi/whatsmars/boot/sample/actuator/ActuatorWebAutoConfiguration.java b/whatsmars-spring-boot-samples/whatsmars-boot-sample-actuator/src/main/java/org/hongxi/whatsmars/boot/sample/actuator/ActuatorWebAutoConfiguration.java
new file mode 100644
index 00000000..265d42fd
--- /dev/null
+++ b/whatsmars-spring-boot-samples/whatsmars-boot-sample-actuator/src/main/java/org/hongxi/whatsmars/boot/sample/actuator/ActuatorWebAutoConfiguration.java
@@ -0,0 +1,27 @@
+package org.hongxi.whatsmars.boot.sample.actuator;
+
+import org.hongxi.whatsmars.boot.sample.actuator.filter.ActuatorFilter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
+
+/**
+ * Created by shenhongxi on 2020/7/17.
+ */
+@Configuration
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
+public class ActuatorWebAutoConfiguration {
+
+    @Order(99)
+    @Bean
+    public WebSecurityConfigurer standardWebSecurityConfigurer() {
+        return new StandardWebSecurityConfigurer();
+    }
+
+    @Bean
+    public ActuatorFilter actuatorFilter() {
+        return new ActuatorFilter();
+    }
+}
-- 
GitLab