diff --git a/pom.xml b/pom.xml index 4d545b91ca55e2c5853941dd67286ec3f6c1fada..dcde6c5f161190843fb3314145c1450b418aa75a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,9 @@ 1.8 UTF-8 8 + 2.1.1.RELEASE + 2.1.12.RELEASE + Greenwich.SR5 4.4 1.2.62 2.9.2 @@ -33,7 +36,7 @@ 7.2.28 4.1.3 4.1.1 - 2.1.6 + 2.2.2 1.7 2.6 5.0.2.RELEASE @@ -47,10 +50,6 @@ 2.6 4.0.1 3.2.5.RELEASE - 2.1.1.RELEASE - 2.1.12.RELEASE - Greenwich.SR5 - 2.1.12.RELEASE 1.2.2 zlt-job/**/*, zlt-register/**/*, zlt-web/**/* openjdk:8-jre-alpine @@ -380,7 +379,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot-maven-plugin.version} + ${spring-boot-dependencies.version} com.spotify diff --git a/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java b/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java index 3bb1533cd2b81015a7dadd1f24a2b248a03b2beb..27c64e9da21e380cf58a774c644fd0bcad6943b2 100644 --- a/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java +++ b/zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java @@ -50,8 +50,7 @@ public class JsonErrorWebExceptionHandler extends DefaultErrorWebExceptionHandle */ @Override protected HttpStatus getHttpStatus(Map errorAttributes) { - int statusCode = (int) errorAttributes.get("code"); - return HttpStatus.valueOf(statusCode); + return HttpStatus.INTERNAL_SERVER_ERROR; } /** diff --git a/zlt-uaa/src/main/java/com/central/oauth/filter/LoginProcessSetTenantFilter.java b/zlt-uaa/src/main/java/com/central/oauth/filter/LoginProcessSetTenantFilter.java index 5b7b0dcd9ec84516da86314e93464c26d20d559d..7030122c6f2f6e65d6e0faae99e882de02864b52 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/filter/LoginProcessSetTenantFilter.java +++ b/zlt-uaa/src/main/java/com/central/oauth/filter/LoginProcessSetTenantFilter.java @@ -1,9 +1,9 @@ package com.central.oauth.filter; import cn.hutool.core.util.ArrayUtil; -import com.alibaba.nacos.common.util.HttpMethod; import com.central.common.constant.SecurityConstants; import com.central.common.context.TenantContextHolder; +import org.springframework.http.HttpMethod; import org.springframework.security.web.savedrequest.DefaultSavedRequest; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; @@ -29,7 +29,7 @@ public class LoginProcessSetTenantFilter extends OncePerRequestFilter { private RequestMatcher requiresAuthenticationRequestMatcher; public LoginProcessSetTenantFilter() { - requiresAuthenticationRequestMatcher = new AntPathRequestMatcher(SecurityConstants.OAUTH_LOGIN_PRO_URL, HttpMethod.POST); + requiresAuthenticationRequestMatcher = new AntPathRequestMatcher(SecurityConstants.OAUTH_LOGIN_PRO_URL, HttpMethod.POST.name()); } /**