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

.idea/vcs.xml

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
  </component>
</project>

svr-app.yml

@@ -31,9 +31,9 @@ spring:
  profiles: test
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  hibernate-properties:
@@ -47,7 +47,7 @@ spring:
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  user-name: ha
  password: jkzlxm
hibernate:

svr-dict.yml

@@ -31,23 +31,22 @@ spring:
  profiles: test
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: true
      format-sql: true
---
spring:
  profiles: prod
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  user-name: ha
  password: jkzlxm
hibernate:

svr-geography.yml

@@ -31,9 +31,9 @@ spring:
  profiles: test
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  hibernate-properties:
@@ -47,7 +47,7 @@ spring:
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  user-name: ha
  password: jkzlxm
hibernate:

svr-org.yml

@@ -32,9 +32,9 @@ spring:
  profiles: test
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  hibernate-properties:
@@ -48,7 +48,7 @@ spring:
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  user-name: ha
  password: jkzlxm
hibernate:

svr-pack-mgr.yml

@@ -1,13 +1,58 @@
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1
  max-total: 20
  max-idle: 10
  min-idle: 1
  validation-query: SELECT 1
  test-on-borrow: true
  remove-abandoned-timeout: 55
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
---
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
---
spring:
  profiles: test
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: true
      format-sql: true
---
spring:
  profiles: prod
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: jkzlxm
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: false
      format-sql: false

svr-patient.yml

@@ -47,23 +47,22 @@ spring:
  profiles: test
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: true
      format-sql: true
---
spring:
  profiles: prod
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  user-name: ha
  password: jkzlxm
hibernate:

svr-security.yml

@@ -31,9 +31,9 @@ spring:
  profiles: test
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  hibernate-properties:
@@ -47,7 +47,7 @@ spring:
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  user-name: ha
  password: jkzlxm
hibernate:

svr-user.yml

@@ -35,9 +35,9 @@ spring:
  profiles: test
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: fujian
  password: fujian
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
hibernate:
  hibernate-properties:
@@ -51,7 +51,7 @@ spring:
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  username: ha
  user-name: ha
  password: jkzlxm
hibernate: