提交 05afcd76 编写于 作者: zlt2000's avatar zlt2000

小修改

上级 0aaa4d74
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>8</java.version> <java.version>8</java.version>
<spring-cloud-alibaba-dependencies.version>2.1.1.RELEASE</spring-cloud-alibaba-dependencies.version>
<spring-boot-dependencies.version>2.1.12.RELEASE</spring-boot-dependencies.version>
<spring-cloud-dependencies.version>Greenwich.SR5</spring-cloud-dependencies.version>
<commons-collections4.version>4.4</commons-collections4.version> <commons-collections4.version>4.4</commons-collections4.version>
<fastjson.version>1.2.62</fastjson.version> <fastjson.version>1.2.62</fastjson.version>
<swagger.version>2.9.2</swagger.version> <swagger.version>2.9.2</swagger.version>
...@@ -33,7 +36,7 @@ ...@@ -33,7 +36,7 @@
<qiniu-java-sdk>7.2.28</qiniu-java-sdk> <qiniu-java-sdk>7.2.28</qiniu-java-sdk>
<easypoi.version>4.1.3</easypoi.version> <easypoi.version>4.1.3</easypoi.version>
<poi.version>4.1.1</poi.version> <poi.version>4.1.1</poi.version>
<spring-boot-admin.version>2.1.6</spring-boot-admin.version> <spring-boot-admin.version>2.2.2</spring-boot-admin.version>
<velocity.version>1.7</velocity.version> <velocity.version>1.7</velocity.version>
<commons-configuration2.version>2.6</commons-configuration2.version> <commons-configuration2.version>2.6</commons-configuration2.version>
<txlcn.version>5.0.2.RELEASE</txlcn.version> <txlcn.version>5.0.2.RELEASE</txlcn.version>
...@@ -47,10 +50,6 @@ ...@@ -47,10 +50,6 @@
<commons-io.version>2.6</commons-io.version> <commons-io.version>2.6</commons-io.version>
<servlet-api.version>4.0.1</servlet-api.version> <servlet-api.version>4.0.1</servlet-api.version>
<spring-data-elasticsearch.version>3.2.5.RELEASE</spring-data-elasticsearch.version> <spring-data-elasticsearch.version>3.2.5.RELEASE</spring-data-elasticsearch.version>
<spring-cloud-alibaba-dependencies.version>2.1.1.RELEASE</spring-cloud-alibaba-dependencies.version>
<spring-boot-dependencies.version>2.1.12.RELEASE</spring-boot-dependencies.version>
<spring-cloud-dependencies.version>Greenwich.SR5</spring-cloud-dependencies.version>
<spring-boot-maven-plugin.version>2.1.12.RELEASE</spring-boot-maven-plugin.version>
<docker-maven-plugin.version>1.2.2</docker-maven-plugin.version> <docker-maven-plugin.version>1.2.2</docker-maven-plugin.version>
<sonar.exclusions>zlt-job/**/*, zlt-register/**/*, zlt-web/**/*</sonar.exclusions> <sonar.exclusions>zlt-job/**/*, zlt-register/**/*, zlt-web/**/*</sonar.exclusions>
<docker.baseImage>openjdk:8-jre-alpine</docker.baseImage> <docker.baseImage>openjdk:8-jre-alpine</docker.baseImage>
...@@ -380,7 +379,7 @@ ...@@ -380,7 +379,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot-maven-plugin.version}</version> <version>${spring-boot-dependencies.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
......
...@@ -50,8 +50,7 @@ public class JsonErrorWebExceptionHandler extends DefaultErrorWebExceptionHandle ...@@ -50,8 +50,7 @@ public class JsonErrorWebExceptionHandler extends DefaultErrorWebExceptionHandle
*/ */
@Override @Override
protected HttpStatus getHttpStatus(Map<String, Object> errorAttributes) { protected HttpStatus getHttpStatus(Map<String, Object> errorAttributes) {
int statusCode = (int) errorAttributes.get("code"); return HttpStatus.INTERNAL_SERVER_ERROR;
return HttpStatus.valueOf(statusCode);
} }
/** /**
......
package com.central.oauth.filter; package com.central.oauth.filter;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import com.alibaba.nacos.common.util.HttpMethod;
import com.central.common.constant.SecurityConstants; import com.central.common.constant.SecurityConstants;
import com.central.common.context.TenantContextHolder; import com.central.common.context.TenantContextHolder;
import org.springframework.http.HttpMethod;
import org.springframework.security.web.savedrequest.DefaultSavedRequest; import org.springframework.security.web.savedrequest.DefaultSavedRequest;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher;
...@@ -29,7 +29,7 @@ public class LoginProcessSetTenantFilter extends OncePerRequestFilter { ...@@ -29,7 +29,7 @@ public class LoginProcessSetTenantFilter extends OncePerRequestFilter {
private RequestMatcher requiresAuthenticationRequestMatcher; private RequestMatcher requiresAuthenticationRequestMatcher;
public LoginProcessSetTenantFilter() { public LoginProcessSetTenantFilter() {
requiresAuthenticationRequestMatcher = new AntPathRequestMatcher(SecurityConstants.OAUTH_LOGIN_PRO_URL, HttpMethod.POST); requiresAuthenticationRequestMatcher = new AntPathRequestMatcher(SecurityConstants.OAUTH_LOGIN_PRO_URL, HttpMethod.POST.name());
} }
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册