Merge branch 'master' of http://gogs.ywtinfo.com/ywt_rebuild_group/ywt-gateway

src/main/resources/application-routes-mg-qa.yml

@@ -58,24 +58,12 @@ spring:
 #                authResponse401: true
 #                auth: ${auths-name.ywt-mg}
                 timeout: 90
-        # 根目录
-        - id: mg-qa
-          uri: ${servers-mapping.web-static}
-          predicates:
-            - Host=${host-name.mg-qa}
-            - Path=/
-          filters:
-            - PreserveHostHeader  # 发送网关原始主机头
-            - name: Auth
-              args:
-                authResponse401: true
-                auth: ${auths-name.ywt-mg}
         # 营养餐接口
         - id: mg-qa-nutrimeal
           uri: ${lb-servers.nutrimeal-rest}
           predicates:
             - Host=${host-name.mg-qa}
-            - Path=/nutrimeal
+            - Path=/nutrimeal/**
           filters:
             - StripPrefix=1
             - name: Auth
@@ -98,7 +86,7 @@ spring:
           uri: ${lb-servers.glasses-web}
           predicates:
             - Host=${host-name.mg-qa}
-            - Path=/glasses
+            - Path=/glasses/**
           filters:
             - StripPrefix=1
             - name: Auth
@@ -110,7 +98,7 @@ spring:
           uri: ${lb-servers.download-service-api-service}
           predicates:
             - Host=${host-name.mg-qa}
-            - Path=/downloadService
+            - Path=/downloadService/**
           filters:
             - StripPrefix=1
             - name: Auth
@@ -126,6 +114,18 @@ spring:
             - Path=/drapi/dev/opLog,/nfyybyfydocapi/dev/opLog,/thnetdocapi/dev/opLog,/marketingapi/dev/opLog,/nfthapi/dev/opLog,/api/dev/opLog
           filters:
             - StripPrefix=1
+        # 根目录
+        - id: mg-qa
+          uri: ${servers-mapping.web-static}
+          predicates:
+            - Host=${host-name.mg-qa}
+            - Path=/**
+          filters:
+#            - PreserveHostHeader  # 发送网关原始主机头
+            - name: Auth
+              args:
+                authResponse401: true
+                auth: ${auths-name.ywt-mg}
         # 管理后台 end
 
 

src/main/resources/application-routes-qa.yml

@@ -940,12 +940,6 @@ spring:
                 #                authResponse401: true
                 #                auth: ${auths-name.ywt-mg}
                 timeout: 90
-        # 根目录
-        - id: mg-qa
-          uri: ${servers-mapping.web-static}
-          predicates:
-            - Host=${host-name.mg-qa}
-            - Path=/
         # 营养餐接口
         - id: mg-qa-nutrimeal
           uri: ${lb-servers.nutrimeal-rest}
@@ -994,7 +988,18 @@ spring:
                 authResponse401: true
                 timeout: 300
                 auth: ${auths-name.ywt-mg}
-
+        # 根目录
+        - id: mg-qa
+          uri: ${servers-mapping.web-static}
+          predicates:
+            - Host=${host-name.mg-qa}
+            - Path=/**
+          filters:
+            - PreserveHostHeader  # 发送网关原始主机头
+#            - name: Auth
+#              args:
+#                authResponse401: true
+#                auth: ${auths-name.ywt-mg}
         # 管理后台 end