Merge branch 'dev' of trick9191/wlyy2.0 into dev

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -29,16 +29,16 @@ spring:
---
spring:
  profiles: prod
  profiles: jwprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.120.153:3000/Amoy2/wlyy2.0.config.git}
          uri: ${wlyy.spring.config.git.uri:http://192.0.33.26:3000/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:prod}
        default-label: ${wlyy.spring.config.git.label:jwprod}
---
spring: