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

svr-adaption.yml

@@ -45,7 +45,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.54:22122
  public-server: http://172.19.103.13:22122
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8

svr-standard.yml

@@ -37,7 +37,7 @@ hibernate:
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-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,7 +49,7 @@ spring:
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-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