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

gateway/ag-basic/pom.xml

@@ -40,19 +40,23 @@
            <artifactId>tomcat-embed-jasper</artifactId>
        </dependency>
        <!-- 支持Tomcat启动 -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
            <version>2.2.9.RELEASE</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-bootstrap</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.retry</groupId>
            <artifactId>spring-retry</artifactId>
@@ -89,6 +93,12 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>io.lettuce</groupId>
                    <artifactId>lettuce-core</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>redis.clients</groupId>
@@ -132,6 +142,11 @@
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-netflix-eureka-client</artifactId>
            <version>RELEASE</version>
        </dependency>
    </dependencies>
    <!--<build>

gateway/ag-basic/src/main/resources/bootstrap.yml

@@ -20,69 +20,105 @@ eureka:
---
spring:
  profiles: jwdev
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy-spring.config.label:jwdev}
  main:
    allow-bean-definition-overriding: true
  config:
    activate:
      on-profile: jwdev
---
spring:
  profiles: jwtest
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy-spring.config.label:jwdev}
  main:
    allow-bean-definition-overriding: true
  config:
    activate:
      on-profile: jwtest
---
spring:
  profiles: iottest
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://172.26.0.109:1221}
      label: ${wlyy-spring.config.label:jwdev}
  config:
    activate:
      on-profile: iottest
  main:
    allow-bean-definition-overriding: true
---
spring:
  profiles: iotyanshi
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:jwdev}
  config:
    activate:
      on-profile: iotyanshi
  main:
    allow-bean-definition-overriding: true
---
spring:
  profiles: qytest
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:jwdev}
  config:
    activate:
      on-profile: qytest
  main:
    allow-bean-definition-overriding: true
---
spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: jwprod
  main:
    allow-bean-definition-overriding: true
---
spring:
  profiles: jwprod70
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://172.16.1.70:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: jwprod70
  main:
    allow-bean-definition-overriding: true
---
spring:
  profiles: jwOracleProd
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: jwOracleProd
  main:
    allow-bean-definition-overriding: true
---
spring:
  profiles: xzprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://172.16.100.63:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: xzprod
  main:
    allow-bean-definition-overriding: true
---
spring:
  profiles: xmjwprod