Merge branch 'jwdev' of http://192.168.1.220:10080/Amoy2/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:
@@ -171,4 +171,16 @@ spring:
  redis:
    host: 59.61.92.90 # Redis server host.
    port: 9206  # Redis server port.
    password: jkzlehr
---
## 卫计委配置-内网
spring:
  profiles: xmjwlocal
  datasource:
    url: jdbc:mysql://10.95.22.191:3046/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: qY#j2n5O
  redis:
    host: 10.95.22.142 # Redis server host.
    port: 6380  # Redis server port.
    password: jkzlehr

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

@@ -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:
@@ -182,6 +182,26 @@ spring:
    port: 9206  # Redis server port.
    password: jkzlehr
  ##发现服务
iHealth:
  user-info-uri: http://www.xmtyw.cn/wlyy/iHealth/userInfo
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://192.168.103.159:22122
---
## 卫计委
spring:
  profiles: xmjwlocal
  datasource:
    url: jdbc:mysql:/10.95.22.191:3046/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: qY#j2n5O
  redis:
    host: 10.95.22.142 # Redis server host.
    port: 6380  # Redis server port.
    password: jkzlehr
  ##发现服务
iHealth:
  user-info-uri: http://www.xmtyw.cn/wlyy/iHealth/userInfo

svr-internet-hospital.yml

@@ -640,6 +640,75 @@ im:
  im_list_get: http://27.150.190.148:16000/
  data_base_name: im
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
es:
  pwflag: 0 # 1需要密码，0不需要密码
  index:
    Statistics: hlw_quota_prod
  type:
    Statistics: hlw_quota_prod
  host:  http://59.61.92.90:9208
  tHost: 59.61.92.90:9209
  clusterName: jkzl
  securityUser: lion:jkzlehr
#是否开启i健康接口 0关闭，1开启
testPattern:
  sign: 1
wlyy:
  url: http://www.xmtyw.cn/wlyy/
##==厦门卫计委 内网===============================================================================
spring:
  profiles: xmjwlocal
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://10.95.22.191:3046/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: qY#j2n5O
#  elasticsearch:
#    cluster-name: jkzl #集群名 默认elasticsearch
#    cluster-nodes: 59.61.92.90:9208 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
#    client-transport-sniff: false
#    jest:
#      uris: http://59.61.92.90:9209
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://59.61.92.90:9103
    user: jkzl
    password: jkzlehr
  redis:
    host: 10.95.22.142 # Redis server host.
    port: 6380  # Redis server port.
    password: jkzlehr
fastDFS:
  fastdfs_file_url: http://192.168.103.159:8888/
fast-dfs:
  tracker-server: 192.168.103.159:22122 #服务器地址
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段  # todo 待配置
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP #todo 待配置
myFamily:
  qrCodeFailurTime: 2
# mq 是否获取his数据，flag代表获取演示数据，false代表获取his真实数据
demo:
  flag: false
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
im:
  im_list_get: http://27.150.190.148:16000/
  data_base_name: im
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp

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