修正合并错误

config-init/config/project-gateway.yaml

@@ -2,42 +2,18 @@ spring:
   cloud:
   cloud:
     gateway:
     gateway:
       routes:
       routes:
-        - id: placeOrder
-          uri: lb://project-order
-          predicates:
-            - Path=/pea-order
-        - id: queryStorage
-          uri: lb://project-storage
-          predicates:
-            - Path=/storage/
-        - id: queryAccount
-          uri: lb://project-account
-          predicates:
-            - Path=/account/
-        - id: praiseItemRocketMQ
-          uri: lb://project-provider
-          predicates:
-            - Path=/praise/rocketmq
-        - id: praiseItemSentinel
-          uri: lb://project-provider
-          predicates:
-            - Path=/praise/sentinel
-        - id: queryPraise
-          uri: lb://project-consumer
-          predicates:
-            - Path=/praise/query
         - id: user
         - id: user
           uri: lb://user
           uri: lb://user
           predicates:
           predicates:
-          - Path=/user/**, /v1/team/**, /v1/user/**
+            - Path=/user/**, /v1/team/**, /v1/user/**
         - id: order
         - id: order
           uri: lb://project-order
           uri: lb://project-order
           predicates:
           predicates:
-            - Path=/order/**
+            - Path=/pea-order/**
         - id: gis
         - id: gis
           uri: lb://project-gis
           uri: lb://project-gis
           predicates:
           predicates:
-          - Path=/gis/**
+            - Path=/gis/**
         - id: district
         - id: district
           uri: lb://project-district
           uri: lb://project-district
           predicates:
           predicates:
@@ -45,4 +21,4 @@ spring:
 
 
 auth:
 auth:
   path: /test/**,/user/**,/v1/**,/gis/** # 需要认证的路边列表，多个用逗号连接
   path: /test/**,/user/**,/v1/**,/gis/** # 需要认证的路边列表，多个用逗号连接
-  
+