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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

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

@@ -148,24 +148,28 @@ security:
#
---
spring:
  profiles: jwtest
  datasource:
     url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     url: jdbc:mysql://172.26.0.104/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: jkzlehr
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
    port: 6379
  config:
    activate:
      on-profile: jwtest # Redis server port.
---
spring:
  profiles: iottest
  datasource:
     url: jdbc:mysql://172.26.0.104/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: jkzlehr
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
    port: 6379
  config:
    activate:
      on-profile: iottest # Redis server port.
---
spring:
  profiles: iotyanshi
@@ -231,7 +235,6 @@ spring:
---
## 卫计委配置
spring:
  profiles: xmjwprod
  datasource:
    url: jdbc:mysql://59.61.92.90:9409/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
@@ -240,10 +243,12 @@ spring:
    host: 59.61.92.90 # Redis server host.
    port: 9054  # Redis server port.
    password: jkzlehr
  config:
    activate:
      on-profile: xmjwprod
---
spring:
  profiles: iotprod
  datasource:
     url: jdbc:mysql://10.90.32.3:20002/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy_new
@@ -252,9 +257,11 @@ spring:
     host: 59.61.92.90 # Redis server host.
     port: 9054  # Redis server port.
     password: o!a1#B74&m
  config:
    activate:
      on-profile: iotprod
---
spring:
  profiles: iotprodIn
  datasource:
    url: jdbc:mysql://10.95.22.143:3306/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy_new
@@ -263,21 +270,25 @@ spring:
    host: 10.95.22.142 # Redis server host.
    port: 6380  # Redis server port.
    password: o!a1#B74&m
  config:
    activate:
      on-profile: iotprodIn
---
spring:
  profiles: jwystest
  datasource:
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: jkzlehr
  redis:
    host: 172.26.0.190 # Redis server host.
    port: 6379 # Redis server port.
    port: 6379
  config:
    activate:
      on-profile: jwystest # Redis server port.
---
spring:
  profiles: tnJwprod
  datasource:
     url: jdbc:mysql://10.9.1.247:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
@@ -286,10 +297,12 @@ spring:
     host: 10.9.1.247 # Redis server host.
     port: 6380  # Redis server port.
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: tnJwprod
---
spring:
  profiles: hzprod
  datasource:
    url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
@@ -298,10 +311,12 @@ spring:
    host: 10.18.43.40 # Redis server host.
    port: 6379  # Redis server port.
    password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: hzprod
---
spring:
  profiles: wjwProd
  datasource:
     url: jdbc:mysql://127.0.0.1:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
@@ -310,22 +325,26 @@ spring:
     host: 127.0.0.1 # Redis server host.
     port: 6380  # Redis server port.
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: wjwProd
---
spring:
  profiles: dsyy
  datasource:
     url: jdbc:mysql://127.0.0.1:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
     password: 2oEq3Kf7@zjxl
  redis:
    host: 127.0.0.1 # Redis server host.
    port: 6380 # Redis server port.
    port: 6380
  config:
    activate:
      on-profile: dsyy # Redis server port.
---
spring:
  profiles: hcyyProd
  datasource:
     url: jdbc:mysql://192.168.120.103:6001/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
@@ -334,10 +353,12 @@ spring:
    host: 192.168.120.103 # Redis server host.
    port: 6007 # Redis server port.
    password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: hcyyProd
---
spring:
  profiles: jwZnyg
  datasource:
     url: jdbc:mysql://172.26.0.222:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
@@ -346,11 +367,13 @@ spring:
    host: 172.26.0.222 # Redis server host.
    port: 6379 # Redis server port.
    password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: jwZnyg
---
spring:
  profiles: jwZnygProd
  datasource:
     url: jdbc:mysql://59.61.92.90:9409/medicine?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
@@ -359,20 +382,24 @@ spring:
     host: 59.61.92.90
     port: 9054
     password: jkzlehr
  config:
    activate:
      on-profile: jwZnygProd
---
spring:
  profiles: ZjxlProd
  datasource:
    url: jdbc:mysql://172.26.0.13:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: jkzlehr
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
    port: 6379
  config:
    activate:
      on-profile: ZjxlProd # Redis server port.
---
spring:
  profiles: jwZnygProdIn
  datasource:
     url: jdbc:mysql://10.95.22.191:3406/medicine?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: wlyy
@@ -381,10 +408,12 @@ spring:
     host: 10.95.22.142
     port: 6380
     password: jkzlehr
  config:
    activate:
      on-profile: jwZnygProdIn
---
spring:
  profiles: mlwProd
  datasource:
     url: jdbc:mysql://10.172.0.61:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
@@ -392,4 +421,34 @@ spring:
  redis:
     host: 10.172.0.61
     port: 6379
     password: Kb6wKDQP1W4
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: mlwProd
---
spring:
  datasource:
     url: jdbc:mysql://10.172.0.61:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: 4D^tK%!4
  redis:
     host: 10.172.0.61
     port: 6379
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: mlwProd
---
spring:
  datasource:
     url: jdbc:mysql://172.26.0.114:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: 4D^tK%!4
  redis:
     host: 172.26.0.253
     port: 6390
     password: Kb6wKDQP1W4
  config:
    activate:
      on-profile: mlwTest

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

