Browse Source

增加全局选项,屏蔽网卡

Sand Wen 9 years ago
parent
commit
ca4a115a66
16 changed files with 178 additions and 82 deletions
  1. 5 1
      ag-admin.yml
  2. 5 0
      ag-ehr-platform.yml
  3. 9 10
      application.yml
  4. 5 0
      svr-adaption.yml
  5. 5 0
      svr-app.yml
  6. 5 0
      svr-dict.yml
  7. 5 0
      svr-esb.yml
  8. 5 0
      svr-geography.yml
  9. 50 32
      svr-health-profiles.yml
  10. 6 1
      svr-org.yml
  11. 5 0
      svr-pack-mgr.yml
  12. 52 37
      svr-pack-resolve.yml
  13. 5 0
      svr-patient.yml
  14. 5 0
      svr-security.yml
  15. 5 0
      svr-standard.yml
  16. 6 1
      svr-user.yml

+ 5 - 1
ag-admin.yml

@ -1,4 +1,8 @@
logging:
  level:
    com:
      netflix: INFO
      
---
spring:
  profiles: dev

+ 5 - 0
ag-ehr-platform.yml

@ -3,6 +3,11 @@ zuul:
  routes:
    - /esb/**
    
logging:
  level:
    com:
      netflix: DEBUG
      
---
spring:
  profiles: dev

+ 9 - 10
application.yml

@ -1,5 +1,5 @@
#服务端口,以10100开始,每个服务间隔为10,若有新服务,请更新最大端口号。当前最大:10180
#Application port, since 10100, 10 per step. Update max port if new application created. Current max: 10180
svr-adaption.server.port: 10150
svr-app.server.port: 10160
svr-dict.server.port: 10050
@ -17,19 +17,21 @@ svr-user.server.port: 10120
ag-ehr-platform.server.port: 443
ag-admin.server.port: 10000
#错误消息
#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.
ehr.common.invalid.parameter: 参数解析错误
ehr.common.query.not.found: 不存在该对象
ehr.common.repeat.code: 代码重复
#应用部署所在区域
#The region code, where application deployed
deploy:
  region: 3502
#用户默认密码
#EHR platform user default password
default:
  password: 123456
#Application acuator
endpoints:
  restart:
    enabled: true
@ -38,12 +40,13 @@ endpoints:
  health:
    sensitive: false
#JPA config for MySQL
spring:
  jpa:
    database-platform: org.hibernate.dialect.MySQL5Dialect
    hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
  #屏蔽虚拟网卡IP
  #block the inet address of nic, virtual card and so on. Need spring version: Brixton M5
  cloud:
    inetutils:
      ignoredInterfaces:
@ -51,11 +54,7 @@ spring:
        - veth.*
        - vmnet.*
logging:
  level:
    com:
      netflix: DEBUG
#Each application use ip to register it in eureka, eureka host is defined in "eureka-server-ip"
eureka:
  instance:
    prefer-ip-address: true

+ 5 - 0
svr-adaption.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1

+ 5 - 0
svr-app.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1

+ 5 - 0
svr-dict.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1

+ 5 - 0
svr-esb.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1

+ 5 - 0
svr-geography.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1

+ 50 - 32
svr-health-profiles.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1
@ -8,63 +13,76 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
redis:
  pool:
    max-total: 10
    max-idle: 5
    min-idle: 3
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    host: localhost # 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:
  zkClientTimeout: 10000
  zkConnectTimeout: 10000
  # SOLR (SolrProperties)
  data:
    solr:
      repositories.enabled: true # Enable Solr repositories.
---
spring:
  profiles: dev
  redis:
    host: 172.19.103.47 # Redis server host.
  data:
    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.
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
redis:
  connection-factory:
    host-name: 172.19.103.47
solr:
  server: http://172.19.103.10:8983/solr
  zookeeper: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr
---
spring:
  profiles: test
  redis:
    host: 172.17.110.68 # Redis server host.
  data:
    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.
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
redis:
  connection-factory:
    host-name: 172.17.110.68
solr:
  server: http://172.19.103.10:8983/solr
  zookeeper: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr
---
spring:
  profiles: prod
  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: 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.
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  password: jkzlxm
redis:
  connection-factory:
    host-name: 11.1.2.20
solr:
  server: http://172.19.103.10:8983/solr
  zookeeper: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr

+ 6 - 1
svr-org.yml

@ -1,4 +1,9 @@
data-source:
logging:
  level:
    com:
      netflix: DEBUG
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1
  max-total: 20

+ 5 - 0
svr-pack-mgr.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1

+ 52 - 37
svr-pack-resolve.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1
@ -8,14 +13,28 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
redis:
  connection-factory:
    port: 6379
  pool:
    max-total: 10
    max-idle: 5
    min-idle: 3
spring:
  # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    host: localhost # 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)
  data:
    solr:
      repositories.enabled: true # Enable Solr repositories.
fast-dfs:
  pool:
@ -33,10 +52,6 @@ fast-dfs:
    anti-steal-token: no
    secret-key: FastDFS1234567890
solr:
  zkClientTimeout: 10000
  zkConnectTimeout: 10000
profile:
  data-buffer-size: 200   # 记录缓冲区数量
@ -46,58 +61,58 @@ profile:
spring:
  profiles: dev
  redis:
    host: 172.19.103.47 # Redis server host.
  data:
    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.
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
redis:
  connection-factory:
    host-name: 172.19.103.47
fast-dfs:
  tracker-server: 172.19.103.54:22122
solr:
  server: http://172.19.103.10:8983/solr
  zookeeper: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr
---
spring:
  profiles: test
  redis:
    host: 172.17.110.68 # Redis server host.
  data:
    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.
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
redis:
  connection-factory:
    host-name: 172.17.110.68
fast-dfs:
  tracker-server: 172.19.103.13:22122
solr:
  server: http://172.19.103.10:8983/solr
  zookeeper: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr
---
spring:
  profiles: prod
  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: 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.
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  password: jkzlxm
redis:
  connection-factory:
    host-name: 11.1.2.20
fast-dfs:
  tracker-server: 11.1.2.9:22122
solr:
  server: http://172.19.103.10:8983/solr
  zookeeper: host-172-17-110-23,host-172-17-110-27,host-172-17-110-26:2181/solr
  tracker-server: 11.1.2.9:22122

+ 5 - 0
svr-patient.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1

+ 5 - 0
svr-security.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1

+ 5 - 0
svr-standard.yml

@ -1,3 +1,8 @@
logging:
  level:
    com:
      netflix: DEBUG
      
common.query.not.found: 该{0}不存在:{1}
common.miss.parameter: 参数不能为空:{0}!
common.notfound.entity: 没有找到{0}实体:{}

+ 6 - 1
svr-user.yml

@ -1,4 +1,9 @@
data-source:
logging:
  level:
    com:
      netflix: DEBUG
      
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1
  max-total: 20