Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

src/main/resources/bootstrap.yml

@@ -12,54 +12,42 @@ spring:
   mvc:
     static-path-pattern:
 
+#eureka设置
 eureka:
   client:
-    serviceUrl:
-        defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
-#      defaultZone: http://root:root@http://172.16.2.149:32101/eureka/
-    metadata-map:
-      cluster: ribbon
+    service-url:
+      defaultZone: http://root:root@${EUREKA_HOST:dev-discovery.steerinfo.com}:${EUREKA_PORT:80}/eureka/
   instance:
-    hostname: dil-dazhou-service
-    status-page-url: http://${SWAGGER_INDEX:tgwl.steerinfo.com}/swagger-ui.html
     prefer-ip-address: true
+    status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
-#禁止调用eureka client获取注册列表信息
-ribbon:
-  eureka:
-    enabled: true
-#新版配置，否则后面dashboard无法找到hystrix.stream
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
+
 
 openfeign:
- # ColumnDataFeign:
-  #  url: ${COLUMNDATAFEIGN_URL:localhost:8083}
-  #AmsFeign:
-  #  url: ${AMSFEIGN_URL:localhost:8099}
-  #BmsshipFeign:
-  #  url: ${BMSSHIPFEIGN_URL:localhost:8078}
-  #BmstrainFeign:
-  #  url: ${BMSTRAINFEIGN_URL:localhost:8077}
-  #BmstruckFeign:
-  #  url: ${BMSTRUCKFEIGN_URL:localhost:8076}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:localhost:8099}
+  BmsshipFeign:
+    url: ${BMSSHIPFEIGN_URL:localhost:8078}
+  BmstrainFeign:
+    url: ${BMSTRAINFEIGN_URL:localhost:8077}
+  BmstruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:localhost:8087}
-  #TmsTrainFeign:
-  #  url: ${TMSTRAINFEIGN_URL:localhost:8086}
-  #TmsTruckFeign:
-   # url: ${TMSTRUCKFEIGN_URL:localhost:8088}
-  #TmsshipFeign:
-  #  url: ${TMSSHIPFEIGN_URL:localhost:8090}
-  #WMSHFeign:
-  #  url: ${WMSHFEIGN_URL:localhost:8084}
-  #WMSFeign:
-  #  url: ${WMSFEIGN_URL:localhost:8093}
-  #OMSFeign:
-  #  url: ${OMSFEIGN_URL:localhost:8095}
+  TmsTrainFeign:
+    url: ${TMSTRAINFEIGN_URL:localhost:8086}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+  TmsshipFeign:
+    url: ${TMSSHIPFEIGN_URL:localhost:8090}
+  WMSHFeign:
+    url: ${WMSHFEIGN_URL:localhost:8084}
+  WMSFeign:
+   url: ${WMSFEIGN_URL:localhost:8093}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:localhost:8095}
 
 
 genxml: