Browse Source

Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	ag-admin.yml
hill9868 7 years ago
parent
commit
94b3fd2557
17 changed files with 179 additions and 851 deletions
  1. 6 34
      ag-admin.yml
  2. 3 16
      ag-ehr-cloud.yml
  3. 4 14
      ag-portal-cloud.yml
  4. 24 1
      application.yml
  5. 2 2
      hos-admin.yml
  6. 8 44
      svr-dfs.yml
  7. 50 53
      svr-ehr-basic.yml
  8. 5 81
      svr-health-profile.yml
  9. 4 77
      svr-pack-analyze.yml
  10. 6 77
      svr-pack-mgr.yml
  11. 2 146
      svr-pack-resolve.yml
  12. 40 39
      svr-quota.yml
  13. 0 52
      svr-redis-memory.yml
  14. 3 79
      svr-redis.yml
  15. 12 61
      svr-resource.yml
  16. 3 8
      svr-security.yml
  17. 7 67
      svr-standard.yml

+ 6 - 34
ag-admin.yml

@ -1,12 +1,3 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
ribbon:
  ReadTimeout: 30000
  ConnectTimeout: 10000
@ -28,61 +19,42 @@ zuul:
    updateHosEsbMiniRelease:
      path: /api/v1.0/esb/updateHosEsbMiniRelease
      serviceId: svr-esb
eip:
  tenant: jkzl
---
spring:
  profiles: dev
eip:
  tenant: jkzl
#总部统一网关接口参数配置
service-gateway:
  url: http://service.yihu.com:8085/WSGW/rest
  handlerId: 50871
  clientId: 9000401
---
spring:
  profiles: alpha
eip:
  tenant: jkzl
  clientVersion: 1.0
---
spring:
  profiles: test
eip:
  tenant: jkzl
---
spring:
  profiles: prod
eip:
  tenant: jkzl
---
spring:
  profiles: prod_fz
eip:
  tenant: jkzl
#总部统一网关接口参数配置
service-gateway:
  url: http://service.yihu.com:8085/WSGW/rest
  handlerId: 50871
  clientId: 9000401
  clientVersion: 1.0
---
spring:
  profiles: prod_sr
eip:
  tenant: jkzl
#总部统一网关接口参数配置
service-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
  handlerId: 50641
  clientId: 9000401
  clientVersion: 1.0
---
spring:
  profiles: prod_fzzy
eip:
  tenant: jkzl
  profiles: prod_fzzy

+ 3 - 16
ag-ehr-cloud.yml

