gaodm 6 лет назад
Родитель
Сommit
8137602cdd

+ 47 - 37
config-server/src/main/resources/shared/gateway-service-dev.yml

@@ -10,44 +10,8 @@ ribbon:
   ReadTimeout: 20000
   ConnectTimeout: 20000
 
-zuul:
-  host:
-    connect-timeout-millis: 20000
-    socket-timeout-millis: 20000
-
-  routes:
-    user-service:
-      path: /userapi/**
-      serviceId: user-service
-      sensitiveHeaders:
-
-    logger-service:
-      path: /logapi/**
-      serviceId: logger-service
-      sensitiveHeaders:
-
-    bi-service:
-      path: /biapi/**
-      serviceId: bi-service
-      sensitiveHeaders:
-
-    diagbotman-service:
-      path: /diagbotmanapi/**
-      serviceId: diagbotman-service
-      sensitiveHeaders:
-
-    feedback-service:
-      path: /feedbackapi/**
-      serviceId: feedback-service
-      sensitiveHeaders:
-
-    knowledge-service:
-      path: /knowledgeapi/**
-      serviceId: knowledge-service
-      sensitiveHeaders:
-
-#mq
 spring:
+  #mq
   rabbitmq:
     host: 192.168.2.236
     port: 5672
@@ -55,6 +19,52 @@ spring:
     password: lantone
     publisher-confirms: true
     virtual-host: /
+  cloud:
+      gateway:
+        default-filters:
+        routes:
+        - id: user-service
+          uri: lb://user-service
+          predicates:
+          - Path=/userapi/**
+          filters:
+          - SwaggerHeaderFilter
+          - StripPrefix=1
+        - id: logger-service
+          uri: lb://logger-service
+          predicates:
+          - Path=/logapi/**
+          filters:
+          - SwaggerHeaderFilter
+          - StripPrefix=1
+        - id: bi-service
+          uri: lb://bi-service
+          predicates:
+          - Path=/biapi/**
+          filters:
+          - SwaggerHeaderFilter
+          - StripPrefix=1
+        - id: diagbotman-service
+          uri: lb://diagbotman-service
+          predicates:
+          - Path=/diagbotmanapi/**
+          filters:
+          - SwaggerHeaderFilter
+          - StripPrefix=1
+        - id: feedback-service
+          uri: lb://feedback-service
+          predicates:
+          - Path=/feedbackapi/**
+          filters:
+          - SwaggerHeaderFilter
+          - StripPrefix=1
+        - id: knowledge-service
+          uri: lb://knowledge-service
+          predicates:
+          - Path=/knowledgeapi/**
+          filters:
+          - SwaggerHeaderFilter
+          - StripPrefix=1
 
 server:
   port: 5050

+ 1 - 50
config-server/src/main/resources/shared/gateway-service-local.yml

@@ -10,42 +10,6 @@ ribbon:
   ReadTimeout: 20000
   ConnectTimeout: 20000
 
-#zuul:
-#  host:
-#    connect-timeout-millis: 20000
-#    socket-timeout-millis: 20000
-#
-#  routes:
-#    user-service:
-#      path: /userapi/**
-#      serviceId: user-service
-#      sensitiveHeaders:
-#
-#    logger-service:
-#      path: /logapi/**
-#      serviceId: logger-service
-#      sensitiveHeaders:
-#
-#    bi-service:
-#      path: /biapi/**
-#      serviceId: bi-service
-#      sensitiveHeaders:
-#
-#    diagbotman-service:
-#      path: /diagbotmanapi/**
-#      serviceId: diagbotman-service
-#      sensitiveHeaders:
-#
-#    feedback-service:
-#      path: /feedbackapi/**
-#      serviceId: feedback-service
-#      sensitiveHeaders:
-#
-#    knowledge-service:
-#      path: /knowledgeapi/**
-#      serviceId: knowledge-service
-#      sensitiveHeaders:
-
 spring:
   #mq
   rabbitmq:
@@ -57,8 +21,7 @@ spring:
     virtual-host: /
   cloud:
       gateway:
-        locator:
-          enabled: true
+        default-filters:
         routes:
         - id: user-service
           uri: lb://user-service
@@ -102,18 +65,6 @@ spring:
           filters:
           - SwaggerHeaderFilter
           - StripPrefix=1
-        - id: monitor-service
-          uri: lb://monitor-service
-          predicates:
-          - Path=/monitorapi/**
-#          filters:
-#          - StripPrefix=1
-        - id: admin-service
-          uri: lb://admin-service
-          predicates:
-          - Path=/adminapi/**
-#          filters:
-#          - StripPrefix=1
 
 server:
   port: 5050