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

ag-admin.yml

@@ -33,23 +33,41 @@ zuul:
---
spring:
  profiles: dev
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: alpha
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: test
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: prod
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: prod_fz
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: prod_sr
eip:
  schema: hos1
  tenant: ehr

ag-ehr-cloud.yml

@@ -56,6 +56,9 @@ spring:
      statsd:
        host: 172.19.103.73
        port: 8125
eip:
  schema: hos1
  tenant: ehr
#server:
#  ssl:
@@ -78,6 +81,9 @@ spring:
      statsd:
        host: 192.168.1.221
        port: 8125
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -94,6 +100,9 @@ spring:
      statsd:
        host: 172.19.103.73
        port: 8125
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -109,6 +118,9 @@ spring:
      statsd:
        host: 11.1.2.5
        port: 8125
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -124,6 +136,9 @@ spring:
      statsd:
        host: 192.168.135.29
        port: 8125
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -138,4 +153,7 @@ spring:
    export:
      statsd:
        host: 10.176.97.10
        port: 8125
        port: 8125
eip:
  schema: hos1
  tenant: ehr

ag-portal-cloud.yml

@@ -34,23 +34,41 @@ spring:
---
spring:
  profiles: dev
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: alpha
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: test
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: prod
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: prod_fz
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: prod_sr
  profiles: prod_sr
eip:
  schema: hos1
  tenant: ehr

svr-ehr-basic.yml

@@ -69,6 +69,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -81,6 +84,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -100,6 +106,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -112,6 +121,9 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -132,7 +144,9 @@ spring:
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -153,3 +167,6 @@ spring:
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122
eip:
  schema: hos1
  tenant: ehr

svr-health-profile.yml

@@ -74,6 +74,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -90,6 +93,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -105,6 +111,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -121,6 +130,9 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
eip:
  schema: hos1
  tenant: ehr
---
@@ -135,7 +147,9 @@ spring:
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -153,4 +167,7 @@ spring:
    id: JKZL
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122
  public-server: http://10.176.97.5:22122
eip:
  schema: hos1
  tenant: ehr

svr-pack-mgr.yml

@@ -70,6 +70,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -94,6 +97,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -112,6 +118,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -128,7 +137,9 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -144,7 +155,9 @@ spring:
fast-dfs:
  tracker-server: 192.168.135.25:22122
  public-server: http://192.168.25.42:22122
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -159,4 +172,7 @@ spring:
    password: q4YaQemf
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122
  public-server: http://10.176.97.5:22122
eip:
  schema: hos1
  tenant: ehr

svr-resource.yml

@@ -44,6 +44,9 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -60,6 +63,10 @@ spring:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: test
@@ -79,6 +86,10 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
  profiles: prod
@@ -99,6 +110,9 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -122,7 +136,9 @@ hadoop:
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -145,4 +161,8 @@ hadoop:
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122
  public-server: http://10.176.97.5:22122
eip:
  schema: hos1
  tenant: ehr
  

svr-security.yml

@@ -24,6 +24,9 @@ spring:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -33,6 +36,9 @@ spring:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -42,6 +48,9 @@ spring:
    url: jdbc:mysql://172.19.103.38:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: cloud
    password: cloud
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -51,3 +60,6 @@ spring:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm
eip:
  schema: hos1
  tenant: ehr

svr-standard.yml

@@ -73,8 +73,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -91,9 +92,10 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
eip:
  schema: hos1
  tenant: ehr
  
---
spring:
  profiles: test
@@ -109,7 +111,9 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -126,7 +130,9 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -142,7 +148,9 @@ spring:
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
eip:
  schema: hos1
  tenant: ehr
---
spring:
@@ -157,4 +165,7 @@ spring:
    password: q4YaQemf
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122
  public-server: http://10.176.97.5:22122
eip:
  schema: hos1
  tenant: ehr