Merge remote-tracking branch 'remotes/origin/dev'

4 years ago · 70955598d2
2 changed files with 6 additions and 7 deletions
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
@ -97,12 +97,6 @@ mybatis-plus:
 feign:
  hystrix:
    enabled: true
    threadpool:
      default:
        coreSize: 20
        maximumSize: 50
        maxQueueSize: 500
        queueSizeRejectionThreshold: 800
  client:
    config:
      default:
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
@ -108,7 +108,6 @@ feign:
    config:
      default:
        loggerLevel: BASIC
  okhttp:
    enabled: true
 hystrix:
@ -118,6 +117,12 @@ hystrix:
        isolation:
          thread:
            timeoutInMilliseconds: 60000 #缺省为1000
  threadpool:
    default:
      coreSize: 20
      maximumSize: 50
      maxQueueSize: 500
      queueSizeRejectionThreshold: 800
 ribbon:
  ReadTimeout: 300000