@@ -121,57 +121,71 @@ spring:
    allow-bean-definition-overriding: true
---
spring:
  profiles: xmjwprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://192.168.120.210:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: xmjwprod
---
spring:
  profiles: xmjwlocal
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://10.95.22.193:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: xmjwlocal
---
spring:
  profiles: iotprod
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: iotprod
---
spring:
  profiles: iotprodIn
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: iotprodIn
---
spring:
  profiles: jwystest
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://172.26.0.194:1221}
      label: ${wlyy-spring.config.label:jwdev}
  config:
    activate:
      on-profile: jwystest
---
spring:
  profiles: tnJwprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: tnJwprod
---
spring:
  profiles: hzprod
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:master}
  config:
    activate:
      on-profile: hzprod
---
spring:
@@ -183,64 +197,89 @@ spring:
---
spring:
  profiles: dsyy
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: dsyy
---
spring:
  profiles: hcyyProd
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: hcyyProd
---
spring:
  profiles: yqfk
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: yqfk
---
spring:
  profiles: jwZnyg
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:jwdev}
  config:
    activate:
      on-profile: jwZnyg
---
spring:
  profiles: jwZnygProd
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:jwdev}
  config:
    activate:
      on-profile: jwZnygProd
---
spring:
  profiles: ZjxlProd
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: ZjxlProd
---
spring:
  profiles: mlwProd
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
  config:
    activate:
      on-profile: mlwProd
---
spring:
  profiles: jwZnygProdIn
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:jwdev}
      label: ${wlyy-spring.config.label:jwdev}
  config:
    activate:
      on-profile: jwZnygProdIn
---
spring:
  cloud:
    config:
      uri: ${wlyy-spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy-spring.config.label:jwdev}
  config:
    activate:
      on-profile: mlwTest

server/svr-configuration/pom.xml

@@ -48,7 +48,7 @@
        </dependency>
        <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.boot</groupId>

server/svr-configuration/src/main/java/com/yihu/ConfigServer.java

