Bladeren bron

fix: 修复测试发现的 bugs;

Walker 1 jaar geleden
bovenliggende
commit
05e9e98672

+ 2 - 1
src/main/java/com/ywt/gateway/filter/AuthGatewayFilterFactory.java

@@ -75,7 +75,8 @@ public class AuthGatewayFilterFactory extends AbstractGatewayFilterFactory<HostL
             ServerHttpRequest request = exchange.getRequest();
             String requestUrl = request.getPath().toString();
             String methodName = request.getMethodValue();
-            HttpHeaders headers = request.getHeaders();
+            HttpHeaders headers = new HttpHeaders();
+            headers.addAll(request.getHeaders());
             String host = "";
             if (request.getLocalAddress() != null) {
                 host = request.getLocalAddress().getHostString();

+ 50 - 47
src/main/resources/application-routes-qa.yml

@@ -38,6 +38,56 @@ spring:
             - StripPrefix=2
             - SetRequestHeader=${headers-key.pl-terminal},20
 
+
+        - id: api-qa-v2-common-announcement
+          uri: ${lb-servers.outpatient-web}
+          predicates:
+            - Host=${host-name.api-qa}
+            - Path=/v2/nfyybyfy/commonAnnouncement/getCommonAnnouncement,/v2/commonAnnouncement/getCommonAnnouncement
+          filters:
+            - RewritePath=/.*,/commonAnnouncement/getCommonAnnouncement
+
+        - id: api-qa-v2-nfyybyfy-taihe-user-sync-med-cards
+          # FIXME: 应该使用自定义 Filter 实现更好
+          uri: ${servers-mapping.no-rest}
+          predicates:
+            - Host=${host-name.api-qa}
+            - Path=/v2/nfyybyfy/taihe/user/syncMedCards
+
+        - id: api-qa-v2-nfyybyfy-nutrimeal
+          uri: ${lb-servers.nutrimeal-rest}
+          predicates:
+            - Host=${host-name.api-qa}
+            - Path=/v2/nfyybyfy/nutrimeal/**
+          filters:
+            - StripPrefix=3
+            - name: Auth
+              args:
+                auth: ${auths-name.external-api}
+
+        - id: api-qa-v2-nfyybyfy-glasses
+          uri: ${lb-servers.glasses-web}
+          predicates:
+            - Host=${host-name.api-qa}
+            - Path=/v2/nfyybyfy/glasses/**
+          filters:
+            - StripPrefix=3
+            - name: Auth
+              args:
+                auth: ${auths-name.external-api}
+        - id: api-qa-v2-nfyybyfy
+          uri: ${lb-servers.internethospital-web}
+          predicates:
+            - Host=${host-name.api-qa}
+            - Path=/v2/nfyybyfy/**
+          filters:
+            - StripPrefix=2
+            - SetRequestHeader=${headers-key.pl-terminal},20
+            - name: Auth
+              args:
+                auth: ${auths-name.external-api}
+
+
         - id: api-qa-v2-auth-nfywtwxmp
           uri: ${lb-servers.internethospital-web}
           predicates:
@@ -88,54 +138,7 @@ spring:
               args:
                 auth: ${auths-name.external-api}
 
-        - id: api-qa-v2-nfyybyfy
-          uri: ${lb-servers.internethospital-web}
-          predicates:
-            - Host=${host-name.api-qa}
-            - Path=/v2/nfyybyfy
-          filters:
-            - StripPrefix=2
-            - SetRequestHeader=${headers-key.pl-terminal},20
-            - name: Auth
-              args:
-                auth: ${auths-name.external-api}
 
-        - id: api-qa-v2-nfyybyfy-taihe-user-sync-med-cards
-          # FIXME: 应该使用自定义 Filter 实现更好
-          uri: ${servers-mapping.no-rest}
-          predicates:
-            - Host=${host-name.api-qa}
-            - Path=/v2/nfyybyfy/taihe/user/syncMedCards
-
-        - id: api-qa-v2-nfyybyfy-nutrimeal
-          uri: ${lb-servers.nutrimeal-rest}
-          predicates:
-            - Host=${host-name.api-qa}
-            - Path=/v2/nfyybyfy/nutrimeal
-          filters:
-            - StripPrefix=3
-            - name: Auth
-              args:
-                auth: ${auths-name.external-api}
-
-        - id: api-qa-v2-nfyybyfy-glasses
-          uri: ${lb-servers.glasses-web}
-          predicates:
-            - Host=${host-name.api-qa}
-            - Path=/v2/nfyybyfy/glasses
-          filters:
-            - StripPrefix=3
-            - name: Auth
-              args:
-                auth: ${auths-name.external-api}
-
-        - id: api-qa-v2-common-announcement
-          uri: ${lb-servers.internethospital-web}
-          predicates:
-            - Host=${host-name.api-qa}
-            - Path=/v2/nfyybyfy/commonAnnouncement/getCommonAnnouncement,/v2/commonAnnouncement/getCommonAnnouncement
-          filters:
-            - RewritePath=/.*,/commonAnnouncement/getCommonAnnouncement
 
         - id: api-qa-v2-alipaymp-nfyybyfy
           uri: ${servers-mapping.alipay-mp-api}