Merge branch 'dev' of http://192.168.1.220:10080/EHR/ehr.config into dev

svr-dict.yml

@@ -3,6 +3,23 @@ logging:
    com:
      netflix: 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.
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1
@@ -17,6 +34,9 @@ data-source:
spring:
  profiles: dev
  redis:
    host: 192.168.1.220 # Redis server host.
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
@@ -26,6 +46,9 @@ data-source:
spring:
  profiles: test
  redis:
    host: 172.19.103.47 # Redis server host.
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: weifuwu
@@ -35,6 +58,9 @@ data-source:
spring:
  profiles: prod
  redis:
    host: 11.1.2.20 # Redis server host.
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha

svr-special-dict.yml

@@ -3,6 +3,24 @@ logging:
    com:
      netflix: DEBUG
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.
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1
@@ -17,6 +35,9 @@ data-source:
spring:
  profiles: dev
  redis:
    host: 192.168.1.220 # Redis server host.
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
@@ -26,6 +47,9 @@ data-source:
spring:
  profiles: test
  redis:
    host: 172.19.103.47 # Redis server host.
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: weifuwu
@@ -35,6 +59,9 @@ data-source:
spring:
  profiles: prod
  redis:
    host: 11.1.2.20 # Redis server host.
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha