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

Conflicts:
	svr-health-profile.yml

ag-ehr-cloud.yml

@@ -46,8 +46,8 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
  thymeleaf:
    cache: false

ag-ehr-platform.yml

@@ -43,15 +43,9 @@ spring:
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        host: 172.19.103.73
        port: 8125
server:
  ssl:
    key-store: C:/Windows/tomcat.keystore
    key-store-password: 123456
    key-password: 123456
---
spring:
  profiles: alpha

application.yml

@@ -104,7 +104,8 @@ eureka:
    prefer-ip-address: false
#eureka-server-ip: 127.0.0.1:8761
eureka-server-ip: 192.168.1.221:8761
#eureka-server-ip: 192.168.1.221:8761
eureka-server-ip: 172.19.103.73:8761
#eureka-server-ip: 172.19.103.33:8761
---

svr-ehr-basic.yml

@@ -55,8 +55,8 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
  data:
    mongodb:
      host: 192.168.1.220
@@ -123,11 +123,11 @@ spring:
  data:
    mongodb:
      host: 192.168.135.41
      port: 27017
      port: 29000
      username: sr_ehr
      password: ehr@#(2^
      authenticationDatabase: admin
      database: wlyy
      database: ehr
fast-dfs:
  tracker-server: 192.168.135.42:22122

svr-health-profile.yml

@@ -61,8 +61,8 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
  application:
    id: JKZL

svr-logCollection.yml

@@ -42,8 +42,8 @@ spring:
  data:
    mongodb:
      host: 192.168.135.41
      port: 27017
      port: 29000
      username: sr_ehr
      password: ehr@#(2^
      authenticationDatabase: admin
      database: wlyy
      database: ehr

svr-pack-mgr.yml

@@ -51,8 +51,8 @@ spring:
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
@@ -105,7 +105,7 @@ spring:
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        host: 172.19.103.73
        port: 8125
fast-dfs:
  tracker-server: 172.19.103.13:22122
@@ -137,6 +137,7 @@ spring:
    password: data!@)1
  redis:
    host: 192.168.135.40 # Redis server host.
    port: 6390
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122

svr-pack-resolve.yml

@@ -139,8 +139,8 @@ spring:
  # Mysql
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
@@ -152,7 +152,7 @@ spring:
  metrics:
    export:
      statsd:
        host: 192.168.1.221
        host: 172.19.103.73
        port: 8125
fast-dfs:
@@ -261,6 +261,7 @@ spring:
    password: data!@)1
  redis:
    host: 192.168.135.40 # Redis server host.
    port: 6390
  data:
    solr:

svr-quota.yml

@@ -27,8 +27,8 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
---
spring:

svr-redis.yml

@@ -53,8 +53,8 @@ spring:
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
    password:  # Login password of the redis server.
@@ -130,6 +130,7 @@ spring:
  redis:
    host: 192.168.135.40 # Redis server host.
    port: 6390
    password: redis!'#'456 # Login password of the redis server.
fast-dfs:

svr-resource.yml

@@ -28,8 +28,8 @@ spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
  data:
@@ -95,6 +95,7 @@ spring:
    password: data!@)1
  redis:
    host: 192.168.135.40 # Redis server host.
    port: 6390
  data:
    solr:
      #zk-host: 11.1.2.51,11.1.2.52,11.1.2.53:2181/solr # ZooKeeper host address in the form HOST:PORT.

svr-standard.yml

@@ -62,8 +62,8 @@ spring:
  datasource:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: chenweishan
    password: chenweishan
    username: weifuwu
    password: weifuwu
  redis:
    host: 172.19.103.47 # Redis server host.
@@ -135,6 +135,7 @@ spring:
    password: data!@)1
  redis:
    host: 192.168.135.40 # Redis server host.
    port: 6390
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122