优化

miaoguoxin
1 parent f966b555
Showing 4 changed files with 25 additions and 13 deletions
gateway-core/src/main/java/com/diligrp/xtrade/core/common/utils/PathUtils.java
gateway-core/src/main/java/com/diligrp/xtrade/core/config/property/AuthPathProperties.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
@@ -91,9 +91,6 @@ public class PathUtils {
         if (pathPatterns == null){
             pathPatterns = new CopyOnWriteArrayList<>();
         }
-        if (!CollectionUtils.isEmpty(pathPatterns)){
-            pathPatterns.clear();
-        }
         for (String path : paths) {
             PathPattern pathPattern = PATH_PATTERN_PARSER.parse(path);
             pathPatterns.add(pathPattern);
@@ -3,6 +3,7 @@ package com.diligrp.xtrade.core.config.property;
 import com.diligrp.xtrade.core.common.utils.PathUtils;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.util.pattern.PathPattern;
  
 import java.util.List;
@@ -21,13 +22,16 @@ public class AuthPathProperties {
  
  
     /**
-    * 属性配置刷新的时候会从这里进入
+    * 属性配置刷新的时候会从这里进入（不要直接注释掉属性配置，否则无法触发）
     * @author miaoguoxin
     * @date 2020/4/13
     */
     public void setExcludePaths(String[] excludePaths) {
         this.excludePaths = excludePaths;
-        this.excludePathPatterns = PathUtils.assemblePath(this.excludePaths,this.excludePathPatterns);
+        if (!CollectionUtils.isEmpty(this.excludePathPatterns)) {
+            this.excludePathPatterns.clear();
+        }
+        this.excludePathPatterns = PathUtils.assemblePath(this.excludePaths, this.excludePathPatterns);
     }
  
  
@@ -92,9 +92,9 @@ public class ApiMetricsInfo {
         }
     }
  
-    private static String getRequestHeaderJson(HttpHeaders headers){
+    private static String getRequestHeaderJson(HttpHeaders headers) {
         Map<String, List<String>> headerMap = new LinkedHashMap<>();
-        headerMap.put(HttpHeaders.CONTENT_TYPE,headers.get(HttpHeaders.CONTENT_TYPE));
+        headerMap.put(HttpHeaders.CONTENT_TYPE, headers.get(HttpHeaders.CONTENT_TYPE));
         return JsonUtils.toJsonString(headerMap);
     }
  
@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.support.NotFoundException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
@@ -56,12 +57,7 @@ public class RequestDispatcher {
      */
     public Message<Object> executeMethod(String uri, String paramsJson, ServerWebExchange exchange) {
         try {
-            if (HAS_INIT.compareAndSet(false, true)) {
-                String[] paths = MAPPING_INFO_MAP.keySet().toArray(new String[0]);
-                if (paths.length > 0) {
-                    PATH_PATTERNS.addAll(PathUtils.assemblePath(paths, PATH_PATTERNS));
-                }
-            }
+            this.convertPathPatterns();
             String matchUri = PathUtils.getMatchUri(uri, PATH_PATTERNS);
             if (Strings.isNullOrEmpty(matchUri)) {
                 throw NotFoundException.create(true, String.format("%s not found", uri));
@@ -74,6 +70,7 @@ public class RequestDispatcher {
         }
     }
  
+
     /**
      * 注册mapping信息
      *
@@ -132,4 +129,18 @@ public class RequestDispatcher {
             throw tex.getCause() == null ? tex : tex.getCause();
         }
     }
+
+    private void convertPathPatterns() {
+        if (!HAS_INIT.compareAndSet(false, true)) {
+            return;
+        }
+        String[] paths = MAPPING_INFO_MAP.keySet().toArray(new String[0]);
+        if (paths.length == 0) {
+            return;
+        }
+        if (!CollectionUtils.isEmpty(PATH_PATTERNS)) {
+            PATH_PATTERNS.clear();
+        }
+        PATH_PATTERNS.addAll(PathUtils.assemblePath(paths, PATH_PATTERNS));
+    }
 }