diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/config/MonitorProperties.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/config/MonitorProperties.java index 0403619b..138710e4 100644 --- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/config/MonitorProperties.java +++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/config/MonitorProperties.java @@ -12,13 +12,27 @@ import org.springframework.context.annotation.Configuration; @ConfigurationProperties(prefix = "monitor") public class MonitorProperties { - /** - * 是否开启. - */ - private Boolean enabled = true; + private Actuator actuator; - private String secretId; + @Data + public static class Actuator { - private String secretKey; + private Auth auth; + + @Data + public static class Auth { + + /** + * 是否开启. + */ + private Boolean enabled = true; + + private String secretId; + + private String secretKey; + + } + + } } diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/FilterConfig.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/FilterConfig.java index 396a5ca1..a2e10518 100644 --- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/FilterConfig.java +++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/FilterConfig.java @@ -1,7 +1,7 @@ package com.hccake.ballcat.common.conf.web; import com.hccake.ballcat.common.conf.config.MonitorProperties; -import com.hccake.ballcat.common.core.filter.ActuatorFilter; +import com.hccake.ballcat.common.core.filter.ActuatorAuthFilter; import com.hccake.ballcat.common.core.filter.XSSFilter; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -31,15 +31,16 @@ public class FilterConfig { } @Bean - @ConditionalOnProperty(prefix = "monitor", name = "enabled", havingValue = "true", matchIfMissing = true) - public FilterRegistrationBean actuatorFilterRegistrationBean(MonitorProperties properties) { + @ConditionalOnProperty(prefix = "monitor.actuator.auth", name = "enabled", havingValue = "true", + matchIfMissing = true) + public FilterRegistrationBean actuatorFilterRegistrationBean(MonitorProperties properties) { log.debug("Actuator 过滤器已开启===="); - FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); - - if (properties.getEnabled()) { + FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); + MonitorProperties.Actuator.Auth auth = properties.getActuator().getAuth(); + if (auth.getEnabled()) { // 监控开启 - ActuatorFilter actuatorFilter = new ActuatorFilter(properties.getSecretId(), properties.getSecretKey()); - registrationBean.setFilter(actuatorFilter); + ActuatorAuthFilter filter = new ActuatorAuthFilter(auth.getSecretId(), auth.getSecretKey()); + registrationBean.setFilter(filter); registrationBean.addUrlPatterns("/actuator/*"); registrationBean.setOrder(0); } diff --git a/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/filter/ActuatorFilter.java b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/filter/ActuatorAuthFilter.java similarity index 95% rename from ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/filter/ActuatorFilter.java rename to ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/filter/ActuatorAuthFilter.java index 9f68651a..505adfa1 100644 --- a/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/filter/ActuatorFilter.java +++ b/ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/filter/ActuatorAuthFilter.java @@ -23,7 +23,7 @@ import java.io.IOException; * @version 1.0 * @date 2019 /10/17 20:28 */ -public class ActuatorFilter extends OncePerRequestFilter { +public class ActuatorAuthFilter extends OncePerRequestFilter { private final String secretId; @@ -34,7 +34,7 @@ public class ActuatorFilter extends OncePerRequestFilter { * @param secretId the secret id * @param secretKey the secret key */ - public ActuatorFilter(String secretId, String secretKey) { + public ActuatorAuthFilter(String secretId, String secretKey) { this.secretId = secretId; this.secretKey = secretKey; }