Merge branch 'jwdev' of http://192.168.1.220:10080/Amoy2/wlyy2.0.config into jwdev

ag-basic.yml

@@ -51,7 +51,7 @@ ribbon:
#  sleuth:
#    sampler:
#      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10%
#      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10
zuul:
  retryable: true
  config-priority: false

svr-internet-hospital.yml

@@ -140,6 +140,7 @@ FileTempPath:
  chat_file_path : /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index:
    Statistics: hlw_quota_test
  type:
@@ -209,6 +210,7 @@ FileTempPath:
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index:
    Statistics: hlw_quota_test
  type:
@@ -277,6 +279,7 @@ FileTempPath:
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index:
    Statistics: hlw_quota_test
  type:
@@ -354,6 +357,7 @@ FileTempPath:
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index:
    Statistics: hlw_quota_test
  type:
@@ -431,6 +435,7 @@ FileTempPath:
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index:
    Statistics: hlw_quota_test
  type:
@@ -503,6 +508,7 @@ FileTempPath:
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index:
    Statistics: hlw_quota_test
  type:
@@ -525,14 +531,14 @@ spring:
    url: jdbc:mysql://59.61.92.90:9409/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: qY#j2n5O
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 10.95.22.155:9200 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    client-transport-sniff: false
    jest:
      uris: http://10.95.22.155:9300
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
#  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
@@ -572,12 +578,13 @@ FileTempPath:
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
es:
  pwflag: 0 # 1需要密码，0不需要密码
  index:
    Statistics: hlw_quota_test
  type:
    Statistics: hlw_quota_test
  host:  http://59.61.92.90:9065
  tHost: 59.61.92.90:9066
  host:  http://59.61.92.90:9208
  tHost: 59.61.92.90:9209
  clusterName: jkzl
  securityUser: lion:jkzlehr
#是否开启i健康接口 0关闭，1开启