Merge branch 'dev' of linaz/ehr.config into dev

svr-adaption.yml

@@ -41,17 +41,9 @@ data-source:
  user-name: ha
  password: ha
hibernate:
  show-sql: true
  format-sql: true
---
spring:
  profiles: test
hibernate:
  show-sql: true
  format-sql: true
fast-dfs:
  tracker-server: 172.19.103.54:22122
@@ -64,7 +56,6 @@ hibernate:
  show-sql: true
  format-sql: true
---
spring:
  profiles: prod
@@ -79,7 +70,8 @@ data-source:
  user-name: ha
  password: ha
hibernate:
  show-sql: true
  format-sql: true

svr-stdandard.yml

@@ -7,19 +7,19 @@ data-source:
  validation-query: SELECT 1
  test-on-borrow: true
  remove-abandoned-timeout: 55
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
fast-dfs:
  pool:
    init-size: 5
    max-size: 20
    wait-time: 500
  connect-timeout: 2
  network-timeout: 30
  fast-dfs:
    charset: ISO8859-1
  tracker-server: l27.0.0.1
  http:
    tracker-http-port: 80
@@ -27,53 +27,52 @@ fast-dfs:
    secret-key: FastDFS1234567890
---
spring:
  profiles: dev
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  show-sql: true
  format-sql: true
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
  password: ha
---
spring:
  profiles: test
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
  password: ha
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: yuhaihua
  password: yuhaihua
hibernate:
  show-sql: true
  format-sql: true
fast-dfs:
  tracker-server: 172.19.103.54:22122
---
spring:
  profiles: prod
hibernate:
  show-sql: true
  format-sql: true
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
  password: ha
hibernate:
  show-sql: true
  format-sql: true
fast-dfs:
  tracker-server: 172.19.103.54:22122