Merge branch 'dev' of EHR/ehr.config into master

application.yml

@@ -55,7 +55,7 @@ svr-portal.server.port: 10250
svr-file-resource.server.port: 10270
svr-ehr-basic.server.port: 10300
svr-redis.server.port: 10310
svr-logCollection.server.port: 10320
svr-log-collection.server.port: 10320
svr-quota.server.port: 10330
#Application acuator
endpoints:

svr-logCollection.yml

@@ -2,6 +2,12 @@ logging:
  level:
    root: INFO
server:
  port: ${svr-log-collection.server.port}
management:
  port: ${server.port}
kafka:
  broker:
    address: node1.hde.h3c.com:6667,node2.hde.h3c.com:6667