b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ monitor.* 移动到 monitor.actuator.auth

Browse Source
This commit is contained in:
b2baccline
2020-10-14 10:23:58 +08:00
parent b56fa0480c
commit 1c3182de7e
3 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/config/MonitorProperties.java
View File

@@ -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;
}
}
}

17
ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/FilterConfig.java
View File

@@ -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<ActuatorFilter> actuatorFilterRegistrationBean(MonitorProperties properties) {
@ConditionalOnProperty(prefix = "monitor.actuator.auth", name = "enabled", havingValue = "true",
matchIfMissing = true)
public FilterRegistrationBean<ActuatorAuthFilter> actuatorFilterRegistrationBean(MonitorProperties properties) {
log.debug("Actuator 过滤器已开启====");
FilterRegistrationBean<ActuatorFilter> registrationBean = new FilterRegistrationBean<>();
if (properties.getEnabled()) {
FilterRegistrationBean<ActuatorAuthFilter> 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);
}

4
ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/filter/ActuatorFilter.java → ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/filter/ActuatorAuthFilter.java
View File

@@ -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;
}