Merge branch 'jwdev' of humingfen/wlyy2.0.config into jwdev

ag-basic.yml

@@ -135,9 +135,9 @@ spring:
  profiles: jwOracleProd
  datasource:
    driver-class-name: oracle.jdbc.driver.OracleDriver
    url: jdbc:oracle:thin:@192.168.20.55:1521:orcl
    username: system
    password: hxyk9573
    url: jdbc:oracle:thin:@10.10.10.16:1521:rac
    username: HLWYY
    password: Xmykzxhlwyy963
  jpa:
    properties:
      hibernate:

application.yml

@@ -67,7 +67,7 @@ eureka:
    healthcheck:
      enabled: false #监控检查
    serviceUrl:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@192.168.33.199:8761/eureka/
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}

svr-authentication.yml

@@ -128,9 +128,9 @@ spring:
  profiles: jwOracleProd
  datasource:
    driver-class-name: oracle.jdbc.driver.OracleDriver
    url: jdbc:oracle:thin:@192.168.20.55:1521:orcl
    username: system
    password: hxyk9573
    url: jdbc:oracle:thin:@10.10.10.16:1521:rac
    username: HLWYY
    password: Xmykzxhlwyy963
  jpa:
    properties:
      hibernate:
@@ -148,7 +148,7 @@ iHealth:
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://192.0.33.26:22122
  fastdfs_file_url: http://192.168.33.198:22122
---
## 心脏中心
spring:

svr-internet-hospital.yml

@@ -447,9 +447,9 @@ spring:
  ## ==眼科医院 数据库========================================================================
  datasource:
    driver-class-name: oracle.jdbc.driver.OracleDriver
    url: jdbc:oracle:thin:@192.168.20.55:1521:orcl
    username: system
    password: hxyk9573
    url: jdbc:oracle:thin:@10.10.10.16:1521:rac
    username: HLWYY
    password: Xmykzxhlwyy963
  jpa:
    properties:
      hibernate:

svr-iot.yml

@@ -70,7 +70,11 @@ hadoop:
  user:
    name: root
yihu:
  admin:
    client:
      advice:
        sql: true
---
spring:
@@ -108,6 +112,13 @@ fast-dfs:
fastDFS:
  fastdfs_file_url: http://172.26.0.200:22122/
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
  profiles: jwtest
@@ -125,6 +136,13 @@ fast-dfs:
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
  profiles: jwprod
@@ -141,3 +159,11 @@ fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082

web-gateway.yml

@@ -22,6 +22,11 @@ server:
#  ribbon:
#    listOfService: http://localhost:10020/,http://localhost:10021/
yihu:
  admin:
    client:
      advice:
        sql: false
---
spring:
@@ -32,6 +37,12 @@ spring:
  sleuth:
    sampler:
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
@@ -42,6 +53,12 @@ spring:
  sleuth:
    sampler:
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082
---
spring:
  profiles: jwprod
@@ -51,4 +68,10 @@ spring:
  sleuth:
    sampler:
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
      percentage: 1.0 ##采用需要的请求的百分比 默认是0.1 即 10%
yihu:
  admin:
    client:
      server:
        ip: 192.168.131.102
        port: 8082