Merge branch 'dev' of zdm/ehr.config into dev

svr-ehr-basic.yml

@@ -54,9 +54,9 @@ spring:
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
  data:
    mongodb:
      host: 192.168.1.220
@@ -67,8 +67,8 @@ spring:
      database: ehr
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:

svr-health-profile.yml

@@ -62,9 +62,9 @@ spring:
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
fast-dfs:

svr-pack-mgr.yml

@@ -50,12 +50,12 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
  redis:
    host: 192.168.1.220 # Redis server host.
    host: 172.19.103.47 # Redis server host.
  metrics:
    export:
@@ -66,8 +66,8 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:

svr-pack-resolve.yml

@@ -138,12 +138,12 @@ spring:
  # Mysql
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
  redis:
    host: 192.168.1.220 # Redis server host.
    host: 172.19.103.47 # Redis server host.
  data:
    solr:
@@ -156,8 +156,8 @@ spring:
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
hadoop:
  hbase-properties:

svr-redis.yml

@@ -52,17 +52,17 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
  redis:
    host: 192.168.1.220 # Redis server host.
    host: 172.19.103.47 # Redis server host.
    password:  # Login password of the redis server.
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  password: ha
---

svr-resource.yml

@@ -27,11 +27,11 @@ spring:
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
  redis:
    host: 192.168.1.220 # Redis server host.
    host: 172.19.103.47 # Redis server host.
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.

svr-standard.yml

@@ -61,16 +61,16 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
  redis:
    host: 192.168.1.220 # Redis server host.
    host: 172.19.103.47 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80