@@ -3,7 +3,8 @@ package com.yihu;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cloud.config.server.EnableConfigServer;
/**

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

@@ -1,21 +1,28 @@
spring:
  jmx:
    enabled: false
  security:
    basic:
      enabled: true
    user:
      name: jw
      password: jkzl
server:
  port: 1221
security:
  user:
    name: jw
    password: jkzl
eureka:
  client:
    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
#      defaultZone: http://jw:jkzl@172.16.1.42:8761/eureka # 中山医院
#      defaultZone: http://jw:jkzl@192.0.33.26:8762/eureka
#      defaultZone: http://jw:jkzl@192.168.33.199:8761/eureka
@@ -25,6 +32,338 @@ eureka:
  instance:
    #eurika使用IP不使用host
    prefer-ip-address: true
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
    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://127.0.0.1/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:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: jwdev
---
spring:
  cloud:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: jwtest
---
spring:
  cloud:
    config:
      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
          repos:
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: iottest
---
spring:
  cloud:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: iotyanshi
---
spring:
  cloud:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: qytest
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://172.16.1.42:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: jwprod
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://10.95.22.168:3000/Amoy2/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:local}
  config:
    activate:
      on-profile: local
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/ehr.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: jwOracleProd
---
## 心脏中心外网
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://172.16.100.241:3000/jkzl/config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: xzprod
---
## 心脏中心内网
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.103.150:3000/jkzl/config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:in_master}
  config:
    activate:
      on-profile: xzprod_in
---
## 卫计委
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.120.210:3000/jkzl/config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: xmjwprod
---
## 物联网
spring:
  profiles: iotprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:10010/jkzl/config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
---
spring:
  cloud:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: jwystest
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: tnJwprod
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://10.18.43.41:3001/jkzl/ehr.config.git}
          basedir: /usr/local/wlyy2.0-config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: hzprod
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3000/jkzl/ehr.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: wjwProd
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://27.150.172.197:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0.config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: dsyy
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/wlyy2.0.config.git}
          basedir: /data/wlyy2.0/wlyy2.0.config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: hcyyProd
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/wlyy2.0.config.git}
          basedir: /data/wlyy2.0/wlyy2.0.config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: yqfk
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        native:
          search-locations: /usr/local/wlyy2.0.config
  config:
    activate:
      on-profile: native
---
spring:
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: mlwProd
---
spring:
  cloud:
    config:
      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}
  config:
    activate:
      on-profile: mlwTest

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

@@ -4,280 +4,131 @@ spring:
---
spring:
  profiles: jwdev
  cloud:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: jwdev
---
spring:
  profiles: jwtest
##git配置
  cloud:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: jwtest
---
spring:
  profiles: iottest
##git配置
  cloud:
    config:
      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
          repos:
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: iottest
---
spring:
  profiles: iotyanshi
##git配置
  cloud:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: iotyanshi
---
spring:
  profiles: qytest
##git配置
  cloud:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: qytest
---
spring:
  profiles: jwprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://172.16.1.42:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: jwprod
---
spring:
  profiles: local
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://10.95.22.168:3000/Amoy2/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:local}
  config:
    activate:
      on-profile: local
---
spring:
  profiles: jwOracleProd
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/ehr.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: jwOracleProd
---
## 心脏中心外网
spring:
  profiles: xzprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://172.16.100.241:3000/jkzl/config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: xzprod
---
## 心脏中心内网
spring:
  profiles: xzprod_in
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.103.150:3000/jkzl/config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:in_master}
  config:
    activate:
      on-profile: xzprod_in
---
## 卫计委
spring:
  profiles: xmjwprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.120.210:3000/jkzl/config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: xmjwprod
---
## 物联网
spring:
  profiles: iotprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:10010/jkzl/config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: iotprod
---
spring:
  profiles: jwystest
  ##git配置
  cloud:
    config:
      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
        default-label: ${wlyy.spring.config.git.label:jwdev}
  config:
    activate:
      on-profile: jwystest
---
spring:
  profiles: tnJwprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: tnJwprod
---
spring:
  profiles: hzprod
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://10.18.43.41:3001/jkzl/ehr.config.git}
          basedir: /usr/local/wlyy2.0-config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: hzprod
---
spring:
  profiles: wjwProd
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3000/jkzl/ehr.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: wjwProd
---
spring:
  profiles: dsyy
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://27.150.172.197:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0.config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: dsyy
---
spring:
  profiles: hcyyProd
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/wlyy2.0.config.git}
          basedir: /data/wlyy2.0/wlyy2.0.config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: hcyyProd
---
spring:
  profiles: yqfk
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/wlyy2.0.config.git}
          basedir: /data/wlyy2.0/wlyy2.0.config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: yqfk
---
spring:
  profiles: native
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        native:
          search-locations: /usr/local/wlyy2.0.config
  config:
    activate:
      on-profile: native
---
spring:
  profiles: mlwProd
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:3001/jkzl/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
          username: jkzl
          password: jkzl
        default-label: ${wlyy.spring.config.git.label:master}
  config:
    activate:
      on-profile: mlwProd
---
spring:
  config:
    activate:
      on-profile: mlwTest

server/svr-discovery/src/main/java/com/yihu/DiscoveryServer.java

@@ -3,7 +3,7 @@ package com.yihu;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
/**

server/svr-discovery/src/main/java/com/yihu/jw/endpoint/DiscoveryEndpoint.java

@@ -139,6 +139,7 @@ public class DiscoveryEndpoint {
            @RequestParam("hostName") String hostName,
            @RequestParam("status") InstanceInfo.InstanceStatus status,
            @RequestParam("overriddenstatus") InstanceInfo.InstanceStatus overriddenstatus,
            @RequestParam("overriddenstatus") InstanceInfo.InstanceStatus overriddenStatusAlt,
            @RequestParam("leaseInfo") LeaseInfo leaseInfo,
            @RequestParam("isCoordinatingDiscoveryServer") Boolean isCoordinatingDiscoveryServer,
            @RequestParam("metadata") HashMap<String, String> metadata,
@@ -152,7 +153,7 @@ public class DiscoveryEndpoint {
                    sid, port, securePort, homePageUrl,
                    statusPageUrl, healthCheckUrl, secureHealthCheckUrl, vipAddress,
                    secureVipAddress, countryId, dataCenterInfo, hostName,
                    status, overriddenstatus, leaseInfo, isCoordinatingDiscoveryServer,
                    status, overriddenstatus,overriddenStatusAlt, leaseInfo, isCoordinatingDiscoveryServer,
                    metadata, lastUpdatedTimestamp, lastDirtyTimestamp, actionType, asgName);
            eurekaServerContext.getRegistry().register(info, true);
            return "注册成功";

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

@@ -1,25 +1,24 @@
spring:
  jmx:
    enabled: false
  #eureka界面的账号密码
  security:
      basic:
        enabled: true
      user:
        name: jw
        password: jkzl
server:
  port: 8761 # 外网互联网医院内网服务
#   port: 8762 # 互联网医院内网服务
#eureka界面的账号密码
security:
  basic:
    enabled: true
  user:
    name: jw
    password: jkzl
eureka:
  server:
    enable-self-preservation: false  #是否开启自我保护模式，默认为true。
    #eviction-interval-timer-in-ms: 60000 #eureka server清理无效节点的时间间隔，默认60000毫秒，即60秒
  client:
    register-with-eureka: false
    register-with-eureka: true
    fetch-registry: false #如果是做高可用的发现服务那就要改成 true
    registry-fetch-interval-seconds: 30 #定期的更新客户端的服务清单 30秒更新一次
    service-url: