From 05afcd761eb8b1e35558971ff7b9f9aae20078f2 Mon Sep 17 00:00:00 2001
From: zlt2000 <zltdiablo@163.com>
Date: Sun, 12 Apr 2020 22:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               | 11 +++++------
 .../gateway/error/JsonErrorWebExceptionHandler.java   |  3 +--
 .../oauth/filter/LoginProcessSetTenantFilter.java     |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4d545b9..dcde6c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,9 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <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>
         <fastjson.version>1.2.62</fastjson.version>
         <swagger.version>2.9.2</swagger.version>
@@ -33,7 +36,7 @@
         <qiniu-java-sdk>7.2.28</qiniu-java-sdk>
         <easypoi.version>4.1.3</easypoi.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>
         <commons-configuration2.version>2.6</commons-configuration2.version>
         <txlcn.version>5.0.2.RELEASE</txlcn.version>
@@ -47,10 +50,6 @@
         <commons-io.version>2.6</commons-io.version>
         <servlet-api.version>4.0.1</servlet-api.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>
         <sonar.exclusions>zlt-job/**/*, zlt-register/**/*, zlt-web/**/*</sonar.exclusions>
         <docker.baseImage>openjdk:8-jre-alpine</docker.baseImage>
@@ -380,7 +379,7 @@
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring-boot-maven-plugin.version}</version>
+                    <version>${spring-boot-dependencies.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>com.spotify</groupId>
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 3bb1533..27c64e9 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<String, Object> 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 5b7b0dc..7030122 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());
     }
 
     /**
-- 
GitLab