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

ag-admin.yml

@@ -19,12 +19,12 @@ zuul:
    updateHosEsbMiniRelease:
      path: /api/v1.0/esb/updateHosEsbMiniRelease
      serviceId: svr-esb
eip:
  tenant: jkzl
---
spring:
  profiles: dev
eip:
  tenant: jkzl
#总部统一网关接口参数配置
service-gateway:
  url: http://service.yihu.com:8085/WSGW/rest
@@ -35,20 +35,14 @@ service-gateway:
---
spring:
  profiles: test
eip:
  tenant: jkzl
---
spring:
  profiles: prod_fz
eip:
  tenant: jkzl
---
spring:
  profiles: prod_sr
eip:
  tenant: jkzl
#总部统一网关接口参数配置
service-gateway:
  url: http://service.yihu.com:8080/WSGW/rest
@@ -58,6 +52,4 @@ service-gateway:
---
spring:
  profiles: prod_fzzy
eip:
  tenant: jkzl
  profiles: prod_fzzy

ag-ehr-cloud.yml

@@ -40,6 +40,8 @@ zuul:
      path: /api/v1.0/health_profiles/**
      serviceId: svr-health-profile
      stripPrefix: false
eip:
  tenant: jkzl
---
spring:
@@ -56,9 +58,6 @@ spring:
      statsd:
        host: 172.19.103.73
        port: 8125
eip:
  tenant: jkzl
#server:
#  ssl:
#    key-store-password: 123456
@@ -80,8 +79,6 @@ spring:
      statsd:
        host: 192.168.1.221
        port: 8125
eip:
  tenant: jkzl
---
spring:
@@ -98,8 +95,6 @@ spring:
      statsd:
        host: 172.19.103.73
        port: 8125
eip:
  tenant: jkzl
---
spring:
@@ -115,8 +110,6 @@ spring:
      statsd:
        host: 11.1.2.5
        port: 8125
eip:
  tenant: jkzl
---
spring:
@@ -132,8 +125,6 @@ spring:
      statsd:
        host: 11.1.2.5
        port: 8125
eip:
  tenant: jkzl
---
spring:
@@ -149,8 +140,6 @@ spring:
      statsd:
        host: 10.176.97.10
        port: 8125
eip:
  tenant: jkzl
---
spring:
@@ -165,6 +154,4 @@ spring:
    export:
      statsd:
        host: 100.100.1.162
        port: 8125
eip:
  tenant: jkzl
        port: 8125

ag-portal-cloud.yml

@@ -31,44 +31,34 @@ spring:
  ignoreUrls:
    /api/v1.0/portal/oauth/login;/api/v1.0/portal/oauth/accessToken;/api/v1.0/portal/oauth/refreshToken;/api/v1.0/portal/oauth/validToken;/api/v1.0/portal/portalResourcesTop;/api/v1.0/portal/portalResources
eip:
  tenant: jkzl
---
spring:
  profiles: dev
eip:
  tenant: jkzl
---
spring:
  profiles: alpha
eip:
  tenant: jkzl
---
spring:
  profiles: test
eip:
  tenant: jkzl
---
spring:
  profiles: prod
eip:
  tenant: jkzl
---
spring:
  profiles: prod_fz
eip:
  tenant: jkzl
---
spring:
  profiles: prod_sr
eip:
  tenant: jkzl
---
spring:
  profiles: prod_fzzy
eip:
  tenant: jkzl

application.yml

@@ -4,6 +4,7 @@ logging:
    org:
      apache:
        zookeeper: WARN
        hadoop: WARN
      hibernate: ERROR
#set max http header size
@@ -118,8 +119,8 @@ eureka:
  client:
    serviceUrl:
      defaultZone: http://${eureka-server-ip}/eureka/
    #healthcheck:
      #enabled: true
    healthcheck:
      enabled: false
---
spring:
@@ -134,6 +135,7 @@ eureka:
#eureka-server-ip: 127.0.0.1:8761
#eureka-server-ip: 192.168.1.221:8761
eureka-server-ip: 172.19.103.73:8761
#eureka-server-ip: 172.19.103.58:8761
#eureka-server-ip: 172.19.103.33:8761
---

svr-ehr-basic.yml

@@ -36,10 +36,8 @@ spring:
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
eip:
  tenant: jkzl
---
spring:
  profiles: dev
@@ -183,4 +181,4 @@ es:
  type: wlyy_quota_test
  host: http://100.100.1.158:9200
  tHost: 100.100.1.158:9300
  clusterName: jkzl
  clusterName: jkzl

svr-security.yml

@@ -15,6 +15,8 @@ spring:
    min-idle: 8
    validation-query: SELECT 1
    test-on-borrow: true
eip:
  tenant: jkzl
---
spring:
@@ -24,8 +26,7 @@ spring:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
eip:
  tenant: jkzl
---
spring:
@@ -35,8 +36,6 @@ spring:
    url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: ha
eip:
  tenant: jkzl
---
spring:
@@ -46,8 +45,6 @@ spring:
    url: jdbc:mysql://172.19.103.38:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: cloud
    password: cloud
eip:
  tenant: jkzl
---
spring:
@@ -57,5 +54,3 @@ spring:
    url: jdbc:mysql://11.1.2.5:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: ha
    password: jkzlxm
eip:
  tenant: jkzl