Browse Source

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

hill9868 8 years ago
parent
commit
17a2f68c4f

+ 29 - 0
ag-portal-cloud.yml

@ -0,0 +1,29 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
ribbon:
  ReadTimeout: 30000
  ConnectTimeout: 10000
---
spring:
  profiles: dev
---
spring:
  profiles: alpha
---
spring:
  profiles: test
---
spring:
  profiles: prod

+ 3 - 0
application.yml

@ -62,6 +62,7 @@ ehr.common.repeat.code: 代码重复
#Application port, since 10100, 10 per step. Update max port if new application created. Current max: 10220
ag-ehr-platform.server.port: 443
ag-ehr-cloud.server.port: 443
ag-portal-cloud.server.port: 444
ag-admin.server.port: 10000
svr-adaption.server.port: 10150
svr-app.server.port: 10160
@ -83,6 +84,7 @@ svr-workflow.server.port: 10210
svr-resource.server.port: 10220
svr-archive-security.server.port: 10230
svr-profile-statistics.server.port: 10240
svr-portal.server.port: 10250
#Application acuator
endpoints:
  restart:
@ -129,6 +131,7 @@ eureka:
  instance:
    prefer-ip-address: false
#eureka-server-ip: 127.0.0.1:8761
eureka-server-ip: 192.168.1.221:8761
---

+ 4 - 0
svr-health-profile-search.yml

@ -28,6 +28,7 @@ spring:
  data:
    solr:
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
@ -41,6 +42,7 @@ spring:
  data:
    solr:
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
@ -54,6 +56,7 @@ spring:
  data:
    solr:
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
---
@ -63,3 +66,4 @@ spring:
  data:
    solr:
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.

+ 7 - 0
svr-health-profile.yml

@ -73,6 +73,7 @@ spring:
  data:
    solr:
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@ -82,6 +83,7 @@ spring:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
    #- hbase.zookeeper.quorum: node1,node2,node3
fast-dfs:
  tracker-server: 172.19.103.54:22122
@ -97,6 +99,7 @@ spring:
  data:
    solr:
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@ -106,6 +109,7 @@ spring:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
    #- hbase.zookeeper.quorum: node1,node2,node3
fast-dfs:
  tracker-server: 172.19.103.54:22122
@ -121,6 +125,7 @@ spring:
  data:
    solr:
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@ -130,6 +135,7 @@ spring:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
    #- hbase.zookeeper.quorum: node1,node2,node3
fast-dfs:
  tracker-server: 172.19.103.54:22122
@ -154,6 +160,7 @@ spring:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    #- hbase.zookeeper.quorum: node1,node2,node3
fast-dfs:
  tracker-server: 11.1.2.9:22122

+ 9 - 0
svr-pack-resolve.yml

@ -96,6 +96,8 @@ spring:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #host: http://172.17.110.20:8983/solr # Solr host. Ignored if "zk-host" is set.
      #zk-host: host-172-17-110-20,host-172-17-110-186,host-172-17-110-18:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
@ -110,6 +112,7 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
    #- hbase.zookeeper.quorum: node1,node2,node3
---
spring:
@ -122,6 +125,8 @@ spring:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #host: http://172.17.110.20:8983/solr # Solr host. Ignored if "zk-host" is set.
      #zk-host: host-172-17-110-20,host-172-17-110-186,host-172-17-110-18:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
@ -136,6 +141,7 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
    #- hbase.zookeeper.quorum: node1,node2,node3
---
spring:
@ -148,6 +154,8 @@ spring:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      zk-host: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #host: http://172.17.110.20:8983/solr # Solr host. Ignored if "zk-host" is set.
      #zk-host: host-172-17-110-20,host-172-17-110-186,host-172-17-110-18:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
@ -162,6 +170,7 @@ fast-dfs:
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
    #- hbase.zookeeper.quorum: node1,node2,node3
---
spring:

+ 71 - 0
svr-portal.yml

@ -0,0 +1,71 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
      
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 20
    max-idle: 8
    min-idle: 8
    validation-query: SELECT 1
    test-on-borrow: true
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: weifuwu
    password: weifuwu
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122

+ 3 - 0
svr-profile-statistics.yml

@ -62,6 +62,7 @@ spring:
  data:
    solr:
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@ -82,6 +83,7 @@ spring:
  data:
    solr:
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@ -102,6 +104,7 @@ spring:
  data:
    solr:
      zk-host: node1.jkzldev.com,node2.jkzldev.com,node4.jkzldev.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8