From 6b680a0cc66fc9e7c25bebabbacb78a12e1d01e7 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Sat, 18 Dec 2021 19:52:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E5=9F=BA=E7=A1=80=E8=B7=AF=E5=BE=84.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/config/GlobalSecurityConfig.java | 16 ++++++++-------- .../auth/filter/JWTAuthenticationFilter.java | 3 ++- .../cn/hippo4j/common/constant/Constants.java | 2 +- .../starter/alarm/BaseSendMessageService.java | 4 +++- .../cn/hippo4j/starter/core/DiscoveryClient.java | 8 ++++---- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java index 78891036..4e9283be 100644 --- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java +++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/GlobalSecurityConfig.java @@ -78,14 +78,14 @@ public class GlobalSecurityConfig extends WebSecurityConfigurerAdapter { public void configure(WebSecurity web) throws Exception { String[] ignores = Stream .of( - "/v1/cs/apps/renew/**", - "/v1/cs/apps/remove/**", - "/v1/cs/apps/register/**", - "/v1/cs/configs/**", - "/v1/cs/listener/**", - "/v1/cs/monitor/**", - "/v1/cs/health/check/**", - "/v1/cs/notify/list/config/**" + "/hippo4j/v1/cs/apps/renew/**", + "/hippo4j/v1/cs/apps/remove/**", + "/hippo4j/v1/cs/apps/register/**", + "/hippo4j/v1/cs/configs/**", + "/hippo4j/v1/cs/listener/**", + "/hippo4j/v1/cs/monitor/**", + "/hippo4j/v1/cs/health/check/**", + "/hippo4j/v1/cs/notify/list/config/**" ) .toArray(String[]::new); web.ignoring().antMatchers(ignores); diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java index 4b6ac669..e7c94574 100644 --- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java +++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthenticationFilter.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.Map; import static cn.hippo4j.auth.constant.Constants.SPLIT_COMMA; +import static cn.hippo4j.common.constant.Constants.BASE_PATH; /** * JWT authentication filter. @@ -42,7 +43,7 @@ public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilte public JWTAuthenticationFilter(AuthenticationManager authenticationManager) { this.authenticationManager = authenticationManager; - super.setFilterProcessesUrl("/v1/cs/auth/login"); + super.setFilterProcessesUrl(BASE_PATH + "/auth/login"); } @Override diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java index 1ec088ed..a035f5b8 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/Constants.java @@ -36,7 +36,7 @@ public class Constants { public static final String LONG_POLLING_LINE_SEPARATOR = "\r\n"; - public static final String BASE_PATH = "/v1/cs"; + public static final String BASE_PATH = "/hippo4j/v1/cs"; public static final String CONFIG_CONTROLLER_PATH = BASE_PATH + "/configs"; diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/BaseSendMessageService.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/BaseSendMessageService.java index 1765c890..689cd117 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/BaseSendMessageService.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/BaseSendMessageService.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import static cn.hippo4j.common.constant.Constants.BASE_PATH; + /** * Base send message service. * @@ -122,7 +124,7 @@ public class BaseSendMessageService implements InitializingBean, SendMessageServ Result result = null; try { - result = httpAgent.httpPostByDiscovery("/v1/cs/notify/list/config", new ThreadPoolNotifyReqDTO(groupKeys)); + result = httpAgent.httpPostByDiscovery(BASE_PATH + "/notify/list/config", new ThreadPoolNotifyReqDTO(groupKeys)); } catch (Throwable ex) { log.error("Get dynamic thread pool notify configuration error.", ex); } diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/DiscoveryClient.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/DiscoveryClient.java index 679421a7..2e31284d 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/DiscoveryClient.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/DiscoveryClient.java @@ -17,7 +17,7 @@ import org.springframework.beans.factory.DisposableBean; import java.util.Map; import java.util.concurrent.*; -import static cn.hippo4j.common.constant.Constants.GROUP_KEY; +import static cn.hippo4j.common.constant.Constants.*; /** * Discovery client. @@ -71,7 +71,7 @@ public class DiscoveryClient implements DisposableBean { boolean register() { log.info("{}{} - registering service...", PREFIX, appPathIdentifier); - String urlPath = Constants.BASE_PATH + "/apps/register/"; + String urlPath = BASE_PATH + "/apps/register/"; Result registerResult; try { registerResult = httpAgent.httpPostByDiscovery(urlPath, instanceInfo); @@ -108,7 +108,7 @@ public class DiscoveryClient implements DisposableBean { log.error("{}{} - remove config cache fail.", PREFIX, appPathIdentifier, ex); } - String removeNodeUrlPath = Constants.BASE_PATH + "/apps/remove/"; + String removeNodeUrlPath = BASE_PATH + "/apps/remove/"; Result removeNodeResult; try { removeNodeResult = httpAgent.httpPostByDiscovery(removeNodeUrlPath, instanceInfo); @@ -139,7 +139,7 @@ public class DiscoveryClient implements DisposableBean { .setLastDirtyTimestamp(instanceInfo.getLastDirtyTimestamp().toString()) .setStatus(instanceInfo.getStatus().toString()); - renewResult = httpAgent.httpPostByDiscovery(Constants.BASE_PATH + "/apps/renew", instanceRenew); + renewResult = httpAgent.httpPostByDiscovery(BASE_PATH + "/apps/renew", instanceRenew); if (StrUtil.equals(ErrorCodeEnum.NOT_FOUND.getCode(), renewResult.getCode())) { long timestamp = instanceInfo.setIsDirtyWithTime(); boolean success = register();