@ -40,6 +40,8 @@ zuul:
      path: /api/v1.0/health_profiles/**
      serviceId: svr-health-profile
      stripPrefix: false
eip:
  tenant: jkzl
---
spring:
@ -56,9 +58,6 @@ spring:
      statsd:
        host: 172.19.103.73
        port: 8125
eip:
  tenant: jkzl
#server:
#  ssl:
#    key-store-password: 123456
@ -80,8 +79,6 @@ spring:
      statsd:
        host: 192.168.1.221
        port: 8125
eip:
  tenant: jkzl
---
spring:
@ -98,8 +95,6 @@ spring:
      statsd:
        host: 172.19.103.73
        port: 8125
eip:
  tenant: jkzl
---
spring:
@ -115,8 +110,6 @@ spring:
      statsd:
        host: 11.1.2.5
        port: 8125
eip:
  tenant: jkzl
---
spring:
@ -132,8 +125,6 @@ spring:
      statsd:
        host: 11.1.2.5
        port: 8125
eip:
  tenant: jkzl
---
spring:
@ -149,8 +140,6 @@ spring:
      statsd:
        host: 10.176.97.10
        port: 8125
eip:
  tenant: jkzl
---
spring:
@ -165,6 +154,4 @@ spring:
    export:
      statsd:
        host: 100.100.1.162
        port: 8125
eip:
  tenant: jkzl
        port: 8125

+ 4 - 14
ag-portal-cloud.yml

@ -31,44 +31,34 @@ spring:
  ignoreUrls:
    /api/v1.0/portal/oauth/login;/api/v1.0/portal/oauth/accessToken;/api/v1.0/portal/oauth/refreshToken;/api/v1.0/portal/oauth/validToken;/api/v1.0/portal/portalResourcesTop;/api/v1.0/portal/portalResources
eip:
  tenant: jkzl
---
spring:
  profiles: dev
eip:
  tenant: jkzl
---
spring:
  profiles: alpha
eip:
  tenant: jkzl
---
spring:
  profiles: test
eip:
  tenant: jkzl
---
spring:
  profiles: prod
eip:
  tenant: jkzl
---
spring:
  profiles: prod_fz
eip:
  tenant: jkzl
---
spring:
  profiles: prod_sr
eip:
  tenant: jkzl
---
spring:
  profiles: prod_fzzy
eip:
  tenant: jkzl

+ 24 - 1
application.yml

@ -1,3 +1,12 @@
#log level
logging:
  level:
    org:
      apache:
        zookeeper: WARN
        hadoop: WARN
      hibernate: ERROR
#set max http header size
server:
  tomcat:
@ -11,13 +20,24 @@ deploy:
default:
  password: 123456
#Actuator
management:
  security:
    enabled: false
#Hystrix
hystrix:
  command:
    default:
      execution:
        isolation:
          thread:
            timeoutInMilliseconds: 3000000
            timeoutInMilliseconds: 300000
#Ribbon
ribbon:
  ReadTimeout: 300000
  ConnectTimeout: 5000
#Application error definition, this file define common errors,
#if the error is used only in your application, please define it in your application configuration file.
@ -99,6 +119,8 @@ eureka:
  client:
    serviceUrl:
      defaultZone: http://${eureka-server-ip}/eureka/
    healthcheck:
      enabled: false
---
spring:
@ -113,6 +135,7 @@ eureka:
#eureka-server-ip: 127.0.0.1:8761
#eureka-server-ip: 192.168.1.221:8761
eureka-server-ip: 172.19.103.73:8761
#eureka-server-ip: 172.19.103.58:8761
#eureka-server-ip: 172.19.103.33:8761
---

+ 2 - 2
hos-admin.yml

@ -16,7 +16,7 @@ spring:
  profiles: dev
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.19.103.57:8066/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    url: jdbc:mysql://172.19.103.57:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: 123456
    test-on-borrow: true
@ -65,7 +65,7 @@ spring:
  profiles: test
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.19.103.57:8066/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    url: jdbc:mysql://172.19.103.57:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: 123456
    test-on-borrow: true

+ 8 - 44
svr-dfs.yml

@ -1,24 +1,11 @@
logging:
  level:
    org:
      springframework:
        web: INFO
      hibernate: ERROR
    com:
      yihu:
        ehr: WARN
server:
  port: ${svr-dfs.server.port}
management:
  port: ${server.port}
info:
  app:
    name: svr-dfs
    description: Ehr Platform Distributed File System Service.
    version: 1.0.0
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 5
    max-idle: 2
    min-idle: 2
    validation-query: SELECT 1
    test-on-borrow: true
fast-dfs:
  connect-timeout: 2
@ -38,15 +25,6 @@ fast-dfs:
    name: dfs #ES索引名称
    type: info #ES索引类型
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 5
    max-idle: 2
    min-idle: 2
    validation-query: SELECT 1
    test-on-borrow: true
elasticsearch:
  pool:
    init-size: 5
@ -66,20 +44,6 @@ fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80
---
spring:
  profiles: test

+ 50 - 53
svr-ehr-basic.yml

@ -1,19 +1,6 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
server:
  port: ${svr-ehr-basic.server.port}
management:
  port: ${server.port}
fast-dfs:
  pool:
    init-size: 5
@ -49,7 +36,8 @@ spring:
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
eip:
  tenant: jkzl
---
spring:
  profiles: dev
@ -65,26 +53,20 @@ spring:
      password: admin
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host: http://172.19.103.68:9200
  tHost: 172.19.103.68:9300
  clusterName: jkzl
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54
eip:
  tenant: jkzl
---
spring:
  profiles: test
@ -100,25 +82,19 @@ spring:
      password: admin
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
eip:
  tenant: jkzl
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host: http://172.19.103.68:9200
  tHost: 172.19.103.68:9300
  clusterName: jkzl
---
spring:
@ -135,12 +111,19 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://172.19.103.68:9200
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host: http://172.19.103.68:9200
  tHost: 172.19.103.68:9300
  clusterName: jkzl
---
spring:
@ -157,12 +140,19 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://10.176.97.7:9200
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
eip:
  tenant: jkzl
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host: http://10.176.97.7:9200
  tHost: 10.176.97.7:9300
  clusterName: jkzl
---
spring:
@ -179,9 +169,16 @@ spring:
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
  elasticsearch:
    jest:
      uris: http://100.100.1.158:9200
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
eip:
  tenant: jkzl
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host: http://100.100.1.158:9200
  tHost: 100.100.1.158:9300
  clusterName: jkzl

+ 5 - 81
svr-health-profile.yml

@ -1,33 +1,16 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    #host: 172.19.103.47 # Redis server host.
    port: 6379 # Redis server port.
    password: # Login password of the redis server.
    timeout: 0 # Connection timeout in milliseconds.
    #sentinel:
    #  master: # Name of Redis server.
    #  nodes: # Comma-separated list of host:port pairs.
    pool:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
  # SOLR (SolrProperties)
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 20
@ -35,17 +18,17 @@ spring:
    min-idle: 8
    validation-query: SELECT 1
    test-on-borrow: true
  application:
    id: JKZL
fast-dfs:
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  connect-timeout: 2
  network-timeout: 30
  charset: ISO8859-1
  http:
    tracker-http-port: 80
    anti-steal-token: no
@ -57,6 +40,9 @@ cda-document-type-options:
    - "0": 0dae00065684c9920dc35654490aa9ac   # 门诊
    - "1": 0dae00065684cb220dc35654490aa9ae   # 住院
eip:
  tenant: jkzl
---
spring:
  profiles: dev
@ -68,37 +54,13 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  application:
    id: JKZL
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
  application:
    id: JKZL
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80
eip:
  tenant: jkzl
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
@ -107,33 +69,9 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  application:
    id: JKZL
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
  application:
    id: JKZL
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
eip:
  tenant: jkzl
---
spring:
@ -146,13 +84,9 @@ spring:
    host: 11.1.2.22 # Redis server host.
    port: 6390
    password: Kb6wKDQP1W4
  application:
    id: JKZL
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl
---
spring:
@ -165,14 +99,9 @@ spring:
    host: 10.176.97.5 # Redis server host.
    port: 6390
    password: q4YaQemf
  application:
    id: JKZL
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
eip:
  tenant: jkzl
---
spring:
@ -185,11 +114,6 @@ spring:
    host: 100.100.1.161 # Redis server host.
    port: 6390
    password: q4YaQemf
  application:
    id: JKZL
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
eip:
  tenant: jkzl

+ 4 - 77
svr-pack-analyze.yml

@ -1,24 +1,8 @@
server:
  port: ${svr-pack-analyzer.server.port}
management:
  port: ${server.port}
elasticsearch:
  pool:
    init-size: 5
    max-size: 10
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
      apache: ERROR
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
@ -30,7 +14,6 @@ spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    timeout: 0 # Connection timeout in milliseconds.
    #sentinel:
    #  master: # Name of Redis server.
@ -100,34 +83,6 @@ hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: alpha
  # Mysql
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # 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.
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: test
@ -137,6 +92,8 @@ spring:
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
@ -147,44 +104,14 @@ spring:
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  public-server: http://172.19.103.52
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
  cluster-nodes: 172.19.103.9:9300
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
  redis:
    host: 11.1.2.20 # Redis server host.
  data:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.hde.jkzlehr.com,node2.hde.jkzlehr.com,node3.hde.jkzlehr.com:2181/solr
  metrics:
    export:
      statsd:
        host: localhost
        port: 8125
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.17.110.17:9300
hadoop:
  hbase-properties:
    #- hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    hbase.zookeeper.quorum: node1,node2,node3
---
spring:
  profiles: prod_fz

+ 6 - 77
svr-pack-mgr.yml

@ -1,18 +1,8 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
fast-dfs:
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  connect-timeout: 2
  network-timeout: 30
  charset: ISO8859-1
@ -25,19 +15,15 @@ spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    password: # Login password of the redis server.
    timeout: 0 # Connection timeout in milliseconds.
    #sentinel:
    #  master: # Name of Redis server.
    #  nodes: # Comma-separated list of host:port pairs.
    
    pool:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 20
@ -45,59 +31,29 @@ spring:
    min-idle: 8
    validation-query: SELECT 1
    test-on-borrow: true
eip:
  tenant: jkzl
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # Redis server host.
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
eip:
  tenant: jkzl
---
spring:
@ -113,31 +69,11 @@ spring:
  metrics:
    export:
      statsd:
        host: 172.19.103.73
        host: 192.168.1.221
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
  redis:
    host: 11.1.2.20 # Redis server host.
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
eip:
  tenant: jkzl
---
spring:
@ -153,8 +89,6 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl
---
spring:
@ -170,8 +104,6 @@ spring:
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
eip:
  tenant: jkzl
---
spring:
@ -186,7 +118,4 @@ spring:
    password: q4YaQemf
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
eip:
  tenant: jkzl
  public-server: http://100.100.1.157:8888

+ 2 - 146
svr-pack-resolve.yml

@ -1,19 +1,3 @@
server:
  port: ${svr-pack-resolve.server.port}
management:
  port: ${server.port}
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
      apache: ERROR
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
@ -61,78 +45,6 @@ hadoop:
  user:
    name: root
ehr:
  # 档案包数据提取器参数,从数据集中提取摘要、事件时间与身份标识
  pack-extractor:
    # 事件提取参数,用于生成事件摘要
    # 门诊从“门诊摘要”与“挂号”数据集提取事件
    # 住院从“病人摘要”,“入院记录”与“病案首页”提取事件    Clinic 0门诊 Resident 1住院  MedicalExam 2体检
    event:
      data-sets:
        - HDSC01_02: Clinic #门诊-挂号 v1.0
        - HDSD00_85: Clinic #门诊-挂号 v1.3
        - HDSD00_72: Clinic #门诊-症状 v1.3
        - HDSB03_10: Clinic #门诊-传染病报告卡信息 v1.3
        - HDSC02_09: Resident #住院-入院记录 v1.0
        - HDSC02_01: Resident #检验-报告单 v1.0
        - HDSC02_02: Resident #检验-图片报告单 v1.0
        - HDSD00_13: Resident #住院-入院记录 v1.3
        - HDSD00_77: Resident #检验-报告单 v1.3
        - HDSD00_76: Resident #检验-图片报告单 v1.3
        - HDSB05_03: MedicalExam #体检-登记信息 v1.3
      meta-data:
        - HDSD00_01_457 #就诊日期时间 v.1.0 & v.13
        - HDSD00_01_575 #入院日期时间 v1.0
        - HDSD00_13_057 #入院日期时间 v1.3
        - HDSB05_03_011 #体检日期 v1.3
    #诊断信息
    diagnosis:
      data-sets:
        - HDSC01_03 #门诊-诊断记录 v1.0
        - HDSD00_73 #门诊-诊断记录 v1.3
        - HDSC02_17 #住院-诊断记录 v1.0
        - HDSD00_69 #住院-诊断记录 v1.3
        - HDSB05_84 #体检-诊断记录 v1.3
      meta-data:
        - HDSD00_01_550 #门诊-疾病临床诊断在特定分类体系中的代码 v1.0(住院代码相同) & v1.3
        - HDSD00_69_002 #住院-疾病临床诊断在特定分类体系中的代码 v1.3
        - JDSB05_84_003 #体检-疾病临床诊断在特定分类体系中的代码 v1.3
    # 身份提取参数,从人口学提取
    identity:
      data-sets:
        - HDSA00_01  #人口学信息 v1.0 & v1.3
      meta-data:
        id-card-no: HDSA00_01_017     # 身份标识
        id-card-type: HDSA00_01_016   # 身份类型
        patient-name: HDSA00_01_009  # 姓名  HDSD00_01_002
    # 卡提取参数,从就诊摘要提取
    card:
      data-sets:
        - HDSD00_85: 门诊-挂号 #v1.3
        - HDSD00_13: 住院-入院记录 #v1.3
        - HDSC01_02: 门诊-挂号 #v1.0
        - HDSC02_09: 住院-入院记录 #v1.0
      meta-data:
        - card-no: JDSD00_85_005 #就诊卡号 CARD_NO
        - card-type: JDSD00_85_006  #就诊卡类型 CARD_TYPE
  eventIndex: #病人事件索引信息
    patientId:
      - JDSA00_01_001 #v1.3
      - PATIENT_ID
    eventNo:
      - HDSD00_02_040 # 门(急)诊号 v1.3
      - HDSD00_02_066 # 住院号 v1.3
      - HDSD03_01_031
      - HDSD00_01_579 #会诊记录表编号
      - EVENT_NO
    eventTime:
      - HDSD00_01_457 #就诊日期时间 v1.0 & v1.3
      - HDSD00_16_031 #入院时间 v1.0
      - HDSD00_13_057 #入院日期时间 v1.3
      - HDSD00_01_185 #出院日期 v1.0
      - HDSD00_16_005 #出院日期时间 v1.3
#error code and message
resolve:
  job:
    init-size: 4 #解析入库初始任务数
@ -168,36 +80,10 @@ hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: alpha
  # Mysql
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # 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.
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: test
  # Mysql
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
@ -212,7 +98,7 @@ spring:
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        host: 172.19.103.73
        port: 8125
fast-dfs:
@ -223,36 +109,6 @@ hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
  redis:
    host: 11.1.2.20 # Redis server host.
  data:
    solr:
      host: http://172.19.103.10:8983/solr # Solr host. Ignored if "zk-host" is set.
      #zk-host: node1,node2,node3:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.hde.jkzlehr.com,node2.hde.jkzlehr.com,node3.hde.jkzlehr.com:2181/solr
  metrics:
    export:
      statsd:
        host: localhost
        port: 8125
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
hadoop:
  hbase-properties:
    #- hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
    hbase.zookeeper.quorum: node1,node2,node3
---
spring:
  profiles: prod_fz

+ 40 - 39
svr-quota.yml

@ -1,18 +1,3 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
server:
  port: ${svr-quota.server.port}
management:
  port: ${server.port}
spring:
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
@ -22,54 +7,61 @@ spring:
    validation-query: SELECT 1
    test-on-borrow: true
elasticsearch:
  pool:
    init-size: 5
    max-size: 10
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
    username: chenweishan
    password: chenweishan
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://172.19.103.9:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
    username: chenweishan
    password: chenweishan
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://172.19.103.9:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
---
spring:
  profiles: prod_fz
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  data:
    solr:
      zk-host: node1.ehr.h3c.com,node2.ehr.h3c.com,node3.ehr.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://172.19.103.9:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.19.103.9:9300
---
spring:
@ -78,11 +70,15 @@ spring:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  data:
    solr:
      zk-host: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://10.176.97.7:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 10.176.97.7:9300
---
spring:
@ -91,7 +87,12 @@ spring:
    url: jdbc:mysql://100.100.1.159:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com,node4.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  elasticsearch:
    jest:
      uris: http://100.100.1.158:9200
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 100.100.1.158:9300

+ 0 - 52
svr-redis-memory.yml

@ -1,29 +1,16 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    timeout: 0 # Connection timeout in milliseconds.
    #sentinel:
    #  master: # Name of Redis server.
    #  nodes: # Comma-separated list of host:port pairs.
    pool:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 20
@ -32,7 +19,6 @@ spring:
    validation-query: SELECT 1
    test-on-borrow: true
---
spring:
  profiles: dev
@ -53,25 +39,6 @@ ehr-redis:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # Redis server host.
ehr-redis:
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv
---
spring:
  profiles: test
@ -90,25 +57,6 @@ ehr-redis:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv
---
spring:
  profiles: prod
  redis:
    host: 11.1.2.20 # Redis server host.
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
ehr-redis:
  cache:
    memory:
      rdbFilePath: /usr/local/bin/dump.rdb
      outFilePath: /home/ehr/redisReport/memory.csv
---
spring:
  profiles: prod_fz

+ 3 - 79
svr-redis.yml

@ -1,30 +1,17 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    #password:  # Login password of the redis server.
    timeout: 0 # Connection timeout in milliseconds.
    #sentinel:
    #  master: # Name of Redis server.
    #  nodes: # Comma-separated list of host:port pairs.
    pool:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 20
@ -33,7 +20,6 @@ spring:
    validation-query: SELECT 1
    test-on-borrow: true
fast-dfs:
  pool:
    init-size: 5
@ -50,7 +36,6 @@ fast-dfs:
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
@ -59,90 +44,37 @@ spring:
    host: 172.19.103.47 # Redis server host.
    port: 6379
    password: redis!@456
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  password: ha
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # 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
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
---
spring:
  profiles: test
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
    password:  # Login password of the redis server.
    port: 6379
    password: redis!@456
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
---
spring:
  profiles: prod
  redis:
    host: 11.1.2.20 # Redis server host.
    password:  # Login password of the redis server.
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
  password: ha
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
---
spring:
  profiles: prod_fz
@ -150,7 +82,6 @@ spring:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 11.1.2.22 # Redis server host.
    port: 6390
@ -158,14 +89,12 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
---
spring:
  profiles: prod_sr
@ -173,7 +102,6 @@ spring:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 10.176.97.5 # Redis server host.
    port: 6390
@ -181,14 +109,12 @@ spring:
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
ehr-redis:
  mq:
    pubsub:
      publisherAppId: svr-redis
      responseTimeChannel: redis.cache.reponse-time
---
spring:
  profiles: prod_fzzy
@ -196,7 +122,6 @@ spring:
    url: jdbc:mysql://100.100.1.159:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 100.100.1.161 # Redis server host.
    port: 6390
@ -204,7 +129,6 @@ spring:
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
ehr-redis:
  mq:
    pubsub:

+ 12 - 61
svr-resource.yml

@ -1,12 +1,3 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
hadoop:
  hbase-properties:
    hbase.zookeeper.property.clientPort: 2181
@ -15,6 +6,15 @@ hadoop:
    name: root
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    timeout: 0 # Connection timeout in milliseconds.
    pool:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 20
@ -23,6 +23,9 @@ spring:
    validation-query: SELECT 1
    test-on-borrow: true
eip:
  tenant: jkzl
---
spring:
  profiles: dev
@ -44,26 +47,6 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # 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.
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
eip:
  tenant: jkzl
---
spring:
@ -86,31 +69,6 @@ hadoop:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
  redis:
    host: 11.1.2.20 # Redis server host.
  data:
    solr:
      #zk-host: 11.1.2.51,11.1.2.52,11.1.2.53:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.hde.jkzlehr.com,node2.hde.jkzlehr.com,node3.hde.jkzlehr.com:2181/solr
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node2.jkzl.com,node3.jkzl.com,node1.jkzl.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
@ -134,8 +92,6 @@ hadoop:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl
---
spring:
@ -159,9 +115,6 @@ hadoop:
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
eip:
  tenant: jkzl
---
spring:
@ -185,5 +138,3 @@ hadoop:
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
eip:
  tenant: jkzl

+ 3 - 8
svr-security.yml

@ -15,6 +15,8 @@ spring:
    min-idle: 8
    validation-query: SELECT 1
    test-on-borrow: true
eip:
  tenant: jkzl
---
spring:
@ -24,8 +26,7 @@ spring:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
eip:
  tenant: jkzl
---
spring:
@ -35,8 +36,6 @@ spring:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
eip:
  tenant: jkzl
---
spring:
@ -46,8 +45,6 @@ spring:
    url: jdbc:mysql://172.19.103.38:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: cloud
    password: cloud
eip:
  tenant: jkzl
---
spring:
@ -57,5 +54,3 @@ spring:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm
eip:
  tenant: jkzl

+ 7 - 67
svr-standard.yml

@ -1,12 +1,3 @@
logging:
  level:
    com:
      netflix: INFO
    org:
      springframework:
        web: INFO
      hibernate: ERROR
      
common.query.not.found: 该{0}不存在:{1}
common.miss.parameter: 参数不能为空:{0}!
common.notfound.entity: 没有找到{0}实体:{}
@ -20,7 +11,6 @@ fast-dfs:
  connect-timeout: 2
  network-timeout: 30
  charset: ISO8859-1
  http:
    tracker-http-port: 80
    anti-steal-token: no
@ -30,24 +20,15 @@ spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    password: # Login password of the redis server.
    timeout: 0 # Connection timeout in milliseconds.
    #sentinel:
    #  master: # Name of Redis server.
    #  nodes: # Comma-separated list of host:port pairs.
    
    pool:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
  # SOLR (SolrProperties)
  data:
    solr:
      repositories.enabled: true # Enable Solr repositories.
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 20
@ -55,6 +36,13 @@ spring:
    min-idle: 8
    validation-query: SELECT 1
    test-on-borrow: true
  # SOLR (SolrProperties)
  data:
    solr:
      repositories.enabled: true # Enable Solr repositories.
eip:
  tenant: jkzl
---
spring:
@ -73,28 +61,6 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: alpha
  datasource:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: ha
  redis:
    host: 192.168.1.220 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
eip:
  tenant: jkzl
  
---
spring:
@ -113,26 +79,6 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
eip:
  tenant: jkzl
---
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: ha
    password: jkzlxm
  redis:
    host: 11.1.2.20 # Redis server host.
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
eip:
  tenant: jkzl
---
spring:
@ -148,8 +94,6 @@ spring:
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://11.1.2.9:80
eip:
  tenant: jkzl
---
spring:
@ -165,8 +109,6 @@ spring:
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:8888
eip:
  tenant: jkzl
---
spring:
@ -182,5 +124,3 @@ spring:
fast-dfs:
  tracker-server: 100.100.1.157:22122
  public-server: http://100.100.1.157:8888
eip:
  tenant: jkzl