Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

# Conflicts:
#	gateway/ag-basic/src/main/resources/application.yml

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

@@ -18,7 +18,7 @@ eureka:
    healthcheck:
      enabled: false #启动监控检查，
    serviceUrl: # 默认正式线地址
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka # 默认本机环境
      defaultZone: http://jw:jkzl@172.26.0.153:8761/eureka # 默认本机环境
    register-with-eureka: true
    fetch-registry: true
@@ -34,23 +34,6 @@ eureka:
    prefer-ip-address: true
    instance-id: ${spring.cloud.client.ip-address}:${server.port}
---
spring:
  config:
    activate:
      on-profile: mlwTest
  cloud:
      config:
        enabled: true
        failFast: true #启动快速失败 即链接不到配置服务就启动失败
        server:
            git:
              uri: ${wlyy.spring.config.git.uri:http://192.168.1.220:10080/Amoy2/wlyy2.0.config.git}
              basedir: /usr/local/wlyy2.0.config
              username: jkzl
              password: jkzl
            default-label: ${wlyy.spring.config.git.label:master}
---
spring:
  cloud:
@@ -324,17 +307,7 @@ spring:
      on-profile: yqfk
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        native:
          search-locations: /usr/local/wlyy2.0.config
  config:
    activate:
      on-profile: native
---
spring:
@@ -359,11 +332,15 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
          git:
            uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:10080/Amoy2/wlyy2.0.config.git}
            uri: ${wlyy.spring.config.git.uri:http://192.168.1.220:10080/Amoy2/wlyy2.0.config.git}
            basedir: /usr/local/wlyy2.0.config
            username: jkzl
            password: jkzl
          default-label: ${wlyy.spring.config.git.label:master}
            default-label: ${wlyy.spring.config.git.label:master}
            order: 1
          native:
            search-locations: /usr/local/wlyy2.0.config
            order: 2
  config:
    activate:
      on-profile: mlwTest

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

@@ -115,12 +115,6 @@ spring:
      on-profile: yqfk
---
spring:
  config:
    activate:
      on-profile: native
---
spring:
  config:
@@ -131,4 +125,4 @@ spring:
spring:
  config:
    activate:
      on-profile: mlwTest
      on-profile: mlwTest,native