Merge branch 'dev' of http://192.168.1.220:10080/EHR/ehr.config into dev

application.yml

@@ -1,8 +1,3 @@
logging:
  level:
    com:
      netflix: DEBUG
#The region code, where application deployed
deploy:
  region: 3502

svr-esb.yml

@@ -49,6 +49,7 @@ data-source:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
---
spring:
@@ -61,6 +62,7 @@ data-source:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  
---
spring:
@@ -72,4 +74,5 @@ data-source:
  password: jkzlxm
fast-dfs:
  tracker-server: 11.1.2.9:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122

svr-health-profile.yml

@@ -83,6 +83,7 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
---
spring:
@@ -106,6 +107,7 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:
@@ -128,4 +130,5 @@ hadoop:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
fast-dfs:
  tracker-server: 11.1.2.9:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122

svr-org.yml

@@ -53,6 +53,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@@ -67,7 +68,8 @@ spring:
    host: 172.19.103.47 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.54:22122
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@@ -82,7 +84,8 @@ spring:
    host: 11.1.2.20 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.54:22122
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8

svr-pack-mgr.yml

@@ -59,6 +59,7 @@ data-source:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
---
spring:
@@ -74,6 +75,7 @@ data-source:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:
@@ -84,6 +86,7 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8

svr-pack-resolve.yml

@@ -61,6 +61,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
hadoop:
  hbase-properties:
@@ -80,6 +81,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
hadoop:
  hbase-properties:
@@ -99,6 +101,7 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
hadoop:
  hbase-properties:

svr-patient.yml

@@ -32,6 +32,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@@ -44,6 +45,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@@ -56,6 +58,7 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8

svr-standard.yml

@@ -70,7 +70,7 @@ hibernate:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@@ -86,7 +86,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: 172.19.103.52:80
  public-server: http://172.19.103.52:80
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@@ -110,6 +110,7 @@ hibernate:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8

svr-user.yml

@@ -32,6 +32,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@@ -44,6 +45,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@@ -56,6 +58,7 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8