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

svr-health-profile.yml

@@ -97,8 +97,8 @@ spring:
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: yuhaihua
  password: yuhaihua
  user-name: weifuwu
  password: weifuwu
hadoop:
  hbase-properties:

svr-org.yml

@@ -30,6 +30,20 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
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
    secret-key: FastDFS1234567890
---
spring:
  profiles: dev
@@ -37,6 +51,9 @@ spring:
  redis:
    host: 192.168.1.220 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.54:22122
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
@@ -49,6 +66,9 @@ spring:
  redis:
    host: 172.19.103.47 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.54:22122
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: weifuwu
@@ -61,6 +81,9 @@ spring:
  redis:
    host: 11.1.2.20 # Redis server host.
fast-dfs:
  tracker-server: 172.19.103.54:22122
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha

svr-user.yml

@@ -13,10 +13,26 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
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
    secret-key: FastDFS1234567890
---
spring:
  profiles: dev
fast-dfs:
  tracker-server: 172.19.103.54:22122
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
@@ -26,6 +42,9 @@ data-source:
spring:
  profiles: test
fast-dfs:
  tracker-server: 172.19.103.13:22122
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: weifuwu
@@ -35,7 +54,10 @@ data-source:
spring:
  profiles: prod
fast-dfs:
  tracker-server: 11.1.2.9:22122
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: jkzlxm
  password: jkzlxm