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

ag-basic.yml

@@ -1,4 +1,5 @@
server:
  port: ${server.ag-basic-port}
spring:
@@ -28,11 +29,31 @@ spring:
      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 settings only has an effect if it is positive.
hystrix:
  command:
    default:
      execution:
        timeout:
          enabled: true
        isolation:
          thread:
            timeoutInMilliseconds: 4800000
#Ribbon
ribbon:
  ReadTimeout: 600000
  ConnectTimeout: 600000
  SocketTimeout: 600000
  MaxAutoRetries: 3
  MaxAutoRetriesNextServer: 0
  eureka:
     enabled: true
#  sleuth:
#    sampler:
#      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10%
zuul:
  retryable: true
  config-priority: false
  ignored-services: '*'
  sensitive-headers:
@@ -63,7 +84,7 @@ zuul:
spring:
  profiles: jwdev
  datasource:
    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: jkzlehr
  redis:
@@ -77,7 +98,7 @@ spring:
spring:
  profiles: jwtest
  datasource:
     url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
     url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
     username: root
     password: jkzlehr
  redis:
@@ -87,7 +108,7 @@ spring:
spring:
  profiles: jwprod
  datasource:
    url: jdbc:mysql://192.0.33.27/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://192.0.33.27/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: im
    password: 2oEq3Kf7
  redis:
@@ -95,4 +116,4 @@ spring:
    port: 6390 # Redis server port.
    password: Kb6wKDQP1W4
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
#    base-url: http://localhost:9411 #日志追踪的地址

application.yml

@@ -18,24 +18,30 @@ management:
    enabled: false
#Hystrix
hystrix:
  command:
    default:
      execution:
        isolation:
          thread:
            timeoutInMilliseconds: 610000
#hystrix:
#  command:
#    default:
#      execution:
#        timeout:
#          enabled: false
#        isolation:
#          thread:
#            timeoutInMilliseconds: 240000
#Ribbon
ribbon:
  ReadTimeout: 300000
  ConnectTimeout: 5000
#ribbon:
#  ReadTimeout: 600000
#  ConnectTimeout: 600000
#  MaxAutoRetries: 3
#  MaxAutoRetriesNextServer: 0
#  eureka:
#     enabled: true
#Zuul
zuul:
  host:
    socket-timeout-millis: 300000
    connect-timeout-millis: 300000
#Zuul serviceid 模式配置zuulhost 无效.启用ribbon
#zuul:
#  host:
#    socket-timeout-millis: 300000
#    connect-timeout-millis: 300000
#Spring
spring:

svr-authentication.yml

@@ -40,7 +40,7 @@ spring:
  profiles: jwdev
  ##发现服务
  datasource:
    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
  redis:
@@ -54,13 +54,11 @@ zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
fast-dfs:
  tracker-server: 172.26.0.110:22122 #服务器地址
---
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: jkzlehr
  redis:
@@ -75,13 +73,11 @@ zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
fast-dfs:
  tracker-server: 172.26.0.110:22122 #服务器地址
---
spring:
  profiles: jwprod
  datasource:
    url: jdbc:mysql://192.0.33.27/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://192.0.33.27/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: im
    password: 2oEq3Kf7
  redis:
@@ -95,6 +91,4 @@ iHealth:
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://192.0.33.26:8888/
fast-dfs:
  tracker-server: 192.0.33.26:22122 #服务器地址
  fastdfs_file_url: http://192.0.33.26:22122

svr-internet-hospital.yml

@@ -83,7 +83,7 @@ spring:
#    url: jdbc:mysql://172.17.110.160/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: ssgg
#    password: ssgg
    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.26.0.114/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: jkzlehr
  elasticsearch:
@@ -142,7 +142,7 @@ FileTempPath:
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.26.0.104/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: ssgg
    password: ssgg@jkzl2019
#    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
@@ -197,7 +197,7 @@ FileTempPath:
spring:
  profiles: jwprod
  datasource:
    url: jdbc:mysql://192.0.33.27:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://192.0.33.27:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: im
    password: 2oEq3Kf7
  elasticsearch: