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

application.yml

@@ -1,97 +1,43 @@
logging:
  level:
    com:
      netflix: DEBUG
spring:
  jpa:
    database-platform: org.hibernate.dialect.MySQL5Dialect
    hibernate:
      dialect: org.hibernate.dialect.MySQL5Dialect
quartz:
  auto-startup: false
    hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
#应用部署所在区域
deploy:
  region: 3502
#服务端口，以10100开始，每个服务间隔为10，当前最大：10180
svr-adaption.ribbon.listOfServers:           ${servers.server1}:10150
svr-app.ribbon.listOfServers:                 ${servers.server1}:10160
svr-configuration.ribbon.listOfServers:      ${servers.server1}:1221
svr-dict.ribbon.listOfServers:                ${servers.server1}:10050
svr-discovelry.ribbon.listOfServers:         ${servers.server1}:8761
svr-esb.ribbon.listOfServers:                 ${servers.server1}:10130
svr-geography.ribbon.listOfServers:          ${servers.server1}:10090
svr-health-profiles.ribbon.listOfServers:   ${servers.server1}:9009
svr-organization.ribbon.listOfServers:       ${servers.server1}:10070
svr-pack-mgr.ribbon.listOfServers:           ${servers.server1}:10140
svr-pack-resolve.ribbon.listOfServers:      ${servers.server1}:10170
svr-patient.ribbon.listOfServers:            ${servers.server1}:10100
svr-security.ribbon.listOfServers:           ${servers.server1}:10110
svr-special-dict.ribbon.listOfServers:      ${servers.server1}:10180
svr-standard.ribbon.listOfServers:           ${servers.server1}:10040
svr-user.ribbon.listOfServers:               ${servers.server1}:10120
---
spring:
  profiles: dev
micro:
  service:
    adaption:
      address-str: http://localhost
      port: 10150
    app:
      address-str: http://localhost
      port: 10160
    dict:
      address-str: http://localhost
      port: 10050
    esb:
      address-str: http://localhost
      port: 10130
    geography:
      address-str: http://localhost
      port: 10090
    organization:
      address-str: http://localhost
      port: 10070
    package:
      address-str: http://localhost
      port: 6010
    patient:
      address-str: http://localhost
      port: 10100
    security:
      address-str: http://localhost
      port: 10110
    standard:
      address-str: http://localhost
      port: 10040
    user:
      address-str: http://localhost
      port: 10120
---
spring:
  profiles: test
micro:
  service:
    adaption:
      address-str: http://172.19.103.73
      port: 10150
    app:
      address-str: http://172.19.103.73
      port: 10160
    dict:
      address-str: http://172.19.103.74
      port: 10050
    esb:
      address-str: http://172.19.103.74
      port: 10130
    geography:
      address-str: http://172.19.103.74
      port: 10090
    organization:
      address-str: http://172.19.103.74
      port: 10070
    package:
      address-str: http://172.19.103.74
      port: 6010
    patient:
      address-str: http://172.19.103.75
      port: 10100
    security:
      address-str: http://172.19.103.75
      port: 10110
    standard:
      address-str: http://172.19.103.75
      port: 10040
    user:
      address-str: http://172.19.103.75
      port: 10120
---
spring:
  profiles: prod

svr-adaption.yml

@@ -26,16 +26,13 @@ fast-dfs:
    anti-steal-token: no
    secret-key: FastDFS1234567890
---
spring:
  profiles: dev
hibernate:
  show-sql: true
  format-sql: true
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:22122
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
@@ -45,33 +42,26 @@ data-source:
---
spring:
  profiles: test
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.54:22122
data-source:
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: weifuwu
  password: weifuwu
hibernate:
  show-sql: true
  format-sql: true
---
spring:
  profiles: prod
hibernate:
  show-sql: true
  format-sql: true
fast-dfs:
  tracker-server: 11.1.2.9:22122
  public-server: http://ds.ehr.yihu.com:22122
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: jkzlxm

svr-org.yml

@@ -1,5 +1,4 @@

data-source:
data-source:
  driver-class-name: com.mysql.jdbc.Driver
  initialize-size: 1
  max-total: 20
@@ -9,10 +8,6 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
---
spring:
  profiles: dev
@@ -22,11 +17,6 @@ data-source:
  user-name: ha
  password: ha
hibernate:
  show-sql: true
  format-sql: true
---
spring:
  profiles: test
@@ -36,20 +26,10 @@ data-source:
  user-name: weifuwu
  password: weifuwu
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: true
      format-sql: true
---
spring:
  profiles: prod
hibernate:
  show-sql: true
  format-sql: true
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha

svr-pack-mgr.yml

@@ -8,9 +8,6 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
fast-dfs:
  pool:
    init-size: 5
@@ -28,7 +25,6 @@ fast-dfs:
    anti-steal-token: no
    secret-key: FastDFS1234567890
---
spring:
  profiles: dev
@@ -38,14 +34,10 @@ data-source:
  user-name: ha
  password: ha
hibernate:
  show-sql: true
  format-sql: true
fast-dfs:
  tracker-server: 172.19.103.54:22122
---
spring:
  profiles: test
@@ -55,21 +47,13 @@ data-source:
  user-name: weifuwu
  password: weifuwu
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: true
      format-sql: true
fast-dfs:
  tracker-server: 172.19.103.13:22122
---
spring:
  profiles: prod
hibernate:
  show-sql: true
  format-sql: true
fast-dfs:
  tracker-server: 11.1.2.9:22122
@@ -77,4 +61,3 @@ data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: jkzlxm

svr-pack-resolve.yml

@@ -8,9 +8,6 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
redis:
  connection-factory:
    port: 6379
@@ -54,10 +51,6 @@ data-source:
  user-name: ha
  password: ha
hibernate:
  show-sql: true
  format-sql: true
redis:
  connection-factory:
    host-name: 172.19.103.47
@@ -78,12 +71,6 @@ data-source:
  username: fujian
  password: fujian
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: true
      format-sql: true
redis:
  connection-factory:
    host-name: 172.17.110.68
@@ -104,12 +91,6 @@ data-source:
  username: ha
  password: jkzlxm
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: false
      format-sql: false
redis:
  connection-factory:
    host-name: 11.1.2.20

svr-patient.yml

@@ -8,9 +8,6 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
fast-dfs:
  pool:
    init-size: 5
@@ -27,7 +24,6 @@ fast-dfs:
    anti-steal-token: no
    secret-key: FastDFS1234567890
---
spring:
  profiles: dev
@@ -37,11 +33,6 @@ data-source:
  user-name: ha
  password: ha
hibernate:
  show-sql: true
  format-sql: true
---
spring:
  profiles: test
@@ -51,19 +42,10 @@ data-source:
  user-name: weifuwu
  password: weifuwu
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: true
      format-sql: true
---
spring:
  profiles: prod
hibernate:
  show-sql: true
  format-sql: true
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha

svr-profile-browser.yml

@@ -8,9 +8,6 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
redis:
  pool:
    max-total: 10
@@ -23,7 +20,6 @@ solr:
#error code and message
---
spring:
  profiles: dev
@@ -33,10 +29,6 @@ data-source:
  user-name: ha
  password: ha
hibernate:
  show_sql: true
  format_sql: true
redis:
  connection-factory:
    host-name: 172.19.103.47
@@ -54,10 +46,6 @@ data-source:
  username: fujian
  password: fujian
hibernate:
  show_sql: true
  format_sql: true
redis:
  connection-factory:
    host-name: 172.17.110.68
@@ -75,10 +63,6 @@ data-source:
  username: ha
  password: jkzlxm
hibernate:
  show_sql: false
  format_sql: false
redis:
  connection-factory:
    host-name: 11.1.2.20

svr-resources.yml

@@ -1,13 +0,0 @@
---
spring:
  profiles: dev
---
spring:
  profiles: test
---
spring:
  profiles: prod

svr-security.yml

@@ -11,7 +11,6 @@ data-source:
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
---
spring:
  profiles: dev
@@ -21,11 +20,6 @@ data-source:
  user-name: ha
  password: ha
hibernate:
  show-sql: true
  format-sql: true
---
spring:
  profiles: test
@@ -35,20 +29,10 @@ data-source:
  user-name: weifuwu
  password: weifuwu
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: true
      format-sql: true
---
spring:
  profiles: prod
hibernate:
  show-sql: true
  format-sql: true
data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha

svr-standard.yml

@@ -7,6 +7,7 @@ data-source:
  validation-query: SELECT 1
  test-on-borrow: true
  remove-abandoned-timeout: 55
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
@@ -26,13 +27,14 @@ fast-dfs:
    anti-steal-token: no
    secret-key: FastDFS1234567890
---
spring:
  profiles: dev
hibernate:
  show-sql: true
  format-sql: true
fast-dfs:
  tracker-server: 172.19.103.54:22122
@@ -44,6 +46,7 @@ data-source:
---
spring:
  profiles: test
fast-dfs:
  tracker-server: 172.19.103.13:22122
@@ -55,12 +58,15 @@ data-source:
hibernate:
  show-sql: true
  format-sql: true
---
spring:
  profiles: prod
hibernate:
  show-sql: true
  format-sql: true
fast-dfs:
  tracker-server: 11.1.2.9:22122
@@ -68,9 +74,3 @@ data-source:
  url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: jkzlxm

svr-user.yml

@@ -12,10 +12,6 @@ data-source:
  test-on-borrow: true
  remove-abandoned-timeout: 55
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
---
spring:
  profiles: dev
@@ -25,11 +21,6 @@ data-source:
  user-name: ha
  password: ha
hibernate:
  show-sql: true
  format-sql: true
---
spring:
  profiles: test
@@ -39,13 +30,6 @@ data-source:
  user-name: weifuwu
  password: weifuwu
hibernate:
  hibernate-properties:
    hibernate:
      show-sql: true
      format-sql: true
---
spring:
  profiles: prod