优化，代码健壮性检查

miaoguoxin
1 parent 36d196a4
Showing 4 changed files with 20 additions and 19 deletions
gateway-core/src/main/java/com/diligrp/xtrade/core/filters/factory/DispatchGatewayFilterFactory.java
gateway-core/src/main/java/com/diligrp/xtrade/core/filters/web/ReactiveContextWebFilter.java → gateway-core/src/main/java/com/diligrp/xtrade/core/filters/web/FacadeWebFilter.java
gateway-core/src/main/java/com/diligrp/xtrade/core/support/ApiMetricsInfo.java
gateway-core/src/main/java/com/diligrp/xtrade/core/support/dispatch/RequestDispatcher.java
@@ -14,8 +14,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
 import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.ORIGINAL_RESPONSE_CONTENT_TYPE_ATTR;
 /**
 package com.diligrp.xtrade.core.filters.web;
-import com.diligrp.xtrade.core.common.constant.GatewayConst;
 import com.diligrp.xtrade.core.support.ApiMetricsCollector;
 import com.diligrp.xtrade.core.support.ApiMetricsInfo;
 import com.diligrp.xtrade.core.support.context.ReactiveExchangeContextHolder;
+import com.diligrp.xtrade.shared.type.ErrorCode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -18,12 +18,12 @@ import reactor.core.publisher.Mono;
 /**
  * @Auther: miaoguoxin
  * @Date: 2020/4/16 09:17
- * @Description: 操作reactive request和response上下文的过滤器
+ * @Description: 入口过滤器（前置和后置处理）
  */
 @Component
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
-public class ReactiveContextWebFilter implements WebFilter {
-    private static final Logger log = LoggerFactory.getLogger(ReactiveContextWebFilter.class);
+public class FacadeWebFilter implements WebFilter {
+    private static final Logger log = LoggerFactory.getLogger(FacadeWebFilter.class);
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
@@ -40,10 +40,11 @@ public class ReactiveContextWebFilter implements WebFilter {
             log.info("消耗时间：{}", endTime);
             ApiMetricsInfo apiMetricsInfo = ApiMetricsInfo.build(exchange, endTime);
             ApiMetricsCollector.addMetricsInfo(apiMetricsInfo);
-            Throwable throwable = (Throwable) exchange.getAttributes().get(GatewayConst.GATEWAY_EXCEPTION_ATTR);
-            if (throwable != null) {
+            if (apiMetricsInfo != null
+                    && apiMetricsInfo.getCode() == ErrorCode.UNKNOWN_ERROR.getCode()
+                    && apiMetricsInfo.getThrowable() != null) {
                 //log.error("[全局异常处理]异常请求路径:{},记录异常信息:{}", errorAttrs.get("path"),errorAttributes.getError(request));
-                log.error("error:{}", throwable);
+                log.error("error:{}", apiMetricsInfo.getThrowable());
             }
         });
     }
@@ -3,6 +3,7 @@ package com.diligrp.xtrade.core.support;
 import com.diligrp.xtrade.core.common.constant.GatewayConst;
 import com.diligrp.xtrade.shared.domain.Message;
 import com.diligrp.xtrade.shared.util.JsonUtils;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.cloud.gateway.route.Route;
@@ -10,7 +11,6 @@ import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
 import org.springframework.web.server.ServerWebExchange;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.time.LocalDateTime;
 /**
@@ -29,8 +29,9 @@ public class ApiMetricsInfo {
     private String url;
     /**请求体*/
     private String requestBody;
-    /**异常栈跟踪Json信息*/
-    private String stacktrace;
+    /**异常信息*/
+    @JsonIgnore
+    private Throwable throwable;
     /**方法执行时间，单位：ms*/
     private Long executeTime;
     /**创建时间*/
@@ -56,7 +57,7 @@ public class ApiMetricsInfo {
                 info.setUrl(uri != null ? uri.toString() : "unknown");
                 info.setServiceId(route != null ? route.getId() : "unknown");
                 info.setRequestBody(requestBody);
-                info.setStacktrace(throwable != null ? JsonUtils.toJsonString(throwable.getStackTrace()) : null);
+                info.setThrowable(throwable);
                 info.setExecuteTime(time);
                 return info;
             }
@@ -122,12 +123,11 @@ public class ApiMetricsInfo {
         this.requestBody = requestBody;
     }
-    public String getStacktrace() {
-        return stacktrace;
+    public Throwable getThrowable() {
+        return throwable;
     }
-    public void setStacktrace(String stacktrace) {
-        this.stacktrace = stacktrace;
+    public void setThrowable(Throwable throwable) {
+        this.throwable = throwable;
     }
-
 }
@@ -58,7 +58,9 @@ public class RequestDispatcher {
         try {
             if (HAS_INIT.compareAndSet(false, true)) {
                 String[] paths = MAPPING_INFO_MAP.keySet().toArray(new String[0]);
-                PATH_PATTERNS.addAll(PathUtils.assemblePath(paths, PATH_PATTERNS));
+                if (paths.length>0){
+                    PATH_PATTERNS.addAll(PathUtils.assemblePath(paths, PATH_PATTERNS));
+                }
             }
             String matchUri = PathUtils.getMatchUri(uri, PATH_PATTERNS);
             if (Strings.isNullOrEmpty(matchUri)) {