7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into registry-nacos

Browse Source
This commit is contained in:
tanghc
2019-08-14 17:42:29 +08:00
parent 16e56a93e3 539f9dbcf7
commit 12a3cec8a3
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/result/GatewayResultExecutor.java
View File

@@ -8,11 +8,9 @@ import com.gitee.sop.gatewaycommon.message.Error;
import com.gitee.sop.gatewaycommon.message.ErrorEnum; import com.gitee.sop.gatewaycommon.message.ErrorEnum;
import com.gitee.sop.gatewaycommon.result.BaseExecutorAdapter; import com.gitee.sop.gatewaycommon.result.BaseExecutorAdapter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.gateway.support.NotFoundException;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.server.ResponseStatusException;
import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchange;
import java.util.List; import java.util.List;
@@ -54,21 +52,11 @@ public class GatewayResultExecutor extends BaseExecutorAdapter<ServerWebExchange
@Override @Override
public GatewayResult buildErrorResult(ServerWebExchange exchange, Throwable ex) { public GatewayResult buildErrorResult(ServerWebExchange exchange, Throwable ex) {
Error error = null; Error error;
if (ex instanceof ApiException) { if (ex instanceof ApiException) {
ApiException apiException = (ApiException) ex; ApiException apiException = (ApiException) ex;
error = apiException.getError(); error = apiException.getError();
} else if (ex instanceof NotFoundException) { } else {
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) {
error = ErrorEnum.ISP_UNKNOWN_ERROR.getErrorMeta().getError(); error = ErrorEnum.ISP_UNKNOWN_ERROR.getErrorMeta().getError();
} }