Merge branch 'fuzhou' of http://192.168.192.92:3000/jkzl.cloud/svr-inspection

.gitignore

@@ -22,4 +22,6 @@
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
/.nb-gradle/
logs/

src/main/resources/application.yml

@@ -20,33 +20,9 @@ spring:
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
    url: jdbc:mysql://172.18.20.105:3312/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: cloud
    password: o8t$P39ekYSZ
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: chenweishan
    password: chenweishan
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com:2181/solr
      zk-host: 11.1.2.30:2181/solr

src/main/resources/bootstrap.yml

@@ -3,7 +3,6 @@ spring:
    name: svr-inspection
  cloud:
    config:
      username: user
      password: configuration
---
@@ -11,8 +10,8 @@ spring:
  profiles: dev
  cloud:
    config:
      uri: ${spring.config.uri:http://172.19.103.73:1221}
      label: ${spring.config.label:dev}
      uri: ${spring.config.uri:http://11.1.2.31:1221}
      label: ${spring.config.label:fuzhou}
---
spring: