Merge branch 'temp' into debug

src/main/resources/application-dev.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 1800000
     default:
       execution:
         timeout:
@@ -18,11 +19,11 @@ hystrix:
           semaphore:
             maxConcurrentRequests: 2000
           thread:
-            timeoutInMilliseconds: 2000000
+            timeoutInMilliseconds: 20000
 
 ribbon:
-  ReadTimeout: 2000000
-  ConnectTimeout: 2000000
+  ReadTimeout: 20000
+  ConnectTimeout: 20000
   MaxAutoRetries: 0
   MaxAutoRetriesNextServer: 1
 
@@ -168,5 +169,3 @@ encrypt:
 
 swagger:
   enable: true
-
-hystrix.command.QcServiceClient#extract().execution.isolation.thread.timeoutInMilliseconds: 1800000

src/main/resources/application-local.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 1800000
     default:
       execution:
         timeout:
@@ -168,5 +169,3 @@ encrypt:
 
 swagger:
   enable: true
-
-hystrix.command.QcServiceClient#extract().execution.isolation.thread.timeoutInMilliseconds: 1800000