From db24154ea9222446e70028e119d726abbf8ae388 Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Wed, 14 Aug 2019 17:38:37 +0800
Subject: [PATCH 1/2] 1.15.1

---
 .../gateway/result/GatewayResultExecutor.java      | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/result/GatewayResultExecutor.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/result/GatewayResultExecutor.java
index f7724b29..0d97bff4 100644
--- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/result/GatewayResultExecutor.java
+++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/result/GatewayResultExecutor.java
@@ -8,11 +8,9 @@ import com.gitee.sop.gatewaycommon.message.Error;
 import com.gitee.sop.gatewaycommon.message.ErrorEnum;
 import com.gitee.sop.gatewaycommon.result.BaseExecutorAdapter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cloud.gateway.support.NotFoundException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
 
 import java.util.List;
@@ -58,17 +56,7 @@ public class GatewayResultExecutor extends BaseExecutorAdapter<ServerWebExchange
         if (ex instanceof ApiException) {
             ApiException apiException = (ApiException) ex;
             error = apiException.getError();
-        } else if (ex instanceof NotFoundException) {
-            error = ErrorEnum.ISV_INVALID_METHOD.getErrorMeta().getError();
-        } else if (ex instanceof ResponseStatusException) {
-            ResponseStatusException responseStatusException = (ResponseStatusException) ex;
-            HttpStatus status = responseStatusException.getStatus();
-            if (status == HttpStatus.NOT_FOUND) {
-                error = ErrorEnum.ISV_INVALID_METHOD.getErrorMeta().getError();
-            }
-        }
-
-        if (error == null) {
+        } else {
             error = ErrorEnum.ISP_UNKNOWN_ERROR.getErrorMeta().getError();
         }
 

From 539f9dbcf784dfe069b9ecba2aaa16d7ecbd28e4 Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Wed, 14 Aug 2019 17:41:56 +0800
Subject: [PATCH 2/2] 1.15.1

---
 .../sop/gatewaycommon/gateway/result/GatewayResultExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/result/GatewayResultExecutor.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/result/GatewayResultExecutor.java
index 0d97bff4..55f57a92 100644
--- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/result/GatewayResultExecutor.java
+++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/result/GatewayResultExecutor.java
@@ -52,7 +52,7 @@ public class GatewayResultExecutor extends BaseExecutorAdapter<ServerWebExchange
 
     @Override
     public GatewayResult buildErrorResult(ServerWebExchange exchange, Throwable ex) {
-        Error error = null;
+        Error error;
         if (ex instanceof ApiException) {
             ApiException apiException = (ApiException) ex;
             error = apiException.getError();